From 55f32671c54514189fa4ac151a7dee9975e50942 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Thu, 26 Oct 2023 17:52:43 +0200
Subject: [PATCH 01/28] Revert "fix timeline breaking when max_id is null"

This reverts commit 289db097707090f5f480dc91080bb153c438fa32.
---
 .../fragments/HomeTimelineFragment.java       | 57 ++++++-------------
 1 file changed, 16 insertions(+), 41 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
index 6decae1fe..eeffe59b0 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -11,10 +11,10 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
-import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.events.StatusDeletedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.FilterContext;
@@ -57,7 +57,6 @@ public class HomeTimelineFragment extends StatusListFragment {
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		String maxID=this.maxID;
 		AccountSessionManager.getInstance()
 				.getAccount(accountID).getCacheController()
 				.getHomeTimeline(offset>0 ? maxID : null, count, refreshing, new SimpleCallback<>(this){
@@ -65,8 +64,8 @@ public class HomeTimelineFragment extends StatusListFragment {
 					public void onSuccess(CacheablePaginatedResponse<List<Status>> result){
 						if(getActivity()==null) return;
 						boolean empty=result.items.isEmpty();
-						if(result.isFromCache()) refreshCachedData(result, maxID);
-						HomeTimelineFragment.this.maxID=result.maxID;
+						if(result.isFromCache()) refreshData(result.items);
+						maxID=result.maxID;
 						AccountSessionManager.get(accountID).filterStatuses(result.items, getFilterContext());
 						onDataLoaded(result.items, !empty);
 						if(result.isFromCache() && GlobalUserPreferences.loadNewPosts)
@@ -75,46 +74,22 @@ public class HomeTimelineFragment extends StatusListFragment {
 				});
 	}
 
-	private void handleRefreshedData(List<Status> result, List<Status> cachedList){
-		Map<String, Status> refreshed=result.stream().collect(Collectors.toMap(Status::getID, Function.identity()));
-		for(Status cached : cachedList){
-			if(refreshed.containsKey(cached.id)){
-				Status updated=refreshed.get(cached.id);
-				if(updated.editedAt!=null && cached.editedAt!=null && updated.editedAt.isAfter(cached.editedAt))
-					E.post(new StatusUpdatedEvent(updated));
-				else
-					E.post(new StatusCountersUpdatedEvent(updated.getContentStatus()));
-			}else{
-				removeStatus(cached);
-			}
-		}
-	}
-
-	private void refreshCachedData(CacheablePaginatedResponse<List<Status>> result, String maxID){
-		List<Status> cachedList=new ArrayList<>(result.items);
-		if(cachedList.isEmpty()) return;
-		if(maxID==null){
-			// fetch top status manually so we can use its id as the max_id to fetch the rest
-			Status firstFromCache=cachedList.get(0);
-			maxID=firstFromCache.id;
-			cachedList.remove(0);
-			new GetStatusByID(maxID).setCallback(new Callback<>(){
-				@Override
-				public void onSuccess(Status result){
-					handleRefreshedData(
-							Collections.singletonList(result),
-							Collections.singletonList(firstFromCache)
-					);
-				}
-
-				@Override
-				public void onError(ErrorResponse ignored){}
-			}).exec(accountID);
-		}
+	private void refreshData(List<Status> cachedList){
 		new GetHomeTimeline(maxID, null, cachedList.size(), null, getSession().getLocalPreferences().timelineReplyVisibility).setCallback(new Callback<>(){
 			@Override
 			public void onSuccess(List<Status> result){
-				handleRefreshedData(result, cachedList);
+				Map<String, Status> refreshed=result.stream().collect(Collectors.toMap(Status::getID, Function.identity()));
+				for(Status cached : cachedList){
+					if(refreshed.containsKey(cached.id)){
+						Status updated=refreshed.get(cached.id);
+						if(updated.editedAt!=null && cached.editedAt!=null && updated.editedAt.isAfter(cached.editedAt))
+							E.post(new StatusUpdatedEvent(updated));
+						else
+							E.post(new StatusCountersUpdatedEvent(updated));
+					}else{
+						removeStatus(cached);
+					}
+				}
 			}
 
 			@Override

From 708142e1b80d019ad3691ffc305a8c5dee6eebeb Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Thu, 26 Oct 2023 17:53:36 +0200
Subject: [PATCH 02/28] Revert "refresh data from cache"

This reverts commit 60a998be8952520c8bf0f60efd0810378a8fca76.
---
 .../fragments/HomeTimelineFragment.java       | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
index eeffe59b0..8c00be228 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -8,14 +8,10 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
-import org.joinmastodon.android.events.StatusDeletedEvent;
-import org.joinmastodon.android.events.StatusUpdatedEvent;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
@@ -27,11 +23,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.Callback;
@@ -64,7 +58,6 @@ public class HomeTimelineFragment extends StatusListFragment {
 					public void onSuccess(CacheablePaginatedResponse<List<Status>> result){
 						if(getActivity()==null) return;
 						boolean empty=result.items.isEmpty();
-						if(result.isFromCache()) refreshData(result.items);
 						maxID=result.maxID;
 						AccountSessionManager.get(accountID).filterStatuses(result.items, getFilterContext());
 						onDataLoaded(result.items, !empty);
@@ -74,29 +67,6 @@ public class HomeTimelineFragment extends StatusListFragment {
 				});
 	}
 
-	private void refreshData(List<Status> cachedList){
-		new GetHomeTimeline(maxID, null, cachedList.size(), null, getSession().getLocalPreferences().timelineReplyVisibility).setCallback(new Callback<>(){
-			@Override
-			public void onSuccess(List<Status> result){
-				Map<String, Status> refreshed=result.stream().collect(Collectors.toMap(Status::getID, Function.identity()));
-				for(Status cached : cachedList){
-					if(refreshed.containsKey(cached.id)){
-						Status updated=refreshed.get(cached.id);
-						if(updated.editedAt!=null && cached.editedAt!=null && updated.editedAt.isAfter(cached.editedAt))
-							E.post(new StatusUpdatedEvent(updated));
-						else
-							E.post(new StatusCountersUpdatedEvent(updated));
-					}else{
-						removeStatus(cached);
-					}
-				}
-			}
-
-			@Override
-			public void onError(ErrorResponse ignored){}
-		}).exec(accountID);
-	}
-
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);

From af339a833f2bec5af876611f44dc841aa5c9f236 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Thu, 26 Oct 2023 18:11:54 +0200
Subject: [PATCH 03/28] fix gap time being wrong when next status is own

closes sk22#902
---
 .../android/ui/displayitems/GapStatusDisplayItem.java |  8 +++++++-
 .../android/ui/displayitems/StatusDisplayItem.java    | 11 +++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java
index ee4764a92..96c2366ae 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.drawables.SawtoothTearDrawable;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -63,7 +64,12 @@ public class GapStatusDisplayItem extends StatusDisplayItem{
 			}
 			top.setClickable(!item.loading);
 			bottom.setClickable(!item.loading);
-			StatusDisplayItem next=getNextVisibleDisplayItem().orElse(null);
+			StatusDisplayItem next=getNextVisibleDisplayItem(i->{
+				if(!(item.parentFragment instanceof StatusListFragment)) return false;
+				Status s=((StatusListFragment) item.parentFragment).getStatusByID(i.parentID);
+				return s!=null && !s.fromStatusCreated;
+			}).orElse(null);
+			bottom.setVisibility(next==null ? View.GONE : View.VISIBLE);
 			Instant dateBelow=next instanceof HeaderStatusDisplayItem h ? h.status.createdAt
 					: next instanceof ReblogOrReplyLineStatusDisplayItem l ? l.status.createdAt
 					: null;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
index 71bfdf54f..c4cf28ab5 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
@@ -45,6 +45,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.Nav;
@@ -384,12 +385,14 @@ public abstract class StatusDisplayItem{
 		}
 
 		public Optional<StatusDisplayItem> getNextVisibleDisplayItem(){
+			return getNextVisibleDisplayItem(null);
+		}
+		public Optional<StatusDisplayItem> getNextVisibleDisplayItem(Predicate<StatusDisplayItem> predicate){
 			Optional<StatusDisplayItem> next=getNextDisplayItem();
 			for(int offset=1; next.isPresent(); next=getDisplayItemOffset(++offset)){
-				if(!next.map(n->
-						(n instanceof EmojiReactionsStatusDisplayItem e && e.isHidden()) ||
-						(n instanceof DummyStatusDisplayItem)
-				).orElse(false)) return next;
+				boolean isHidden=next.map(n->(n instanceof EmojiReactionsStatusDisplayItem e && e.isHidden())
+						|| (n instanceof DummyStatusDisplayItem)).orElse(false);
+				if(!isHidden && (predicate==null || predicate.test(next.get()))) return next;
 			}
 			return Optional.empty();
 		}

From c8f633ae3b61099cade78389342cf004d67151a4 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Thu, 26 Oct 2023 18:23:56 +0200
Subject: [PATCH 04/28] don't hide gap behind warning

closes sk22#899
---
 .../ui/displayitems/StatusDisplayItem.java     | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
index c4cf28ab5..9b5995f2d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
@@ -28,6 +28,7 @@ import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.DisplayItemsParent;
+import org.joinmastodon.android.model.FilterAction;
 import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.FilterResult;
@@ -42,6 +43,7 @@ import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -303,10 +305,7 @@ public abstract class StatusDisplayItem{
 			footer=new FooterStatusDisplayItem(parentID, fragment, statusForContent, accountID);
 			footer.hideCounts=hideCounts;
 			items.add(footer);
-			if(status.hasGapAfter!=null && !(fragment instanceof ThreadFragment))
-				items.add(new GapStatusDisplayItem(parentID, fragment, status));
 		}
-		int i=1;
 		boolean inset=(flags & FLAG_INSET)!=0;
 		// add inset dummy so last content item doesn't clip out of inset bounds
 		if((inset || footer==null) && (flags & FLAG_CHECKABLE)==0){
@@ -316,6 +315,10 @@ public abstract class StatusDisplayItem{
 			// !contentItems.isEmpty() && contentItems
 			// 	.get(contentItems.size() - 1) instanceof MediaGridStatusDisplayItem));
 		}
+		GapStatusDisplayItem gap=null;
+		if((flags & FLAG_NO_FOOTER)==0 && status.hasGapAfter!=null && !(fragment instanceof ThreadFragment))
+			items.add(gap=new GapStatusDisplayItem(parentID, fragment, status));
+		int i=1;
 		for(StatusDisplayItem item:items){
 			item.inset=inset;
 			item.index=i++;
@@ -327,8 +330,13 @@ public abstract class StatusDisplayItem{
 			}
 		}
 
-		return applyingFilter==null ? items :
-				new ArrayList<>(List.of(new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, items, applyingFilter)));
+		List<StatusDisplayItem> nonGapItems=gap!=null ? items.subList(0, items.size()-1) : items;
+		WarningFilteredStatusDisplayItem warning=applyingFilter==null ? null :
+				new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, nonGapItems, applyingFilter);
+		return applyingFilter==null ? items : new ArrayList<>(gap!=null
+				? List.of(warning, gap)
+				: Collections.singletonList(warning)
+		);
 	}
 
 	public static void buildPollItems(String parentID, BaseStatusListFragment fragment, Poll poll, List<StatusDisplayItem> items){

From e8c9253a7628ac3d2941b48343e9e88531cbc7d4 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Thu, 26 Oct 2023 18:32:46 +0200
Subject: [PATCH 05/28] don't remove gap when removing status

re: sk22#898
---
 .../java/org/joinmastodon/android/api/CacheController.java     | 1 +
 .../org/joinmastodon/android/fragments/StatusListFragment.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
index 12725fe0c..6fd6478da 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
@@ -273,6 +273,7 @@ public class CacheController{
 
 	public void deleteStatus(String id){
 		runOnDbThread((db)->{
+			// TODO: set previous status's hasGapAfter flag if the deleted status hasGapAfter
 			db.delete("home_timeline", "`id`=?", new String[]{id});
 		});
 	}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
index 2175c9abe..7bb00c27f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
@@ -25,6 +25,7 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.EmojiReactionsStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.parceler.Parcels;
@@ -216,7 +217,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 			StatusDisplayItem item=displayItems.get(i);
 			// we found a status that the to-be-removed status replies to!
 			// storing indices to maybe update its display items
-			if(item.parentID.equals(status.inReplyToId)){
+			if(item.parentID.equals(status.inReplyToId) && !(item instanceof GapStatusDisplayItem)){
 				if(ancestorFirstIndex==-1) ancestorFirstIndex=i;
 				ancestorLastIndex=i;
 			}

From 812ab7198c223a315c56fb353e74c5b007d24169 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Thu, 26 Oct 2023 18:38:06 +0200
Subject: [PATCH 06/28] revert, i said!

actually, the cached posts limit can stay
---
 .../main/java/org/joinmastodon/android/api/CacheController.java | 2 +-
 .../joinmastodon/android/fragments/HomeTimelineFragment.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
index 6fd6478da..147043376 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
@@ -121,7 +121,7 @@ public class CacheController{
 				db.insertWithOnConflict("home_timeline", null, values, SQLiteDatabase.CONFLICT_REPLACE);
 			}
 			if(!clear)
-				db.delete("home_timeline", "`id` NOT IN (SELECT `id` FROM `home_timeline` ORDER BY `time` DESC LIMIT ?)", new String[]{"100"});
+				db.delete("home_timeline", "`id` NOT IN (SELECT `id` FROM `home_timeline` ORDER BY `time` DESC LIMIT ?)", new String[]{"1000"});
 		});
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
index 8c00be228..fae16790d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -332,7 +332,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 			dataLoading=false;
 		}
 		if(parent!=null) parent.hideNewPostsButton();
-		loadNewPosts();
+		super.onRefresh();
 	}
 
 	@Override

From 9cf7da64196b5bf01b2073cb422d7b4e0e0e4dc1 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Sun, 22 Oct 2023 13:39:49 +0000
Subject: [PATCH 07/28] Translated using Weblate (Spanish)

Currently translated at 100.0% (398 of 398 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
---
 mastodon/src/main/res/values-es-rES/strings_sk.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mastodon/src/main/res/values-es-rES/strings_sk.xml b/mastodon/src/main/res/values-es-rES/strings_sk.xml
index b36d66107..dc08fe823 100644
--- a/mastodon/src/main/res/values-es-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-es-rES/strings_sk.xml
@@ -408,4 +408,8 @@
     <string name="sk_settings_color_palette_default">Por defecto (%s)</string>
     <string name="sk_settings_underlined_links">Enlaces subrayados</string>
     <string name="sk_edit_alt_text">Editar el texto alternativo</string>
+    <string name="sk_settings_default_visibility">Visibilidad de la publicación predeterminada</string>
+    <string name="sk_settings_lock_account">Aprobar nuevos seguidores manualmente</string>
+    <string name="sk_timeline_cache_cleared">Caché de la línea de tiempo de inicio borrada</string>
+    <string name="sk_settings_clear_timeline_cache">Borrar la caché de la línea de tiempo de inicio</string>
 </resources>
\ No newline at end of file

From 0b622f8f2ac85f88d894414cd9d49ada36c329c3 Mon Sep 17 00:00:00 2001
From: poesty <poesty7450@gmail.com>
Date: Tue, 24 Oct 2023 07:13:16 +0000
Subject: [PATCH 08/28] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.7% (398 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
---
 mastodon/src/main/res/values-zh-rCN/strings_sk.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
index f99a0394c..045c359a1 100644
--- a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
@@ -405,4 +405,5 @@
     <string name="sk_settings_lock_account">手动批准新关注者</string>
     <string name="sk_timeline_cache_cleared">已清除主页时间线缓存</string>
     <string name="sk_settings_clear_timeline_cache">清除主页时间线缓存</string>
+    <string name="sk_button_mutuals">互关</string>
 </resources>
\ No newline at end of file

From cc1e13d1bd7aa058253fa19a0692248aea315d9e Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 23 Oct 2023 14:56:53 +0000
Subject: [PATCH 09/28] Translated using Weblate (Spanish)

Currently translated at 100.0% (399 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
---
 mastodon/src/main/res/values-es-rES/strings_sk.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/values-es-rES/strings_sk.xml b/mastodon/src/main/res/values-es-rES/strings_sk.xml
index dc08fe823..52cc5ae96 100644
--- a/mastodon/src/main/res/values-es-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-es-rES/strings_sk.xml
@@ -412,4 +412,5 @@
     <string name="sk_settings_lock_account">Aprobar nuevos seguidores manualmente</string>
     <string name="sk_timeline_cache_cleared">Caché de la línea de tiempo de inicio borrada</string>
     <string name="sk_settings_clear_timeline_cache">Borrar la caché de la línea de tiempo de inicio</string>
+    <string name="sk_button_mutuals">Amigos</string>
 </resources>
\ No newline at end of file

From 35e3d5afc48233ad74a1dfac701ceac7365ad934 Mon Sep 17 00:00:00 2001
From: Choukajohn <j.blanc@ikmail.com>
Date: Sun, 22 Oct 2023 21:48:55 +0000
Subject: [PATCH 10/28] Translated using Weblate (French)

Currently translated at 100.0% (399 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
---
 mastodon/src/main/res/values-fr-rFR/strings_sk.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index 74016c34d..666ba8345 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -414,4 +414,5 @@
     <string name="sk_settings_default_visibility">Visibilité de publication par défaut</string>
     <string name="sk_settings_lock_account">Approuver manuellement les nouveaux abonnés</string>
     <string name="sk_timeline_cache_cleared">Cache du fil d\'accueil vidé</string>
+    <string name="sk_button_mutuals">Amis</string>
 </resources>
\ No newline at end of file

From 1a95b4e3610327268b343d173484423bd0e68d57 Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Mon, 23 Oct 2023 00:13:48 +0000
Subject: [PATCH 11/28] Translated using Weblate (Indonesian)

Currently translated at 100.0% (399 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
---
 mastodon/src/main/res/values-in-rID/strings_sk.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/values-in-rID/strings_sk.xml b/mastodon/src/main/res/values-in-rID/strings_sk.xml
index a3bb8c789..485509a01 100644
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -406,4 +406,5 @@
     <string name="sk_settings_lock_account">Setujui pengikut baru secara manual</string>
     <string name="sk_timeline_cache_cleared">Tembolok lini masa beranda dihapus</string>
     <string name="sk_settings_clear_timeline_cache">Hapus tembolok lini masa beranda</string>
+    <string name="sk_button_mutuals">Mutual</string>
 </resources>
\ No newline at end of file

From fe259749585753ff40f406fe577bb13bed3c8d60 Mon Sep 17 00:00:00 2001
From: Oliebol <schrijfmedan@gmail.com>
Date: Mon, 23 Oct 2023 09:10:30 +0000
Subject: [PATCH 12/28] Translated using Weblate (Dutch)

Currently translated at 91.7% (366 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/nl/
---
 .../src/main/res/values-nl-rNL/strings_sk.xml | 50 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-nl-rNL/strings_sk.xml b/mastodon/src/main/res/values-nl-rNL/strings_sk.xml
index 359d72771..aa3bd16b2 100644
--- a/mastodon/src/main/res/values-nl-rNL/strings_sk.xml
+++ b/mastodon/src/main/res/values-nl-rNL/strings_sk.xml
@@ -286,7 +286,7 @@
     <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_enter_emoji_hint">Type een emoji of zoek</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>
@@ -326,4 +326,52 @@
     <string name="sk_time_seconds">%d seconden</string>
     <string name="sk_search_suicide_hotlines">Vind een hulplijn</string>
     <string name="sk_recently_used">Recent gebruikt</string>
+    <string name="sk_disable_pill_shaped_active_indicator">Schakel pilvormige actieve tabindicator uit</string>
+    <string name="sk_edit_timeline_tags_hint">Voer hashtags in…</string>
+    <string name="sk_gif_badge">GIF</string>
+    <string name="sk_settings_show_emoji_reactions_only_opened">Alleen als een bericht geopend is</string>
+    <string name="sk_add_timeline">Tijdlijn toevoegen</string>
+    <string name="sk_set_as_default">Instellen als standaard</string>
+    <string name="sk_settings_like_icon">Gebruik een hartje als icoon voor favoriet</string>
+    <string name="sk_settings_color_palette_default">Standaard (%s)</string>
+    <string name="sk_settings_show_emoji_reactions">Toon emoji reacties in tijdlijnen</string>
+    <string name="sk_blocked_accounts">Geblokkeerde accounts</string>
+    <string name="sk_icon_feed">Feed</string>
+    <string name="sk_edit_timeline_tag_main">Berichten met hashtag…</string>
+    <string name="sk_icon_verified">Geverifieerd</string>
+    <string name="sk_settings_underlined_links">Onderstreepte links</string>
+    <string name="sk_settings_lock_account">Handmatig nieuwe volgers goedkeuren</string>
+    <string name="sk_settings_instance">Instance</string>
+    <string name="sk_settings_display_pronouns_in_timelines">Toon voornaamwoorden in tijdlijnen</string>
+    <string name="sk_switch_timeline">Tijdlijn wisselen</string>
+    <string name="sk_hashtag_timeline_local_only_switch">Alleen lokale berichten tonen\?</string>
+    <string name="sk_icon_umbrella">Paraplu</string>
+    <string name="sk_unfinished_attachments">Uploaden bijlagen</string>
+    <string name="sk_timeline_cache_cleared">Cache gewist van de home tijdlijn</string>
+    <string name="sk_muted_accounts">Genegeerde accounts</string>
+    <string name="sk_settings_true_black">Diepzwarte modus</string>
+    <string name="sk_edit_timeline_tag_any">...of een van deze</string>
+    <string name="sk_settings_display_pronouns_in_threads">Toon voornaamwoorden in threads</string>
+    <string name="sk_edit_timeline_tag_all">...en elke van deze</string>
+    <string name="sk_icon_diamond">Diamant</string>
+    <string name="sk_trending_posts_info_banner">Deze berichten zijn momenteel populair in de Fediverse.</string>
+    <string name="sk_settings_display_pronouns_in_user_listings">Toon voornaamwoorden in gebruikersoverzichten</string>
+    <string name="sk_icon_doctor">Dokter</string>
+    <string name="sk_edit_timeline_tag_hint">Voer hashtag in…</string>
+    <string name="sk_icon_bed">Bed</string>
+    <string name="sk_edit_timeline_tag_none">...maar geen van deze</string>
+    <string name="sk_icon_beaker">Beker</string>
+    <string name="sk_button_mutuals">Vrienden</string>
+    <string name="sk_exclusive_list">Exclusieve lijst</string>
+    <string name="sk_settings_continues_playback">Audio overlay</string>
+    <string name="sk_icon_recycle_bin">Recycle bak</string>
+    <string name="sk_trending_links_info_banner">Deze nieuwsberichten worden besproken in de Fediverse.</string>
+    <string name="sk_search_fediverse">Zoek in de Fediverse</string>
+    <string name="sk_post_contains_media">Bericht bevat media</string>
+    <string name="sk_settings_clear_timeline_cache">Wis de cache van de home tijdlijn</string>
+    <string name="sk_edit_alt_text">Bewerk alt tekst</string>
+    <string name="sk_settings_unifiedpush">Gebruik UnifiedPush</string>
+    <string name="sk_add_timeline_tag_error_empty">Hashtag mag niet leeg zijn</string>
+    <string name="sk_list_exclusive_switch_explanation">Berichten van leden op een exclusieve lijst worden niet getoond in je home tijdlijn - als je instance dit ondersteunt.</string>
+    <string name="sk_pronouns_label">Voornaamwoorden</string>
 </resources>
\ No newline at end of file

From e99e5b2836fed92941edfe83ac1c3eea159e988c Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Mon, 23 Oct 2023 09:26:54 +0000
Subject: [PATCH 13/28] Translated using Weblate (Ukrainian)

Currently translated at 99.7% (398 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
---
 mastodon/src/main/res/values-uk-rUA/strings_sk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
index fe134ddcb..2347ed0cd 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
@@ -184,7 +184,7 @@
     <string name="sk_icon_language">Мова</string>
     <string name="sk_icon_microphone">Мікрофон</string>
     <string name="sk_icon_microscope">Мікроскоп</string>
-    <string name="sk_icon_keyboard">🎹 Клавіатура музичного інструмента</string>
+    <string name="sk_icon_keyboard">Клавіатура</string>
     <string name="sk_icon_coffee">Кава</string>
     <string name="sk_icon_laugh">Посмішка</string>
     <string name="sk_icon_pi">Пі</string>

From 576da2a3eb8f81a227bc783d7d1d31978f3f6bff Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Wed, 25 Oct 2023 14:59:03 +0000
Subject: [PATCH 14/28] Translated using Weblate (Korean)

Currently translated at 99.2% (396 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
---
 .../src/main/res/values-ko-rKR/strings_sk.xml | 106 ++++++++++++++++--
 1 file changed, 94 insertions(+), 12 deletions(-)

diff --git a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
index 507e492a1..877056204 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -136,7 +136,7 @@
     <string name="sk_list_name_hint">리스트 이름</string>
     <string name="sk_create">만들기</string>
     <string name="sk_list_replies_policy_list">리스트의 구성원들</string>
-    <string name="sk_list_replies_policy_followed">팔로우한 사용자 누구나</string>
+    <string name="sk_list_replies_policy_followed">팔로우한 사용자</string>
     <string name="sk_list_replies_policy_none">아무도 없음</string>
     <string name="sk_delete_list">리스트 삭제</string>
     <string name="sk_edit_list_title">리스트 수정</string>
@@ -249,7 +249,7 @@
     <string name="sk_filtered">%s 필터로 걸러짐</string>
     <string name="sk_collapse">접기</string>
     <string name="sk_expand">펼치기</string>
-    <string name="sk_unfinished_attachments">첨부 파일을 수정하시겠습니까\?</string>
+    <string name="sk_unfinished_attachments">첨부 파일 업로드 중</string>
     <string name="sk_unfinished_attachments_message">일부 첨부 파일의 업로드가 완료되지 않았습니다.</string>
     <string name="sk_new_reports">새로운 신고</string>
     <string name="sk_signed_up">가입했습니다</string>
@@ -272,16 +272,16 @@
     <string name="sk_show_thread">스레드 보기</string>
     <string name="sk_notification_action_replied">%s 님에게 답글을 보냈습니다</string>
     <string name="sk_compact_reblog_reply_line">부스트/답글 정보 요약</string>
-    <string name="sk_settings_auto_reveal_equal_spoilers">답글의 동일한 CW 펼치기</string>
-    <string name="sk_settings_auto_reveal_author">작성자</string>
-    <string name="sk_settings_auto_reveal_anyone">모두</string>
+    <string name="sk_settings_auto_reveal_equal_spoilers">답글의 동일한 CW 자동으로 펼치기</string>
+    <string name="sk_settings_auto_reveal_author">같은 작성자가 작성한 답글</string>
+    <string name="sk_settings_auto_reveal_anyone">누구나 적은 답글</string>
     <string name="sk_open_in_app_failed">앱으로 열 수 없습니다</string>
     <string name="sk_external_share_title">계정으로 공유</string>
     <string name="sk_external_share_or_open_title">계정으로 공유 및 열기</string>
-    <string name="sk_settings_auto_reveal_nobody">아무도</string>
-    <string name="sk_settings_prefix_replies_never">아무도</string>
-    <string name="sk_settings_prefix_replies_to_others">다른 사람</string>
-    <string name="sk_settings_prefix_replies_always">모두</string>
+    <string name="sk_settings_auto_reveal_nobody">안 함</string>
+    <string name="sk_settings_prefix_replies_never">안 함</string>
+    <string name="sk_settings_prefix_replies_to_others"></string>
+    <string name="sk_settings_prefix_replies_always"></string>
     <string name="sk_content_type">콘텐츠 유형</string>
     <string name="sk_content_type_unspecified">지정되지 않음</string>
     <string name="sk_icon_beaker">비커</string>
@@ -321,11 +321,93 @@
     <string name="sk_advanced_options_hide">고급 설정 숨기기</string>
     <string name="sk_error_loading_profile">%s 인스턴스에서 프로필을 불러오지 못했습니다</string>
     <string name="sk_no_remote_info_hint">원격 정보를 사용할 수 없습니다</string>
-    <string name="sk_settings_forward_report_default">“신고 시 전달” 설정 기본값</string>
+    <string name="sk_settings_forward_report_default">“신고 시 전달” 기본으로 활성화</string>
     <string name="sk_timeline_bubble">버블</string>
     <string name="sk_icon_feed">피드</string>
     <string name="sk_settings_confirm_before_reblog">부스트 전 확인</string>
-    <string name="sk_reacted_with">%s 계정으로 반응했습니다</string>
-    <string name="sk_reacted">반응했습니다</string>
+    <string name="sk_reacted_with">%1$s 님이 %2$s 이모지로 반응했습니다</string>
+    <string name="sk_reacted">%s 님이 반응했습니다</string>
     <string name="sk_bubble_timeline_info_banner">인스턴스 관리자가 큐레이션한 네트워크의 가장 최근 게시물입니다.</string>
+    <string name="sk_disable_pill_shaped_active_indicator">알약 모양의 활성 탭 표시 비활성화</string>
+    <string name="sk_tab_profile">프로필</string>
+    <plurals name="sk_time_seconds">
+        <item quantity="other">%d초</item>
+    </plurals>
+    <string name="sk_gif_badge">GIF</string>
+    <string name="sk_mute_label">기간</string>
+    <string name="sk_settings_show_emoji_reactions_only_opened">게시물이 열려 있을 때에만</string>
+    <plurals name="sk_time_hours">
+        <item quantity="other">%d시간</item>
+    </plurals>
+    <string name="sk_set_as_default">기본으로 설정</string>
+    <string name="sk_settings_like_icon">좋아요 아이콘으로 하트 사용</string>
+    <string name="sk_settings_color_palette_default">기본 (%s)</string>
+    <string name="sk_tab_home">홈</string>
+    <string name="sk_settings_show_emoji_reactions_hide_empty">비어 있는 이모지 반응 숨기기</string>
+    <string name="sk_settings_show_emoji_reactions">타임라인에 이모지 반응 표시</string>
+    <plurals name="sk_posts_count_label">
+        <item quantity="other">게시물</item>
+    </plurals>
+    <string name="sk_notification_mention">%s 님에게 멘션을 받았습니다</string>
+    <string name="sk_settings_emoji_reactions">이모지 반응 활성화</string>
+    <string name="sk_blocked_accounts">차단한 계정</string>
+    <string name="sk_suicide_search_terms">자살</string>
+    <string name="sk_duration_minutes_5">5분</string>
+    <string name="sk_spoiler_show">내용 보이기</string>
+    <string name="sk_settings_unifiedpush_no_distributor_body">UnifiedPush 알림이 동작하려면 공급자를 설치해야 합니다. 자세한 정보: https://unifiedpush.org/</string>
+    <string name="sk_settings_default_visibility">기본 게시 공개 범위</string>
+    <string name="sk_settings_underlined_links">밑줄 표시된 링크</string>
+    <string name="sk_settings_lock_account">새로운 팔로워를 수동으로 승인</string>
+    <string name="sk_settings_instance">인스턴스</string>
+    <string name="sk_load_missing_posts_above">새로운 게시물 불러오기</string>
+    <string name="sk_settings_display_pronouns_in_timelines">타임라인에 인칭 대명사 표시</string>
+    <string name="sk_switch_timeline">타임라인 전환</string>
+    <plurals name="sk_time_days">
+        <item quantity="other">%d일</item>
+    </plurals>
+    <string name="sk_settings_show_labels_in_navigation_bar">내비게이션 바에 탭 레이블 표시</string>
+    <string name="sk_tab_search">검색</string>
+    <string name="sk_settings_show_emoji_reactions_always">항상 추가 버튼 표시</string>
+    <string name="sk_duration_indefinite">무기한</string>
+    <string name="sk_search_suicide_hotlines">상담전화 찾기</string>
+    <string name="sk_timeline_cache_cleared">홈 타임라인 캐시를 지웠습니다</string>
+    <string name="sk_duration_hours_1">1시간</string>
+    <string name="sk_duration_hours_6">6시간</string>
+    <string name="sk_muted_accounts">뮤트한 계정</string>
+    <string name="sk_enter_emoji_hint">이모지를 입력하거나 검색하세요</string>
+    <string name="sk_duration_days_7">7일</string>
+    <string name="sk_settings_unifiedpush_no_distributor">공급자 찾지 못함</string>
+    <string name="sk_settings_true_black">칠흑같은 어둠 모드</string>
+    <string name="sk_do_not_show_again">다시 보지 않기</string>
+    <string name="sk_suicide_helplines_url">http://suicideprevention.or.kr/</string>
+    <string name="sk_settings_display_pronouns_in_threads">스레드에 인칭 대명사 표시</string>
+    <string name="sk_enter_emoji_toast">이모지를 입력하세요</string>
+    <string name="sk_trending_posts_info_banner">연합우주에서 현재 많은 관심을 받고 있는 게시물들입니다.</string>
+    <string name="sk_duration_minutes_30">30분</string>
+    <string name="sk_settings_display_pronouns_in_user_listings">유저 목록에 인칭 대명사 표시</string>
+    <string name="sk_button_react">이모지로 반응</string>
+    <string name="sk_duration_days_1">1일</string>
+    <string name="sk_load_missing_posts_below">오래된 게시물 불러오기</string>
+    <string name="sk_settings_emoji_reactions_explanation">게시글에 이모지 반응을 표시하고 추가할 수 있도록 합니다. 다양한 연합우주 서버들이 지원하지만, Mastodon은 지원하지 않습니다.</string>
+    <string name="sk_duration_days_3">3일</string>
+    <string name="sk_recently_used">최근에 사용</string>
+    <string name="sk_search_suicide_title">우울감 등 말하기 어려운 고민이 있는 경우…</string>
+    <string name="sk_settings_unifiedpush_choose">공급자 선택</string>
+    <plurals name="sk_time_minutes">
+        <item quantity="other">%d분</item>
+    </plurals>
+    <string name="sk_settings_continues_playback_summary">재생 중인 미디어가 계속 재생되는 것을 허용하여, 새로운 재생을 겹쳐서 재생합니다</string>
+    <plurals name="sk_users_reacted_with">
+        <item quantity="other">%1$,d명의 사용자가 %2$s 이모지로 반응</item>
+    </plurals>
+    <string name="sk_settings_continues_playback">오디오 겹치기</string>
+    <string name="sk_search_suicide_message">자살하지 말아야 하는 이유를 찾고 계신다면 바로 여기에 있습니다. 고민이 있으신 경우 가까운 자살예방 상담전화에 연락해 보세요.</string>
+    <string name="sk_trending_links_info_banner">연합우주 전역에서 이야기되고 있는 뉴스입니다.</string>
+    <string name="sk_search_fediverse">연합우주 검색</string>
+    <string name="sk_post_contains_media">미디어를 포함한 게시물</string>
+    <string name="sk_tab_notifications">알림</string>
+    <string name="sk_settings_clear_timeline_cache">홈 타임라인 캐시 지우기</string>
+    <string name="sk_edit_alt_text">대체 텍스트 편집</string>
+    <string name="sk_settings_unifiedpush">UnifiedPush 사용</string>
+    <string name="sk_pronouns_label">인칭 대명사</string>
 </resources>
\ No newline at end of file

From 34157805a10d647e364c1eb6c218763777b935d0 Mon Sep 17 00:00:00 2001
From: kallekn <kalle.kniivila@gmail.com>
Date: Wed, 25 Oct 2023 08:16:32 +0000
Subject: [PATCH 15/28] Translated using Weblate (Finnish)

Currently translated at 100.0% (399 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fi/
---
 .../src/main/res/values-fi-rFI/strings_sk.xml | 101 ++++++++++--------
 1 file changed, 55 insertions(+), 46 deletions(-)

diff --git a/mastodon/src/main/res/values-fi-rFI/strings_sk.xml b/mastodon/src/main/res/values-fi-rFI/strings_sk.xml
index 361e784ff..90d0a45c6 100644
--- a/mastodon/src/main/res/values-fi-rFI/strings_sk.xml
+++ b/mastodon/src/main/res/values-fi-rFI/strings_sk.xml
@@ -8,7 +8,7 @@
     <string name="sk_settings_emoji_reactions_in_lists_explanation">Näytetäänkö emojireaktiot aikajanoissa. Jos tämä on pois käytöstä, emojireaktiot näkyvät vain lankaa katsottaessa.</string>
     <string name="sk_button_react">Reagoi emojilla</string>
     <string name="sk_again_for_system_keyboard">Järjestelmän näppäimistö seuraavalla painalluksella</string>
-    <string name="sk_enter_emoji_toast">Lisää emoji</string>
+    <string name="sk_enter_emoji_toast">Käytäthän emojia</string>
     <string name="sk_enter_emoji_hint">Lisää emoji tai etsi</string>
     <string name="sk_mute_label">Kesto</string>
     <string name="sk_duration_indefinite">Loputon</string>
@@ -25,13 +25,13 @@
     <string name="sk_delete_and_redraft">Poista ja kirjoita uudestaan</string>
     <string name="sk_pin_post">Kiinnitä profiiliin</string>
     <string name="sk_unpin_post">Irrota profiilista</string>
-    <string name="sk_confirm_delete_and_redraft_title">Poista ja kirjoita viesti uudelleen</string>
-    <string name="sk_confirm_pin_post_title">Kiinnitä viesti profiiliin</string>
-    <string name="sk_confirm_pin_post">Haluatko kiinnittää tämän viestin profiiliisi\?</string>
-    <string name="sk_confirm_delete_and_redraft">Oletko varma että haluat poistaa ja kirjoittaa viestin uudelleen\?</string>
-    <string name="sk_confirm_unpin_post_title">Poista viestin kiinnitys profiilista</string>
-    <string name="sk_unpinning">Viestiä irrotetaan…</string>
-    <string name="sk_pinning">Viestiä kiinnitetään…</string>
+    <string name="sk_confirm_delete_and_redraft_title">Poista ja kirjoita julkaisu uudelleen</string>
+    <string name="sk_confirm_pin_post_title">Kiinnitä julkaisu profiiliin</string>
+    <string name="sk_confirm_pin_post">Haluatko kiinnittää tämän julkaisun profiiliisi\?</string>
+    <string name="sk_confirm_delete_and_redraft">Oletko varma että haluat poistaa ja kirjoittaa julkaisun uudelleen\?</string>
+    <string name="sk_confirm_unpin_post_title">Poista julkaisun kiinnitys profiilista</string>
+    <string name="sk_unpinning">Julkaisua irrotetaan…</string>
+    <string name="sk_pinning">Julkaisua kiinnitetään…</string>
     <string name="sk_image_description">Kuvaselitys</string>
     <string name="sk_visibility_unlisted">Listaamaton</string>
     <string name="sk_settings_show_replies">Näytä vastaukset</string>
@@ -43,7 +43,7 @@
     <string name="sk_settings_auto_reveal_nobody">Ei koskaan</string>
     <string name="sk_settings_auto_reveal_author">Saman tilin vastauksissa</string>
     <string name="sk_settings_auto_reveal_anyone">Kaikkien vastaukset</string>
-    <string name="sk_settings_translate_only_opened">Käännä vain avatut viestit</string>
+    <string name="sk_settings_translate_only_opened">Käännä vain avatut julkaisut</string>
     <string name="sk_translate_show_original">Näytä alkuperäinen</string>
     <string name="sk_available_languages">Käytettävissä olevat kielet</string>
     <string name="sk_translated_using">Kännetty käyttäen %s</string>
@@ -63,12 +63,12 @@
     <string name="sk_loading_fediverse_resource_title">Etsitään Fediversestä</string>
     <string name="sk_undo_reblog">Peru tehostus</string>
     <string name="sk_reblog_with_visibility">Tehostuksen näkyvyysasetus</string>
-    <string name="sk_copy_link_to_post">Kopioi linkki viestiin</string>
+    <string name="sk_copy_link_to_post">Kopioi linkki julkaisuun</string>
     <string name="sk_open_with_account">Avaa toisella tilillä</string>
     <string name="sk_resource_not_found">Kohdetta ei löytynyt</string>
     <string name="sk_settings_allow_remote_loading">Hae tietoa etäinstansseista</string>
     <string name="sk_forward_report_to">Lähetä edelleen kohteeseen %s</string>
-    <string name="sk_unsent_posts">Julkaisemattomat viestit</string>
+    <string name="sk_unsent_posts">Odottavat julkaisut</string>
     <string name="sk_settings_prefix_replies_always">Vastaus kenelle tahansa</string>
     <string name="sk_settings_prefix_replies_never">Ei koskaan</string>
     <string name="sk_confirm_save_draft">Tallenna luonnos\?</string>
@@ -81,7 +81,7 @@
     <string name="sk_icon_diamond">Timantti</string>
     <string name="sk_icon_umbrella">Sateenverjo</string>
     <string name="sk_add_timeline">Lisää aikajana</string>
-    <string name="sk_edit_timeline_tag_main">Viestit joissa on aihetunniste…</string>
+    <string name="sk_edit_timeline_tag_main">Julkaisut, joissa on aihetunniste…</string>
     <string name="sk_edit_timeline_tag_any">...tai jokin näistä</string>
     <string name="sk_icon_beaker">Kannu</string>
     <string name="sk_content_type_unspecified">Ei määritelty</string>
@@ -105,27 +105,27 @@
     <string name="sk_icon_dog">Koira</string>
     <string name="sk_icon_pin">Nasta</string>
     <string name="sk_searching">Etsitään…</string>
-    <string name="sk_settings_see_new_posts_button">”Katso uudet viestit” -painike</string>
+    <string name="sk_settings_see_new_posts_button">”Katso uudet julkaisut” -painike</string>
     <string name="sk_icon_feed">Syöte</string>
     <string name="sk_post_edited">muokattu</string>
-    <string name="sk_notification_type_update">Muokatut viestit</string>
+    <string name="sk_notification_type_update">Muokatut julkaisut</string>
     <string name="sk_attach_file">Liitä tiedosto</string>
     <string name="sk_settings_hide_interaction">Piilota reaktiopainikkeet</string>
     <string name="sk_followed_as">Seurattu tilinä %s</string>
     <string name="sk_settings_hide_fab">Piilota Julkaise-painike automaattisesti</string>
     <string name="sk_follow_as">Seuraa toisena tilinä</string>
-    <string name="sk_notification_type_posts">Viesti-ilmoitukset</string>
+    <string name="sk_notification_type_posts">Ilmotukset julkaisuista</string>
     <string name="sk_settings_tabs_disable_swipe">Estä välilehdestä toiseen pyyhkäiseminen</string>
     <string name="sk_settings_enable_delete_notifications">Salli ilmoitusten poistaminen</string>
     <string name="sk_gif_badge">GIF</string>
     <string name="sk_no_alt_text">Selitys puuttuu</string>
     <string name="sk_inline_direct">vain maininnat</string>
-    <string name="sk_settings_glitch_instance">Glitch local-only mode</string>
+    <string name="sk_settings_glitch_instance">Glitch vain paikallinen</string>
     <string name="sk_settings_glitch_mode_explanation">Ota tämä käyttöön, jos koti-instanssisi käyttää Glitchiä. Hometown tai Akkoma eivät tarvitse tätä.</string>
     <string name="sk_unfinished_attachments_message">Joitakin liitteitä ei ole vielä ladattu valmiiksi.</string>
-    <string name="sk_settings_content_types">Ota viestin muotoilu käyttöön</string>
+    <string name="sk_settings_content_types">Ota julkaisun muotoilu käyttöön</string>
     <string name="sk_settings_default_content_type">Sisältötyypin oletusarvo</string>
-    <string name="sk_settings_default_content_type_explanation">Tämä mahdollistaa uusien viestien sisältötyypin ennaltavalinnan, ohittaa julkaisuasetuksissa asetetun arvon.</string>
+    <string name="sk_settings_default_content_type_explanation">Tämä mahdollistaa uusien julkaisun sisältötyypin ennaltavalinnan, ohittaa julkaisuasetusten oletusarvon.</string>
     <string name="sk_instance_info_unavailable">Tietoa instanssista ei juuri nyt ole saatavilla</string>
     <string name="sk_open_in_app">Avaa sovelluksessa</string>
     <string name="sk_external_share_or_open_title">Jaa tai avaa tilinä</string>
@@ -139,8 +139,8 @@
         <item quantity="other">%1$,d käyttäjää reagoi näin: %2$s</item>
     </plurals>
     <plurals name="sk_posts_count_label">
-        <item quantity="one">viesti</item>
-        <item quantity="other">viestiä</item>
+        <item quantity="one">julkaisu</item>
+        <item quantity="other">julkaisut</item>
     </plurals>
     <string name="sk_settings_continues_playback">Ääniraita</string>
     <string name="sk_settings_reply_visibility_following">Vastaukset seuraamilleni</string>
@@ -148,9 +148,9 @@
     <string name="sk_settings_show_interaction_counts">Näytä laskimet</string>
     <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Merkitse media arkaluontoiseksi</string>
-    <string name="sk_federated_timeline_info_banner">Nämä ovat uusimmat viestit yleiseltä aikajanalta.</string>
+    <string name="sk_federated_timeline_info_banner">Nämä ovat uusimmat julkaisut yleiseltä aikajanalta.</string>
     <string name="sk_lists_with_user">Listoja joissa on %s</string>
-    <string name="sk_notification_type_status">Viestit</string>
+    <string name="sk_notification_type_status">Julkaisut</string>
     <string name="sk_color_palette_blue">Sininen</string>
     <string name="sk_color_palette_brown">Ruskea</string>
     <string name="sk_color_palette_red">Punainen</string>
@@ -166,7 +166,7 @@
     <string name="sk_settings_donate">Lahjoita</string>
     <string name="sk_delete_notification_confirm">Oletko varma, että haluat poistaa ilmoituksen\?</string>
     <string name="sk_settings_publish_button_text">Julkaisupainikkeen teksti</string>
-    <string name="sk_quote_post">Kirjoita viesti aiheena tämä</string>
+    <string name="sk_quote_post">Kirjoita julkaisu tästä</string>
     <string name="sk_bookmark_as">Tee kirjamerkki toiselle tilille</string>
     <string name="sk_already_bookmarked">Kirjamerkki jo tallennettu</string>
     <string name="sk_favorite_as">Tykkä toisena tilinä</string>
@@ -176,12 +176,12 @@
     <string name="sk_draft">Luonnos</string>
     <string name="sk_schedule">Ajasta</string>
     <string name="sk_confirm_delete_draft_title">Poista luonnos</string>
-    <string name="sk_confirm_delete_draft">Oletko varma, että haluat poistaa tämän viestiluonnoksen\?</string>
+    <string name="sk_confirm_delete_draft">Oletko varma, että haluat poistaa tämän luonnoksen\?</string>
     <string name="sk_confirm_delete_scheduled_post_title">Poista ajastettu julkaisu</string>
     <string name="sk_user_post_notifications_off">Ilmoitukset käyttäjän %s viesteistä poistettu käyttöstä</string>
     <string name="sk_settings_show_boosts">Näytä tehostukset</string>
-    <string name="sk_settings_load_new_posts">Lataa uudet viestit automaattisesti</string>
-    <string name="sk_draft_or_schedule">Luonnos tai ajastettu viesti</string>
+    <string name="sk_settings_load_new_posts">Lataa uudet julkaisut automaattisesti</string>
+    <string name="sk_draft_or_schedule">Luonnos tai ajastus</string>
     <string name="sk_compose_scheduled">Ajastettu ajalle</string>
     <string name="sk_draft_saved">Luonnos tallennettu</string>
     <string name="sk_post_scheduled">Julkaisu ajastettu</string>
@@ -209,9 +209,9 @@
     <string name="sk_alt_text_missing_title">Kuvaselitys puuttuu</string>
     <string name="sk_publish_anyway">Julkaise silti</string>
     <string name="sk_settings_disable_alt_text_reminder">Poista muistutus mediakuvauksesta</string>
-    <string name="sk_notify_posts_info_banner">Jos otat käyttöön ilmoitukset joidenkin henkilöiden viesteistä, heidän uudet viestinsä näkyvät täällä.</string>
+    <string name="sk_notify_posts_info_banner">Jos otat käyttöön ilmoitukset joidenkin henkilöiden julkaisuista, heidän uudet julkaisunsa näkyvät täällä.</string>
     <string name="sk_timelines">Aikajanat</string>
-    <string name="sk_timeline_posts">Viestit</string>
+    <string name="sk_timeline_posts">Julkaisut</string>
     <string name="sk_timelines_add">Lisää</string>
     <string name="sk_timeline">Aikajana</string>
     <string name="sk_list">Lista</string>
@@ -263,7 +263,7 @@
     <string name="sk_edit_timeline_tag_none">...muttei mitään näistä</string>
     <string name="sk_edit_timeline_tag_hint">Kirjoita aihetunniste…</string>
     <string name="sk_edit_timeline_tags_hint">Kirjoita aihetunnisteet…</string>
-    <string name="sk_hashtag_timeline_local_only_switch">Näytetäänkö vain paikalliset viestit\?</string>
+    <string name="sk_hashtag_timeline_local_only_switch">Näytetäänkö vain paikalliset julkaisut\?</string>
     <string name="sk_add_timeline_tag_error_empty">Aihetunniste ei voi olla tyhjä</string>
     <string name="sk_alt_button">ALT</string>
     <string name="sk_no_results">Ei tuloksia</string>
@@ -274,12 +274,12 @@
     <string name="sk_inline_local_only">vain paikallinen</string>
     <string name="sk_separator">·</string>
     <string name="sk_local_only">Vain paikallinen instanssi</string>
-    <string name="sk_settings_local_only_explanation">Jotta tämä toimii, koti-instanssisi on tuettava viestien julkaisemista ainoastaan paikallisesti. Useimmat Mastodonin muunnellut versiot tukevat, mutta Mastodon ei.</string>
+    <string name="sk_settings_local_only_explanation">Jotta tämä toimii, koti-instanssisi on tuettava sisällön julkaisemista ainoastaan paikallisesti. Useimmat Mastodonin muunnellut versiot tukevat, mutta Mastodon ei.</string>
     <string name="sk_signed_up">rekisteröity</string>
     <string name="sk_reported">raportoitu</string>
     <string name="sk_sign_ups">Käyttäjät rekisteröityvät</string>
     <string name="sk_settings_prefix_reply_cw_with_re">Lisää sisältövaroitukseen \"re:\" kun vastaat</string>
-    <string name="sk_unfinished_attachments">Korjataanko liitteet\?</string>
+    <string name="sk_unfinished_attachments">Liitteitä ladataan</string>
     <string name="sk_content_type_bbcode">BBCode</string>
     <string name="sk_content_type_mfm">MFM</string>
     <string name="sk_settings_prefix_replies_to_others">Vastaukset muille</string>
@@ -310,7 +310,7 @@
     <string name="sk_notify_poll_results">Kyselyn tulokset</string>
     <string name="sk_expand">Avaa</string>
     <string name="sk_collapse">Kätke</string>
-    <string name="sk_settings_collapse_long_posts">Kätke pitkien viestien loppuosa</string>
+    <string name="sk_settings_collapse_long_posts">Kätke pitkien julkaisujen loppuosa</string>
     <string name="sk_reacted_with">%1$s reagoi %2$s</string>
     <string name="sk_notification_action_replied">Vastaus lähetetty käyttäjälle %s</string>
     <string name="sk_update_ready">Megalodon %s on ladattu ja valmis asennettavaksi.</string>
@@ -340,8 +340,8 @@
     <string name="sk_user_post_notifications_on">Ilmoitukset käyttäjän %s viesteistä otettu käyttöön</string>
     <string name="sk_federated_timeline">Yleinen</string>
     <string name="sk_delete_notification_confirm_action">Poista ilmoitus</string>
-    <string name="sk_settings_content_types_explanation">Mahdollistaa viestien sisältötyypin valinnan, esimerkiksi Markdown. Kaikki instanssit eivät tue tätä.</string>
-    <string name="sk_bubble_timeline_info_banner">Nämä ovat uusimmat viestit ihmisiltä, joiden tilejä sinun instanssisi isännöi.</string>
+    <string name="sk_settings_content_types_explanation">Mahdollistaa julkaisujen sisältötyypin valinnan, esimerkiksi Markdown. Kaikki instanssit eivät tue tätä.</string>
+    <string name="sk_bubble_timeline_info_banner">Nämä ovat uusimmat julkaisut ihmisiltä, joiden tilejä sinun instanssisi isännöi.</string>
     <string name="sk_settings_publish_button_text_title">Muokkaa Julkaise-painikkeen tekstiä</string>
     <string name="sk_no_remote_info_hint">etäinfoa ei saatavilla</string>
     <string name="sk_reject_follow_request">Hylkää seuraamispyyntö</string>
@@ -357,9 +357,9 @@
     <string name="sk_confirm_delete_scheduled_post">Oletko varma, että haluat poistaa tämän ajastetun julkaisun\?</string>
     <string name="sk_compose_draft">Julkaisu tallennetaan luonnoksena.</string>
     <string name="sk_scheduled_too_soon">Julkaisu on ajastettava vähintään 10 minuuttia tulevaisuuteen.</string>
-    <string name="sk_confirm_unpin_post">Oletko varma että haluat irrottaa tämän viestin\?</string>
+    <string name="sk_confirm_unpin_post">Oletko varma että haluat irrottaa tämän julkaisun\?</string>
     <string name="sk_settings_unifiedpush_no_distributor_body">On asennettava jakelijaohjelma jotta UnifiedPush-ilmoitukset toimivat. Lisätietoja: https://unifiedpush.org/</string>
-    <string name="sk_settings_emoji_reactions_explanation">Näyttää viestien emojireaktiot ja mahdollistaa omien lisäämisen. Jotkin Mastodonin muokatut versiot tukevat tätä, mutta Mastodon ei.</string>
+    <string name="sk_settings_emoji_reactions_explanation">Näyttää julkaisujen emojireaktiot ja antaa lisätä omasi. Jotkin Fediversumin serverit tukevat tätä, mutta ei Mastodon.</string>
     <string name="sk_recent_searches_placeholder">Hae kirjoittamalla tähän</string>
     <string name="sk_alt_text_missing">Selitys puuttuu vähintään yhdestä liitteestä.</string>
     <string name="sk_pinned_timeline">Kiinnitetty kotinäyttöön</string>
@@ -370,7 +370,7 @@
     <string name="sk_icon_recycle_bin">Roskakori</string>
     <string name="sk_edit_timelines">Muokkaa aikajanoja</string>
     <string name="sk_edit_timeline_tags_explanation">Ota huomioon, että palvelin tekee nämä operaatiot. Niiden yhdistelyä ei välttämättä tueta.</string>
-    <string name="sk_notify_update">Tämä muokkaa tehostettua viestiä</string>
+    <string name="sk_notify_update">Tämä muokkaa tehostettua julkaisua</string>
     <string name="sk_save_draft_message">Haluatko tallentaa muutokset tähän luonnokseen vai julkaista sen nyt\?</string>
     <string name="sk_settings_support_local_only">Palvelin tukee paikallista julkaisemista</string>
     <string name="sk_settings_continues_playback_summary">Anna mediatoiston jatkua lisäten uusi raita</string>
@@ -379,7 +379,7 @@
         <item quantity="one">%d sekunti</item>
         <item quantity="other">%d sekuntia</item>
     </plurals>
-    <string name="sk_settings_show_emoji_reactions_only_opened">Vain kun julkaisu on avattu</string>
+    <string name="sk_settings_show_emoji_reactions_only_opened">Vain jos julkaisu on avattu</string>
     <plurals name="sk_time_hours">
         <item quantity="one">%d tunti</item>
         <item quantity="other">%d tuntia</item>
@@ -388,26 +388,35 @@
     <string name="sk_settings_show_emoji_reactions">Näytä emojireaktiot aikajanoissa</string>
     <string name="sk_blocked_accounts">Estetyt tilit</string>
     <string name="sk_suicide_search_terms">Itsemurha</string>
-    <string name="sk_load_missing_posts_above">Lataa uudempia julkaisuja</string>
+    <string name="sk_load_missing_posts_above">Lataa uusia viestejä</string>
     <plurals name="sk_time_days">
         <item quantity="one">%d päivä</item>
         <item quantity="other">%d päivää</item>
     </plurals>
-    <string name="sk_settings_show_emoji_reactions_always">Näytä lisäyspainike aina</string>
+    <string name="sk_settings_show_emoji_reactions_always">Näytä aina \"lisää\" -painike</string>
     <string name="sk_search_suicide_hotlines">Löydä kriisipuhelin</string>
     <string name="sk_muted_accounts">Hiljennetyt tilit</string>
-    <string name="sk_do_not_show_again">Älä näytä toista kertaa</string>
+    <string name="sk_do_not_show_again">Älä näytä uudelleen</string>
     <string name="sk_suicide_helplines_url">https://mieli.fi/tukea-ja-apua/kriisipuhelin/</string>
-    <string name="sk_trending_posts_info_banner">Nämä julkaisut ovat saamassa vetoa Fediversumissa.</string>
-    <string name="sk_load_missing_posts_below">Lataa vanhempia julkaisuja</string>
+    <string name="sk_trending_posts_info_banner">Nämä julkaisut saavat huomiota Fediversumissa.</string>
+    <string name="sk_load_missing_posts_below">Lataa vanhoja viestejä</string>
     <string name="sk_search_suicide_title">Jos tarvitset apua…</string>
     <plurals name="sk_time_minutes">
         <item quantity="one">%d minuutti</item>
         <item quantity="other">%d minuuttia</item>
     </plurals>
-    <string name="sk_search_suicide_message">Jos haluat merkin siitä, että elämää kannattaa jatkaa, tämä on se. Jos olet hädässä, voit ottaa yhteyttä paikalliseen kriisipuhelimeen.</string>
-    <string name="sk_trending_links_info_banner">Näistä uutisjutuista keskustellaan Fediversumissa.</string>
-    <string name="sk_post_contains_media">Julkaisussa on mediaa</string>
+    <string name="sk_search_suicide_message">Jos odotat merkkiä, että sinun ei kannata tehdä itsemurhaa, niin se on tämä. Harkitse yhteydenottoa valtakunnalliseen kriisipuhelimeen 09 2525 0111.</string>
+    <string name="sk_trending_links_info_banner">Näistä uutisista puhutaan Fediversumissa.</string>
+    <string name="sk_post_contains_media">Julkaisussa on mediasisältöä</string>
     <string name="sk_settings_like_icon">Käytä sydäntä suosikkikuvakkeena</string>
     <string name="sk_recently_used">Äskettäin käytetty</string>
+    <string name="sk_set_as_default">Aseta oletusarvoksi</string>
+    <string name="sk_settings_color_palette_default">Oletusarvo (%s)</string>
+    <string name="sk_settings_default_visibility">Julkaisun oletusnäkyvyys</string>
+    <string name="sk_settings_underlined_links">Alleviivatut linkit</string>
+    <string name="sk_settings_lock_account">Hyväksy uudet seuraajat käsin</string>
+    <string name="sk_timeline_cache_cleared">Kotiaikajanan välimuisti tyhjennetty</string>
+    <string name="sk_button_mutuals">Ystävät</string>
+    <string name="sk_settings_clear_timeline_cache">Tyhjennä kotiaikajanan välimuisti</string>
+    <string name="sk_edit_alt_text">Muuta selitystä</string>
 </resources>
\ No newline at end of file

From c077b9d47c2f0776e6f23b2e15240d0c81bc201f Mon Sep 17 00:00:00 2001
From: Espasant3 <eloi.b.pineiro@gmail.com>
Date: Wed, 25 Oct 2023 16:48:09 +0000
Subject: [PATCH 16/28] Translated using Weblate (Galician)

Currently translated at 98.4% (393 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/gl/
---
 mastodon/src/main/res/values-gl-rES/strings_sk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-gl-rES/strings_sk.xml b/mastodon/src/main/res/values-gl-rES/strings_sk.xml
index 88acf3640..5d5a91c45 100644
--- a/mastodon/src/main/res/values-gl-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-gl-rES/strings_sk.xml
@@ -333,7 +333,7 @@
     <string name="sk_trending_posts_info_banner">Estas publicacións están a gañar tracción no Fediverso.</string>
     <string name="sk_settings_unifiedpush_choose">Escoller un distribuidor</string>
     <string name="sk_settings_continues_playback">Superposición de audio</string>
-    <string name="sk_trending_links_info_banner">Destas novas historias se está a falar en todo o Fediverso.</string>
+    <string name="sk_trending_links_info_banner">Destas novas historias estase a falar en todo o Fediverso.</string>
     <string name="sk_settings_unifiedpush">Empregar UnifiedPush</string>
     <string name="sk_disable_pill_shaped_active_indicator">Desactivar o indicador de lapela activa en forma de pílula</string>
     <string name="sk_tab_profile">Perfil</string>

From dbf3d2776eb96176747a6908a0fc02fece6ccb9a Mon Sep 17 00:00:00 2001
From: reindex <ot02092000@gmail.com>
Date: Wed, 25 Oct 2023 23:53:19 +0000
Subject: [PATCH 17/28] Translated using Weblate (Japanese)

Currently translated at 86.4% (345 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ja/
---
 .../src/main/res/values-ja-rJP/strings_sk.xml | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/mastodon/src/main/res/values-ja-rJP/strings_sk.xml b/mastodon/src/main/res/values-ja-rJP/strings_sk.xml
index befa74f5a..3dab4f5ed 100644
--- a/mastodon/src/main/res/values-ja-rJP/strings_sk.xml
+++ b/mastodon/src/main/res/values-ja-rJP/strings_sk.xml
@@ -291,4 +291,67 @@
     <string name="sk_settings_support_local_only">サーバーはローカルのみの投稿をサポートしています</string>
     <string name="sk_spoiler_show">コンテンツを表示</string>
     <string name="sk_advanced_options_hide">高度な設定を非表示にする</string>
+    <string name="sk_signed_up">登録済み</string>
+    <string name="sk_sign_ups">ユーザー登録</string>
+    <plurals name="sk_time_seconds">
+        <item quantity="other">%d 秒</item>
+    </plurals>
+    <string name="sk_followed_as">%s からフォロー</string>
+    <plurals name="sk_time_hours">
+        <item quantity="other">%d 時間</item>
+    </plurals>
+    <string name="sk_reported">報告済み</string>
+    <string name="sk_set_as_default">デフォルトに設定</string>
+    <string name="sk_settings_like_icon">お気に入りアイコンにハートを使用する</string>
+    <string name="sk_content_type_html">HTML</string>
+    <string name="sk_settings_color_palette_default">デフォルト (%s)</string>
+    <string name="sk_open_in_app">アプリで開く</string>
+    <string name="sk_blocked_accounts">ブロック済みのアカウント</string>
+    <string name="sk_suicide_search_terms">自殺</string>
+    <string name="sk_icon_feed">フィード</string>
+    <string name="sk_instance_info_unavailable">インスタンスの情報が一時的に利用できません</string>
+    <string name="sk_list_replies_policy">返信を表示</string>
+    <string name="sk_filtered">フィルター: %s</string>
+    <string name="sk_load_missing_posts_above">新しい投稿を読み込む</string>
+    <plurals name="sk_time_days">
+        <item quantity="other">%d 日</item>
+    </plurals>
+    <string name="sk_instance_features">インスタンスの特徴</string>
+    <string name="sk_notification_action_replied">%s に返信を送信</string>
+    <string name="sk_settings_show_emoji_reactions_always">常に追加ボタンを表示</string>
+    <string name="sk_content_type_plain">プレーンテキスト</string>
+    <string name="sk_search_suicide_hotlines">相談先を探す</string>
+    <string name="sk_content_type_mfm">MFM</string>
+    <string name="sk_unfinished_attachments">添付ファイルをアップロード中</string>
+    <string name="sk_timeline_cache_cleared">ホームタイムラインキャッシュをクリアしました</string>
+    <string name="sk_muted_accounts">ミュート済みのアカウント</string>
+    <string name="sk_settings_hide_fab">折り畳むボタンを自動で隠す</string>
+    <string name="sk_enter_emoji_hint">絵文字を入力または検索</string>
+    <string name="sk_publish_anyway">とにかく公開する</string>
+    <string name="sk_do_not_show_again">再び表示しない</string>
+    <string name="sk_follow_as">他のアカウントからフォローする</string>
+    <string name="sk_suicide_helplines_url">https://www.mhlw.go.jp/mamorouyokokoro/soudan/</string>
+    <string name="sk_content_type_markdown">マークダウン</string>
+    <string name="sk_content_type_bbcode">BBCode</string>
+    <string name="sk_enter_emoji_toast">絵文字を入力してください</string>
+    <string name="sk_collapse">折り畳む</string>
+    <string name="sk_settings_server_version">サーバーバージョン: %s</string>
+    <string name="sk_content_type">コンテンツタイプ</string>
+    <string name="sk_compact_reblog_reply_line">コンパクトなブーストと返信ライン</string>
+    <string name="sk_settings_hide_interaction">インタラクションボタンを隠す</string>
+    <string name="sk_expand">展開</string>
+    <string name="sk_load_missing_posts_below">古い投稿を読み込む</string>
+    <string name="sk_external_share_title">アカウントで共有</string>
+    <string name="sk_unfinished_attachments_message">一部の添付ファイルのアップロードが完了していません。</string>
+    <string name="sk_settings_content_types">投稿のフォーマットを有効化</string>
+    <string name="sk_settings_collapse_long_posts">長文の投稿を折り畳む</string>
+    <string name="sk_settings_default_content_type">デフォルトのコンテンツタイプ</string>
+    <string name="sk_search_suicide_title">もしも、あなたが悩んでいるのなら…</string>
+    <plurals name="sk_time_minutes">
+        <item quantity="other">%d 分</item>
+    </plurals>
+    <string name="sk_new_reports">新しい報告</string>
+    <string name="sk_show_thread">スレッドを表示</string>
+    <string name="sk_settings_clear_timeline_cache">ホームタイムラインキャッシュをクリア</string>
+    <string name="sk_add_timeline_tag_error_empty">ハッシュタグは空欄にできません</string>
 </resources>
\ No newline at end of file

From 9b82d704f65e16aa1fbb3e04ba09360983956dd0 Mon Sep 17 00:00:00 2001
From: reindex <ot02092000@gmail.com>
Date: Wed, 25 Oct 2023 23:43:10 +0000
Subject: [PATCH 18/28] Translated using Weblate (Japanese)

Currently translated at 11.1% (2 of 18 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ja/
---
 metadata/ja-JP/short_description.txt | 1 +
 metadata/ja-JP/title.txt             | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 metadata/ja-JP/short_description.txt
 create mode 100644 metadata/ja-JP/title.txt

diff --git a/metadata/ja-JP/short_description.txt b/metadata/ja-JP/short_description.txt
new file mode 100644
index 000000000..6ce1d5f72
--- /dev/null
+++ b/metadata/ja-JP/short_description.txt
@@ -0,0 +1 @@
+ピンクなAndroid版Mastodonアプリですが、様々な機能が追加されています
diff --git a/metadata/ja-JP/title.txt b/metadata/ja-JP/title.txt
new file mode 100644
index 000000000..cf946e02c
--- /dev/null
+++ b/metadata/ja-JP/title.txt
@@ -0,0 +1 @@
+Megalodon

From 1eb55428dbcc9dc8281b25f07ddf9c5b791a721b Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Thu, 26 Oct 2023 13:25:24 +0000
Subject: [PATCH 19/28] Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/
---
 mastodon/src/main/res/values-ko-rKR/strings_sk.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
index 877056204..ee16954fb 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -280,8 +280,6 @@
     <string name="sk_external_share_or_open_title">계정으로 공유 및 열기</string>
     <string name="sk_settings_auto_reveal_nobody">안 함</string>
     <string name="sk_settings_prefix_replies_never">안 함</string>
-    <string name="sk_settings_prefix_replies_to_others"></string>
-    <string name="sk_settings_prefix_replies_always"></string>
     <string name="sk_content_type">콘텐츠 유형</string>
     <string name="sk_content_type_unspecified">지정되지 않음</string>
     <string name="sk_icon_beaker">비커</string>

From d5d9e20a0612bd4e6565c8013aca85133076ebeb Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Thu, 26 Oct 2023 18:53:40 +0200
Subject: [PATCH 20/28] update strings

---
 .../src/main/res/values-ar-rDZ/strings.xml    | 474 ------------------
 .../src/main/res/values-de-rDE/strings.xml    |  11 +-
 .../src/main/res/values-el-rGR/strings.xml    |  16 +-
 .../src/main/res/values-es-rES/strings.xml    |   1 -
 .../src/main/res/values-eu-rES/strings.xml    |   6 +-
 .../src/main/res/values-fa-rIR/strings.xml    |   1 -
 .../src/main/res/values-fi-rFI/strings.xml    |  65 ++-
 .../src/main/res/values-fr-rFR/strings.xml    |  49 +-
 .../src/main/res/values-gd-rGB/strings.xml    |  34 +-
 .../src/main/res/values-gl-rES/strings.xml    |   1 -
 .../src/main/res/values-is-rIS/strings.xml    |   7 +-
 .../src/main/res/values-it-rIT/strings.xml    |  45 +-
 .../src/main/res/values-ja-rJP/strings.xml    |  15 +-
 .../src/main/res/values-th-rTH/strings.xml    |   2 +-
 .../src/main/res/values-uk-rUA/strings.xml    |  39 +-
 .../src/main/res/values-zh-rTW/strings.xml    |   2 +-
 mastodon/src/main/res/values/strings.xml      |  10 +-
 17 files changed, 270 insertions(+), 508 deletions(-)
 delete mode 100644 mastodon/src/main/res/values-ar-rDZ/strings.xml

diff --git a/mastodon/src/main/res/values-ar-rDZ/strings.xml b/mastodon/src/main/res/values-ar-rDZ/strings.xml
deleted file mode 100644
index 61d977a26..000000000
--- a/mastodon/src/main/res/values-ar-rDZ/strings.xml
+++ /dev/null
@@ -1,474 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="get_started">الخطوات الأولى</string>
-    <string name="log_in">تسجيلُ الدخول</string>
-    <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">بَدَأ بِمُتابَعَتِك</string>
-    <string name="user_sent_follow_request">أرسَلَ طَلَبًا لِمُتابَعَتِك</string>
-    <string name="user_favorited">فَضَّلَ مَنشُورَك</string>
-    <string name="notification_boosted">أعادَ تَدوينَ مَنشُورَك</string>
-    <string name="poll_ended">انتهى استطلاعُ الرأي</string>
-    <string name="time_seconds">%d ثا</string>
-    <string name="time_minutes">%d د</string>
-    <string name="time_hours">%d سا</string>
-    <string name="time_days">%d يوم</string>
-    <string name="share_toot_title">شارك</string>
-    <string name="settings">الإعدادات</string>
-    <string name="publish">انشر</string>
-    <string name="discard_draft">أتريد التخلص من المسودة؟</string>
-    <string name="discard">تخلص</string>
-    <string name="cancel">إلغاء</string>
-    <plurals name="followers">
-        <item quantity="zero">لا متابِعين</item>
-        <item quantity="one">متابِع</item>
-        <item quantity="two">متابِعان</item>
-        <item quantity="few">متابِعين</item>
-        <item quantity="many">متابِعًا</item>
-        <item quantity="other">متابِع</item>
-    </plurals>
-    <plurals name="following">
-        <item quantity="zero">لا متابَعين</item>
-        <item quantity="one">متابَع</item>
-        <item quantity="two">متابَعان</item>
-        <item quantity="few">متابَعين</item>
-        <item quantity="many">متابَعًا</item>
-        <item quantity="other">متابَع</item>
-    </plurals>
-    <plurals name="posts">
-        <item quantity="zero">لا منشورات</item>
-        <item quantity="one">منشور</item>
-        <item quantity="two">منشوران</item>
-        <item quantity="few">منشورات</item>
-        <item quantity="many">منشورًا</item>
-        <item quantity="other">منشور</item>
-    </plurals>
-    <string name="posts">منشورات</string>
-    <string name="posts_and_replies">مَنشُوراتٌ وَرُدُود</string>
-    <string name="media">وسائط</string>
-    <string name="profile_about">حَول</string>
-    <string name="button_follow">تابِع</string>
-    <string name="button_following">يُتابِع</string>
-    <string name="edit_profile">حرّر الملف الشخصي</string>
-    <string name="mention_user">ذِكر @%s</string>
-    <string name="share_user">مُشارَكَةُ %s</string>
-    <string name="mute_user">كَتمُ %s</string>
-    <string name="unmute_user">إلغاء الكَتم عن @%s</string>
-    <string name="block_user">حَظرُ %s</string>
-    <string name="unblock_user">رفع الحَظر عن %s</string>
-    <string name="report_user">الإبلاغُ عَن %s</string>
-    <string name="block_domain">حَظرُ %s</string>
-    <string name="unblock_domain">رفع الحَظر عن %s</string>
-    <plurals name="x_posts">
-        <item quantity="zero">لا مَنشورات</item>
-        <item quantity="one">منشورٌ واحِد</item>
-        <item quantity="two">منشورانِ اثنان</item>
-        <item quantity="few">%,d منشورات</item>
-        <item quantity="many">%,d منشورًا</item>
-        <item quantity="other">%,d منشور</item>
-    </plurals>
-    <string name="profile_joined">انضم في</string>
-    <string name="done">تمّ</string>
-    <string name="loading">يحمل…</string>
-    <string name="field_label">التسمية</string>
-    <string name="field_content">المحتوى</string>
-    <string name="saving">يحفظ…</string>
-    <string name="post_from_user">نُشر من %s</string>
-    <string name="poll_option_hint">الخيار %d</string>
-    <plurals name="x_minutes">
-        <item quantity="zero">أقل من دقيقة</item>
-        <item quantity="one">دقيقة واحدة</item>
-        <item quantity="two">دقيقتان</item>
-        <item quantity="few">%d دقائق</item>
-        <item quantity="many">%d دقيقة</item>
-        <item quantity="other">%d دقيقة</item>
-    </plurals>
-    <plurals name="x_hours">
-        <item quantity="zero">أقل من ساعة</item>
-        <item quantity="one">ساعة واحدة</item>
-        <item quantity="two">ساعتان</item>
-        <item quantity="few">%d ساعات</item>
-        <item quantity="many">%d ساعة</item>
-        <item quantity="other">%d ساعة</item>
-    </plurals>
-    <plurals name="x_days">
-        <item quantity="zero">أقل من يوم</item>
-        <item quantity="one">يومٌ واحِد</item>
-        <item quantity="two">يَومان</item>
-        <item quantity="few">%d أيام</item>
-        <item quantity="many">%d يومًا</item>
-        <item quantity="other">%d يوم</item>
-    </plurals>
-    <string name="compose_poll_duration">المُدَّة: %s</string>
-    <plurals name="x_seconds_left">
-        <item quantity="zero">تتبقى لَحظة</item>
-        <item quantity="one">تتبقى ثانية واحِدة</item>
-        <item quantity="two">تتبقى ثانيتان</item>
-        <item quantity="few">تتبقى %d ثوان</item>
-        <item quantity="many">تتبقى %d ثانية</item>
-        <item quantity="other">تتبقى %d ثانية</item>
-    </plurals>
-    <plurals name="x_minutes_left">
-        <item quantity="zero">تبقت أقل من دقيقة</item>
-        <item quantity="one">تبقت دقيقة</item>
-        <item quantity="two">تبقت دقيقتان</item>
-        <item quantity="few">تبقت %d دقائق</item>
-        <item quantity="many">تبقت %d دقيقة</item>
-        <item quantity="other">تبقت %d دقيقة</item>
-    </plurals>
-    <plurals name="x_hours_left">
-        <item quantity="zero">تبقت أقل من ساعة</item>
-        <item quantity="one">تبقت ساعة واحدة</item>
-        <item quantity="two">تبقت ساعتان</item>
-        <item quantity="few">تبقت %d ساعات</item>
-        <item quantity="many">تبقت %d ساعة</item>
-        <item quantity="other">تبقت %d ساعة</item>
-    </plurals>
-    <plurals name="x_days_left">
-        <item quantity="zero">تبقى أقل من يوم</item>
-        <item quantity="one">تبقى يوم واحد</item>
-        <item quantity="two">تبقى يومان</item>
-        <item quantity="few">تبقى %d أيام</item>
-        <item quantity="many">تبقى %d يومًا</item>
-        <item quantity="other">تبقى %d يوم</item>
-    </plurals>
-    <plurals name="x_voters">
-        <item quantity="zero">لا يوجد مصوتون</item>
-        <item quantity="one">مصوت واحد</item>
-        <item quantity="two">مصوتان</item>
-        <item quantity="few">%,d مصوتين</item>
-        <item quantity="many">%,d مصوتًا</item>
-        <item quantity="other">%,d مصوت</item>
-    </plurals>
-    <string name="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>
-    <string name="confirm_unmute">أكِّد رفع الكتم عن %s</string>
-    <string name="do_unmute">ارفع الكتم</string>
-    <string name="confirm_block_title">احجب الحساب</string>
-    <string name="confirm_block_domain_title">احجب النطاق</string>
-    <string name="confirm_block">أكّد حجب %s</string>
-    <string name="do_block">احجب</string>
-    <string name="confirm_unblock_title">ارفع الحجب عن الحساب</string>
-    <string name="confirm_unblock_domain_title">ارفع الحجب عن النطاق</string>
-    <string name="confirm_unblock">أكّد رفع الحجب عن %s</string>
-    <string name="do_unblock">ارفع الحجب</string>
-    <string name="button_muted">مَكتوم</string>
-    <string name="button_blocked">محجوب</string>
-    <string name="action_vote">صَوّت</string>
-    <string name="tap_to_reveal">اُنقُر لِلكَشف</string>
-    <string name="delete">احذف</string>
-    <string name="confirm_delete_title">احذف المنشور</string>
-    <string name="confirm_delete">أمتأكد من حذف هذا المنشور؟</string>
-    <string name="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="all_notifications">الكل</string>
-    <string name="mentions">الذِكر</string>
-    <plurals name="x_people_talking">
-        <item quantity="zero">لا أحد يتحدث</item>
-        <item quantity="one">شخص واحد يتحدث</item>
-        <item quantity="two">شخصان يتحدثان</item>
-        <item quantity="few">%d أشخاص يتحدثون</item>
-        <item quantity="many">%d شخصًا يتحدثون</item>
-        <item quantity="other">%d شخص يتحدثون</item>
-    </plurals>
-    <plurals name="discussed_x_times">
-        <item quantity="zero">لم يُناقش</item>
-        <item quantity="one">نوقش مرة واحدة</item>
-        <item quantity="two">نوقش مرتين</item>
-        <item quantity="few">نوقش %d مرات</item>
-        <item quantity="many">نوقش %d مرة</item>
-        <item quantity="other">نوقش %d مرة</item>
-    </plurals>
-    <string name="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>
-    <string name="report_choose_posts">هل توجد منشورات تدعم صحة هذا البلاغ؟</string>
-    <string name="report_choose_posts_subtitle">اختر كل ما ينطبق</string>
-    <string name="report_comment_title">هل لديك شيء آخر لتخبرنا به؟</string>
-    <string name="report_comment_hint">تعليقات إضافية</string>
-    <string name="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="instance_catalog_title">يتكوّن ماستدون من مستخدمين موزّعين عبر خوادم مختلفة.</string>
-    <string name="instance_catalog_subtitle">اختر خادمًا بناءً على اهتماماتك، منطقتك أو يمكنك حتى اختيارُ مجتمعٍ ذي غرضٍ عام. وسيضل بامكانك التواصل مع المستخدمين من الخوادم الأخرى.</string>
-    <string name="search_communities">ابحث عن خادم أو أدخل رابطه</string>
-    <string name="instance_rules_title">بعض القواعد الأساسية</string>
-    <string name="instance_rules_subtitle">خذ دقيقة لمراجعة القواعد التي حددها وفرضها مديروا %s.</string>
-    <string name="signup_title">دعنا نجهزك في %s</string>
-    <string name="edit_photo">حرّر</string>
-    <string name="display_name">الاسم العلني</string>
-    <string name="username">اسم المستخدم</string>
-    <string name="email">البريد الإلكتروني</string>
-    <string name="password">كلمة المرور</string>
-    <string name="password_note">ضمّن الأحرف الكبيرة والأحرف الخاصة والأرقام لزيادة قوة كلمة المرور.</string>
-    <string name="category_academia">أكاديمي</string>
-    <string name="category_activism">النشطاء</string>
-    <string name="category_all">الكل</string>
-    <string name="category_art">فنون</string>
-    <string name="category_food">طعام</string>
-    <string name="category_furry">حيوان ذو فرو</string>
-    <string name="category_games">ألعاب</string>
-    <string name="category_general">عام</string>
-    <string name="category_journalism">صحافة</string>
-    <string name="category_lgbt">LGBT</string>
-    <string name="category_music">موسيقى</string>
-    <string name="category_regional">إقليمي</string>
-    <string name="category_tech">تقني</string>
-    <string name="confirm_email_title">شيءٌ أخير</string>
-    <string name="confirm_email_subtitle">أنقر على الرابط المرسل إليك لاستيثاق حسابك.</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="add_image_description">أضف وصفًا للصورة…</string>
-    <string name="retry_upload">حاول الرفع مجددًا</string>
-    <string name="edit_image">حرّر الصورة</string>
-    <string name="save">احفظ</string>
-    <string name="add_alt_text">أضف نصًا بديلًا</string>
-    <string name="alt_text_subtitle">يصف النص البديل محتوى الصور للمكفوفين وضعاف البصر. حاول تضمين أكبر قدر ممكن من التفاصيل ليفهموا السياق.</string>
-    <string name="alt_text_hint">مثال: كلب ينظر حوله بارتياب وعيناه مثبتتان على الكاميرا.</string>
-    <string name="visibility_public">علني</string>
-    <string name="visibility_followers_only">للمُتابِعينَ فقط</string>
-    <string name="visibility_private">لمن ذكرتُهم فقط</string>
-    <string name="search_all">الكل</string>
-    <string name="search_people">أشخاص</string>
-    <string name="recent_searches">عَمَليَّاُت البَحثِ الأخيرَة</string>
-    <string name="step_x_of_n">الخطوة %1$d من %2$d</string>
-    <string name="skip">تخطى</string>
-    <string name="notification_type_follow">متابعُون جُدُد</string>
-    <string name="notification_type_favorite">المفضلة</string>
-    <string name="notification_type_reblog">المعاد تدوينها</string>
-    <string name="notification_type_mention">الذِكر</string>
-    <string name="notification_type_poll">استطلاع رأي</string>
-    <string name="choose_account">اختر حسابًا</string>
-    <string name="err_not_logged_in">يرجى تسجيل الدخول إلى حساب ماستدون أولًا</string>
-    <plurals name="cant_add_more_than_x_attachments">
-        <item quantity="zero">يجب عليك إرفاق ملف</item>
-        <item quantity="one">لا يمكنك إرفاق ملف</item>
-        <item quantity="two">لا يمكنك إرفاق أكثر من ملفين</item>
-        <item quantity="few">لا يمكنك إرفاق أكثر من %d ملفات</item>
-        <item quantity="many">لا يمكنك إرفاق أكثر من %d ملفًا</item>
-        <item quantity="other">لا يمكنك إرفاق أكثر من %d ملف</item>
-    </plurals>
-    <string name="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="theme_true_black">الوضع الداكن الحقيقي</string>
-    <string name="settings_behavior">السلوك</string>
-    <string name="settings_gif">تشغيل الصور الرمزية المتحركة والرموز التعبيرية المتحركة</string>
-    <string name="settings_custom_tabs">استخدم المتصفح المضمن</string>
-    <string name="settings_notifications">الإشعارات</string>
-    <string name="notify_me_when">أشعِرني عند قيام</string>
-    <string name="notify_anyone">أيَّ شخصٍ</string>
-    <string name="notify_follower">مُتابِع</string>
-    <string name="notify_followed">شخص أُتابِعُه</string>
-    <string name="notify_none">لَا أحد</string>
-    <string name="notify_favorites">بِالإعْجاب بِمَنشوري</string>
-    <string name="notify_follow">بمتابعتي</string>
-    <string name="notify_reblog">بإعادة تدوين مَنشوري</string>
-    <string name="notify_mention">ذكرني</string>
-    <string name="settings_boring">المنطِقَةُ المُملَّة</string>
-    <string name="settings_account">إعدادات الحساب</string>
-    <string name="settings_contribute">ساهم في ماستدون</string>
-    <string name="settings_tos">شروط الخدمة</string>
-    <string name="settings_privacy_policy">سياسة الخصوصية</string>
-    <string name="settings_spicy">المنطِقَةُ اللَّاذِعَة</string>
-    <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">أمتأكد من الخروج؟</string>
-    <string name="sensitive_content">محتوى حساس</string>
-    <string name="sensitive_content_explain">علّم المؤلف هته الوسائط كحساسة. اضغط لكشفها.</string>
-    <string name="media_hidden">اُنقُر لِلكَشف</string>
-    <string name="avatar_description">انتقل للصفحة الشخصية لـ %s</string>
-    <string name="more_options">مزيد من الخيارات</string>
-    <string name="reveal_content">اكشف المحتوى</string>
-    <string name="hide_content">اخف المحتوى</string>
-    <string name="new_post">منشور جديد</string>
-    <string name="button_reply">ردّ</string>
-    <string name="button_reblog">أعد تدوين</string>
-    <string name="button_favorite">فضّل</string>
-    <string name="button_share">شارك</string>
-    <string name="media_no_description">وسائط بدون وصف</string>
-    <string name="add_media">أضف وسائط</string>
-    <string name="add_poll">أضف استطلاع رأي</string>
-    <string name="emoji">إيموجي</string>
-    <string name="post_visibility">مرئية المنشور</string>
-    <string name="home_timeline">الخيط الزمني الرئيسي</string>
-    <string name="my_profile">ملفي الشخصي</string>
-    <string name="media_viewer">عارض الوسائط</string>
-    <string name="follow_user">تابع %s</string>
-    <string name="unfollowed_user">ألغ متابعة %s</string>
-    <string name="followed_user">أنت تتابع %s</string>
-    <string name="open_in_browser">افتح في المتصفح</string>
-    <string name="hide_boosts_from_user">اخف ما أعاد %s تدوينه</string>
-    <string name="show_boosts_from_user">أظهر ما أعاد %s تدوينه</string>
-    <string name="signup_reason">لماذا ترغب في الانضمام؟</string>
-    <string name="signup_reason_note">هذا سوف يساعدنا في مراجعة تطبيقك.</string>
-    <string name="clear">امسح</string>
-    <string name="profile_header">الصورة الفوقية</string>
-    <string name="profile_picture">صورة الملفّ الشخصي</string>
-    <string name="reorder">أعد الترتيب</string>
-    <string name="download">نزّل</string>
-    <string name="permission_required">يتطلب أذونات</string>
-    <string name="storage_permission_to_download">يحتاج هذا التطبيق أذن الوصول للتخزين لحفظ الملف.</string>
-    <string name="open_settings">افتح الإعدادات</string>
-    <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_hashtags_info_banner">هَذِهِ هِيَ الوُسُومُ الَّتي تَكْتَسِبُ شَعبِيَّةً فِي الرُّكنِ الخاصِّ بِكَ مِن مَاستودُون.</string>
-    <string name="trending_links_info_banner">هَذِهِ هِيَ القِصَصُ الأخبارِيَّةُ المُتَنَاقَلَةُ بِكِثرَةٍ فِي الرُّكنِ الخاصِّ بِكَ مِن مَاستودُون.</string>
-    <string name="local_timeline_info_banner">هذه هي أحدث منشورات المستخدمين المتواجدين على نفس الخادم الذي تستخدمه.</string>
-    <string name="dismiss">رفض</string>
-    <string name="see_new_posts">استعرض المنشورات الجديدة</string>
-    <string name="load_missing_posts">حمّل المَنشورات المَفقودَة</string>
-    <string name="follow_back">رُدّ المتابعة</string>
-    <string name="button_follow_pending">معلق</string>
-    <string name="follows_you">يُتابِعُك</string>
-    <string name="manually_approves_followers">الموافقة اليدوية على طلبات المتابعة</string>
-    <string name="current_account">الحِسابُ الحاليّ</string>
-    <string name="log_out_account">تَسجيلُ الخُرُوجِ مِن %s</string>
-    <!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
-    <plurals name="x_followers">
-        <item quantity="zero">ليس له متابِعون</item>
-        <item quantity="one">متابِع واحد</item>
-        <item quantity="two">متابِعان</item>
-        <item quantity="few">%,d متابِعين</item>
-        <item quantity="many">%,d متابِعًا</item>
-        <item quantity="other">%,d متابِع</item>
-    </plurals>
-    <plurals name="x_following">
-        <item quantity="zero">ليس له متابَعون</item>
-        <item quantity="one">متابَع واحد</item>
-        <item quantity="two">متابَعان</item>
-        <item quantity="few">%,d متابَعين</item>
-        <item quantity="many">%,d متابَعًا</item>
-        <item quantity="other">%,d متابَع</item>
-    </plurals>
-    <plurals name="x_favorites">
-        <item quantity="zero">دون تفضيلات</item>
-        <item quantity="one">تفضيل واحد</item>
-        <item quantity="two">تفضيلان</item>
-        <item quantity="few">%,d تفضيلات</item>
-        <item quantity="many">%,d تفضيلًا</item>
-        <item quantity="other">%,d تفضيل</item>
-    </plurals>
-    <plurals name="x_reblogs">
-        <item quantity="zero">لا إعادات تدوين</item>
-        <item quantity="one">إعاد تدوين واحدة</item>
-        <item quantity="two">إعادتا تدوين</item>
-        <item quantity="few">%,d إعادات تدوين</item>
-        <item quantity="many">%,d إعادة تدوين</item>
-        <item quantity="other">%,d إعادة تدوين</item>
-    </plurals>
-    <string name="timestamp_via_app">%1$s عبر %2$s</string>
-    <string name="time_now">الآن</string>
-    <string name="post_info_reblogs">إعادات التدوين</string>
-    <string name="post_info_favorites">المفضلة</string>
-    <string name="edit_history">تاريخ التعديل</string>
-    <string name="last_edit_at_x">آخر تعديل %s</string>
-    <string name="time_just_now">للتوّ</string>
-    <plurals name="x_seconds_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>
-    <plurals name="x_minutes_ago">
-        <item quantity="zero">الان</item>
-        <item quantity="one">منذ دقيقة</item>
-        <item quantity="two">منذ دقيقتان</item>
-        <item quantity="few">%d دقائق مضت</item>
-        <item quantity="many">منذ %d دقائق</item>
-        <item quantity="other">منذ %d دقائق</item>
-    </plurals>
-    <string name="edited_timestamp">عُدّل في %s</string>
-    <string name="edit_original_post">المنشور الأصلي</string>
-    <string name="edit_text_edited">تم تعديل النص</string>
-    <string name="edit_spoiler_added">تم إضافة تحذير المحتوى</string>
-    <string name="edit_spoiler_edited">تم تعديل تحذير المحتوى</string>
-    <string name="edit_spoiler_removed">تم حذف تحذير المحتوى</string>
-    <string name="edit_poll_added">تمت إضافة استطلاع للرأي</string>
-    <string name="edit_poll_edited">تم تعديل الاستطلاع</string>
-    <string name="edit_poll_removed">تمت إزالة الاستطلاع</string>
-    <string name="edit_media_added">تمت إضافة الوسائط</string>
-    <string name="edit_media_removed">تمت إزالة الوسائط</string>
-    <string name="edit_media_reordered">تمت إعادة ترتيب الوسائط</string>
-    <string name="edit_marked_sensitive">مُعَين كحساس</string>
-    <string name="edit_marked_not_sensitive">مُعَين كمنشور غير حساس</string>
-    <string name="edit_multiple_changed">عُدّل المنشور</string>
-    <string name="edit">تعديل</string>
-    <string name="discard_changes">تجاهل التغييرات؟</string>
-    <string name="upload_failed">فشلت عملية التحميل</string>
-    <string name="file_size_bytes">%d بايت</string>
-    <string name="file_size_kb">%.2f كيلوبايت</string>
-    <string name="file_size_mb">%.2f ميغابايت</string>
-    <string name="file_size_gb">%.2f جيجابايت</string>
-    <string name="file_upload_progress">%1$s من %2$s</string>
-    <string name="file_upload_time_remaining">%s متبقية</string>
-    <string name="upload_error_connection_lost">فقد جهازك الاتصال بالإنترنت</string>
-    <string name="upload_processing">قيد المعالجة…</string>
-    <!-- %s is version like 1.2.3 -->
-    <string name="update_available">ماستدون %s للأندرويد جاهز للتنزيل.</string>
-    <!-- %s is version like 1.2.3 -->
-    <string name="update_ready">تم تنزيل ماستدون %s للأندرويد ومستعد لتثبيته.</string>
-    <!-- %s is file size -->
-    <string name="download_update">جارٍ التنزيل (%s)</string>
-    <string name="install_update">تثبيت</string>
-    <string name="privacy_policy_title">ماستدون وخصوصيتك</string>
-    <string name="privacy_policy_subtitle">على الرغم من أن تطبيق ماستدون لا يجمع أي بيانات، فإن الخادم الذي قمت بالتسجيل من خلاله قد تكون له سياسة مختلفة. خذ دقيقة للمراجعة والموافقة على سياسة خصوصية التطبيق ماستدون وسياسة الخصوصية للخادم الخاص بك.</string>
-    <string name="i_agree">أنا مُوافِق</string>
-    <string name="empty_list">هذه القائمة فارغة</string>
-    <string name="instance_signup_closed">هذا الخادم لا يقبل تسجيلات جديدة.</string>
-    <string name="text_copied">تم النسخ إلى الحافظة</string>
-    <string name="add_bookmark">إضافة إلى الفواصل المرجعية</string>
-    <string name="remove_bookmark">إزالة من الفواصل المرجعية</string>
-    <string name="bookmarks">الفواصل المرجعية</string>
-    <string name="your_favorites">مفضلاتك</string>
-</resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values-de-rDE/strings.xml b/mastodon/src/main/res/values-de-rDE/strings.xml
index 3b9a6e7cc..d4545413c 100644
--- a/mastodon/src/main/res/values-de-rDE/strings.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings.xml
@@ -43,8 +43,8 @@
 	<string name="block_user">%s sperren</string>
 	<string name="unblock_user">%s entsperren</string>
 	<string name="report_user">%s melden</string>
-	<string name="block_domain">%s sperren</string>
-	<string name="unblock_domain">%s nicht mehr sperren</string>
+	<string name="block_domain">%s blockieren</string>
+	<string name="unblock_domain">%s nicht mehr blockieren</string>
 	<plurals name="x_posts">
 		<item quantity="one">%,d Beitrag</item>
 		<item quantity="other">%,d Beiträge</item>
@@ -98,12 +98,12 @@
 	<string name="do_unmute">Nicht mehr stummschalten</string>
 	<string name="confirm_block_title">Konto sperren</string>
 	<string name="confirm_block_domain_title">Domain sperren</string>
-	<string name="confirm_block">Bestätigen, um %s zu sperren</string>
+	<string name="confirm_block">Bestätigen, um %s zu blockieren</string>
 	<string name="do_block">Sperren</string>
 	<string name="confirm_unblock_title">Konto nicht mehr sperren</string>
 	<string name="confirm_unblock_domain_title">Domain nicht mehr blockieren</string>
-	<string name="confirm_unblock">Bestätigen, um Sperre von %s aufzuheben</string>
-	<string name="do_unblock">Sperre aufheben</string>
+	<string name="confirm_unblock">Bestätigen, um %s nicht mehr zu blockieren</string>
+	<string name="do_unblock">Nicht mehr blockieren</string>
 	<string name="button_blocked">Blockiert</string>
 	<string name="action_vote">Abstimmen</string>
 	<string name="delete">Löschen</string>
@@ -592,7 +592,6 @@
 	<string name="settings_discoverable">Profil und Beiträge in Suchalgorithmen berücksichtigen</string>
 	<string name="settings_indexable">Öffentliche Beiträge in die Suchergebnisse einbeziehen</string>
 	<string name="error_playing_video">Fehler bei Videowiedergabe</string>
-	<string name="timeline_following">Folge ich</string>
 	<string name="lists">Listen</string>
 	<string name="followed_hashtags">Gefolgte Hashtags</string>
 	<string name="no_lists">Du hast noch keine Listen.</string>
diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index 57a6b14d2..b86702e09 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -262,6 +262,7 @@
 	<!-- %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>
 	<string name="button_follow_pending">Εκκρεμεί</string>
@@ -599,7 +600,7 @@
 		<item quantity="other">%,d αναρτήσεις σήμερα</item>
 	</plurals>
 	<string name="error_playing_video">Σφάλμα αναπαραγωγής βίντεο</string>
-	<string name="timeline_following">Ακολουθείς</string>
+	<string name="timeline_following">Αρχική</string>
 	<string name="lists">Λίστες</string>
 	<string name="followed_hashtags">Ετικέτες που ακολουθούνται</string>
 	<string name="no_lists">Δεν έχεις καμία λίστα ακόμα.</string>
@@ -614,6 +615,17 @@
 	<!-- %s is the name of the list -->
 	<string name="delete_list_confirm">Διαγραφή “%s”;</string>
 	<string name="list_exclusive">Απόκρυψη μελών στο Ακολουθείς</string>
+	<string name="list_exclusive_subtitle">Αν κάποιος είναι σε αυτή τη λίστα, κρύψε τον στη ροή Ακολουθείς σας για να αποφεύγεις να βλέπεις τις αναρτήσεις του δύο φορές.</string>
+	<string name="list_name">Όνομα λίστας</string>
+	<string name="list_show_replies_to">Εμφάνιση απαντήσεων σε</string>
+	<string name="list_replies_no_one">Κανένας</string>
+	<string name="list_replies_members">Μέλη της λίστας</string>
+	<string name="list_replies_anyone">Όποιον ακολουθώ</string>
+	<string name="confirm_remove_list_members">Αφαίρεση μελών;</string>
+	<string name="remove">Αφαίρεση</string>
+	<string name="add_list_member">Προσθήκη μέλους</string>
+	<string name="search_among_people_you_follow">Αναζήτησε μεταξύ των ανθρώπων που ακουλουθείς</string>
+	<string name="add_user_to_list">Προσθήκη στη λίστα…</string>
+	<string name="add_user_to_list_title">Προσθήκη στη λίστα</string>
 	<!-- %s is a username -->
-	<string name="see_new_posts">Δες νέες αναρτήσεις</string>
 </resources>
diff --git a/mastodon/src/main/res/values-es-rES/strings.xml b/mastodon/src/main/res/values-es-rES/strings.xml
index 3efdfe347..295788718 100644
--- a/mastodon/src/main/res/values-es-rES/strings.xml
+++ b/mastodon/src/main/res/values-es-rES/strings.xml
@@ -592,7 +592,6 @@
 	<string name="settings_discoverable">Mostrar perfil y publicaciones en algoritmos de descubrimiento</string>
 	<string name="settings_indexable">Incluir publicaciones públicas en los resultados de búsqueda</string>
 	<string name="error_playing_video">Error al reproducir el video</string>
-	<string name="timeline_following">Siguiendo</string>
 	<string name="lists">Listas</string>
 	<string name="followed_hashtags">Etiquetas seguidas</string>
 	<string name="no_lists">Aún no tienes ninguna lista.</string>
diff --git a/mastodon/src/main/res/values-eu-rES/strings.xml b/mastodon/src/main/res/values-eu-rES/strings.xml
index a845a2734..a3aeb122b 100644
--- a/mastodon/src/main/res/values-eu-rES/strings.xml
+++ b/mastodon/src/main/res/values-eu-rES/strings.xml
@@ -250,6 +250,7 @@
 	<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">Bidalketa berriak</string>
 	<string name="load_missing_posts">Falta diren bidalketak kargatu</string>
 	<string name="follow_back">Jarraitu</string>
 	<string name="button_follow_pending">Zain</string>
@@ -357,6 +358,10 @@
 	<string name="opening_link">Lotura irekitzen…</string>
 	<string name="retry">Berriro saiatu</string>
 	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_description_image">irudi %s</string>
+	<string name="attachment_description_video">bideo %s</string>
+	<string name="attachment_description_audio">audio %s</string>
+	<string name="attachment_description_unknown">fitxategi %s</string>
 	<string name="attachment_type_image">Irudia</string>
 	<string name="attachment_type_video">Bideoa</string>
 	<string name="attachment_type_audio">Audioa</string>
@@ -449,5 +454,4 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
-	<string name="see_new_posts">Ikusi bidalketa berriak</string>
 </resources>
diff --git a/mastodon/src/main/res/values-fa-rIR/strings.xml b/mastodon/src/main/res/values-fa-rIR/strings.xml
index a1dc79334..a4ccd25e6 100644
--- a/mastodon/src/main/res/values-fa-rIR/strings.xml
+++ b/mastodon/src/main/res/values-fa-rIR/strings.xml
@@ -600,7 +600,6 @@
 		<item quantity="other">%,d فرسته امروز</item>
 	</plurals>
 	<string name="error_playing_video">خطا در پخش ویدئو</string>
-	<string name="timeline_following">پی‌گرفته</string>
 	<string name="lists">سیاهه‌ها</string>
 	<string name="followed_hashtags">برچسب‌های پی‌گرفته</string>
 	<string name="no_lists">شما هنوز هیچ سیاهه‌ای ندارید.</string>
diff --git a/mastodon/src/main/res/values-fi-rFI/strings.xml b/mastodon/src/main/res/values-fi-rFI/strings.xml
index 0e65723e7..e8a77bc5b 100644
--- a/mastodon/src/main/res/values-fi-rFI/strings.xml
+++ b/mastodon/src/main/res/values-fi-rFI/strings.xml
@@ -14,7 +14,7 @@
 	<string name="user_followed_you">%s seurasi sinua</string>
 	<string name="user_sent_follow_request">%s lähetti sinulle seurauspyynnön</string>
 	<string name="user_favorited">%s tykkäsi julkaisustasi</string>
-	<string name="notification_boosted">%s tehosti viestiäsi</string>
+	<string name="notification_boosted">%s tehosti julkaisuasi</string>
 	<string name="poll_ended">Katso tulokset äänestyksestä johon osallistuit</string>
 	<string name="share_toot_title">Jaa</string>
 	<string name="settings">Asetukset</string>
@@ -30,8 +30,8 @@
 		<item quantity="one">seurataan</item>
 		<item quantity="other">seurataan</item>
 	</plurals>
-	<string name="posts">Viestit</string>
-	<string name="posts_and_replies">Viestit ja vastaukset</string>
+	<string name="posts">Julkaisut</string>
+	<string name="posts_and_replies">Julkaisut ja vastaukset</string>
 	<string name="media">Media</string>
 	<string name="profile_about">Tietoja</string>
 	<string name="button_follow">Seuraa</string>
@@ -148,7 +148,7 @@
 	<string name="report_sent_subtitle">Sillä välin kun tarkistamme tätä, voit ryhtyä toimenpiteisiin käyttäjää @%s vastaan:</string>
 	<string name="unfollow_user">Lopeta käyttäjän %s seuraaminen</string>
 	<string name="unfollow">Lopeta seuraaminen</string>
-	<string name="mute_user_explain">Et näe hänen viestejään. Hän voi silti seurata sinua ja nähdä viestisi. Hän ei tiedä, että on mykistetty.</string>
+	<string name="mute_user_explain">Et näe hänen julkaisujaan. Hän voi silti seurata sinua ja nähdä julkaisusi. Hän ei tiedä, että hänet on mykistetty.</string>
 	<string name="block_user_explain">Et näe hänen viestejään, eikä hän voi nähdä viestejäsi tai seurata sinua. Hän näkevät, että olet estänyt hänet.</string>
 	<string name="report_personal_title">Etkö halua nähdä tätä?</string>
 	<string name="report_personal_subtitle">Tässä on vaihtoehtosi hallita näkemääsi Mastodonissa:</string>
@@ -260,8 +260,9 @@
 	<string name="trending_posts_info_banner">Nämä julkaisut ovat saamassa vetoa eri puolilla Mastodonia.</string>
 	<string name="trending_links_info_banner">Näistä uutisista puhutaan Mastodonissa.</string>
 	<!-- %s is the server domain -->
-	<string name="local_timeline_info_banner">Nämä ovat viestit kaikilta palvelimesi (%s) käyttäjiltä.</string>
+	<string name="local_timeline_info_banner">Nämä ovat julkaisut kaikilta palvelimesi (%s) käyttäjiltä.</string>
 	<string name="recommended_accounts_info_banner">Muiden seuraamiesi perusteella saattaisit pitää näistä tileistä.</string>
+	<string name="see_new_posts">Uudet julkaisut</string>
 	<string name="load_missing_posts">Lataa puuttuvat julkaisut</string>
 	<string name="follow_back">Seuraa takaisin</string>
 	<string name="button_follow_pending">Pyydetty</string>
@@ -298,7 +299,7 @@
 		<item quantity="other">%d minuuttia sitten</item>
 	</plurals>
 	<string name="edited_timestamp">muokattu %s</string>
-	<string name="edit_original_post">Alkuperäinen viesti</string>
+	<string name="edit_original_post">Alkuperäinen jukaisu</string>
 	<string name="edit_text_edited">Tekstiä muokattu</string>
 	<string name="edit_spoiler_added">Sisältövaroitus</string>
 	<string name="edit_spoiler_edited">Sisältövaroitus muokattu</string>
@@ -392,7 +393,7 @@
 	<string name="log_out_all_accounts">Kirjaudu ulos kaikista tileistä</string>
 	<string name="confirm_log_out_all_accounts">Kirjaudu ulos kaikista tileistä?</string>
 	<string name="retry">Yritä uudelleen</string>
-	<string name="post_failed">Viestin lähettäminen epäonnistui</string>
+	<string name="post_failed">Julkaiseminen epäonnistui</string>
 	<!-- %s is formatted file size ("467 KB image") -->
 	<string name="attachment_description_image">%s kuva</string>
 	<string name="attachment_description_video">%s video</string>
@@ -477,7 +478,7 @@
 	<string name="about_server">Tietoja</string>
 	<string name="server_rules">Säännöt</string>
 	<string name="server_administrator">Ylläpitäjä</string>
-	<string name="send_email_to_server_admin">Viestin ylläpitäjä</string>
+	<string name="send_email_to_server_admin">Lähetä viesti ylläpitäjälle</string>
 	<string name="notifications_disabled_in_system">Ota ilmoitukset käyttöön laitteesi asetuksista nähdäksesi päivityksiä mistä tahansa.</string>
 	<string name="settings_even_more">Vielä enemmän asetuksia</string>
 	<string name="settings_show_cws">Näytä sisältövaroitukset</string>
@@ -548,7 +549,7 @@
 	<string name="edit_muted_word">Muokkaa mykistettyä sanaa</string>
 	<string name="add">Lisää</string>
 	<string name="filter_word_or_phrase">Sana tai lause</string>
-	<string name="filter_add_word_help">Sanat ovat tapauskohtaisia ja vastaavat vain kokonaisia sanoja.\n\nJos suodattaa avainsana “Apple”, se piilottaa viestit sisältävät “omena” tai “aPPLe” mutta ei “ananas\".</string>
+	<string name="filter_add_word_help">Sanat ovat tapauskohtaisia ja vastaavat vain kokonaisia sanoja.\n\nJos suodatat avainsanat “Apple”, se piilottaa julkaisut joissa on “apple” tai “aPpLe” mutta ei “pineapple\"</string>
 	<string name="settings_delete_filter_word">Poista sana “%s”?</string>
 	<string name="enter_selection_mode">Valitse</string>
 	<string name="select_all">Valitse kaikki</string>
@@ -596,11 +597,53 @@
 	</plurals>
 	<plurals name="x_posts_today">
 		<item quantity="one">%,d viesti tänään</item>
-		<item quantity="other">%,d viestiä tänään</item>
+		<item quantity="other">%,d julkaisua tänään</item>
 	</plurals>
 	<string name="error_playing_video">Virhe videon toistossa</string>
+	<string name="timeline_following">Koti</string>
+	<string name="lists">Listat</string>
+	<string name="followed_hashtags">Seuratut aihetunnisteet</string>
+	<string name="no_lists">Sinulla ei ole vielä yhtään listaa.</string>
+	<string name="no_followed_hashtags">Et seuraa yhtään aihetunnistetta.</string>
+	<string name="manage_lists">Hallitse listoja</string>
+	<string name="manage_hashtags">Hallitse aihetunnisteita</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">Pudotusvalikko</string>
+	<string name="edit_list">Muokkaa listaa</string>
+	<string name="list_members">Listan jäsenet</string>
+	<string name="delete_list">Poista lista</string>
 	<!-- %s is the name of the list -->
+	<string name="delete_list_confirm">Poistetaanko “%s”?</string>
+	<string name="list_exclusive">Piilota jäsenet Seuratuissa</string>
+	<string name="list_exclusive_subtitle">Jos joku on tällä listalla, piilota hänet Seuratut-aikajanalla jottet näe julkaisuja kahdesti.</string>
+	<string name="list_name">Listan nimi</string>
+	<string name="list_show_replies_to">Näytä vastaukset</string>
+	<string name="list_replies_no_one">Ei kellekään</string>
+	<string name="list_replies_members">Listan jäsenille</string>
+	<string name="list_replies_anyone">Kenelle tahansa seuraamalleni</string>
+	<string name="confirm_remove_list_members">Poista jäsenet?</string>
+	<string name="remove">Poista</string>
+	<string name="add_list_member">Lisää jäsen</string>
+	<string name="search_among_people_you_follow">Etsi seuraamistasi henkilöistä</string>
+	<string name="add_user_to_list">Lisää listalle…</string>
+	<string name="add_user_to_list_title">Lisää listalle</string>
 	<!-- %s is a username -->
-	<string name="see_new_posts">Uusia julkaisuja</string>
+	<string name="manage_user_lists">Hallitse listoja joissa %s on mukana</string>
+	<string name="remove_from_list">Poista listalta</string>
+	<string name="confirm_remove_list_member">Poista jäsen?</string>
+	<string name="no_followed_hashtags_title">Pysy ajan tasalla seuraamalla kiinnostavia aihetunnisteita</string>
+	<string name="no_followed_hashtags_subtitle">Seuratut näkyvät täällä</string>
+	<string name="no_lists_title">Järjestä kotiaikajanasi listojen avulla</string>
+	<string name="no_lists_subtitle">Omasi näkyy täällä</string>
+	<string name="manage_accounts">Lisää tai vaihda tiliä</string>
+	<plurals name="x_posts_recently">
+		<item quantity="one">%,d äskeinen julkaisu</item>
+		<item quantity="other">%,d äskeistä julkaisua</item>
+	</plurals>
+	<string name="create_list">Luo lista</string>
+	<string name="step_x_of_y">Vaihe %1$d / %2$d</string>
+	<string name="create">Luo</string>
+	<string name="manage_list_members">Hallitse listan jäseniä</string>
+	<string name="list_no_members">Ei vielä jäseniä</string>
+	<string name="list_find_users">Etsi lisättäviä käyttäjiä</string>
 </resources>
diff --git a/mastodon/src/main/res/values-fr-rFR/strings.xml b/mastodon/src/main/res/values-fr-rFR/strings.xml
index d1e363593..113e0ea91 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings.xml
@@ -262,6 +262,7 @@
 	<!-- %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">Nouveaux messages </string>
 	<string name="load_missing_posts">Charger les messages manquants</string>
 	<string name="follow_back">Suivre en retour</string>
 	<string name="button_follow_pending">En attente</string>
@@ -587,6 +588,9 @@
 	<string name="post_translated">Traduit depuis %1$s via %2$s</string>
 	<string name="translation_show_original">Afficher l’original</string>
 	<string name="translation_failed">La traduction a échoué. Peut-être que l’administrateur n’a pas activé les traductions sur ce serveur ou que ce serveur utilise une ancienne version de Mastodon où les traductions ne sont pas encore prises en charge.</string>
+	<string name="settings_privacy">Vie privée et visibilité</string>
+	<string name="settings_discoverable">Autoriser des algorithmes de découverte à mettre en avant votre profil et vos messages</string>
+	<string name="settings_indexable">Inclure mes messages publics dans les résultats de recherche</string>
 	<plurals name="x_participants">
 		<item quantity="one">%,d participant</item>
 		<item quantity="other">%,d participants</item>
@@ -595,8 +599,51 @@
 		<item quantity="one">%,d message aujourd’hui</item>
 		<item quantity="other">%,d messages aujourd’hui</item>
 	</plurals>
+	<string name="error_playing_video">Erreur lors de la lecture de la vidéo</string>
+	<string name="timeline_following">Accueil</string>
+	<string name="lists">Listes</string>
+	<string name="followed_hashtags">Hashtags suivis</string>
+	<string name="no_lists">Vous n’avez pas encore de listes.</string>
+	<string name="no_followed_hashtags">Vous ne suivez aucun hashtag.</string>
+	<string name="manage_lists">Gérer les listes</string>
+	<string name="manage_hashtags">Gérer les hashtags</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">Menu déroulant</string>
+	<string name="edit_list">Modifier la liste</string>
+	<string name="list_members">Membres de la liste</string>
+	<string name="delete_list">Supprimer la liste</string>
 	<!-- %s is the name of the list -->
+	<string name="delete_list_confirm">Supprimer « %s » ?</string>
+	<string name="list_exclusive">Cacher les membres dans Abonné⋅e</string>
+	<string name="list_exclusive_subtitle">Si quelqu\'un est dans cette liste, les cacher dans votre fil pour éviter de voir leurs messages deux fois.</string>
+	<string name="list_name">Nom de la liste</string>
+	<string name="list_show_replies_to">Montrer les réponses à</string>
+	<string name="list_replies_no_one">Personne</string>
+	<string name="list_replies_members">Membres de la liste</string>
+	<string name="list_replies_anyone">Toute personne que je suis</string>
+	<string name="confirm_remove_list_members">Supprimer les membres ?</string>
+	<string name="remove">Supprimer</string>
+	<string name="add_list_member">Ajouter un membre</string>
+	<string name="search_among_people_you_follow">Rechercher parmi les gens que vous suivez</string>
+	<string name="add_user_to_list">Ajouter à la liste…</string>
+	<string name="add_user_to_list_title">Ajouter à la liste</string>
 	<!-- %s is a username -->
-	<string name="see_new_posts">Voir les nouveaux messages</string>
+	<string name="manage_user_lists">Gérer les listes où %s apparaît</string>
+	<string name="remove_from_list">Supprimer de la liste</string>
+	<string name="confirm_remove_list_member">Supprimer le membre ?</string>
+	<string name="no_followed_hashtags_title">Restez au courant des sujets qui vous intéressent en suivant des hashtags</string>
+	<string name="no_followed_hashtags_subtitle">Les abonnements apparaîtront ici</string>
+	<string name="no_lists_title">Organisez votre fil d\'accueil avec des listes</string>
+	<string name="no_lists_subtitle">Vos listes apparaîtront ici</string>
+	<string name="manage_accounts">Ajouter ou changer de compte</string>
+	<plurals name="x_posts_recently">
+		<item quantity="one">%,d message récemment</item>
+		<item quantity="other">%,d messages récemment</item>
+	</plurals>
+	<string name="create_list">Créer une liste</string>
+	<string name="step_x_of_y">Étape %1$d sur %2$d</string>
+	<string name="create">Créer</string>
+	<string name="manage_list_members">Gérer les membres de la liste</string>
+	<string name="list_no_members">Aucun membre pour l\'instant</string>
+	<string name="list_find_users">Trouver des utilisateurs à ajouter</string>
 </resources>
diff --git a/mastodon/src/main/res/values-gd-rGB/strings.xml b/mastodon/src/main/res/values-gd-rGB/strings.xml
index 537fb7ca2..bea727ea7 100644
--- a/mastodon/src/main/res/values-gd-rGB/strings.xml
+++ b/mastodon/src/main/res/values-gd-rGB/strings.xml
@@ -288,6 +288,7 @@
 	<!-- %s is the server domain -->
 	<string name="local_timeline_info_banner">Seo gach post o gach cleachdaiche an fhrithealaiche agad (%s).</string>
 	<string name="recommended_accounts_info_banner">Dh’fhaoidte gun còrd na cunntasan seo riut stèidhichte air feadhainn eile a tha thu a’ leantainn.</string>
+	<string name="see_new_posts">Postaichean ùra</string>
 	<string name="load_missing_posts">Luchdaich postaichean a dhìth</string>
 	<string name="follow_back">Lean air ais</string>
 	<string name="button_follow_pending">Ri dhèiligeadh</string>
@@ -640,9 +641,40 @@
 	<string name="time_hours_ago_short">%du air ais</string>
 	<string name="time_days_ago_short">%dl air ais</string>
 	<!-- %s is the name of the post language -->
+	<string name="translate_post">Eadar-theangaich o %s</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="post_translated">Air eadar-theangachadh o %1$s le %2$s</string>
+	<string name="translation_show_original">Seall an tionndadh tùsail</string>
+	<string name="translation_failed">Dh’fhàillig an t-eadar-theangachadh. Dh’fhaoidte nach do chuir an rianaire na h-eadar-theangachaidhean an comas air an fhrithealaiche seo no gu bheil am frithealaiche a’ ruith seann-tionndadh de Mhastodon far nach eil taic ri eadar-theangachadh fhathast.</string>
+	<string name="settings_privacy">Prìobhaideachd ’s ruigse</string>
+	<string name="settings_discoverable">Brosnaich a’ phròifil is postaichean agad sna h-algairimean luirg</string>
+	<string name="settings_indexable">Gabh na postaichean poblach a-staigh ann an toraidhean luirg</string>
+	<plurals name="x_participants">
+		<item quantity="one">%,d chom-pàirtiche</item>
+		<item quantity="two">%,d chom-pàirtiche</item>
+		<item quantity="few">%,d com-pàirtichean</item>
+		<item quantity="other">%,d com-pàirtiche</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="one">%,d phost an-diugh</item>
+		<item quantity="two">%,d phost an-diugh</item>
+		<item quantity="few">%,d postaichean an-diugh</item>
+		<item quantity="other">%,d post an-diugh</item>
+	</plurals>
+	<string name="error_playing_video">Mearachd le cluich a’ video</string>
+	<string name="timeline_following">Dachaigh</string>
+	<string name="lists">Liostaichean</string>
+	<string name="followed_hashtags">Tagaichean hais ’gan leantainn</string>
+	<string name="no_lists">Chan eil liosta agad fhathast.</string>
+	<string name="no_followed_hashtags">Chan eil thu a’ leantainn taga hais fhathast.</string>
+	<string name="manage_lists">Stiùirich na liostaichean</string>
+	<string name="manage_hashtags">Stiùirich na tagaichean hais</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">Clàr-taice teàrnach</string>
+	<string name="edit_list">Deasaich an liosta</string>
+	<string name="list_members">Buill na liosta</string>
+	<string name="delete_list">Sguab às an liosta</string>
 	<!-- %s is the name of the list -->
+	<string name="delete_list_confirm">A bheil thu airson “%s” a sguabadh às?</string>
 	<!-- %s is a username -->
-	<string name="see_new_posts">Seall na postaichean ùra</string>
 </resources>
diff --git a/mastodon/src/main/res/values-gl-rES/strings.xml b/mastodon/src/main/res/values-gl-rES/strings.xml
index 592c186fc..b77928fb4 100644
--- a/mastodon/src/main/res/values-gl-rES/strings.xml
+++ b/mastodon/src/main/res/values-gl-rES/strings.xml
@@ -600,7 +600,6 @@
 		<item quantity="other">%,d publicacións hoxe</item>
 	</plurals>
 	<string name="error_playing_video">Erro ao reproducir o vídeo</string>
-	<string name="timeline_following">A Seguir</string>
 	<string name="lists">Listas</string>
 	<string name="followed_hashtags">Cancelos seguidos</string>
 	<string name="no_lists">Aínda non tes ningunha lista.</string>
diff --git a/mastodon/src/main/res/values-is-rIS/strings.xml b/mastodon/src/main/res/values-is-rIS/strings.xml
index 6cb2330bf..b833ab538 100644
--- a/mastodon/src/main/res/values-is-rIS/strings.xml
+++ b/mastodon/src/main/res/values-is-rIS/strings.xml
@@ -600,7 +600,7 @@
 		<item quantity="other">%,d færslur í dag</item>
 	</plurals>
 	<string name="error_playing_video">Villa við að spila myndskeið</string>
-	<string name="timeline_following">Fylgist með</string>
+	<string name="timeline_following">Heim</string>
 	<string name="lists">Listar</string>
 	<string name="followed_hashtags">Myllumerki sem fylgst er með</string>
 	<string name="no_lists">Þú ert ekki ennþá með neina lista.</string>
@@ -635,10 +635,15 @@
 	<string name="no_followed_hashtags_subtitle">Þeir sem fylgst er með birtast hér</string>
 	<string name="no_lists_title">Skipulegðu heimastreymið þitt með listum</string>
 	<string name="no_lists_subtitle">Þú munt birtast hér</string>
+	<string name="manage_accounts">Bæta við eða skipta um aðganga</string>
 	<plurals name="x_posts_recently">
 		<item quantity="one">%,d nýleg færsla</item>
 		<item quantity="other">%,d nýlegar færslur</item>
 	</plurals>
+	<string name="create_list">Búa til lista</string>
 	<string name="step_x_of_y">Skref %1$d af %2$d</string>
 	<string name="create">Búa til</string>
+	<string name="manage_list_members">Sýsla með meðlimi listans</string>
+	<string name="list_no_members">Engir meðlimir ennþá</string>
+	<string name="list_find_users">Finndu notendur til að bæta við</string>
 </resources>
diff --git a/mastodon/src/main/res/values-it-rIT/strings.xml b/mastodon/src/main/res/values-it-rIT/strings.xml
index 9fcdfe326..51470d41b 100644
--- a/mastodon/src/main/res/values-it-rIT/strings.xml
+++ b/mastodon/src/main/res/values-it-rIT/strings.xml
@@ -262,6 +262,7 @@
 	<!-- %s is the server domain -->
 	<string name="local_timeline_info_banner">Questi sono tutti i post di tutti gli utenti nel tuo server (%s).</string>
 	<string name="recommended_accounts_info_banner">Questi account potrebbero piacerti in base agli altri che segui.</string>
+	<string name="see_new_posts">Nuovi post</string>
 	<string name="load_missing_posts">Carica i post mancanti</string>
 	<string name="follow_back">Segui anche tu</string>
 	<string name="button_follow_pending">In attesa</string>
@@ -599,8 +600,50 @@
 		<item quantity="other">%,d post oggi</item>
 	</plurals>
 	<string name="error_playing_video">Errore nella riproduzione del video</string>
+	<string name="timeline_following">Inizio</string>
+	<string name="lists">Liste</string>
+	<string name="followed_hashtags">Hashtag seguiti</string>
+	<string name="no_lists">Non hai ancora nessuna lista.</string>
+	<string name="no_followed_hashtags">Non segui alcun hashtag.</string>
+	<string name="manage_lists">Gestisci le liste</string>
+	<string name="manage_hashtags">Gestisci gli hashtag</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">Menù a discesa</string>
+	<string name="edit_list">Modifica la lista</string>
+	<string name="list_members">Elenca i membri</string>
+	<string name="delete_list">Elimina la lista</string>
 	<!-- %s is the name of the list -->
+	<string name="delete_list_confirm">Eliminare “%s”?</string>
+	<string name="list_exclusive">Nascondi i membri nell\'elenco \"Stai seguendo\"</string>
+	<string name="list_exclusive_subtitle">Se qualcuno è presente in questa lista, nascondilo nella timeline degli utenti \"Sto seguendo\" per evitare di vedere i suoi post due volte.</string>
+	<string name="list_name">Elenco dei nomi</string>
+	<string name="list_show_replies_to">Mostra le risposte a</string>
+	<string name="list_replies_no_one">Nessuno</string>
+	<string name="list_replies_members">Membri della lista</string>
+	<string name="list_replies_anyone">Chiunque io segua</string>
+	<string name="confirm_remove_list_members">Rimuovere i membri?</string>
+	<string name="remove">Rimuovi</string>
+	<string name="add_list_member">Aggiungi membro</string>
+	<string name="search_among_people_you_follow">Cerca tra le persone che segui</string>
+	<string name="add_user_to_list">Aggiungi alla lista…</string>
+	<string name="add_user_to_list_title">Aggiungi alla lista</string>
 	<!-- %s is a username -->
-	<string name="see_new_posts">Visualizza nuovi post</string>
+	<string name="manage_user_lists">Gestisci gli elenchi in cui appare %s</string>
+	<string name="remove_from_list">Rimuovi dalla lista</string>
+	<string name="confirm_remove_list_member">Rimuovere membro?</string>
+	<string name="no_followed_hashtags_title">Tieniti aggiornato sugli interessi seguendo gli hashtag</string>
+	<string name="no_followed_hashtags_subtitle">Gli hashtag seguiti verranno visualizzati qui</string>
+	<string name="no_lists_title">Organizza la tua home feed con le Liste</string>
+	<string name="no_lists_subtitle">Le tue appariranno qui</string>
+	<string name="manage_accounts">Aggiungi o cambia account</string>
+	<plurals name="x_posts_recently">
+		<item quantity="one">%,d post di recente</item>
+		<item quantity="other">%,d post di recente</item>
+	</plurals>
+	<string name="create_list">Crea una lista</string>
+	<string name="step_x_of_y">Passaggio %1$d di %2$d</string>
+	<string name="create">Crea</string>
+	<string name="manage_list_members">Gestisci i membri della lista</string>
+	<string name="list_no_members">Ancora nessun membro</string>
+	<string name="list_find_users">Trova gli utenti da aggiungere</string>
 </resources>
diff --git a/mastodon/src/main/res/values-ja-rJP/strings.xml b/mastodon/src/main/res/values-ja-rJP/strings.xml
index eacc73d01..c403c3b1a 100644
--- a/mastodon/src/main/res/values-ja-rJP/strings.xml
+++ b/mastodon/src/main/res/values-ja-rJP/strings.xml
@@ -249,6 +249,7 @@
 	<!-- %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>
 	<string name="button_follow_pending">保留</string>
@@ -568,7 +569,7 @@
 		<item quantity="other">今日の投稿 %,d 件</item>
 	</plurals>
 	<string name="error_playing_video">動画再生に失敗しました</string>
-	<string name="timeline_following">フォロー中</string>
+	<string name="timeline_following">ホーム</string>
 	<string name="lists">リスト</string>
 	<string name="followed_hashtags">フォロー中のハッシュタグ</string>
 	<string name="no_lists">まだリストがありません。</string>
@@ -599,8 +600,18 @@
 	<string name="manage_user_lists">%s さんが表示されるリストを管理</string>
 	<string name="remove_from_list">リストから外す</string>
 	<string name="confirm_remove_list_member">メンバーを削除しますか？</string>
+	<string name="no_followed_hashtags_title">ハッシュタグをフォローして関心を持ち続けましょう</string>
+	<string name="no_followed_hashtags_subtitle">ここにフォローが表示されます</string>
+	<string name="no_lists_title">リストでホームフィードを整理する</string>
+	<string name="no_lists_subtitle">ここにリストが表示されます</string>
+	<string name="manage_accounts">アカウントの追加または切り替え</string>
 	<plurals name="x_posts_recently">
 		<item quantity="other">最近の投稿 %,d 件</item>
 	</plurals>
-	<string name="see_new_posts">新しい投稿を見る</string>
+	<string name="create_list">リストを作成</string>
+	<string name="step_x_of_y">%2$d ステップの %1$d</string>
+	<string name="create">作成</string>
+	<string name="manage_list_members">リストのメンバーを管理</string>
+	<string name="list_no_members">まだメンバーがいません</string>
+	<string name="list_find_users">追加したいユーザーを探す</string>
 </resources>
diff --git a/mastodon/src/main/res/values-th-rTH/strings.xml b/mastodon/src/main/res/values-th-rTH/strings.xml
index 70235c4fd..bb367a4ee 100644
--- a/mastodon/src/main/res/values-th-rTH/strings.xml
+++ b/mastodon/src/main/res/values-th-rTH/strings.xml
@@ -569,7 +569,7 @@
 		<item quantity="other">%,d โพสต์วันนี้</item>
 	</plurals>
 	<string name="error_playing_video">เกิดข้อผิดพลาดในการเล่นวิดีโอ</string>
-	<string name="timeline_following">กำลังติดตาม</string>
+	<string name="timeline_following">หน้าแรก</string>
 	<string name="lists">รายการ</string>
 	<string name="followed_hashtags">แฮชแท็กที่ติดตาม</string>
 	<string name="no_lists">คุณยังไม่มีรายการใด ๆ</string>
diff --git a/mastodon/src/main/res/values-uk-rUA/strings.xml b/mastodon/src/main/res/values-uk-rUA/strings.xml
index ff94b0de3..8c16edee6 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings.xml
@@ -288,6 +288,7 @@
 	<!-- %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>
 	<string name="button_follow_pending">Очікується</string>
@@ -661,8 +662,44 @@
 		<item quantity="other">%,d дописа сьогодні</item>
 	</plurals>
 	<string name="error_playing_video">Помилка відтворення відео</string>
+	<string name="timeline_following">Головна</string>
+	<string name="lists">Списки</string>
+	<string name="followed_hashtags">Відстежувані хештеги</string>
+	<string name="no_lists">У вас ще немає списків.</string>
+	<string name="no_followed_hashtags">Ви не підписані на жодний хештег.</string>
+	<string name="manage_lists">Керувати списками</string>
+	<string name="manage_hashtags">Керувати хештегами</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">Випадаюче меню</string>
+	<string name="edit_list">Редагувати список</string>
+	<string name="list_members">Учасники списку</string>
+	<string name="delete_list">Видалити список</string>
 	<!-- %s is the name of the list -->
+	<string name="delete_list_confirm">Видалити “%s”?</string>
+	<string name="list_name">Назва списку</string>
+	<string name="list_show_replies_to">Показати відповіді для</string>
+	<string name="list_replies_no_one">Ніхто</string>
+	<string name="list_replies_members">Учасники списку</string>
+	<string name="list_replies_anyone">Хтось, за ким я слідкую</string>
+	<string name="confirm_remove_list_members">Видалити учасників?</string>
+	<string name="remove">Видалити</string>
+	<string name="add_list_member">Додати учасника</string>
+	<string name="search_among_people_you_follow">Шукати серед людей, на яких ви підписані</string>
+	<string name="add_user_to_list">Додати до списку…</string>
+	<string name="add_user_to_list_title">Додати до списку</string>
 	<!-- %s is a username -->
-	<string name="see_new_posts">Переглянути нові дописи</string>
+	<string name="remove_from_list">Видалити зі списку</string>
+	<string name="confirm_remove_list_member">Видалити учасника?</string>
+	<string name="manage_accounts">Додати або змінити обліковий запис</string>
+	<plurals name="x_posts_recently">
+		<item quantity="one">%,d допис нещодавно</item>
+		<item quantity="few">%,d дописи нещодавно</item>
+		<item quantity="many">%,d дописів нещодавно</item>
+		<item quantity="other">%,d допису нещодавно</item>
+	</plurals>
+	<string name="create_list">Створити список</string>
+	<string name="step_x_of_y">Крок %1$d з %2$d</string>
+	<string name="create">Створити</string>
+	<string name="manage_list_members">Керувати учасниками списку</string>
+	<string name="list_no_members">Ще немає учасників</string>
 </resources>
diff --git a/mastodon/src/main/res/values-zh-rTW/strings.xml b/mastodon/src/main/res/values-zh-rTW/strings.xml
index a66262662..d15d3a1da 100644
--- a/mastodon/src/main/res/values-zh-rTW/strings.xml
+++ b/mastodon/src/main/res/values-zh-rTW/strings.xml
@@ -569,7 +569,7 @@
 		<item quantity="other">本日共 %,d 則嘟文</item>
 	</plurals>
 	<string name="error_playing_video">播放影片時發生錯誤</string>
-	<string name="timeline_following">跟隨中</string>
+	<string name="timeline_following">首頁</string>
 	<string name="lists">列表</string>
 	<string name="followed_hashtags">已跟隨主題標籤</string>
 	<string name="no_lists">您尚未建立任何列表。</string>
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index 967138f58..6d77ae5e7 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -610,7 +610,7 @@
 	</plurals>
 
 	<string name="error_playing_video">Error playing video</string>
-	<string name="timeline_following">Following</string>
+	<string name="timeline_following">Home</string>
 	<string name="lists">Lists</string>
 	<string name="followed_hashtags">Followed hashtags</string>
 	<string name="no_lists">You don\'t have any lists yet.</string>
@@ -645,9 +645,15 @@
 	<string name="no_followed_hashtags_subtitle">Follows will appear here</string>
 	<string name="no_lists_title">Organize your home feed with Lists</string>
 	<string name="no_lists_subtitle">Yours will appear here</string>
-	<string name="manage_accounts">Manage accounts</string>
+	<string name="manage_accounts">Add or switch accounts</string>
 	<plurals name="x_posts_recently">
 		<item quantity="one">%,d post recently</item>
 		<item quantity="other">%,d posts recently</item>
 	</plurals>
+	<string name="create_list">Create list</string>
+	<string name="step_x_of_y">Step %1$d of %2$d</string>
+	<string name="create">Create</string>
+	<string name="manage_list_members">Manage list members</string>
+	<string name="list_no_members">No members yet</string>
+	<string name="list_find_users">Find users to add</string>
 </resources>
\ No newline at end of file

From 790269109344e5184fe036e0bfc40dc753363257 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 27 Oct 2023 01:28:27 +0200
Subject: [PATCH 21/28] avoid index out of bounds

closes sk22#904
---
 .../android/ui/displayitems/MediaGridStatusDisplayItem.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
index 385978be7..0d066fdf3 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
@@ -382,7 +382,7 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		public MediaAttachmentViewController getViewController(int index){
-			return controllers.get(index);
+			return index<controllers.size() ? controllers.get(index) : null;
 		}
 
 		public void setClipChildren(boolean clip){

From 4cab9169574a10237d00d6f678a29f816ae82c7e Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 27 Oct 2023 16:02:14 +0200
Subject: [PATCH 22/28] move status list fragment check out of predicate

---
 .../android/ui/displayitems/GapStatusDisplayItem.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java
index 96c2366ae..6fa9ce444 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java
@@ -64,11 +64,12 @@ public class GapStatusDisplayItem extends StatusDisplayItem{
 			}
 			top.setClickable(!item.loading);
 			bottom.setClickable(!item.loading);
-			StatusDisplayItem next=getNextVisibleDisplayItem(i->{
-				if(!(item.parentFragment instanceof StatusListFragment)) return false;
-				Status s=((StatusListFragment) item.parentFragment).getStatusByID(i.parentID);
-				return s!=null && !s.fromStatusCreated;
-			}).orElse(null);
+			StatusDisplayItem next=item.parentFragment instanceof StatusListFragment
+					? getNextVisibleDisplayItem(i->{
+						Status s=((StatusListFragment) item.parentFragment).getStatusByID(i.parentID);
+						return s!=null && !s.fromStatusCreated;
+					}).orElse(null)
+					: null;
 			bottom.setVisibility(next==null ? View.GONE : View.VISIBLE);
 			Instant dateBelow=next instanceof HeaderStatusDisplayItem h ? h.status.createdAt
 					: next instanceof ReblogOrReplyLineStatusDisplayItem l ? l.status.createdAt

From 375b5b3133fe15abb58c072d51bd31e8e8e00491 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 27 Oct 2023 16:14:16 +0200
Subject: [PATCH 23/28] fix gaps not showing time

closes sk22#889
---
 .../ui/displayitems/GapStatusDisplayItem.java    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java
index 6fa9ce444..4d0a087e8 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java
@@ -64,16 +64,14 @@ public class GapStatusDisplayItem extends StatusDisplayItem{
 			}
 			top.setClickable(!item.loading);
 			bottom.setClickable(!item.loading);
-			StatusDisplayItem next=item.parentFragment instanceof StatusListFragment
-					? getNextVisibleDisplayItem(i->{
-						Status s=((StatusListFragment) item.parentFragment).getStatusByID(i.parentID);
-						return s!=null && !s.fromStatusCreated;
-					}).orElse(null)
-					: null;
+			Status next=!(item.parentFragment instanceof StatusListFragment) ? null : getNextVisibleDisplayItem(i->{
+				Status s=((StatusListFragment) item.parentFragment).getStatusByID(i.parentID);
+				return s!=null && !s.fromStatusCreated;
+			})
+					.map(i->((StatusListFragment) item.parentFragment).getStatusByID(i.parentID))
+					.orElse(null);
 			bottom.setVisibility(next==null ? View.GONE : View.VISIBLE);
-			Instant dateBelow=next instanceof HeaderStatusDisplayItem h ? h.status.createdAt
-					: next instanceof ReblogOrReplyLineStatusDisplayItem l ? l.status.createdAt
-					: null;
+			Instant dateBelow=next!=null ? next.createdAt : null;
 			String text=dateBelow!=null && item.status.createdAt!=null && dateBelow.isBefore(item.status.createdAt)
 					? UiUtils.formatPeriodBetween(item.parentFragment.getContext(), dateBelow, item.status.createdAt)
 					: null;

From a18a4383e59bf41eebbad3d96b46fb584a817e8a Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 27 Oct 2023 17:19:59 +0200
Subject: [PATCH 24/28] update gap in database when deleting status

closes sk22#898
---
 .../android/api/CacheController.java          | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
index 147043376..47b55c4c1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
@@ -273,7 +273,28 @@ public class CacheController{
 
 	public void deleteStatus(String id){
 		runOnDbThread((db)->{
-			// TODO: set previous status's hasGapAfter flag if the deleted status hasGapAfter
+			String gapId=null;
+			int gapFlags=0;
+			// select to-be-removed and newer row
+			try(Cursor cursor=db.query("home_timeline", new String[]{"id", "flags"}, "`time`>=(SELECT `time` FROM `home_timeline` WHERE `id`=?)", new String[]{id}, null, null, "`time` ASC", "2")){
+				boolean hadGapAfter=false;
+				// always either one or two iterations (only one if there's no newer post)
+				while(cursor.moveToNext()){
+					String currentId=cursor.getString(0);
+					int currentFlags=cursor.getInt(1);
+					if(currentId.equals(id)){
+						hadGapAfter=((currentFlags & POST_FLAG_GAP_AFTER)!=0);
+					}else if(hadGapAfter){
+						gapFlags=currentFlags|POST_FLAG_GAP_AFTER;
+						gapId=currentId;
+					}
+				}
+			}
+			if(gapId!=null){
+				ContentValues values=new ContentValues();
+				values.put("flags", gapFlags);
+				db.update("home_timeline", values, "`id`=?", new String[]{gapId});
+			}
 			db.delete("home_timeline", "`id`=?", new String[]{id});
 		});
 	}

From 42c56401dbc3c68e6f19f5b0bc5a5fff877160d3 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 27 Oct 2023 17:34:47 +0200
Subject: [PATCH 25/28] fix wrong check for gap item

re sk22#898
---
 .../joinmastodon/android/fragments/StatusListFragment.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
index 7bb00c27f..058aea1ea 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
@@ -193,10 +193,12 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 		if(firstIndex==-1) return false;
 		int lastIndex=firstIndex;
 		while(lastIndex<displayItems.size()){
-			if(!displayItems.get(lastIndex).parentID.equals(parentID)) break;
+			StatusDisplayItem item=displayItems.get(lastIndex);
+			if(!item.parentID.equals(parentID) || item instanceof GapStatusDisplayItem) break;
 			lastIndex++;
 		}
 		int count=lastIndex-firstIndex;
+		if(count<1) return false;
 		displayItems.subList(firstIndex, lastIndex).clear();
 		adapter.notifyItemRangeRemoved(firstIndex, count);
 		return true;
@@ -217,7 +219,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 			StatusDisplayItem item=displayItems.get(i);
 			// we found a status that the to-be-removed status replies to!
 			// storing indices to maybe update its display items
-			if(item.parentID.equals(status.inReplyToId) && !(item instanceof GapStatusDisplayItem)){
+			if(item.parentID.equals(status.inReplyToId)){
 				if(ancestorFirstIndex==-1) ancestorFirstIndex=i;
 				ancestorLastIndex=i;
 			}

From 3075030b1c47d9bc1dfb0950074157af6dd46e25 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 27 Oct 2023 17:38:54 +0200
Subject: [PATCH 26/28] add todo

---
 .../org/joinmastodon/android/fragments/HomeTimelineFragment.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
index fae16790d..1613aa42b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -212,6 +212,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(gapStatus), false);
 							}
 						}else{
+							// TODO: refactor this code. it's too long. incomprehensible, even
 							if(downwards) {
 								Set<String> idsBelowGap=new HashSet<>();
 								boolean belowGap=false;

From ef1584de55e7e94d395e700923d487ed69387cf7 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Sat, 28 Oct 2023 14:50:56 +0200
Subject: [PATCH 27/28] merge upstream strings

---
 .../src/main/res/values-eu-rES/strings.xml    |  57 ++++++
 .../src/main/res/values-hy-rAM/strings.xml    |  59 ++++++
 .../src/main/res/values-sl-rSI/strings.xml    | 168 +++++++++++++++++-
 3 files changed, 280 insertions(+), 4 deletions(-)

diff --git a/mastodon/src/main/res/values-eu-rES/strings.xml b/mastodon/src/main/res/values-eu-rES/strings.xml
index a3aeb122b..b6ea979f2 100644
--- a/mastodon/src/main/res/values-eu-rES/strings.xml
+++ b/mastodon/src/main/res/values-eu-rES/strings.xml
@@ -15,6 +15,7 @@
 	<string name="user_sent_follow_request">%s-(e)k jarraitzeko eskaera bidali dizu</string>
 	<string name="user_favorited">%s(e)k zure bidalketa gogoko du</string>
 	<string name="notification_boosted">%s(e)k zure bidalketa bultzatu du</string>
+	<string name="poll_ended">Ikusi botoa eman zunuen inkestaren emaitzak</string>
 	<string name="share_toot_title">Partekatu</string>
 	<string name="settings">Ezarpenak</string>
 	<string name="publish">Argitaratu</string>
@@ -144,8 +145,11 @@
 	<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="report_sent_subtitle">Hau berrikusten dugun bitartean, %s erabiltzailearen aurkako neurriak hartu ditzakezu:</string>
 	<string name="unfollow_user">%s jarraitzeari utzi</string>
 	<string name="unfollow">Utzi jarraitzeari</string>
+	<string name="mute_user_explain">Ez dituzu bere bidalketak ikusiko. Zuri jarraitu eta zure bidalketak ikusteko aukera izango dute eta ezingo dute jakin mututu dituzula.</string>
+	<string name="block_user_explain">Ez dituzu bere bidalketak ikusiko. Ezingo dituzte zure bidalketak ikusi eta ez jarraitu. Blokeatu dituzula jakin dezakete.</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>
@@ -233,6 +237,8 @@
 	<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="hide_boosts_from_user">Ezkutatu %s(r)en bultzadak</string>
+	<string name="show_boosts_from_user">Erakutsi @%s(r)en bultzadak</string>
 	<string name="signup_reason">Zergatik elkartu nahi duzu?</string>
 	<string name="signup_reason_note">Honek zure eskaera berrikustean lagunduko digu.</string>
 	<string name="clear">Garbitu</string>
@@ -324,6 +330,7 @@
 	<string name="server_url">Zerbitzariaren URLa</string>
 	<string name="server_filter_any_language">Edozein hizkuntza</string>
 	<string name="server_filter_instant_signup">Berehalako erregistroa</string>
+	<string name="server_filter_manual_review">Eskuzko berrikuspena</string>
 	<string name="server_filter_region_europe">Europa</string>
 	<string name="server_filter_region_north_america">Ipar Amerika</string>
 	<string name="server_filter_region_south_america">Hego Amerika</string>
@@ -331,9 +338,12 @@
 	<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="category_special_interests">Interes bereziak</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="profile_setup">Profilaren konfigurazioa</string>
+	<string name="profile_setup_subtitle">Beti osa dezakezu hau geroago Profila fitxan.</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>
@@ -348,6 +358,7 @@
 	<string name="profile_timeline">Denbora-lerroa</string>
 	<string name="view_all">Ikusi guztia</string>
 	<string name="profile_endorsed_accounts">Kontuak</string>
+	<string name="verified_link">Lotura egiaztatua</string>
 	<string name="show">Erakutsi</string>
 	<string name="hide">Ezkutatu</string>
 	<string name="pick_server">Aukeratu beste zerbitzari bat</string>
@@ -368,13 +379,19 @@
 	<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_length">Inkesta luzera</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="poll_style_title">Inkesta estiloa</string>
+	<string name="alt_text">Alt testua</string>
 	<string name="help">Laguntza</string>
+	<string name="what_is_alt_text">Zer da alt testua?</string>
 	<string name="edit_post">Editatu argitalpena</string>
+	<string name="no_verified_link">Lotura ez egiaztatua</string>
 	<string name="compose_autocomplete_emoji_empty">Esploratu emojiak</string>
+	<string name="no_search_results">Ez da emaitzarik aurkitu bilaketa-termino horientzat</string>
 	<string name="language">Hizkuntza</string>
 	<string name="language_default">Lehenetsia</string>
 	<string name="language_system">Sistema</string>
@@ -382,7 +399,9 @@
 	<string name="language_cant_detect">Ezin da hizkuntza detektatu</string>
 	<string name="language_detected">Detektatuta</string>
 	<string name="media_hidden">Multimedia ezkutatua</string>
+	<string name="forward_report_explanation">Kontua beste zerbitzari batekoa da. Salaketaren kopia anonimo bat bidali nahi duzu zerbitzati horretara?</string>
 	<!-- %s is the server domain -->
+	<string name="forward_report_to_server">Birbidali hona: %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">Salatua</string>
 	<string name="muted_user">Mututu %s</string>
@@ -400,6 +419,7 @@
 	<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="date_at_time">%1$s %2$s-etan</string>
 	<string name="today">gaur</string>
 	<string name="yesterday">atzo</string>
 	<string name="tomorrow">bihar</string>
@@ -433,6 +453,7 @@
 	<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_home_lists">Hasierako denbora-lerroa</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>
@@ -449,9 +470,45 @@
 	<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 -->
+	<string name="time_seconds_ago_short">Duela %d segundo</string>
+	<string name="time_minutes_ago_short">Duela %d minutu</string>
+	<string name="time_hours_ago_short">Duela %d ordu</string>
+	<string name="time_days_ago_short">Duela %d egun</string>
 	<!-- %s is the name of the post language -->
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="translation_show_original">Erakutsi jatorrizkoa</string>
+	<string name="settings_privacy">Pribatutasuna eta irismena</string>
+	<string name="settings_discoverable">Ezagutarazi profila eta bidalketak bilaketa algoritmoetan</string>
+	<string name="settings_indexable">Gehitu argitalpen publikoak bilaketa-emaitzetan</string>
+	<string name="timeline_following">Hasiera</string>
+	<string name="lists">Zerrendak</string>
+	<string name="followed_hashtags">Jarraitutako traolak</string>
+	<string name="no_lists">Ez duzu zerrendarik oraindik.</string>
+	<string name="manage_lists">Kudeatu zerrendak</string>
+	<string name="manage_hashtags">Kudeatu traolak</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">Menu zabalgarria</string>
+	<string name="edit_list">Editatu zerrenda</string>
+	<string name="list_members">Kideen zerrenda</string>
+	<string name="delete_list">Ezabatu zerrenda</string>
 	<!-- %s is the name of the list -->
+	<string name="delete_list_confirm">Ezabatu “%s”?</string>
+	<string name="list_name">Zerrendaren izena</string>
+	<string name="list_show_replies_to">Erakutsi erantzunak</string>
+	<string name="list_replies_no_one">Bat ere ez</string>
+	<string name="list_replies_members">Zerrendako kideak</string>
+	<string name="list_replies_anyone">Jarraitzen dudan edonor</string>
+	<string name="confirm_remove_list_members">Kendu kideak?</string>
+	<string name="remove">Kendu</string>
+	<string name="add_list_member">Gehitu kidea</string>
+	<string name="search_among_people_you_follow">Bilatu jarraitzen dituzun pertsonen artean</string>
+	<string name="add_user_to_list">Gehitu zerrendara…</string>
+	<string name="add_user_to_list_title">Gehitu zerrendara</string>
 	<!-- %s is a username -->
+	<string name="remove_from_list">Kendu zerrendatik</string>
+	<string name="confirm_remove_list_member">Kendu kideak?</string>
+	<string name="create_list">Sortu zerrenda</string>
+	<string name="step_x_of_y">%1$d pausua %2$d -(e)tik</string>
+	<string name="create">Sortu</string>
+	<string name="list_no_members">Oraindik ez dago kiderik</string>
 </resources>
diff --git a/mastodon/src/main/res/values-hy-rAM/strings.xml b/mastodon/src/main/res/values-hy-rAM/strings.xml
index f41083533..d5e4578c9 100644
--- a/mastodon/src/main/res/values-hy-rAM/strings.xml
+++ b/mastodon/src/main/res/values-hy-rAM/strings.xml
@@ -2,7 +2,9 @@
 <resources>
 	<string name="log_in">Մուտք գործել</string>
 	<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>
@@ -42,6 +44,7 @@
 	<string name="unblock_user">Հանել արգելափակումից %s</string>
 	<string name="report_user">Բողոքել %s</string>
 	<string name="block_domain">Արգելափակել %s-ին</string>
+	<string name="unblock_domain">Հանել արգելափակումից %s</string>
 	<plurals name="x_posts">
 		<item quantity="one">%,d գրառում</item>
 		<item quantity="other">%,d գրառում</item>
@@ -128,12 +131,14 @@
 	<string name="report_choose_posts">Կա՞ն զեկույցը ապացուցող գրառումներ։</string>
 	<string name="report_comment_hint">Լրացուցիչ մեկնաբանություններ</string>
 	<string name="sending_report">Զեկույցը ուղարկվում է․․․</string>
+	<string name="report_sent_title">Շնորհակալ ենք զեկուցման համար։</string>
 	<string name="mute_user_explain">Դուք չեք տեսնի նրա գրառումները։ Նա դեռ կարող է ձեզ հետևել և տեսնել ձեր գրառումները և չի իմանա, որ խլեցված է։</string>
 	<string name="block_user_explain">Դուք չեք տեսնի նրա գրառումները։ Նա չի կարող ձեզ հետևել կամ տեսնել ձեր գրառումները։ Նա կիմանա, որ արգելափակված է։</string>
 	<string name="report_personal_title">Չե՞ք ուզում սա տեսնել։</string>
 	<string name="back">Ետ</string>
 	<string name="search_communities">Սպասարկչի անուն կամ հասցե</string>
 	<string name="instance_rules_title">Սպասարկչի կանոնները</string>
+	<string name="instance_rules_subtitle">Շարունակելով` համաձայնվում եք հետևել %s-ի մոդերատորների կողմից սահմանված հետևյալ կանոններին.</string>
 	<string name="signup_title">Ստեղծել հաշիվ</string>
 	<string name="display_name">Անուն</string>
 	<string name="username">Մուտքանուն</string>
@@ -159,11 +164,14 @@
 	<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="skip">Բաց թողնել</string>
 	<string name="notification_type_follow">Նոր հետևորդներ</string>
 	<string name="notification_type_favorite">Հավանումներ</string>
@@ -193,6 +201,7 @@
 	<string name="home_timeline">Տեղական հոսք</string>
 	<string name="my_profile">Իմ հաշիվ</string>
 	<string name="follow_user">Հետևել %s-ին</string>
+	<string name="followed_user">Դուք այժմ հետեւում եք %s-ին</string>
 	<string name="open_in_browser">Բացել բրաուզերում</string>
 	<string name="hide_boosts_from_user">Թաքցնել @%s-ի տարածումները</string>
 	<string name="show_boosts_from_user">Ցուցադրել @%s-ի տարածումները</string>
@@ -203,7 +212,9 @@
 	<string name="reorder">Վերադասավորել</string>
 	<string name="download">Ներբեռնել</string>
 	<string name="permission_required">Անհրաժեշտ է թույլտվություն</string>
+	<string name="storage_permission_to_download">Ֆայլը պահպանելու համար ծրագրին պահանջվում է հիշողության թույլտվություն։</string>
 	<string name="open_settings">Բացել կարգավորումները</string>
+	<string name="file_saved">Ֆայլը պահպանվել է</string>
 	<string name="downloading">Բեռնում․․․</string>
 	<string name="local_timeline">Տեղական</string>
 	<string name="trending_posts_info_banner">Այս գրառումները տարածված են Մաստոդոնում։</string>
@@ -250,6 +261,7 @@
 	<string name="edit_marked_sensitive">Նշվել է որպես դյուրազգաց</string>
 	<string name="edit_multiple_changed">Գրառումը խմբագրվել է</string>
 	<string name="edit">Խմբագրել</string>
+	<string name="discard_changes">Չեղարկե՞լ փոփոխությունները</string>
 	<string name="file_size_bytes">%d բայթ</string>
 	<string name="file_size_kb">%.2f ԿԲ</string>
 	<string name="file_size_mb">%.2f ՄԲ</string>
@@ -261,15 +273,21 @@
 	<string name="download_update">Ներբեռնել (%s)</string>
 	<string name="install_update">Տեղադրել</string>
 	<string name="privacy_policy_title">Ձեր գաղտնիությունը</string>
+	<string name="privacy_policy_subtitle">Չնայած նրան, որ Մաստոդոնի ծրագիրը չի պահպանում անձնական տվյալներ, սերվերը, որտեղ դուք գրանցվում եք, կարող է ունենալ այլ գաղտնիության քաղաքականություն։\n\nԵթե դուք համաձայն չեք %s-ի գաղտնիության քաղաքականության հետ, դուք կարող եք հետ գնալ եւ ընտրել ուրիշ սերվեր։</string>
 	<string name="i_agree">Համաձայն եմ</string>
 	<string name="empty_list">Ցանկը դատարկ է</string>
 	<string name="instance_signup_closed">Սպասարկիչը գրանցումներ չի ընդունում։</string>
 	<string name="text_copied">Պատճենվել է</string>
+	<string name="add_bookmark">Ավելացնել էջանիշ</string>
+	<string name="remove_bookmark">Հեռացնել էջանիշը</string>
 	<string name="bookmarks">Էջանիշեր</string>
 	<string name="your_favorites">Հավանածներ</string>
 	<string name="login_title">Բարի վերադարձ</string>
 	<string name="server_url">Սերվերի հասցե</string>
 	<string name="server_filter_any_language">Որևե լեզու</string>
+	<string name="server_filter_instant_signup">Գրանցում միանգամից</string>
+	<string name="server_filter_manual_review">Հայտերի ստուգում</string>
+	<string name="server_filter_any_signup_speed">Գրանցման որեւէ արագություն</string>
 	<string name="server_filter_region_europe">Եվրոպա</string>
 	<string name="server_filter_region_north_america">Հյուսիսային Ամերիկա</string>
 	<string name="server_filter_region_south_america">Հարավային Ամերիկա</string>
@@ -280,16 +298,23 @@
 	<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>
+	<string name="profile_setup_subtitle">Դուք կարող եք սա կատարել ավելի ուշ` Հաշիվ բաժնում։</string>
+	<string name="profile_setup_explanation">Դուք կարող եք ավելացնել ոչ ավել, քան չորս դաշտ։ Ավելացրեք այն, ինչ ուզում եք` դիրք, հղումներ, դերանուններ և այլն։</string>
 	<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" -->
 	<!-- %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_timeline">Հոսք</string>
 	<string name="view_all">Դիտել բոլորը</string>
@@ -304,14 +329,34 @@
 	<string name="welcome_to_mastodon">Բարի գալուստ Մաստոդոն</string>
 	<string name="welcome_paragraph1">Մաստոդոնը ապակենտրոնացված սոցցանց է, այսինքն՝ այն չի պատկանում մի ընկերության։ Այն բաղկացած է բազմաթիվ անկախ և կապակցված սերվերներից։</string>
 	<string name="what_are_servers">Ի՞նչ է սերվերը։</string>
+	<string name="welcome_paragraph2">Մաստոդոնի որևէ հաշիվ գտնվում է սերվերի վրա - ամեն մեկը՝ իր արժեքներով, կանոններով և ադմիններով։ Դուք կարող եք հետևել և շփվել որևէ սերվերի մարդկանց հետ՝ անկախ ձեր ընտրությունից։</string>
+	<string name="log_out_all_accounts">Ելք բոլոր հաշիվներից</string>
 	<string name="retry">Կրկին</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="no_search_results">Այս հարցման համար ոչինչ չգտնվեց</string>
 	<string name="language">Լեզու</string>
 	<string name="language_default">Լռելյայն</string>
@@ -336,12 +381,19 @@
 	<string name="notifications_policy_followed">Մարդիկ, որոնք ձեզ հետեւում են</string>
 	<string name="notifications_policy_follower">Մարդիկ, որոնց դուք հետեւում եք</string>
 	<string name="notifications_policy_no_one">Ոչ ոք</string>
+	<plurals name="x_weeks">
+		<item quantity="one">%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="open_system_notification_settings">Բացել ծանուցումների կարգավորումները</string>
 	<string name="about_server">Մեր մասին</string>
 	<string name="server_rules">Կանոններ</string>
 	<string name="server_administrator">Ադմինիստրատոր</string>
@@ -380,7 +432,14 @@
 	<string name="settings_edit_filter">Խմբագրել ֆիլտրը</string>
 	<string name="settings_filter_duration">Տեւողություն</string>
 	<string name="settings_filter_muted_words">Լռեցված բառեր</string>
+	<string name="filter_duration_forever">Միշտ</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="settings_filter_ends">Ավարտվում է %s</string>
+	<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_word_or_phrase">Բառ կամ արտահայտություն</string>
+	<string name="filter_add_word_help">Բառերը զգայուն են տառաշարին եւ համապատասխանում են ամբողջ բառերի։\n\nՕրինակ, \"խնձոր\" բառը ավելացնելու դեպքում կթաքցվեն \"Խնձոր\" և \"ԽնՁոՐ\" բառերով գրառումները, բայց ոչ \"արքայախնձոր\" բառով գրառումները։</string>
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
 	<!-- %s is the name of the post language -->
diff --git a/mastodon/src/main/res/values-sl-rSI/strings.xml b/mastodon/src/main/res/values-sl-rSI/strings.xml
index dcefd17ba..368da560f 100644
--- a/mastodon/src/main/res/values-sl-rSI/strings.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings.xml
@@ -105,6 +105,12 @@
 		<item quantity="few">na voljo še %d dnevi</item>
 		<item quantity="other">na voljo še %d dni</item>
 	</plurals>
+	<plurals name="x_votes">
+		<item quantity="one">%,d glas</item>
+		<item quantity="two">%,d glasova</item>
+		<item quantity="few">%,d glasovi</item>
+		<item quantity="other">%,d glasov</item>
+	</plurals>
 	<string name="poll_closed">Zaprto</string>
 	<string name="confirm_mute_title">Utišaj račun</string>
 	<string name="confirm_mute">Potrdite utišanje %s</string>
@@ -217,6 +223,12 @@
 	<string name="notification_type_poll">Ankete</string>
 	<string name="choose_account">Izberite račun</string>
 	<string name="err_not_logged_in">Najprej se prijavite v Mastodon</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Ne morete dodati več kot %d medijske priloge</item>
+		<item quantity="two">Ne morete dodati več kot %d medijskih prilog</item>
+		<item quantity="few">Ne morete dodati več kot %d medijskih prilog</item>
+		<item quantity="other">Ne morete dodati več kot %d medijskih prilog</item>
+	</plurals>
 	<string name="media_attachment_unsupported_type">Vrsta datoteke %s ni podprta</string>
 	<string name="media_attachment_too_big">Datoteka %1$s presega omejitev velikosti %2$s MB</string>
 	<string name="settings_theme">Videz</string>
@@ -276,6 +288,7 @@
 	<!-- %s is the server domain -->
 	<string name="local_timeline_info_banner">To so vse objave vseh uporabnikov na vašem strežniku (%s).</string>
 	<string name="recommended_accounts_info_banner">Glede na to, komu sledite, vam bodo ti računi všeč.</string>
+	<string name="see_new_posts">Nove objave</string>
 	<string name="load_missing_posts">Naloži manjkajoče objave</string>
 	<string name="follow_back">Sledijo nazaj</string>
 	<string name="button_follow_pending">Na čakanju</string>
@@ -300,6 +313,12 @@
 		<item quantity="few">%,d priljubljeni</item>
 		<item quantity="other">%,d priljubljenih</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d izpostavitev</item>
+		<item quantity="two">%,d izpostavitvi</item>
+		<item quantity="few">%,d izpostavitve</item>
+		<item quantity="other">%,d izpostavitev</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s prek %2$s</string>
 	<string name="time_now">zdaj</string>
 	<string name="edit_history">Uredi zgodovino</string>
@@ -423,6 +442,7 @@
 	<string name="attachment_type_audio">Zvok</string>
 	<string name="attachment_type_gif">GIF</string>
 	<string name="attachment_type_unknown">Datoteka</string>
+	<string name="attachment_x_percent_uploaded">Naloženo %d %%</string>
 	<string name="add_poll_option">Dodaj možen odgovor v anketi</string>
 	<string name="poll_length">Dolžina ankete</string>
 	<string name="poll_style">Slog</string>
@@ -433,8 +453,10 @@
 	<string name="alt_text">Nadomestno besedilo</string>
 	<string name="help">Pomoč</string>
 	<string name="what_is_alt_text">Kaj je nadomestno besedilo (alt text)?</string>
+	<string name="alt_text_help">Nadomestno besedilo vsebuje opis slike za ljudi, ki imajo težave z vidom, počasne omrežne povezave ali za ljudi, ki jih zanima dodaten kontekst.\n\nZ dodajanjem jasnega, jedrnatega in objektivnega nadomestnega besedila lahko izboljšate dostopnost in razumevanje za vse.\n\n<ul><li>Zajemite pomembne elemente</li>\n<li>Povzemite besedila na slikah</li>\n<li>Uporabite običajno stavčno obliko</li>\n<li>Izogibajte se odvečnim podatkom</li>\n<li>Osredotočite se na trende in ključne ugotovitve v kompleksnih vizualnih elementih (npr. v grafikonih ali na zemljevidih)</li></ul></string>
 	<string name="edit_post">Uredi objavo</string>
 	<string name="no_verified_link">Ni preverjenih povezav</string>
+	<string name="compose_autocomplete_emoji_empty">Brskajte po emotikonih</string>
 	<string name="compose_autocomplete_users_empty">Najdite tiste, ki jih iščete</string>
 	<string name="no_search_results">Za ta iskalni niz ni zadetkov</string>
 	<string name="language">Jezik</string>
@@ -451,11 +473,21 @@
 	<string name="forward_report_to_server">Posreduj k %s</string>
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
 	<string name="reported">Prijavljeno</string>
+	<string name="report_unfollow_explanation">Da ne bi videli njihovih objav v svojem domačem viru, jim prenehajte slediti.</string>
+	<string name="muted_user">%s je utišan</string>
+	<string name="report_sent_already_blocked">Tega uporabnika ste že blokirali. Medtem ko pregledujemo vašo prijavo, vam ni potrebno storiti nič več.</string>
+	<string name="report_personal_already_blocked">Tega uporabnika ste že blokirali. Medtem ko pregledujemo vašo prijavo, vam ni potrebno storiti nič več.\n\nHvala, ker ta Mastodon ohranjate varen za vse!</string>
+	<string name="blocked_user">%s je blokiran</string>
 	<string name="mark_all_notifications_read">Označi vse kot prebrano</string>
+	<string name="settings_display">Prikaz</string>
 	<string name="settings_filters">Filtri</string>
+	<string name="settings_server_explanation">Pregled, pravila, moderatorji</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="settings_alt_text_reminders">Dodaj opomnike za nadomestno besedilo</string>
+	<string name="settings_confirm_unfollow">Vprašaj pred prenehanjem sledenja uporabniku</string>
+	<string name="settings_confirm_boost">Vprašaj pred izpostavljanjem objave</string>
 	<string name="settings_confirm_delete_post">Vprašaj pred brisanjem objav</string>
 	<string name="pause_all_notifications">Premor za vse</string>
 	<string name="pause_notifications_off">Izklopljeno</string>
@@ -463,14 +495,22 @@
 	<string name="notifications_policy_followed">Ljudje, ki vam sledijo</string>
 	<string name="notifications_policy_follower">Ljudje, ki jim sledite</string>
 	<string name="notifications_policy_no_one">Nihče</string>
+	<string name="settings_notifications_policy">Prejemanje obvestil od</string>
 	<string name="notification_type_mentions_and_replies">Omembe in odgovori</string>
 	<string name="pause_all_notifications_title">Zaustavi vsa obvestila</string>
+	<plurals name="x_weeks">
+		<item quantity="one">%d teden</item>
+		<item quantity="two">%d tedna</item>
+		<item quantity="few">%d tedne</item>
+		<item quantity="other">%d tednov</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 ob %2$s</string>
 	<string name="today">danes</string>
 	<string name="yesterday">včeraj</string>
 	<string name="tomorrow">jutri</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_ends">Se konča %s</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<string name="pause_notifications_banner">Obveščanje se bo nadaljevalo: %s.</string>
 	<string name="resume_notifications_now">Nadaljuj zdaj</string>
@@ -478,10 +518,50 @@
 	<string name="about_server">O programu</string>
 	<string name="server_rules">Pravila</string>
 	<string name="server_administrator">Skrbnik</string>
+	<string name="send_email_to_server_admin">Pošlji e-pošto skrbniku</string>
+	<string name="notifications_disabled_in_system">Da vidite vse posodobitve, omogočite obvestila v nastavitvah naprave.</string>
 	<string name="settings_even_more">Še več nastavitev</string>
 	<string name="settings_show_cws">Pokaži opozorilo o vsebini</string>
 	<string name="settings_hide_sensitive_media">Skrij medij, ki je označen kot občutljiv</string>
 	<string name="settings_show_interaction_counts">Števci interakcije objave</string>
+	<string name="settings_show_emoji_in_names">Emotikoni po meri v prikaznih imenih</string>
+	<plurals name="in_x_seconds">
+		<item quantity="one">čez %d sekundo</item>
+		<item quantity="two">čez %d sekundi</item>
+		<item quantity="few">čez %d sekunde</item>
+		<item quantity="other">čez %d sekund</item>
+	</plurals>
+	<plurals name="in_x_minutes">
+		<item quantity="one">čez %d minuto</item>
+		<item quantity="two">čez %d minuti</item>
+		<item quantity="few">čez %d minute</item>
+		<item quantity="other">čez %d minut</item>
+	</plurals>
+	<plurals name="in_x_hours">
+		<item quantity="one">čez %d uro</item>
+		<item quantity="two">čez %d uri</item>
+		<item quantity="few">čez %d ure</item>
+		<item quantity="other">čez %d ur</item>
+	</plurals>
+	<plurals name="x_hours_ago">
+		<item quantity="one">pred %d uro</item>
+		<item quantity="two">pred %d urama</item>
+		<item quantity="few">pred %d urami</item>
+		<item quantity="other">pred %d urami</item>
+	</plurals>
+	<string name="alt_text_reminder_title">Manjka nadomestno besedilo za večpredstavnostno vsebino</string>
+	<plurals name="alt_text_reminder_x_images">
+		<item quantity="one">Manjka nadomestno besedilo za %s sliko. Ali vseeno objavim?</item>
+		<item quantity="two">Manjka nadomestno besedilo za %s sliki. Ali vseeno objavim?</item>
+		<item quantity="few">Manjka nadomestno besedilo za %s slike. Ali vseeno objavim?</item>
+		<item quantity="other">Manjka nadomestno besedilo za %s slik. Ali vseeno objavim?</item>
+	</plurals>
+	<plurals name="alt_text_reminder_x_attachments">
+		<item quantity="one">Manjka nadomestno besedilo za %s prilogo. Ali vseeno objavim?</item>
+		<item quantity="two">Manjka nadomestno besedilo za %s prilogi. Ali vseeno objavim?</item>
+		<item quantity="few">Manjka nadomestno besedilo za %s priloge. Ali vseeno objavim?</item>
+		<item quantity="other">Manjka nadomestno besedilo za %s prilog. Ali vseeno objavim?</item>
+	</plurals>
 	<string name="count_one">Ena</string>
 	<string name="count_two">Dva</string>
 	<string name="count_three">Tri</string>
@@ -495,13 +575,23 @@
 	<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_context">Mesto utišanja</string>
 	<string name="settings_filter_show_cw">Pokaži z oporozilom o vsebini</string>
+	<string name="settings_filter_show_cw_explanation">Še vedno prikaži objave, ki ustrezajo temu filtru, vendar za opozorilom 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="settings_filter_ends">Se konča %s</string>
+	<plurals name="settings_x_muted_words">
+		<item quantity="one">%d utišana beseda ali fraza</item>
+		<item quantity="two">%d utišani besedi ali frazi</item>
+		<item quantity="few">%d utišane besede ali fraze</item>
+		<item quantity="other">%d utišanih besed ali fraz</item>
+	</plurals>
 	<string name="selection_2_options">%1$s in %2$s</string>
 	<string name="selection_3_options">%1$s, %2$s in %3$s</string>
 	<string name="selection_4_or_more">%1$s, %2$s in še dodatnih %3$d</string>
+	<string name="filter_context_home_lists">Domača časovnica in seznami</string>
 	<string name="filter_context_notifications">Obvestila</string>
 	<string name="filter_context_public_timelines">Javne časovnice</string>
 	<string name="filter_context_threads_replies">Niti in odgovori</string>
@@ -513,11 +603,24 @@
 	<string name="edit_muted_word">Uredi utišano besedo</string>
 	<string name="add">Dodaj</string>
 	<string name="filter_word_or_phrase">Beseda ali besedna zveza</string>
+	<string name="filter_add_word_help">Za besede se ne upošteva velikosti črk in se upoštevajo v celoti.\n\nČe filtrirate besedo »Pingvin«, bodo skrite objave, ki vsebujejo »pingvin« ali »pInGvIn«, ne pa »pingvinji«.</string>
 	<string name="settings_delete_filter_word">Ali želite izbrisati besedo »%s«?</string>
 	<string name="enter_selection_mode">Izberite</string>
 	<string name="select_all">Izberi vse</string>
 	<string name="settings_filter_duration_title">Filtriraj po trajanju</string>
 	<string name="filter_duration_custom">Po meri</string>
+	<plurals name="settings_delete_x_filter_words">
+		<item quantity="one">Ali želite izbrisati %d besedo?</item>
+		<item quantity="two">Ali želite izbrisati %d besedi?</item>
+		<item quantity="few">Ali želite izbrisati %d besede?</item>
+		<item quantity="other">Ali želite izbrisati %d besed?</item>
+	</plurals>
+	<plurals name="x_items_selected">
+		<item quantity="one">Izbranih: %d</item>
+		<item quantity="two">Izbranih: %d</item>
+		<item quantity="few">Izbranih: %d</item>
+		<item quantity="other">Izbranih: %d</item>
+	</plurals>
 	<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>
@@ -534,9 +637,9 @@
 	<string name="accounts_matching_string">Osebe s/z »%s«</string>
 	<!-- Shown in the post header. Please keep it short -->
 	<string name="time_seconds_ago_short">pred %d s</string>
-	<string name="time_minutes_ago_short">pred %d meseci</string>
-	<string name="time_hours_ago_short">pred %dh urami</string>
-	<string name="time_days_ago_short">pred %d dnemi</string>
+	<string name="time_minutes_ago_short">pred %d m</string>
+	<string name="time_hours_ago_short">pred %d u</string>
+	<string name="time_days_ago_short">pred %d d</string>
 	<!-- %s is the name of the post language -->
 	<string name="translate_post">Prevedi iz jezika: %s</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
@@ -546,8 +649,65 @@
 	<string name="settings_privacy">Zasebnost in dosegljivost</string>
 	<string name="settings_discoverable">Izpostavljaj profile in objave v algoritmih odkrivanja</string>
 	<string name="settings_indexable">Med zadetke iskanja vključi javne objave</string>
+	<plurals name="x_participants">
+		<item quantity="one">%,d udeleženec</item>
+		<item quantity="two">%,d udeleženca</item>
+		<item quantity="few">%,d udeleženci</item>
+		<item quantity="other">%,d udeležencev</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="one">%,d objava danes</item>
+		<item quantity="two">%,d objavi danes</item>
+		<item quantity="few">%,d objave danes</item>
+		<item quantity="other">%,d objav danes</item>
+	</plurals>
+	<string name="error_playing_video">Napaka predvajanja videa</string>
+	<string name="timeline_following">Dom</string>
+	<string name="lists">Seznami</string>
+	<string name="followed_hashtags">Sledeni ključniki</string>
+	<string name="no_lists">Ustvarili niste še nobenega seznama.</string>
+	<string name="no_followed_hashtags">Ne sledite še nobenemu ključniku.</string>
+	<string name="manage_lists">Upravljanje seznamov</string>
+	<string name="manage_hashtags">Upravljanje ključnikov</string>
 	<!-- Screen reader description for the menu on the home timeline screen -->
+	<string name="dropdown_menu">Padajoči meni</string>
+	<string name="edit_list">Uredi seznam</string>
+	<string name="list_members">Člani seznama</string>
+	<string name="delete_list">Izbriši seznam</string>
 	<!-- %s is the name of the list -->
+	<string name="delete_list_confirm">Ali želite izbrisati »%s«?</string>
+	<string name="list_exclusive">Skrij v Sledeni</string>
+	<string name="list_exclusive_subtitle">Če je nekdo na tem seznamu, bodo njihove objave skrite v časovnici Sledeni in jih ne boste videli dvakrat.</string>
+	<string name="list_name">Ime seznama</string>
+	<string name="list_show_replies_to">Prikaz odgovorov</string>
+	<string name="list_replies_no_one">Nikomur</string>
+	<string name="list_replies_members">Članom seznama</string>
+	<string name="list_replies_anyone">Vsem, ki jim sledim</string>
+	<string name="confirm_remove_list_members">Odstranim člane?</string>
+	<string name="remove">Odstrani</string>
+	<string name="add_list_member">Dodaj člana</string>
+	<string name="search_among_people_you_follow">Iščite med ljudmi, katerim sledite</string>
+	<string name="add_user_to_list">Dodaj na seznam…</string>
+	<string name="add_user_to_list_title">Dodaj na seznam</string>
 	<!-- %s is a username -->
-	<string name="see_new_posts">Pokaži nove objave</string>
+	<string name="manage_user_lists">Upravljaj sezname, na katerih je %s</string>
+	<string name="remove_from_list">Odstrani s seznama</string>
+	<string name="confirm_remove_list_member">Odstranim člana?</string>
+	<string name="no_followed_hashtags_title">Spremljajte, kar vas zanima, s sledenjem ključnikom</string>
+	<string name="no_followed_hashtags_subtitle">Tu bodo prikazana sledenja</string>
+	<string name="no_lists_title">Organizirajte domači vir s seznami</string>
+	<string name="no_lists_subtitle">Tu bodo prikazan seznami</string>
+	<string name="manage_accounts">Dodajte profile ali preklopite med njimi</string>
+	<plurals name="x_posts_recently">
+		<item quantity="one">%,d nedavna objava</item>
+		<item quantity="two">%,d nedavni objavi</item>
+		<item quantity="few">%,d nedavne objave</item>
+		<item quantity="other">%,d nedavnih objav</item>
+	</plurals>
+	<string name="create_list">Ustvari seznam</string>
+	<string name="step_x_of_y">%1$d. korak od %2$d</string>
+	<string name="create">Ustvari</string>
+	<string name="manage_list_members">Upravljanje članov seznama</string>
+	<string name="list_no_members">Ni še nobenega člana</string>
+	<string name="list_find_users">Poišči člane za dodajanje</string>
 </resources>

From c8122aa65b94dfb63e9dfea5443c34382a8fd0ec Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Sat, 28 Oct 2023 15:09:00 +0200
Subject: [PATCH 28/28] fuck it, production release

---
 mastodon/build.gradle               | 4 ++--
 metadata/de-DE/changelogs/108.txt   | 6 ++++++
 metadata/en-US/changelogs/108.txt   | 6 ++++++
 metadata/en-US/full_description.txt | 5 +----
 4 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 metadata/de-DE/changelogs/108.txt
 create mode 100644 metadata/en-US/changelogs/108.txt

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 011f0982a..a48312df9 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -15,8 +15,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 107
-		versionName "2.1.6+fork.107"
+		versionCode 108
+		versionName "2.1.6+fork.108"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += ['ar-rSA', 'ar-rDZ', 'be-rBY', 'bn-rBD', 'bs-rBA', 'ca-rES', 'cs-rCZ', 'da-rDK', 'de-rDE', 'el-rGR', 'es-rES', 'eu-rES', 'fa-rIR', 'fi-rFI', 'fil-rPH', 'fr-rFR', 'ga-rIE', 'gd-rGB', 'gl-rES', 'hi-rIN', 'hr-rHR', 'hu-rHU', 'hy-rAM', 'ig-rNG', 'in-rID', 'is-rIS', 'it-rIT', 'iw-rIL', 'ja-rJP', 'kab', 'ko-rKR', 'my-rMM', 'nl-rNL', 'no-rNO', 'oc-rFR', 'pl-rPL', 'pt-rBR', 'pt-rPT', 'ro-rRO', 'ru-rRU', 'si-rLK', 'sl-rSI', 'sv-rSE', 'th-rTH', 'tr-rTR', 'uk-rUA', 'ur-rIN', 'vi-rVN', 'zh-rCN', 'zh-rTW']
     }
diff --git a/metadata/de-DE/changelogs/108.txt b/metadata/de-DE/changelogs/108.txt
new file mode 100644
index 000000000..bae3d055e
--- /dev/null
+++ b/metadata/de-DE/changelogs/108.txt
@@ -0,0 +1,6 @@
+- Endlich: Das lang erwartete Material 3 UI-Redesign!
+- Bei Lücken in der Start-Timeline kann man nun auswählen, ob neuere oder ältere Beiträge nachgeladen werden sollen
+- Für Server-Ankündigungen und Akkoma-User*innen: Emoji-Reaktionen!
+- Zuletzt verwendete Emoji in der Emoji-Auswahl
+- Pronomen werden nun neben Anzeigenamen angezeigt
+- Viele Fehlerbehebungen und neue Fehler, die ihr nun entdecken dürft ✨
diff --git a/metadata/en-US/changelogs/108.txt b/metadata/en-US/changelogs/108.txt
new file mode 100644
index 000000000..0d0333060
--- /dev/null
+++ b/metadata/en-US/changelogs/108.txt
@@ -0,0 +1,6 @@
+- Finally: The long-awaited Material 3 UI redesign!
+- Gaps in home timeline now allow choosing whether to load newer or older data
+- For server announcements and Akkoma users: Emoji reactions!
+- Recently used emoji in emoji picker
+- Pronouns are now displayed next to display names
+- Lots of bugfixes and new bugs for you to discover ✨
diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt
index 5a7647719..466608dcf 100644
--- a/metadata/en-US/full_description.txt
+++ b/metadata/en-US/full_description.txt
@@ -6,11 +6,8 @@ Megalodon is a modified version of the <a href="https://github.com/mastodon/mast
 - <b>Federated timeline</b>: See all public posts from people on all other Fediverse neighborhoods your home instance is connected to.
 - <b>Custom timelines</b>: Pin any list or hashtag to your Megalodon’s home tab to simply swipe between your favorite topics and people!
 - <b>Drafts and scheduled posts</b>: Allows for preparing a post and scheduling it to send it automatically at a specific time.
-- <b>Pinning posts</b>: Pin your most important posts to your profile and see what others have pinned using the “Pinned“ tab.
-- <b>Follow hashtags</b>: See new posts from specific hashtags directly in your home timeline by following them.
 - <b>Answering follow requests</b>: Accept or decline follow requests from your notifications or the dedicated Follow requests list.
 - <b>Delete and re-draft</b>: The much-loved feature that made editing possible without an actual editing function.
-- <b>Language selector</b>: Painlessly select the language for every post you make so filters and translation are working correctly.
-- <b>Translation</b>: Easily translate posts right inside Megalodon! Only works if the feature is also available on your Mastodon Web.
 - <b>Post visibility indicator</b>: When opening or replying to a post, a handy icon indicating the post’s visibility will be displayed.
 - <b>Color themes</b>: Should you not like the default Pink color them (the shark is silently judging you), Moshidon’s color themes got you covered.
+- <b>Better compatibility</b>: For those of use who are on Glitch or Akkoma servers, Megalodon provides various extra features and improvements.