Merge remote-tracking branch 'weblate/master'

# Conflicts:
#	metadata/it-IT/full_description.txt

README.md

@@ -15,6 +15,8 @@
 
 ## Key features
 
+### **The ability to add new custom local timelines!**
+
 ### **Material you theme support on Android 12+ devices!**
 
 ### **Show posts filtered with a warning!**
@@ -94,7 +96,7 @@ Variant with an integrated updater. If you download Moshidon from here (and not
   ([Pull request](https://github.com/mastodon/mastodon-android/pull/103))
 * Adding a useful private profile note box!*
 * Auto hiding the compose button on scroll!*
-* Adding the hability to remind yourself to add alt text to images!*
+* Adding the ability to remind yourself to add alt text to images!*
 * An indicator for if an image has alt text or not*
 * Adding the ability to have drafts!*
 * Also adding the ability to view announcements from your instance!*

mastodon/build.gradle

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

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

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Account;
+
+public class GetAccountByHandle extends MastodonAPIRequest<Account>{
+    public GetAccountByHandle(String acct){
+        super(HttpMethod.GET, "/accounts/lookup", Account.class);
+        addQueryParameter("acct", acct);
+    }
+}

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

@@ -13,13 +13,11 @@ import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.view.animation.TranslateAnimation;
 import android.widget.ImageButton;
-import android.widget.ImageButton;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.E;
@@ -34,7 +32,6 @@ import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.BetterItemAnimator;
-import org.joinmastodon.android.model.DisplayItemsParent;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.TileGridLayoutManager;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
@@ -85,7 +82,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected Rect tmpRect=new Rect();
 
-	private final int THRESHHOLD = 800;
+	private final int THRESHOLD = 800;
 
 	public BaseStatusListFragment(){
 		super(20);
@@ -303,7 +300,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				if (fab!=null && GlobalUserPreferences.enableFabAutoHide) {
 //					This piece of code should make it so that the fab is always visible if the status list scroll view is at the item at the top
 					if(list.getChildAt(0).getTop() == 0){
-						scrollDiff=THRESHHOLD+1;
+						scrollDiff= THRESHOLD +1;
 					}else{
 						if(dy > 0){
 							scrollDiff=0;
@@ -323,7 +320,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 						fab.setVisibility(View.INVISIBLE);
 						scrollDiff = 0;
 					} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
-						if (scrollDiff > THRESHHOLD) {
+						if (scrollDiff > THRESHOLD) {
 							TranslateAnimation animate = new TranslateAnimation(
 									0,
 									0,

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

@@ -5,8 +5,14 @@ import android.view.Menu;
 import android.view.MenuInflater;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetAccountByHandle;
+import org.joinmastodon.android.api.requests.accounts.GetAccountByID;
+import org.joinmastodon.android.api.requests.search.GetSearchResults;
+import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
 import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
+import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.SearchResults;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
@@ -14,9 +20,11 @@ import org.joinmastodon.android.utils.StatusFilterPredicate;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 
-public class CustomLocalTimelineFragment extends PinnableStatusListFragment {
+public class CustomLocalTimelineFragment extends StatusListFragment {
     //    private String name;
     private String domain;
 
@@ -40,11 +48,6 @@ public class CustomLocalTimelineFragment extends PinnableStatusListFragment {
         setTitle(this.domain);
     }
 
-    @Override
-    protected TimelineDefinition makeTimelineDefinition() {
-        return TimelineDefinition.ofCustomLocalTimeline(domain);
-    }
-
     @Override
     protected void doLoadData(int offset, int count){
         currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, count)
@@ -55,6 +58,11 @@ public class CustomLocalTimelineFragment extends PinnableStatusListFragment {
                             maxID=result.get(result.size()-1).id;
                         if (getActivity() == null) return;
                         result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+                        result.stream().forEach(status -> {
+                            status.account.acct += "@"+domain;
+                            status.reloadWhenClicked = true;
+                        });
+
                         onDataLoaded(result, !result.isEmpty());
                     }
                 })

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

@@ -7,6 +7,7 @@ import static org.joinmastodon.android.ui.utils.UiUtils.makeBackItem;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
+import android.text.InputType;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -150,7 +151,7 @@ public class EditTimelinesFragment extends BaseRecyclerFragment<TimelineDefiniti
         FrameLayout inputWrap = new FrameLayout(getContext());
         EditText input = new EditText(getContext());
         input.setHint(R.string.sk_example_domain);
-        input.setText(GlobalUserPreferences.publishButtonText.trim());
+        input.setInputType(InputType.TYPE_TEXT_VARIATION_URI);
         FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
         input.setLayoutParams(params);
@@ -190,7 +191,7 @@ public class EditTimelinesFragment extends BaseRecyclerFragment<TimelineDefiniti
         hashtagsMenu.getItem().setIcon(R.drawable.ic_fluent_number_symbol_24_regular);
 
         MenuItem addLocalTimelines = menu.add(0, R.id.menu_add_local_timelines, NONE, R.string.local_timeline);
-        addLocalTimelines.setIcon(R.drawable.ic_fluent_people_community_24_regular);
+        addLocalTimelines.setIcon(R.drawable.ic_fluent_add_24_regular);
 
         makeBackItem(timelinesMenu);
         makeBackItem(listsMenu);

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

@@ -18,6 +18,7 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
@@ -60,6 +61,18 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 		Status status=getContentStatusByID(id);
 		if(status==null)
 			return;
+		if(status.reloadWhenClicked){
+			UiUtils.lookupStatus(getContext(), status, accountID, null, status1 -> {
+				status1.filterRevealed = true;
+				Bundle args=new Bundle();
+				args.putString("account", accountID);
+				args.putParcelable("status", Parcels.wrap(status1));
+				if(status1.inReplyToAccountId!=null && knownAccounts.containsKey(status1.inReplyToAccountId))
+					args.putParcelable("inReplyToAccount", Parcels.wrap(knownAccounts.get(status1.inReplyToAccountId)));
+				Nav.go(getActivity(), ThreadFragment.class, args);
+			});
+			return;
+		}
 		status.filterRevealed = true;
 		Bundle args=new Bundle();
 		args.putString("account", accountID);

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

@@ -17,7 +17,7 @@ public class Poll extends BaseModel{
 	public boolean multiple;
 	public int votersCount;
 	public boolean voted;
-	@RequiredField
+//	@RequiredField
 	public List<Integer> ownVotes;
 	@RequiredField
 	public List<Option> options;

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

@@ -62,6 +62,7 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 	public transient boolean spoilerRevealed;
 	public transient boolean textExpanded, textExpandable;
 	public transient boolean hasGapAfter;
+	public boolean reloadWhenClicked;
 	private transient String strippedText;
 
 	@Override

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

@@ -191,6 +191,19 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void onReplyClick(View v){
+			if(item.status.reloadWhenClicked){
+				UiUtils.lookupStatus(v.getContext(),
+						item.status, item.accountID, null,
+						status -> {
+							v.startAnimation(opacityIn);
+							Bundle args=new Bundle();
+							args.putString("account", item.accountID);
+							args.putParcelable("replyTo", Parcels.wrap(status));
+							Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
+						}
+				);
+				return;
+			}
 			v.startAnimation(opacityIn);
 			Bundle args=new Bundle();
 			args.putString("account", item.accountID);
@@ -214,6 +227,16 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void onBoostClick(View v){
+			if(item.status.reloadWhenClicked){
+				UiUtils.lookupStatus(v.getContext(),
+						item.status, item.accountID, null,
+						status -> {
+							boost.setSelected(!status.reblogged);
+							AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setReblogged(status, !status.reblogged, null, r->boostConsumer(v, r));
+						}
+				);
+				return;
+			}
 			boost.setSelected(!item.status.reblogged);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setReblogged(item.status, !item.status.reblogged, null, r->boostConsumer(v, r));
 		}
@@ -310,6 +333,23 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void onFavoriteClick(View v){
+			if(item.status.reloadWhenClicked){
+				UiUtils.lookupStatus(v.getContext(),
+						item.status, item.accountID, null,
+						status -> {
+							favorite.setSelected(!status.favourited);
+							AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setFavorited(status, !status.favourited, r->{
+								if (status.favourited) {
+									v.startAnimation(GlobalUserPreferences.reduceMotion ? opacityIn : animSet);
+								} else {
+									v.startAnimation(opacityIn);
+								}
+								bindButton(favorite, r.favouritesCount);
+							});
+						}
+				);
+				return;
+			}
 			favorite.setSelected(!item.status.favourited);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setFavorited(item.status, !item.status.favourited, r->{
 				if (item.status.favourited) {
@@ -336,6 +376,18 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void onBookmarkClick(View v){
+			if(item.status.reloadWhenClicked){
+				UiUtils.lookupStatus(v.getContext(),
+						item.status, item.accountID, null,
+						status -> {
+							bookmark.setSelected(!status.bookmarked);
+							AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setBookmarked(status, !status.bookmarked, r->{
+								v.startAnimation(opacityIn);
+							});
+						}
+				);
+				return;
+			}
 			bookmark.setSelected(!item.status.bookmarked);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setBookmarked(item.status, !item.status.bookmarked, r->{
 				v.startAnimation(opacityIn);

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

@@ -441,6 +441,14 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				return;
 			}
 			Bundle args=new Bundle();
+			if(item.status.reloadWhenClicked){
+				UiUtils.lookupAccount(v.getContext(), item.status.account, item.accountID, null, account -> {
+					args.putString("account", item.accountID);
+					args.putParcelable("profileAccount", Parcels.wrap(account));
+					Nav.go(item.parentFragment.getActivity(), ProfileFragment.class, args);
+				});
+				return;
+			}
 			args.putString("account", item.accountID);
 			args.putParcelable("profileAccount", Parcels.wrap(item.user));
 			Nav.go(item.parentFragment.getActivity(), ProfileFragment.class, args);

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

@@ -36,7 +36,7 @@
 		android:layout_marginTop="16dp"
 		android:layout_marginBottom="8dp"
 		android:layout_marginHorizontal="16dp"
-		android:inputType="textFilter|textNoSuggestions"
+		android:inputType="textFilter|textNoSuggestions|textUri"
 		android:singleLine="true"
 		android:imeOptions="actionGo"
 		android:drawableStart="@drawable/ic_fluent_globe_20_regular"

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

@@ -26,4 +26,5 @@
     <string name="mo_sending_error">Fehler beim Veröffentlichen</string>
     <string name="mo_filtered">Gefiltert: %s</string>
     <string name="mo_disable_reminder_to_add_alt_text">Erinnerung zum Hinzufügen einer Bildbeschreibung deaktivieren</string>
+    <string name="mo_add_custom_server_local_timeline">Füge eine lokale Timeline eines benutzerdefinierten Servers hinzu</string>
 </resources>

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

@@ -20,4 +20,6 @@
     <string name="mo_settings_contribute">Contribuir en Moshidon</string>
     <string name="mo_no_image_desc">Las imágenes incluidas no tienen descripción. Por favor, piénsate añadir una para permitir a las personas con discapacidad participar.</string>
     <string name="mo_filtered">Filtrado: %s</string>
+    <string name="mo_disable_reminder_to_add_alt_text">Desactivar recordatorio para añadir descripción</string>
+    <string name="mo_add_custom_server_local_timeline">Añadir una cronología de un servidor</string>
 </resources>

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

@@ -259,4 +259,7 @@
     <string name="sk_settings_prefix_reply_cw_with_re">Añadir \"re:\" a respuestas a Advertencias de Contenido</string>
     <string name="sk_spectator_mode">Modo espectador</string>
     <string name="sk_settings_hide_interaction">Ocultar los botones interactivos</string>
+    <string name="sk_follow_as">Seguir desde otra cuenta</string>
+    <string name="sk_followed_as">Seguido de %s</string>
+    <string name="sk_settings_hide_fab">Ocultar automáticamente el botón Redactar</string>
 </resources>

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

@@ -72,7 +72,7 @@
     <string name="sk_settings_translation_availability_note_available">%s-k itzulpena onartzen du!</string>
     <string name="sk_settings_translation_availability_note_unavailable">%s ez da itzulpena onartzen duten instantzien artean ageri.</string>
     <string name="sk_clear_all_notifications">Ezabatu jakinarazpen guztiak</string>
-    <string name="sk_clear_all_notifications_confirm_action">Ezabatu dena</string>
+    <string name="sk_clear_all_notifications_confirm_action">Ezabatu denak</string>
     <string name="sk_clear_all_notifications_confirm">Ziur al zaude jakinarazpen guztiak ezabatu nahi dituzula\?</string>
     <string name="sk_loading_fediverse_resource_title">Fedibertsoan bilatzen</string>
     <string name="sk_undo_reblog">Bultzada desegin</string>
@@ -146,7 +146,7 @@
     <string name="sk_changelog">Aldaketen zerrenda</string>
     <string name="sk_alt_text_missing">Eranskin batek gutxienez ez du deskribapenik.</string>
     <string name="sk_publish_anyway">Argitaratu hala ere</string>
-    <string name="sk_settings_disable_alt_text_reminder">Desgaitu testu alternatiboaren jakinarazpena</string>
+    <string name="sk_settings_disable_alt_text_reminder">Desgaitu gogorarazlea testu alternatiboa gehitzeko</string>
     <string name="sk_timelines">Denbora-lerroak</string>
     <string name="sk_timeline_posts">Bidalketak</string>
     <string name="sk_timelines_add">Gehitu</string>
@@ -218,7 +218,7 @@
     <string name="sk_edit_timelines">Denbora-lerroak editatu</string>
     <string name="sk_alt_button">ALT</string>
     <string name="sk_post_edited">Editatua</string>
-    <string name="sk_notification_type_update">Bidalketa editatua</string>
+    <string name="sk_notification_type_update">Editatutako argitalpenak</string>
     <string name="sk_notify_update">Bultzatutako bidalketa editatu</string>
     <string name="sk_no_results">Emaitzarik ez</string>
     <string name="sk_save_draft">Zirriborroa gorde\?</string>
@@ -232,4 +232,33 @@
     <string name="sk_alt_text_missing_title">Testu alternatiboa falta da</string>
     <string name="sk_searching">Bilatzen…</string>
     <string name="sk_save_draft_message">Zirriborro honetako aldaketak gorde edo argitaratu nahi dituzu\?</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">Gehitu \"re:\" hasieran edukiaren abisuen erantzunetan</string>
+    <string name="sk_filtered">Iragazita: %s</string>
+    <string name="sk_expand">Zabaldu</string>
+    <string name="sk_collapse">Itxi</string>
+    <string name="sk_settings_collapse_long_posts">Itxi argitalpen oso luzeak</string>
+    <string name="sk_unfinished_attachments">Finkatu eranskinak\?</string>
+    <string name="sk_unfinished_attachments_message">Eranskin batzuk ez dira igo oraindik.</string>
+    <string name="sk_notify_posts_info_banner">Pertsona batzuen argitalpenen jakinarazpenak gaitzen badituzu, beraien argitalpen berriak hemen ageriko dira.</string>
+    <string name="sk_updater_enable_pre_releases">Gaitu beta bertsioak</string>
+    <string name="sk_inline_direct">aipamenak soilik</string>
+    <string name="sk_separator">·</string>
+    <string name="sk_instance_features">Instantziaren ezaugarriak</string>
+    <string name="sk_settings_local_only_explanation">Zure jatorriko instantziak bertan soilik argitaratzea baimendu behar du hau ibili dadin. Aldatutako Mastodon bertsio askok darabilte, baina Mastodonek ez.</string>
+    <string name="sk_inline_local_only">bertan soilik</string>
+    <string name="sk_settings_support_local_only">Zerbitzariak bertan soilik argitaratzea baimentzen du</string>
+    <string name="sk_settings_glitch_instance">Glitch bertan soilik modua</string>
+    <string name="sk_settings_glitch_mode_explanation">Gaitu hau zure jatorrizko instantziak Glitch badarabil. Ez da beharrezkoa Hometown edo Akkomarako.</string>
+    <string name="sk_signed_up">izena emanda</string>
+    <string name="sk_reported">salatuta</string>
+    <string name="sk_sign_ups">Erabiltzaileen izen-ematea</string>
+    <string name="sk_new_reports">Salaketa berriak</string>
+    <string name="sk_local_only">Bertako instantzia soilik</string>
+    <string name="sk_settings_see_new_posts_button">\"Ikusi argitalpen berriak\" botoia</string>
+    <string name="sk_settings_server_version">Zerbitzariaren bertsioa: %s</string>
+    <string name="sk_notify_poll_results">Bozketaren emaitzak</string>
+    <string name="sk_settings_hide_interaction">Ezkutatu interakzio-botoiak</string>
+    <string name="sk_follow_as">Jarraitu beste kontu batetik</string>
+    <string name="sk_followed_as">%s-(d/t)ik jarraitua</string>
+    <string name="sk_settings_hide_fab">Automatikoki ezkutatu Idatzi botoia</string>
 </resources>

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

@@ -260,4 +260,7 @@
     <string name="sk_unfinished_attachments_message">Certaines pièces jointes n\'ont pas fini de se télécharger.</string>
     <string name="sk_spectator_mode">Mode spectateur</string>
     <string name="sk_settings_hide_interaction">Masquer les boutons d\'interaction</string>
+    <string name="sk_follow_as">Suivre depuis un autre compte</string>
+    <string name="sk_followed_as">Suivi depuis %s</string>
+    <string name="sk_settings_hide_fab">Masquer automatiquement le bouton Composer</string>
 </resources>

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

@@ -259,4 +259,7 @@
     <string name="sk_unfinished_attachments">Arranxar arquivos adxuntos\?</string>
     <string name="sk_spectator_mode">Modo espectador</string>
     <string name="sk_settings_hide_interaction">Ocultar botóns de interacción</string>
+    <string name="sk_follow_as">Seguir dende outra conta</string>
+    <string name="sk_followed_as">Seguida dende %s</string>
+    <string name="sk_settings_hide_fab">Auto-ocultar botón de redacción</string>
 </resources>

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

@@ -252,4 +252,15 @@
     <string name="sk_settings_support_local_only">Server hanya mendukung pengiriman hanya lokal</string>
     <string name="sk_settings_server_version">Versi server: %s</string>
     <string name="sk_notify_poll_results">Hasil japat</string>
+    <string name="sk_filtered">Disaring: %s</string>
+    <string name="sk_expand">Buka</string>
+    <string name="sk_collapse">Tutup</string>
+    <string name="sk_settings_hide_interaction">Sembunyikan tombol interaksi</string>
+    <string name="sk_follow_as">Ikuti dari akun lain</string>
+    <string name="sk_followed_as">Diikuti dari %s</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">Awali peringatan konten balasan dengan “re:”</string>
+    <string name="sk_settings_collapse_long_posts">Tutup kiriman yang sangat panjang</string>
+    <string name="sk_unfinished_attachments">Perbaiki lampiran\?</string>
+    <string name="sk_unfinished_attachments_message">Beberapa lampiran belum selesai diunggah.</string>
+    <string name="sk_settings_hide_fab">Sembunyikan tombol Komposer</string>
 </resources>

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

@@ -53,58 +53,58 @@
     <string name="sk_post_language">Lingua: %s</string>
     <string name="sk_language_name">%s (%s)</string>
     <string name="sk_confirm_clear_recent_languages">Sei sicuro di voler cancellare le lingue usate di recente\?</string>
-    <string name="sk_clear_recent_languages">Cancella lingue usate di recente</string>
+    <string name="sk_clear_recent_languages">Cancella le lingue usate di recente</string>
     <string name="sk_welcome_title">Benvenuto!</string>
     <string name="sk_example_domain">example.social</string>
     <string name="sk_poll_allow_multiple">Consenti scelte multiple</string>
     <string name="sk_available_languages">Lingue disponibili</string>
-    <string name="sk_welcome_text">Lo squalo ti saluta! Per iniziare inserisci il dominio dell\'istanza a cui sei iscritto.</string>
+    <string name="sk_welcome_text">Lo squalo ti saluta! Per iniziare inserisci qui sotto l\'indirizzo dell\'istanza a cui sei iscritto.</string>
     <string name="sk_color_palette_material3">Sistema</string>
     <string name="sk_timeline_local">Locale</string>
     <string name="sk_timeline_federated">Federata</string>
-    <string name="sk_bookmark_as">Salva con un altro account</string>
+    <string name="sk_bookmark_as">Aggiungi ai segnalibri con un altro account</string>
     <string name="sk_bookmarked_as">Salvato come %s</string>
-    <string name="sk_favorite_as">Inserisci tra i preferiti con un altro account</string>
+    <string name="sk_favorite_as">Aggiungi ai preferiti con un altro account</string>
     <string name="sk_favorited_as">Inserito tra i preferiti come %s</string>
-    <string name="sk_already_favorited">Già tra i preferiti</string>
+    <string name="sk_already_favorited">Già aggiunto ai preferiti</string>
     <string name="sk_reblog_as">Condividi con un altro account</string>
-    <string name="sk_already_reblogged">Condivisione già eseguita</string>
-    <string name="sk_settings_profile">Imposta il profilo</string>
-    <string name="sk_settings_posting">Preferenze dei post</string>
-    <string name="sk_settings_filters">Configura filtri</string>
+    <string name="sk_already_reblogged">Già condiviso</string>
+    <string name="sk_settings_profile">Impostazioni del profilo</string>
+    <string name="sk_settings_posting">Preferenze di pubblicazione</string>
+    <string name="sk_settings_filters">Configura i filtri</string>
     <string name="sk_settings_rules">Regole</string>
-    <string name="sk_settings_about">Riguardo all\'app</string>
+    <string name="sk_settings_about">Informazioni sull\'app</string>
     <string name="sk_settings_donate">Dona</string>
-    <string name="sk_delete_notification_confirm_action">Elimina notifica</string>
-    <string name="sk_enable_delete_notifications">Abilita l\'eliminazione delle notifiche</string>
+    <string name="sk_delete_notification_confirm_action">Elimina la notifica</string>
+    <string name="sk_enable_delete_notifications">Abilita la cancellazione delle notifiche</string>
     <string name="sk_settings_publish_button_text">Testo del pulsante Pubblica</string>
     <string name="sk_settings_publish_button_text_title">Personalizza il testo del pulsante Pubblica</string>
     <string name="sk_settings_translation_availability_note_available">%s supporta la traduzione!</string>
-    <string name="sk_settings_translation_availability_note_unavailable">Sembra che %s non supporti la traduzione.</string>
-    <string name="sk_clear_all_notifications">Elimina tutte le notifiche</string>
-    <string name="sk_clear_all_notifications_confirm_action">Elimina tutto</string>
-    <string name="sk_clear_all_notifications_confirm">Sei sicuro di volere eliminare tutte le notifiche\?</string>
+    <string name="sk_settings_translation_availability_note_unavailable">%s non sembra supportare la traduzione.</string>
+    <string name="sk_clear_all_notifications">Cancella tutte le notifiche</string>
+    <string name="sk_clear_all_notifications_confirm_action">Cancella tutto</string>
+    <string name="sk_clear_all_notifications_confirm">Sei sicuro di voler eliminare tutte le notifiche\?</string>
     <string name="sk_loading_fediverse_resource_title">Cercando nel Fediverso</string>
     <string name="sk_quote_post">Crea un post riguardo a questo</string>
     <string name="sk_undo_reblog">Annulla la condivisione</string>
-    <string name="sk_reblog_with_visibility">Condividi con visibilità</string>
-    <string name="sk_copy_link_to_post">Copia il link del post</string>
+    <string name="sk_reblog_with_visibility">Reblog con visibilità</string>
+    <string name="sk_copy_link_to_post">Copia il link al post</string>
     <string name="sk_open_with_account">Apri con un altro account</string>
-    <string name="sk_resource_not_found">La risorsa non può essere trovata</string>
+    <string name="sk_resource_not_found">Non è stato possibile trovare la risorsa</string>
     <string name="sk_draft">Bozza</string>
     <string name="sk_schedule">Programma</string>
     <string name="sk_confirm_delete_draft_title">Elimina bozza</string>
-    <string name="sk_draft_or_schedule">Bozza o programma</string>
+    <string name="sk_draft_or_schedule">Salva nelle bozze o programma</string>
     <string name="sk_compose_scheduled">Programmato per</string>
     <string name="sk_draft_saved">Bozza salvata</string>
     <string name="sk_forward_report_to">Inoltra a %s</string>
     <string name="sk_confirm_delete_scheduled_post_title">Elimina post programmato</string>
-    <string name="sk_confirm_delete_scheduled_post">Sei sicuro di volere eliminare questo post programmato\?</string>
+    <string name="sk_confirm_delete_scheduled_post">Sei sicuro di voler eliminare questo post programmato\?</string>
     <string name="sk_compose_draft">Il post verrà salvato come bozza.</string>
     <string name="sk_post_scheduled">Post programmato</string>
     <string name="sk_scheduled_too_soon_title">L\'orario programmato è troppo presto</string>
     <string name="sk_mark_as_draft">Segna come bozza</string>
-    <string name="sk_schedule_post">Programma post</string>
+    <string name="sk_schedule_post">Programma il post</string>
     <string name="sk_compose_no_schedule">Non programmare</string>
     <string name="sk_compose_no_draft">Non tenere in bozza</string>
     <string name="sk_announcements">Annunci</string>
@@ -123,25 +123,25 @@
     <string name="sk_reply_as">Rispondi con un altro account</string>
     <string name="sk_settings_uniform_icon_for_notifications">Icona uniforme per tutte le notifiche</string>
     <string name="sk_color_palette_red">Rosso</string>
-    <string name="sk_tabs_disable_swipe">Disabilita lo scorrimento tra schede</string>
-    <string name="sk_settings_auth">Impostazioni della sicurezza</string>
-    <string name="sk_delete_notification">Elimina notifica</string>
-    <string name="sk_delete_notification_confirm">Sei sicuro di volere eliminare questa notifica\?</string>
-    <string name="sk_settings_translate_only_opened">Traduci solamente i post aperti</string>
-    <string name="sk_loading_resource_on_instance_title">Cercando in %s</string>
-    <string name="sk_hashtags_you_follow">Hashtags che segui</string>
-    <string name="sk_already_bookmarked">Già salvato</string>
+    <string name="sk_tabs_disable_swipe">Disabilita lo scorrimento tra le schede</string>
+    <string name="sk_settings_auth">Impostazioni di sicurezza</string>
+    <string name="sk_delete_notification">Elimina la notifica</string>
+    <string name="sk_delete_notification_confirm">Sei sicuro di voler eliminare questa notifica\?</string>
+    <string name="sk_settings_translate_only_opened">Traduci solo i post aperti</string>
+    <string name="sk_loading_resource_on_instance_title">Cercando su %s</string>
+    <string name="sk_hashtags_you_follow">Hashtag che segui</string>
+    <string name="sk_already_bookmarked">Già aggiunto ai segnalibri</string>
     <string name="sk_reblogged_as">Condivisione eseguita come %s</string>
-    <string name="sk_unsent_posts">Post annullati</string>
-    <string name="sk_confirm_save_draft">Salva bozza\?</string>
-    <string name="sk_confirm_save_changes">Salva le modifiche\?</string>
+    <string name="sk_unsent_posts">Post non pubblicati</string>
+    <string name="sk_confirm_save_draft">Salvare la bozza\?</string>
+    <string name="sk_confirm_save_changes">Salvare le modifiche\?</string>
     <string name="sk_schedule_or_draft">Programma o bozza</string>
     <string name="sk_settings_reduce_motion">Riduci il movimento delle animazioni</string>
     <string name="sk_settings_about_instance">Riguardo all\'istanza</string>
     <string name="sk_delete_list_confirm">Sei sicuro di volere eliminare la lista \"%s\"\?</string>
     <string name="sk_timeline_home">Home</string>
-    <string name="sk_confirm_delete_draft">Sei sicuro di volere eliminare questo post in bozza\?</string>
-    <string name="sk_scheduled_too_soon">I post devono essere programmati almeno tra 10 minuti.</string>
+    <string name="sk_confirm_delete_draft">Sei sicuro di voler cancellare questa bozza\?</string>
+    <string name="sk_scheduled_too_soon">Il post deve essere programmato almeno 10 minuti prima.</string>
     <string name="sk_recent_searches_placeholder">Scrivi per iniziare a cercare</string>
     <string name="sk_remove_follower">Rimuovi come follower</string>
     <string name="sk_remove_follower_confirm">Rimuovi %s come follower bloccandolo e sboccandolo immediatamente\?</string>
@@ -250,4 +250,15 @@
     <string name="sk_settings_see_new_posts_button">Pulsante \"Mostra nuovi post\"</string>
     <string name="sk_settings_server_version">Versione server:%s</string>
     <string name="sk_notify_poll_results">Risultati del sondaggio</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">Aggiungi \"re:\" prima dei CW</string>
+    <string name="sk_filtered">Filtrato: %s</string>
+    <string name="sk_expand">Espandi</string>
+    <string name="sk_collapse">Chiudi</string>
+    <string name="sk_settings_collapse_long_posts">Comprimi post molto lunghi</string>
+    <string name="sk_unfinished_attachments">Correggi gli allegati\?</string>
+    <string name="sk_unfinished_attachments_message">Alcuni allegati non hanno finito l\'upload.</string>
+    <string name="sk_settings_hide_interaction">Nascondi i pulsanti di interazione</string>
+    <string name="sk_follow_as">Segui con un altro account</string>
+    <string name="sk_followed_as">Seguito con %s</string>
+    <string name="sk_settings_hide_fab">Nascondi automaticamente il pulsante Pubblica</string>
 </resources>

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

@@ -20,4 +20,6 @@
     <string name="mo_disable_dividers">Wyłącz dzielenie postów</string>
     <string name="mo_disable_relocate_publish_button_to_enable_customization">Wyłącz opcję Przenoszenia przycisku publikacji aby umożliwić dostosowywanie</string>
     <string name="mo_filtered">Wyfiltrowano: %s</string>
+    <string name="mo_disable_reminder_to_add_alt_text">Wyłącz przypomnienie o dodaniu opisu</string>
+    <string name="mo_add_custom_server_local_timeline">Dodaj lokalną oś czasu innej instancji</string>
 </resources>

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

@@ -258,4 +258,7 @@
     <string name="sk_settings_prefix_reply_cw_with_re">Zaczynaj CW odpowiedzi od “re:”</string>
     <string name="sk_settings_collapse_long_posts">Zwijaj bardzo długie posty</string>
     <string name="sk_settings_hide_interaction">Ukryj przyciski interakcji</string>
+    <string name="sk_followed_as">Obserwowane z %s</string>
+    <string name="sk_follow_as">Obserwuj z innego konta</string>
+    <string name="sk_settings_hide_fab">Automatycznie ukrywaj przycisk tworzenia nowego wpisu</string>
 </resources>

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

@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-</resources>
+    <string name="mo_welcome_text">Щоб розпочати, будь ласка, введіть адресу вашого екземпляру нижче.</string>
+    <string name="mo_no_image_desc">Зображення не мають опису. Ви можете додати його, щоб люди із вадами зору могли зрозуміти, яке забарвлення в котика.</string>
+    <string name="mo_disable_relocate_publish_button_to_enable_customization">Вимкніть переміщення кнопки \"Опублікувати\" для кастомізації</string>
+    <string name="mo_color_palette_nord">Nord</string>
+    <string name="mo_disable_dividers">Вимкнути роздільники публікацій</string>
+    <string name="mo_relocate_publish_button">Перемістити кнопку \"Опублікувати\"</string>
+    <string name="mo_hide_compose_button_while_scrolling_setting">Сховати кнопку \"Нова публікація\" під час прокручування</string>
+    <string name="mo_personal_note">Додати нотатку до цього профілю</string>
+    <string name="mo_personal_note_confirm">Підтвердити зміни</string>
+    <string name="mo_personal_note_update_failed">Не вдалося зберегти нотатку</string>
+    <string name="mo_settings_contribute">Допомогти у розробці Moshidon</string>
+    <string name="mo_update_available">Moshidon %s готовий до завантаження.</string>
+    <string name="mo_update_ready">Moshidon %s готовий до встановлення.</string>
+    <string name="mo_no_image_desc_title">Немає опису зображення</string>
+    <string name="mo_emoji_recent">Нещодавні</string>
+    <string name="mo_clear_recent_emoji">Очистити нещодавні емоджи</string>
+    <string name="mo_disable_reminder_to_add_alt_text">Вимкнути повідомлення про додавання опису зображення</string>
+    <string name="mo_poll_option_add">Опція \"додати нове опитування\"</string>
+    <string name="mo_fab_compose">Новий допис</string>
+    <string name="mo_sending_error">Помилка при публікації</string>
+    <string name="mo_filtered">Відфільтровано: %s</string>
+    <string name="mo_add_custom_server_local_timeline">Додати місцеву стрічку іншого серверу</string>
+</resources>

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

@@ -259,4 +259,7 @@
     <string name="sk_unfinished_attachments_message">Деякі вкладення не повністю завантажилися.</string>
     <string name="sk_spectator_mode">Режим глядача</string>
     <string name="sk_settings_hide_interaction">Сховати кнопки взаємодії</string>
+    <string name="sk_follow_as">Підписатися з іншого облікового запису</string>
+    <string name="sk_followed_as">Відстежується з %s</string>
+    <string name="sk_settings_hide_fab">Автоматично ховати кнопку компонування</string>
 </resources>

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

@@ -21,4 +21,5 @@
     <string name="mo_sending_error">发布帖文时出错</string>
     <string name="mo_filtered">已过滤：%s</string>
     <string name="mo_disable_reminder_to_add_alt_text">禁用添加ALT文本的提醒</string>
+    <string name="mo_add_custom_server_local_timeline">添加自定义实例的本地时间线</string>
 </resources>

metadata/de-DE/changelogs/94.txt

@@ -0,0 +1,5 @@
+Neue Dinge für 94:
+- Verbesserungen am Verhalten des Fabs
+- Geringfügige Änderungen am Launchersymbol
+- Verbesserungen des Benachrichtigungsverhaltens
+- Kleinere Fehlerbehebungen und Verbesserungen

metadata/de-DE/changelogs/95.txt

@@ -0,0 +1,3 @@
+Neue Dinge für 95:
+- Hinzufügen der Möglichkeit, die lokalen Timelines anderer Server in den Timelines anzuzeigen
+- Kleinere Korrekturen und Verbesserungen

metadata/de-DE/changelogs/96.txt

@@ -0,0 +1,3 @@
+Neue Dinge für 96:
+- Verbesserung der Möglichkeit, die lokalen Timelines anderer Server in den Timelines anzuzeigen
+- Kleinere Korrekturen und Verbesserungen

metadata/en-US/changelogs/95.txt

@@ -0,0 +1,3 @@
+New things for 95:
+- Adding the ability to have other server's local timelines in the timelines
+- Minor fixes and improvements

metadata/en-US/changelogs/96.txt

@@ -0,0 +1,3 @@
+New things for 96:
+- Improving the ability to have other server's local timelines in the timelines
+- Minor fixes and improvements

metadata/en-US/changelogs/97.txt

@@ -0,0 +1,3 @@
+Release 97 adds:
+- New Custom Local Timelines feature. It can be accessed on the add timelines menu
+- Minor fixes and improvements

metadata/es/changelogs/77.txt

@@ -0,0 +1,4 @@
+- Mantenga presionado el botón de seguimiento para seguir los perfiles de otra cuenta
+- Opción para abrir perfiles en otra cuenta
+- Ocultar automáticamente el botón de redacción al desplazarse hacia abajo en la línea de tiempo
+- Solucione el bloqueo al abrir los perfiles de administrador del servidor

metadata/gl-ES/changelogs/77.txt

@@ -0,0 +1,4 @@
+- Manter pulsado o botón de seguir para seguir perfís de outra conta
+- Opción de abrir perfís de outra conta
+- Auto-ocultar o botón de redacción cando deslizas cara abaixo na cronoloxía
+- Arranxado o bloqueo ao abrir os perfís dos administradores do servidor

metadata/id/changelogs/76.txt

@@ -0,0 +1,6 @@
+- Saringan ditingkatkan, termasuk kompatibilitas “Sembunyikan dengan peringatan”
+- Rancang ulang halaman profil dengan metadata langsung di bawah bio
+- Fungsi buka/tutup untuk kiriman yang sangat panjang
+- Opsi untuk menambahkan peringatan konten pada balasan dengan “re:”
+- Opsi untuk menyembunyikan tombol interaksi di lini masa
+- Banyak perbaikan kutu, perubahan, dan peningkatan

metadata/id/changelogs/77.txt

@@ -0,0 +1,4 @@
+- Tekan lama pada tombol ikuti untuk mengikuti profil dari akun lain
+- Opsi untuk membuka profil di akun yang lain
+- Sembunyikan tombol komposer secara otomatia ketika menggulir lini masa ke bawah
+- Perbaiki kemogokan ketika membuka profil admin server

metadata/it-IT/changelogs/67.txt

@@ -0,0 +1,10 @@
+- Nuova home con timeline pubbliche
+- Mostra annunci del server
+- Testo scalato in base alle impostazioni di sistema
+- Filtro migliorato (no, "Nascondi con avvertimento" non funziona ancora) da @thiagojedi
+- Funzionalità di gestione delle liste
+- Rimozione di follower con blocco morbido
+- Respinte le connessioni con fascisti
+- Risolto il non caricamento delle immagini se connessi all'istanza di Akkoma
+- Risoluzioni di bug e miglioramenti UI
+- Aggiunto il registro delle modiifche da @LucasGGamerM

metadata/it-IT/changelogs/74.txt

@@ -0,0 +1,9 @@
+- Le timelines possono essere fissate e riorganizzate
+- Supporto per post solo locali
+- Aggiunti indicatori per testi alternativi mancanti
+- Migliorato l'editor del testo alternativo
+- Aggiunta intestazione nella home per gli hashtag seguiti
+- Più categorie di notifiche
+- Aggiunta nuovamente la possibilità di aprire file
+- Aggiunto avviso quando si salvano le bozze
+- Aggiunta opzione per disabilitare il tasto "Visualizza nuovi post"

metadata/it-IT/changelogs/76.txt

@@ -0,0 +1,6 @@
+- Migliorati i filtri, compresa la compatibilità con "Nascondi con avvertimento"
+- Ripensata la pagina del profilo con metadati sotto la bio
+- Funzione mostra/nascondi per post molto lunghi
+- Possibilità di iniziare le risposte a dei Content Warning con "re:"
+- Possiblità di nascondere i pulsanti di interazione nello scorrimento della timeline
+- Numerose correzioni di bug e miglioramenti

metadata/it-IT/changelogs/77.txt

@@ -0,0 +1,4 @@
+- Possibilità di seguire con un altro account con tocco prolungato
+- Possibilità di aprire profili con un altro account
+- Aggiunta la possibilità di nascondere il pulsante per pubblicare quando si scorre nella timeline
+- Corretti crash nell'apertura di profili degli amministratori del server

metadata/pl/changelogs/77.txt

@@ -0,0 +1,4 @@
+- Długie naciśnięcie przycisku "obserwacji" teraz pozwoli ci obserwować profile z innego konta
+- Opcja otwierania profili innym kontem
+- Automatyczne ukrywanie przycisku pisania nowego posta podczas przewijania w dół osi czasu
+- Naprawiono crash podczas otwierania profili administratora serwera

metadata/pl/short_description.txt

@@ -0,0 +1 @@
+Mastodon na Android ale ma motyw Material You i ma więcej funkcji

metadata/pl/title.txt

@@ -0,0 +1 @@
+Moshidon

metadata/uk/changelogs/77.txt

@@ -0,0 +1,4 @@
+- Затискання кнопки підписатися, щоб підписатися на профілі з іншого облікового запису
+- Можливість відкривати профілі в іншому обліковому записі
+- Автоприховування кнопки компонування під час гортання стрічки вниз
+- Виправлено збій під час відкриття профілів адміністратора сервера

metadata/uk/short_description.txt

@@ -0,0 +1 @@
+Mastodon для Android, але має більше функцій й дизайн Material You

metadata/uk/title.txt

@@ -0,0 +1 @@
+Moshidon