bump version, update changelog

Currently translated at 100.0% (59 of 59 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/

README.md

@@ -134,6 +134,7 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Add push notification setting for post notifications](https://github.com/sk22/megalodon/commit/b190480d7739be47f23543d9e7644660f9b4b4ee)
 * [Add option to allow voting for multiple options on polls](https://github.com/sk22/megalodon/commit/5b28468efd49387b4f8b83f142f3adf3104ca60c)
 * [Add translate function](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/translate-button)
+* [Add language selector](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/language-selector)
 
 
 ### Behavior
@@ -160,6 +161,7 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Profile header tweaks](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:ui/profile-header-tweaks)
 * [Custom color themes](https://github.com/sk22/megalodon/pull/124) by [@LucasGGamerM](https://github.com/LucasGGamerM)
 * [Custom "megalodon" text logo](https://github.com/sk22/megalodon/commit/563afd487ca5c608cfbb00fa3909d3c27384acc0) by [@LucasGGamerM](https://github.com/LucasGGamerM)
+* [Custom login screen](https://github.com/sk22/megalodon/commit/9bbf8c4618dbe13accaeb3b5482bf3fe88cac4c0)
 
 
 ## Building

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 57
-		versionName "1.1.4+fork.57"
+		versionCode 59
+		versionName "1.1.4+fork.59"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "en", "ar-rSA", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES",
 				"eu-rES", "fi-rFI", "fr-rFR", "gl-rES", "hr-rHR", "hy-rAM", "it-rIT", "iw-rIL",

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

@@ -1,8 +1,18 @@
 package org.joinmastodon.android;
 
+import static org.joinmastodon.android.api.MastodonAPIController.gson;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class GlobalUserPreferences{
 	public static boolean playGifs;
 	public static boolean useCustomTabs;
@@ -18,10 +28,18 @@ public class GlobalUserPreferences{
 	public static ThemePreference theme;
 	public static ColorPreference color;
 
+	private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
+	public static Map<String, List<String>> recentLanguages;
+
 	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
 
+	private static <T> T fromJson(String json, Type type, T orElse) {
+		try { return gson.fromJson(json, type); }
+		catch (JsonSyntaxException ignored) { return orElse; }
+	}
+
 	public static void load(){
 		SharedPreferences prefs=getPrefs();
 		playGifs=prefs.getBoolean("playGifs", true);
@@ -37,6 +55,7 @@ public class GlobalUserPreferences{
 		voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 		color=ColorPreference.values()[prefs.getInt("color", 0)];
+		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
 	}
 
 	public static void save(){
@@ -53,6 +72,7 @@ public class GlobalUserPreferences{
 				.putBoolean("disableMarquee", disableMarquee)
 				.putInt("theme", theme.ordinal())
 				.putInt("color", color.ordinal())
+				.putString("recentLanguages", gson.toJson(recentLanguages))
 				.apply();
 	}
 

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

@@ -14,9 +14,9 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
-import org.joinmastodon.android.fragments.SplashFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
+import org.joinmastodon.android.fragments.onboarding.MegalodonLoginFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
@@ -33,7 +33,7 @@ public class MainActivity extends FragmentStackActivity{
 
 		if(savedInstanceState==null){
 			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
-				showFragmentClearingBackStack(new SplashFragment());
+				showFragmentClearingBackStack(new MegalodonLoginFragment());
 			}else{
 				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 				AccountSession session;

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

@@ -370,7 +370,7 @@ public class PushSubscriptionManager{
 		for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){
 			if(session.pushSubscription==null || forceReRegister)
 				session.getPushSubscriptionManager().registerAccountForPush(session.pushSubscription);
-			else if(session.needUpdatePushSettings)
+			else
 				session.getPushSubscriptionManager().updatePushSettings(session.pushSubscription);
 		}
 	}

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

@@ -1,5 +1,9 @@
 package org.joinmastodon.android.fragments;
 
+import static org.joinmastodon.android.GlobalUserPreferences.recentLanguages;
+import static org.joinmastodon.android.utils.MastodonLanguage.allLanguages;
+import static org.joinmastodon.android.utils.MastodonLanguage.defaultRecentLanguages;
+
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -29,11 +33,13 @@ import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
@@ -55,6 +61,7 @@ import android.widget.Toast;
 import com.twitter.twittertext.TwitterTextEmojiRegex;
 
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
@@ -95,6 +102,7 @@ import org.joinmastodon.android.ui.views.ComposeEditText;
 import org.joinmastodon.android.ui.views.ComposeMediaLayout;
 import org.joinmastodon.android.ui.views.ReorderableLinearLayout;
 import org.joinmastodon.android.ui.views.SizeListenerLinearLayout;
+import org.joinmastodon.android.utils.MastodonLanguage;
 import org.parceler.Parcel;
 import org.parceler.Parcels;
 
@@ -105,6 +113,7 @@ import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -145,7 +154,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private String accountID;
 	private int charCount, charLimit, trimmedCharCount;
 
-	private Button publishButton;
+	private Button publishButton, languageButton;
+	private PopupMenu languagePopup;
 	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn;
 	private ImageView sensitiveIcon;
 	private ComposeMediaLayout attachmentsView;
@@ -190,6 +200,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private boolean ignoreSelectionChanges=false;
 	private Runnable updateUploadEtaRunnable;
 
+	private String language;
+	private MastodonLanguage.LanguageResolver languageResolver;
+
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -201,6 +214,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		instanceDomain=session.domain;
 		customEmojis=AccountSessionManager.getInstance().getCustomEmojis(instanceDomain);
 		instance=AccountSessionManager.getInstance().getInstanceInfo(instanceDomain);
+		languageResolver=new MastodonLanguage.LanguageResolver(instance);
 		if(getArguments().containsKey("editStatus")){
 			editingStatus=Parcels.unwrap(getArguments().getParcelable("editStatus"));
 			redraftStatus=getArguments().getBoolean("redraftStatus");
@@ -219,8 +233,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			charLimit=instance.configuration.statuses.maxCharacters;
 		else
 			charLimit=500;
-
-		loadDefaultStatusVisibility(savedInstanceState);
 	}
 
 	@Override
@@ -375,6 +387,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			statusVisibility=editingStatus.visibility;
 		}
 
+		loadDefaultStatusVisibility(savedInstanceState);
 		updateVisibilityIcon();
 
 		autocompleteViewController=new ComposeAutocompleteViewController(getActivity(), accountID);
@@ -403,6 +416,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		}
 		outState.putBoolean("sensitive", sensitive);
 		outState.putBoolean("hasSpoiler", hasSpoiler);
+		outState.putString("language", language);
 		if(!attachments.isEmpty()){
 			ArrayList<Parcelable> serializedAttachments=new ArrayList<>(attachments.size());
 			for(DraftMediaAttachment att:attachments){
@@ -494,14 +508,14 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		spoilerEdit.addTextChangedListener(new SimpleTextWatcher(e->updateCharCounter()));
 		if(replyTo!=null){
 			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
-			int visibilityNameRes = switch (statusVisibility) {
+			int visibilityNameRes = switch (replyTo.visibility) {
 				case PUBLIC -> R.string.visibility_public;
 				case UNLISTED -> R.string.sk_visibility_unlisted;
 				case PRIVATE -> R.string.visibility_followers_only;
 				case DIRECT -> R.string.visibility_private;
 			};
 			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes));
-			Drawable visibilityIcon = getActivity().getDrawable(switch(statusVisibility){
+			Drawable visibilityIcon = getActivity().getDrawable(switch(replyTo.visibility){
 				case PUBLIC -> R.drawable.ic_fluent_earth_20_regular;
 				case UNLISTED -> R.drawable.ic_fluent_people_community_20_regular;
 				case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular;
@@ -542,6 +556,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					spoilerEdit.setText(replyTo.spoilerText);
 					spoilerBtn.setSelected(true);
 				}
+				if (replyTo.language != null && !replyTo.language.isEmpty()) updateLanguage(replyTo.language);
 			}
 		}else if (editingStatus==null || editingStatus.inReplyToId==null){
 			// TODO: remove workaround after https://github.com/mastodon/mastodon-android/issues/341 gets fixed
@@ -554,6 +569,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				ignoreSelectionChanges=true;
 				mainEditText.setSelection(mainEditText.length());
 				ignoreSelectionChanges=false;
+				updateLanguage(editingStatus.language);
 				if(!editingStatus.mediaAttachments.isEmpty()){
 					attachmentsView.setVisibility(View.VISIBLE);
 					for(Attachment att:editingStatus.mediaAttachments){
@@ -616,6 +632,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		sendError.setVisibility(View.GONE);
 		sendProgress.setVisibility(View.GONE);
 
+		LinearLayout.LayoutParams langParams=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+		langParams.setMarginEnd(V.dp(8));
+		wrap.addView(buildLanguageSelector(), langParams);
+
 		wrap.addView(publishButton, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
 		wrap.setPadding(V.dp(16), V.dp(4), V.dp(16), V.dp(8));
 		wrap.setClipToPadding(false);
@@ -625,6 +645,56 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		updatePublishButtonState();
 	}
 
+	private void updateLanguage(String lang) {
+		updateLanguage(languageResolver.from(lang));
+	}
+
+	private void updateLanguage(MastodonLanguage loc) {
+		language = loc.getLanguage();
+		languageButton.setText(loc.getLanguageName());
+		languageButton.setContentDescription(getActivity().getString(R.string.sk_post_language, loc.getDefaultName()));
+	}
+
+	@SuppressLint("ClickableViewAccessibility")
+	private Button buildLanguageSelector() {
+		TypedValue typedValue = new TypedValue();
+		getActivity().getTheme().resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
+
+		languageButton=new Button(getActivity());
+		languageButton.setTextColor(typedValue.data);
+		languageButton.setBackground(getActivity().getDrawable(R.drawable.bg_text_button));
+		languageButton.setPadding(V.dp(8), 0, V.dp(8), 0);
+		languageButton.setCompoundDrawablesRelativeWithIntrinsicBounds(getActivity().getDrawable(R.drawable.ic_fluent_local_language_16_regular), null, null, null);
+		languageButton.setCompoundDrawableTintList(languageButton.getTextColors());
+		languageButton.setCompoundDrawablePadding(V.dp(6));
+
+		languagePopup=new PopupMenu(getActivity(), languageButton);
+		languageButton.setOnTouchListener(languagePopup.getDragToOpenListener());
+		languageButton.setOnClickListener(v->languagePopup.show());
+
+		updateLanguage(languageResolver.getDefault());
+
+		Menu languageMenu = languagePopup.getMenu();
+		for (String recentLanguage : Optional.ofNullable(recentLanguages.get(accountID)).orElse(defaultRecentLanguages)) {
+			MastodonLanguage l = languageResolver.from(recentLanguage);
+			languageMenu.add(0, allLanguages.indexOf(l), Menu.NONE, getActivity().getString(R.string.sk_language_name, l.getDefaultName(), l.getLanguageName()));
+		}
+
+		SubMenu allLanguagesMenu = languageMenu.addSubMenu(R.string.sk_available_languages);
+		for (int i = 0; i < allLanguages.size(); i++) {
+			MastodonLanguage l = allLanguages.get(i);
+			allLanguagesMenu.add(0, i, Menu.NONE, getActivity().getString(R.string.sk_language_name, l.getDefaultName(), l.getLanguageName()));
+		}
+
+		languagePopup.setOnMenuItemClickListener(i->{
+			if (i.hasSubMenu()) return false;
+			updateLanguage(allLanguages.get(i.getItemId()));
+			return true;
+		});
+
+		return languageButton;
+	}
+
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item){
 		return true;
@@ -698,6 +768,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		req.status=text;
 		req.visibility=statusVisibility;
 		req.sensitive=sensitive;
+		req.language=language;
 		if(!attachments.isEmpty()){
 			req.mediaIds=attachments.stream().map(a->a.serverAttachment.id).collect(Collectors.toList());
 		}
@@ -775,6 +846,14 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					.setCallback(resCallback)
 					.exec(accountID);
 		}
+
+		if (replyTo == null) {
+			List<String> newRecentLanguages = new ArrayList<>(Optional.ofNullable(recentLanguages.get(accountID)).orElse(defaultRecentLanguages));
+			newRecentLanguages.remove(language);
+			newRecentLanguages.add(0, language);
+			recentLanguages.put(accountID, newRecentLanguages.stream().limit(4).collect(Collectors.toList()));
+			GlobalUserPreferences.save();
+		}
 	}
 
 	private boolean hasDraft(){
@@ -1358,34 +1437,23 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
 		}
 
-		new GetPreferences()
-				.setCallback(new Callback<>(){
-					@Override
-					public void onSuccess(Preferences result){
-						// Only override the reply visibility if our preference is more private
-						if (result.postingDefaultVisibility.isLessVisibleThan(statusVisibility)) {
-							statusVisibility = switch (result.postingDefaultVisibility) {
-								case PUBLIC -> StatusPrivacy.PUBLIC;
-								case UNLISTED -> StatusPrivacy.UNLISTED;
-								case PRIVATE -> StatusPrivacy.PRIVATE;
-								case DIRECT -> StatusPrivacy.DIRECT;
-							};
-						}
+		Preferences prefs = AccountSessionManager.getInstance().getAccount(accountID).preferences;
+		if (prefs != null) {
+			// Only override the reply visibility if our preference is more private
+			if (prefs.postingDefaultVisibility.isLessVisibleThan(statusVisibility)) {
+				statusVisibility = switch (prefs.postingDefaultVisibility) {
+					case PUBLIC -> StatusPrivacy.PUBLIC;
+					case UNLISTED -> StatusPrivacy.UNLISTED;
+					case PRIVATE -> StatusPrivacy.PRIVATE;
+					case DIRECT -> StatusPrivacy.DIRECT;
+				};
+			}
 
-						// A saved privacy setting from a previous compose session wins over all
-						if(savedInstanceState !=null){
-							statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
-						}
-
-						updateVisibilityIcon ();
-					}
-
-					@Override
-					public void onError(ErrorResponse error){
-						Log.w(TAG, "Unable to get user preferences to set default post privacy");
-					}
-				})
-				.exec(accountID);
+			// A saved privacy setting from a previous compose session wins over all
+			if(savedInstanceState !=null){
+				statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
+			}
+		}
 	}
 
 	private void updateVisibilityIcon(){

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

@@ -48,6 +48,7 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
 
 import java.util.ArrayList;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 import androidx.annotation.DrawableRes;
@@ -159,6 +160,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 		items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sk22/megalodon")));
 		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
+		items.add(new TextItem(R.string.sk_clear_recent_languages, ()->UiUtils.showConfirmationAlert(getActivity(), R.string.sk_clear_recent_languages, R.string.sk_confirm_clear_recent_languages, R.string.clear, ()->{
+			GlobalUserPreferences.recentLanguages.remove(accountID);
+			GlobalUserPreferences.save();
+		})));
 		items.add(new TextItem(R.string.log_out, this::confirmLogOut));
 
 		items.add(new FooterItem(getString(R.string.sk_settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)));

mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java

@@ -84,7 +84,7 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		isSignup=getArguments().getBoolean("signup");
+		isSignup=getArguments() != null && getArguments().getBoolean("signup");
 	}
 
 	protected abstract void proceedWithAuthOrSignup(Instance instance);

mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MegalodonLoginFragment.java

@@ -0,0 +1,267 @@
+package org.joinmastodon.android.fragments.onboarding;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.Space;
+import android.widget.TextView;
+import android.widget.Toolbar;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.model.catalog.CatalogInstance;
+import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.DividerItemDecoration;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import me.grishka.appkit.FragmentStackActivity;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.PaginatedList;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class MegalodonLoginFragment extends InstanceCatalogFragment {
+	private View headerView;
+
+	public MegalodonLoginFragment() {
+		super(R.layout.fragment_megalodon_welcome, 1);
+	}
+
+	@Override
+	public void onAttach(Context context){
+		super.onAttach(context);
+		setRefreshEnabled(false);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		dataLoaded();
+	}
+
+	@Override
+	protected void onUpdateToolbar(){
+		super.onUpdateToolbar();
+
+		if (!canGoBack()) {
+			ImageView toolbarLogo=new ImageView(getActivity());
+			toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
+			toolbarLogo.setImageResource(R.drawable.logo);
+			toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
+
+			FrameLayout logoWrap=new FrameLayout(getActivity());
+			FrameLayout.LayoutParams logoParams=new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
+			logoParams.setMargins(0, V.dp(2), 0, 0);
+			logoWrap.addView(toolbarLogo, logoParams);
+
+			getToolbar().addView(logoWrap, new Toolbar.LayoutParams(Gravity.CENTER));
+		} else {
+			setTitle(R.string.add_account);
+		}
+	}
+
+	@Override
+	protected void proceedWithAuthOrSignup(Instance instance) {
+		AccountSessionManager.getInstance().authenticate(getActivity(), instance);
+	}
+
+	@Override
+	protected void updateFilteredList(){
+		boolean addFakeInstance = currentSearchQuery.length()>0 && currentSearchQuery.matches("^\\S+\\.[^\\.]+$");
+		if(addFakeInstance){
+			fakeInstance.domain=fakeInstance.normalizedDomain=currentSearchQuery;
+			fakeInstance.description=getString(R.string.loading_instance);
+			if(filteredData.size()>0 && filteredData.get(0)==fakeInstance){
+				if(list.findViewHolderForAdapterPosition(1) instanceof InstanceViewHolder ivh){
+					ivh.rebind();
+				}
+			}
+			if(filteredData.isEmpty()){
+				filteredData.add(fakeInstance);
+				adapter.notifyItemInserted(0);
+			}
+		}
+		ArrayList<CatalogInstance> prevData=new ArrayList<>(filteredData);
+		filteredData.clear();
+		if(currentSearchQuery.length()>0){
+			boolean foundExactMatch=false;
+			for(CatalogInstance inst:data){
+				if(inst.normalizedDomain.contains(currentSearchQuery)){
+					filteredData.add(inst);
+					if(inst.normalizedDomain.equals(currentSearchQuery))
+						foundExactMatch=true;
+				}
+			}
+			if(!foundExactMatch && addFakeInstance) {
+				filteredData.add(0, fakeInstance);
+				adapter.notifyItemChanged(0);
+			}
+		}
+		UiUtils.updateList(prevData, filteredData, list, adapter, Objects::equals);
+		for(int i=0;i<list.getChildCount();i++){
+			list.getChildAt(i).invalidateOutline();
+		}
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState) {
+		super.onViewCreated(view, savedInstanceState);
+		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorWindowBackground));
+		list.setItemAnimator(new BetterItemAnimator());
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count) {}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		headerView=getActivity().getLayoutInflater().inflate(R.layout.header_megalodon_welcome, list, false);
+		searchEdit=headerView.findViewById(R.id.search_edit);
+		searchEdit.setOnEditorActionListener(this::onSearchEnterPressed);
+
+		headerView.findViewById(R.id.more).setVisibility(View.GONE);
+		headerView.findViewById(R.id.visibility).setVisibility(View.GONE);
+		((TextView) headerView.findViewById(R.id.username)).setText("@megalodon");
+		((TextView) headerView.findViewById(R.id.name)).setText(R.string.sk_app_name);
+		((TextView) headerView.findViewById(R.id.timestamp)).setText(R.string.time_now);
+		((ImageView) headerView.findViewById(R.id.avatar)).setImageDrawable(getActivity().getDrawable(R.mipmap.ic_launcher));
+		((FragmentStackActivity) getActivity()).invalidateSystemBarColors(this);
+
+		searchEdit.addTextChangedListener(new TextWatcher(){
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count, int after){}
+
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before, int count){
+				nextButton.setEnabled(false);
+				chosenInstance = null;
+				searchEdit.removeCallbacks(searchDebouncer);
+				searchEdit.postDelayed(searchDebouncer, 300);
+			}
+
+			@Override
+			public void afterTextChanged(Editable s){}
+		});
+
+		mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
+		mergeAdapter.addAdapter(adapter=new InstancesAdapter());
+		View spacer = new Space(getActivity());
+		spacer.setMinimumHeight(V.dp(8));
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(spacer));
+		return mergeAdapter;
+	}
+
+	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceViewHolder>{
+		public InstancesAdapter(){
+			super(imgLoader);
+		}
+
+		@NonNull
+		@Override
+		public InstanceViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new InstanceViewHolder();
+		}
+
+		@Override
+		public void onBindViewHolder(InstanceViewHolder holder, int position){
+			holder.bind(filteredData.get(position));
+			chosenInstance = filteredData.get(position);
+			if (chosenInstance != fakeInstance) nextButton.setEnabled(true);
+			super.onBindViewHolder(holder, position);
+		}
+
+		@Override
+		public int getItemCount(){
+			return filteredData.size();
+		}
+
+		@Override
+		public int getItemViewType(int position){
+			return -1;
+		}
+	}
+
+	private class InstanceViewHolder extends BindableViewHolder<CatalogInstance> implements UsableRecyclerView.Clickable{
+		private final TextView title, description, userCount, lang;
+		private final RadioButton radioButton;
+
+		public InstanceViewHolder(){
+			super(getActivity(), R.layout.item_megalodon_instance, list);
+
+//			itemView.setPadding(V.dp(16), V.dp(16), V.dp(16), V.dp(16));
+//			TypedValue value = new TypedValue();
+//			getActivity().getTheme().resolveAttribute(android.R.attr.selectableItemBackground, value, true);
+//			itemView.setBackground(getActivity().getTheme().getDrawable(R.drawable.bg_search_field));
+			title=findViewById(R.id.title);
+			description=findViewById(R.id.description);
+			userCount=findViewById(R.id.user_count);
+			lang=findViewById(R.id.lang);
+			radioButton=findViewById(R.id.radiobtn);
+			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N){
+					UiUtils.fixCompoundDrawableTintOnAndroid6(userCount);
+					UiUtils.fixCompoundDrawableTintOnAndroid6(lang);
+			}
+		}
+
+		@Override
+		public void onBind(CatalogInstance item){
+			title.setText(item.normalizedDomain);
+			description.setText(item.description);
+			if (item == fakeInstance) {
+				userCount.setVisibility(View.GONE);
+				lang.setVisibility(View.GONE);
+			} else {
+				userCount.setVisibility(View.VISIBLE);
+				lang.setVisibility(View.VISIBLE);
+				userCount.setText(UiUtils.abbreviateNumber(item.totalUsers));
+				lang.setText(item.language.toUpperCase());
+			}
+			radioButton.setChecked(chosenInstance==item);
+			radioButton.setVisibility(View.GONE);
+		}
+
+		@Override
+		public void onClick(){
+			if(chosenInstance!=null){
+					int idx=filteredData.indexOf(chosenInstance);
+					if(idx!=-1){
+						RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(mergeAdapter.getPositionForAdapter(adapter)+idx);
+						if(holder instanceof InstanceViewHolder ivh){
+							ivh.radioButton.setChecked(false);
+						}
+					}
+			}
+			radioButton.setChecked(true);
+			if(chosenInstance==null)
+					nextButton.setEnabled(true);
+			chosenInstance=item;
+			loadInstanceInfo(chosenInstance.domain, false);
+			onNextClick(null);
+		}
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java

@@ -2,14 +2,12 @@ package org.joinmastodon.android.ui;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -25,8 +23,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.SplashFragment;
-import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.fragments.onboarding.MegalodonLoginFragment;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.List;
@@ -80,7 +77,7 @@ public class AccountSwitcherSheet extends BottomSheet{
 		holder.avatar.setImageResource(R.drawable.ic_fluent_add_circle_24_filled);
 		holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary)));
 		adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, ()->{
-			Nav.go(activity, SplashFragment.class, null);
+			Nav.go(activity, MegalodonLoginFragment.class, null);
 			dismiss();
 		}));
 

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

@@ -89,10 +89,12 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 				button.setBackground(progressBg);
 				itemView.setSelected(item.isMostVoted);
 				icon.setSelected(item.poll.ownVotes.contains(item.poll.options.indexOf(item.option)));
+				icon.setVisibility(item.poll.voted && item.poll.ownVotes.isEmpty() ? View.GONE : View.VISIBLE);
 				percent.setText(String.format(Locale.getDefault(), "%d%%", Math.round(item.votesFraction*100f)));
 			}else{
 				itemView.setSelected(item.poll.selectedOptions!=null && item.poll.selectedOptions.contains(item.option));
 				button.setBackgroundResource(R.drawable.bg_poll_option_clickable);
+				icon.setVisibility(View.VISIBLE);
 			}
 		}
 

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M10 18c4.418 0 8-3.582 8-8s-3.582-8-8-8-8 3.582-8 8 3.582 8 8 8zm0-15c0.657 0 1.407 0.59 2.022 1.908 0.217 0.466 0.406 1.002 0.559 1.592H7.419c0.153-0.59 0.342-1.126 0.56-1.592C8.592 3.59 9.342 3 10 3zM7.072 4.485C6.796 5.077 6.565 5.757 6.389 6.5H3.936c0.837-1.446 2.176-2.565 3.778-3.118-0.241 0.33-0.456 0.704-0.642 1.103zM6.192 7.5C6.068 8.288 6 9.13 6 10c0 0.87 0.067 1.712 0.193 2.5H3.46C3.163 11.724 3 10.88 3 10c0-0.88 0.163-1.724 0.46-2.5h2.733zm0.197 6c0.176 0.743 0.407 1.422 0.683 2.015 0.186 0.399 0.401 0.773 0.642 1.103-1.602-0.553-2.941-1.672-3.778-3.118H6.39zm1.03 0h5.162c-0.153 0.59-0.342 1.126-0.56 1.592C11.408 16.41 10.658 17 10 17c-0.657 0-1.407-0.59-2.022-1.908C7.761 14.626 7.572 14.09 7.42 13.5zm5.375-1H7.206C7.073 11.725 7 10.883 7 10s0.074-1.725 0.206-2.5h5.588C12.927 8.275 13 9.117 13 10s-0.073 1.725-0.206 2.5zm0.817 1h2.453c-0.837 1.446-2.176 2.565-3.778 3.118 0.241-0.33 0.456-0.704 0.642-1.103 0.276-0.593 0.507-1.272 0.683-2.015zm2.93-1h-2.734C13.933 11.712 14 10.87 14 10c0-0.87-0.067-1.712-0.193-2.5h2.733C16.837 8.276 17 9.12 17 10c0 0.88-0.163 1.724-0.46 2.5zm-4.255-9.118c1.602 0.553 2.941 1.672 3.778 3.118H13.61c-0.176-0.743-0.407-1.423-0.683-2.015-0.186-0.399-0.401-0.773-0.642-1.103z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -18,7 +18,8 @@
 			android:layout_marginTop="6dp"
 			android:layout_marginBottom="8dp"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content">
+			android:layout_height="wrap_content"
+			android:visibility="gone">
 			<View
 				android:id="@+id/border_top"
 				android:layout_width="match_parent"

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

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<me.grishka.appkit.views.FragmentRootLinearLayout
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:id="@+id/appkit_loader_root"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:background="?colorBackgroundLight">
+
+	<include layout="@layout/appkit_toolbar"/>
+
+	<FrameLayout
+		android:id="@+id/appkit_loader_content"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1">
+
+		<include layout="@layout/loading"
+			android:id="@+id/loading"/>
+
+		<ViewStub android:layout="?errorViewLayout"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/error"
+			android:visibility="gone"/>
+
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/content_stub"/>
+
+	</FrameLayout>
+
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="0.5dp"
+		android:background="?attr/colorPollVoted"/>
+
+	<LinearLayout
+		android:id="@+id/button_bar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?colorBackgroundLight"
+		android:outlineProvider="bounds"
+		android:orientation="horizontal"
+		android:elevation="0dp">
+
+		<Button
+			style="?primaryLargeButtonStyle"
+			android:id="@+id/btn_next"
+			android:minWidth="145dp"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_margin="16dp"
+			android:layout_weight="1"
+			android:text="@string/next" />
+
+	</LinearLayout>
+</me.grishka.appkit.views.FragmentRootLinearLayout>

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

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<include layout="@layout/display_item_header" />
+
+	<TextView
+		style="@style/m3_headline_small"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="16dp"
+		android:layout_marginVertical="12dp"
+		android:text="@string/sk_welcome_title"
+		/>
+
+	<TextView
+		style="@style/m3_body_large"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingHorizontal="16dp"
+		android:text="@string/sk_welcome_text" />
+
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="0.5dp"
+		android:layout_marginTop="16dp"
+		android:background="?attr/colorPollVoted"/>
+
+	<EditText
+		android:id="@+id/search_edit"
+		android:layout_width="match_parent"
+		android:layout_height="56dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginBottom="8dp"
+		android:layout_marginHorizontal="16dp"
+		android:inputType="textFilter|textNoSuggestions"
+		android:singleLine="true"
+		android:imeOptions="actionGo"
+		android:drawableStart="@drawable/ic_fluent_globe_20_regular"
+		android:drawablePadding="12dp"
+		android:drawableTint="?android:textColorSecondary"
+		android:background="@drawable/bg_search_field"
+		android:paddingHorizontal="16dp"
+		android:elevation="0dp"
+		android:hint="@string/sk_example_domain"/>
+
+
+	<ViewStub
+		android:layout="?errorViewLayout"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:id="@+id/error"
+		android:visibility="gone" />
+
+</LinearLayout>

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="8dp">
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_search_field">
+        <include layout="@layout/item_instance_catalog" />
+    </FrameLayout>
+</FrameLayout>

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

@@ -38,4 +38,13 @@
     <string name="sk_settings_always_reveal_content_warnings">Mostra sempre els avisos de contingut</string>
     <string name="sk_settings_contribute">Contribueix a Megalodon</string>
     <string name="sk_settings_show_federated_timeline">Mostra la línia de temps federada</string>
+    <string name="sk_notification_type_status">Publicacions</string>
+    <string name="sk_notify_posts">Notificacions de publicacions</string>
+    <string name="sk_settings_color_picker">Color de tema</string>
+    <string name="sk_color_theme_pink">Rosa</string>
+    <string name="sk_color_theme_purple">Lila</string>
+    <string name="sk_color_theme_green">Verd</string>
+    <string name="sk_color_theme_blue">Blau</string>
+    <string name="sk_color_theme_brown">Marró</string>
+    <string name="sk_color_theme_yellow">Groc</string>
 </resources>

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

@@ -48,4 +48,15 @@
     <string name="sk_notification_type_status">Beiträge</string>
     <string name="sk_color_theme_blue">Blau</string>
     <string name="sk_poll_allow_multiple">Mehrfachantworten erlauben</string>
+    <string name="sk_translated_using">Übersetzt mit %s</string>
+    <string name="sk_post_language">Sprache: %s</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_confirm_clear_recent_languages">Sicher, dass du die Liste der zuletzt verwendeten Sprachen leeren willst\?</string>
+    <string name="sk_translate_post">Übersetzen</string>
+    <string name="sk_translate_show_original">Original anzeigen</string>
+    <string name="sk_available_languages">Verfügbare Sprachen</string>
+    <string name="sk_clear_recent_languages">Zuletzt verwendete Sprachen leeren</string>
+    <string name="sk_welcome_title">Willkommen!</string>
+    <string name="sk_example_domain">beispiel.social</string>
+    <string name="sk_welcome_text">Der Hai sagt Hi! Um anzufangen, bitte gib den Domain-Namen deiner Heim-Instanz unten ein.</string>
 </resources>

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

@@ -2,28 +2,28 @@
 <resources>
     <string name="sk_pinned_posts">Anclado</string>
     <string name="sk_delete_and_redraft">Eliminar y editar</string>
-    <string name="sk_confirm_delete_and_redraft_title">Eliminar y editar post</string>
-    <string name="sk_confirm_delete_and_redraft">Seguro que quiere eliminar y volver a editar este post\?</string>
-    <string name="sk_pin_post">Fijar en perfil</string>
-    <string name="sk_confirm_pin_post_title">Fijar post en perfil</string>
-    <string name="sk_confirm_pin_post">Desea fijar el post en su perfil\?</string>
-    <string name="sk_pinning">Fijando post…</string>
-    <string name="sk_unpin_post">Quitar del perfil</string>
-    <string name="sk_confirm_unpin_post_title">Quitar post del perfil</string>
-    <string name="sk_confirm_unpin_post">Está seguro que quiere quitar el post\?</string>
+    <string name="sk_confirm_delete_and_redraft_title">Eliminar y editar publicación</string>
+    <string name="sk_confirm_delete_and_redraft">¿Confirma que quiere eliminar y volver a editar esta publicación\?</string>
+    <string name="sk_pin_post">Anclar en perfil</string>
+    <string name="sk_confirm_pin_post_title">Anclar publicación en perfil</string>
+    <string name="sk_confirm_pin_post">¿Quiere anclar la publicación en su perfil\?</string>
+    <string name="sk_pinning">Anclando publicación…</string>
+    <string name="sk_unpin_post">Desanclar del perfil</string>
+    <string name="sk_confirm_unpin_post_title">Desanclar publicación del perfil</string>
+    <string name="sk_confirm_unpin_post">¿Confirma que quiere desanclar esta publicación\?</string>
     <string name="sk_app_name">Megalodon</string>
-    <string name="sk_unpinning">Quitando post…</string>
+    <string name="sk_unpinning">Desanclando publicación…</string>
     <string name="sk_image_description">Descripción de la imagen</string>
-    <string name="sk_visibility_unlisted">Sin listar</string>
+    <string name="sk_visibility_unlisted">Descatalogada</string>
     <string name="sk_settings_show_replies">Mostrar respuestas</string>
-    <string name="sk_settings_show_boosts">Mostrar boosts</string>
-    <string name="sk_settings_load_new_posts">Cargar nuevos posts automáticamente</string>
-    <string name="sk_settings_show_interaction_counts">Mostrar contadores de interacciones</string>
-    <string name="sk_mark_media_as_sensitive">Marcar medio como sensible</string>
+    <string name="sk_settings_show_boosts">Mostrar impulsos</string>
+    <string name="sk_settings_load_new_posts">Cargar publicaciones nuevas automáticamente</string>
+    <string name="sk_settings_show_interaction_counts">Mostrar recuentos de interacciones</string>
+    <string name="sk_mark_media_as_sensitive">Marcar medio como delicado</string>
     <string name="sk_user_post_notifications_on">Activadas las notificaciones de posts para %s</string>
     <string name="sk_user_post_notifications_off">Desactivadas las notificaciones de posts para %s</string>
     <string name="sk_federated_timeline">Federación</string>
-    <string name="sk_federated_timeline_info_banner">Estos son los posts más recientes de las personas de tu federación.</string>
+    <string name="sk_federated_timeline_info_banner">Estas son las publicaciones más recientes de las personas de su federación.</string>
     <string name="sk_update_available">Megalodon %s está listo para descargar.</string>
     <string name="sk_update_ready">Megalodon %s se ha descargado y está listo para instalarse.</string>
     <string name="sk_check_for_update">Buscar actualizaciones</string>
@@ -36,6 +36,24 @@
     <string name="sk_settings_always_reveal_content_warnings">Mostrar siempre advertencias de contenido</string>
     <string name="sk_disable_marquee">Desactivar desplazamiento de texto en barras del título</string>
     <string name="sk_settings_contribute">Contribuir a Megalodon</string>
-    <string name="sk_settings_show_federated_timeline">Mostrar el timeline federado</string>
+    <string name="sk_settings_show_federated_timeline">Mostrar cronología federada</string>
     <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_notification_type_status">Publicaciones</string>
+    <string name="sk_notify_posts">Publicar notificaciones</string>
+    <string name="sk_settings_color_picker">Colores para los temas</string>
+    <string name="sk_color_theme_pink">Rosa</string>
+    <string name="sk_color_theme_purple">Violeta</string>
+    <string name="sk_color_theme_green">Verde</string>
+    <string name="sk_color_theme_blue">Azul</string>
+    <string name="sk_color_theme_brown">Marrón</string>
+    <string name="sk_color_theme_yellow">Amarillo</string>
+    <string name="sk_poll_allow_multiple">Permitir respuesta múltiple</string>
+    <string name="sk_translate_post">Traducir</string>
+    <string name="sk_translate_show_original">Mostrar original</string>
+    <string name="sk_translated_using">Traducido mediante %s</string>
+    <string name="sk_post_language">Idioma: %s</string>
+    <string name="sk_available_languages">Idiomas disponibles</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_confirm_clear_recent_languages">¿Confirma que quiere vaciar sus idiomas usados recientemente\?</string>
+    <string name="sk_clear_recent_languages">Vaciar idiomas usados recientemente</string>
 </resources>

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

@@ -38,4 +38,22 @@
     <string name="sk_settings_show_interaction_counts">Afficher le nombre d\'interactions</string>
     <string name="sk_federated_timeline">Fédération</string>
     <string name="sk_federated_timeline_info_banner">Ce sont les messages les plus récents des membres de votre fédération.</string>
+    <string name="sk_notification_type_status">Messages</string>
+    <string name="sk_notify_posts">Notifications des messages</string>
+    <string name="sk_color_theme_pink">Rose</string>
+    <string name="sk_color_theme_purple">Violet</string>
+    <string name="sk_color_theme_green">Vert</string>
+    <string name="sk_color_theme_blue">Bleu</string>
+    <string name="sk_color_theme_brown">Marron</string>
+    <string name="sk_color_theme_yellow">Jaune</string>
+    <string name="sk_settings_color_picker">Couleur d\'accentuation</string>
+    <string name="sk_poll_allow_multiple">Autoriser plusieurs choix</string>
+    <string name="sk_translate_post">Traduire</string>
+    <string name="sk_translate_show_original">Afficher l\'original</string>
+    <string name="sk_translated_using">Traduit en utilisant %s</string>
+    <string name="sk_post_language">Langue : %s</string>
+    <string name="sk_available_languages">Langues disponibles</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_confirm_clear_recent_languages">Êtes-vous sûr de vouloir effacer vos langues récemment utilisées \?</string>
+    <string name="sk_clear_recent_languages">Effacer les langues récemment utilisées</string>
 </resources>

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

@@ -38,4 +38,13 @@
     <string name="sk_settings_always_reveal_content_warnings">Selalu ungkap peringatan konten</string>
     <string name="sk_disable_marquee">Nonaktifkan teks bergulir dalam bilah judul</string>
     <string name="sk_settings_show_federated_timeline">Tampilkan lini masa federasi</string>
+    <string name="sk_notification_type_status">Kiriman</string>
+    <string name="sk_notify_posts">Notifikasi kiriman</string>
+    <string name="sk_settings_color_picker">Warna tema</string>
+    <string name="sk_color_theme_pink">Merah muda</string>
+    <string name="sk_color_theme_purple">Ungu</string>
+    <string name="sk_color_theme_green">Hijau</string>
+    <string name="sk_color_theme_blue">Biru</string>
+    <string name="sk_color_theme_brown">Cokelat</string>
+    <string name="sk_color_theme_yellow">Kuning</string>
 </resources>

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

@@ -1,3 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="sk_notification_type_status">Post</string>
+    <string name="sk_notify_posts">Notifiche post</string>
+    <string name="sk_settings_color_picker">Colore del tema</string>
+    <string name="sk_color_theme_pink">Rosa</string>
+    <string name="sk_color_theme_purple">Viola</string>
+    <string name="sk_color_theme_green">Verde</string>
+    <string name="sk_color_theme_blue">Blu</string>
+    <string name="sk_color_theme_brown">Marrone</string>
+    <string name="sk_color_theme_yellow">Giallo</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_pinned_posts">Fissati</string>
+    <string name="sk_delete_and_redraft">Elimina e riscrivi</string>
+    <string name="sk_user_post_notifications_on">Attivate notifiche per i post di %s</string>
+    <string name="sk_user_post_notifications_off">Disattivate notifiche per i post di %s</string>
+    <string name="sk_confirm_delete_and_redraft_title">Elimina e riscrivi post</string>
+    <string name="sk_confirm_delete_and_redraft">Sei sicuro di voler eliminare e riscrivere questo post\?</string>
+    <string name="sk_pin_post">Fissa sul profilo</string>
+    <string name="sk_confirm_pin_post_title">Fissa post sul profilo</string>
+    <string name="sk_confirm_pin_post">Vuoi fissare questo post al tuo profilo\?</string>
+    <string name="sk_pinning">Fissando il post…</string>
+    <string name="sk_unpin_post">Togli dal profilo</string>
+    <string name="sk_follow_requests">Richieste di seguirti</string>
+    <string name="sk_accept_follow_request">Accetta richiesta di seguirti</string>
+    <string name="sk_confirm_unpin_post_title">Togli post dal profilo</string>
+    <string name="sk_confirm_unpin_post">Sei sicuro di voler togliere questo post\?</string>
+    <string name="sk_unpinning">Togliendo il post…</string>
+    <string name="sk_image_description">Descrizione immagine</string>
+    <string name="sk_visibility_unlisted">Non in elenco</string>
+    <string name="sk_settings_show_replies">Mostra risposte</string>
+    <string name="sk_settings_show_boosts">Mostra boost</string>
+    <string name="sk_settings_load_new_posts">Carica automaticamente nuovi post</string>
+    <string name="sk_settings_show_interaction_counts">Mostra conteggi interazioni</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_mark_media_as_sensitive">Segnala media come sensibile</string>
+    <string name="sk_federated_timeline">Federata</string>
+    <string name="sk_federated_timeline_info_banner">Questi sono i post più recenti dalle persone nella tua federazione.</string>
+    <string name="sk_update_available">Megalodon %s è pronto da scaricare.</string>
+    <string name="sk_update_ready">Megalodon %s è scaricato e pronto da installare.</string>
+    <string name="sk_check_for_update">Verifica aggiornamenti</string>
+    <string name="sk_no_update_available">Non ci sono aggiornamenti disponibili</string>
+    <string name="sk_list_timelines">Liste</string>
+    <string name="sk_settings_always_reveal_content_warnings">Apri sempre contenuti segnalati come sensibili</string>
+    <string name="sk_lists_with_user">Liste con %s</string>
+    <string name="sk_settings_contribute">Contribuisci a Megalodon</string>
+    <string name="sk_settings_show_federated_timeline">Mostra timeline federata</string>
+    <string name="sk_disable_marquee">Disabilita scorrimento titoli</string>
+    <string name="sk_reject_follow_request">Rifiuta richiesta di seguirti</string>
+</resources>

mastodon/src/main/res/values-ko-rKR/strings_sk.xml

@@ -1,35 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="sk_pinned_posts">고정됨</string>
-	<string name="sk_delete_and_redraft">삭제하고 다시 쓰기</string>
-	<string name="sk_confirm_delete_and_redraft_title">게시물 삭제하고 다시 쓰기</string>
-	<string name="sk_confirm_delete_and_redraft">정말로 이 게시물을 삭제하고 다시 쓰시겠습니까?</string>
-	<string name="sk_pin_post">고정</string>
-	<string name="sk_confirm_pin_post_title">게시물 고정</string>
-	<string name="sk_confirm_pin_post">정말로 이 게시물을 고정하시겠습니까?</string>
-	<string name="sk_pinning">고정 중…</string>
-	<string name="sk_unpin_post">고정 해제</string>
-	<string name="sk_confirm_unpin_post_title">게시물 고정 해제</string>
-	<string name="sk_confirm_unpin_post">정말로 이 게시물을 고정 해제하시겠습니까?</string>
-	<string name="sk_unpinning">고정 해제 중…</string>
-	<string name="sk_image_description">이미지 설명</string>
-	<string name="sk_visibility_unlisted">타임라인에 비표시</string>
-  <string name="sk_settings_show_replies">답장 표시</string>
-	<string name="sk_settings_show_boosts">리블로그 표시</string>
-	<string name="sk_settings_load_new_posts">자동으로 새 포스트 불러오기</string>
-	<string name="sk_settings_show_interaction_counts">상호 작용 수 표시</string>
-	<string name="sk_mark_media_as_sensitive">미디어를 민감함으로 설정하기</string>
-	<string name="sk_user_post_notifications_on">%s의 게시물 알림 켜기</string>
-	<string name="sk_user_post_notifications_off">%s의 게시물 알림 끄기</string>
-	<string name="sk_federated_timeline">연합</string>
-	<string name="sk_federated_timeline_info_banner">당신이 속한 연합에 존재하는 사람들이 공유한 최신 게시물들입니다.</string>
-	<string name="sk_check_for_update">업데이트 확인</string>
-	<string name="sk_no_update_available">사용 가능한 업데이트 없음</string>
-	<string name="sk_list_timelines">리스트</string>
-	<string name="sk_follow_requests">팔로우 요청</string>
-	<string name="sk_accept_follow_request">팔로우 요청 허가</string>
-	<string name="sk_reject_follow_request">팔로우 요청 거부</string>
-	<string name="sk_lists_with_user">%s 님이 포함된 리스트</string>
-	<string name="sk_settings_always_reveal_content_warnings">열람주의 툿을 항상 펼치기</string>
-	<string name="sk_disable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
+    <string name="sk_pinned_posts">고정됨</string>
+    <string name="sk_delete_and_redraft">삭제하고 다시 쓰기</string>
+    <string name="sk_confirm_delete_and_redraft_title">게시물 삭제하고 다시 쓰기</string>
+    <string name="sk_confirm_delete_and_redraft">정말로 이 게시물을 삭제하고 다시 쓰시겠습니까?</string>
+    <string name="sk_pin_post">고정</string>
+    <string name="sk_confirm_pin_post_title">게시물 고정</string>
+    <string name="sk_confirm_pin_post">정말로 이 게시물을 고정하시겠습니까?</string>
+    <string name="sk_pinning">고정 중…</string>
+    <string name="sk_unpin_post">고정 해제</string>
+    <string name="sk_confirm_unpin_post_title">게시물 고정 해제</string>
+    <string name="sk_confirm_unpin_post">정말로 이 게시물을 고정 해제하시겠습니까?</string>
+    <string name="sk_unpinning">고정 해제 중…</string>
+    <string name="sk_image_description">이미지 설명</string>
+    <string name="sk_visibility_unlisted">타임라인에 비표시</string>
+    <string name="sk_settings_show_replies">답장 표시</string>
+    <string name="sk_settings_show_boosts">리블로그 표시</string>
+    <string name="sk_settings_load_new_posts">자동으로 새 게시물 불러오기</string>
+    <string name="sk_settings_show_interaction_counts">반응 수 표시</string>
+    <string name="sk_mark_media_as_sensitive">미디어를 민감함으로 설정하기</string>
+    <string name="sk_user_post_notifications_on">%s 님의 게시물 알림 켜기</string>
+    <string name="sk_user_post_notifications_off">%s 님의 게시물 알림 끄기</string>
+    <string name="sk_federated_timeline">연합</string>
+    <string name="sk_federated_timeline_info_banner">당신이 속한 연합에 존재하는 사람들이 공유한 최신 게시물들입니다.</string>
+    <string name="sk_check_for_update">업데이트 확인</string>
+    <string name="sk_no_update_available">사용 가능한 업데이트 없음</string>
+    <string name="sk_list_timelines">리스트</string>
+    <string name="sk_follow_requests">팔로우 요청</string>
+    <string name="sk_accept_follow_request">팔로우 요청 허가</string>
+    <string name="sk_reject_follow_request">팔로우 요청 거부</string>
+    <string name="sk_lists_with_user">%s 님이 포함된 리스트</string>
+    <string name="sk_settings_always_reveal_content_warnings">열람주의 게시물을 항상 펼치기</string>
+    <string name="sk_disable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_update_available">Megalodon %s 버전을 다운로드할 수 있습니다.</string>
+    <string name="sk_update_ready">Megalodon %s 버전을 다운로드하였으며 설치할 수 있습니다.</string>
+    <string name="sk_settings_show_federated_timeline">연합 타임라인 표시</string>
+    <string name="sk_notification_type_status">게시물</string>
+    <string name="sk_notify_posts">게시물 알림</string>
+    <string name="sk_settings_color_picker">테마 색상</string>
+    <string name="sk_color_theme_pink">분홍색</string>
+    <string name="sk_color_theme_purple">보라색</string>
+    <string name="sk_color_theme_green">초록색</string>
+    <string name="sk_color_theme_blue">파란색</string>
+    <string name="sk_color_theme_brown">갈색</string>
+    <string name="sk_color_theme_yellow">노란색</string>
+    <string name="sk_settings_contribute">Megalodon에 기여</string>
+    <string name="sk_poll_allow_multiple">다중 선택 허용</string>
+    <string name="sk_translate_post">번역하기</string>
+    <string name="sk_translate_show_original">원본 보기</string>
+    <string name="sk_post_language">언어: %s</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_translated_using">%s에서 번역함</string>
+    <string name="sk_available_languages">모든 언어</string>
+    <string name="sk_clear_recent_languages">최근 사용한 언어 지우기</string>
+    <string name="sk_confirm_clear_recent_languages">정말로 최근 사용한 언어를 지우시겠습니까\?</string>
 </resources>

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

@@ -1,41 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="sk_delete_and_redraft">Usuń i zmodyfikuj</string>
-    <string name="sk_pin_post">Przypomnij do profilu</string>
-    <string name="sk_confirm_pin_post_title">Przypomnij post na profilu</string>
-    <string name="sk_confirm_pin_post">Czy chcesz przypiąć ten post na swoim profilu\?</string>
-    <string name="sk_pinning">Przypinanie postu…</string>
-    <string name="sk_unpin_post">Odepnij post z profilu</string>
-    <string name="sk_confirm_unpin_post_title">Odepnij post z profilu</string>
-    <string name="sk_unpinning">Odpinanie postu…</string>
+    <string name="sk_pin_post">Przypnij do profilu</string>
+    <string name="sk_confirm_pin_post_title">Przypnij wpis do profilu</string>
+    <string name="sk_confirm_pin_post">Czy chcesz przypiąć ten wpis do swojego profilu\?</string>
+    <string name="sk_pinning">Przypinanie wpisu…</string>
+    <string name="sk_unpin_post">Odepnij z profilu</string>
+    <string name="sk_confirm_unpin_post_title">Odepnij wpis z profilu</string>
+    <string name="sk_unpinning">Odpinanie wpisu…</string>
     <string name="sk_settings_show_replies">Pokaż odpowiedzi</string>
     <string name="sk_settings_show_boosts">Pokaż podbicia</string>
-    <string name="sk_settings_load_new_posts">Automatycznie wczytuj nowe posty</string>
+    <string name="sk_settings_load_new_posts">Automatycznie wczytuj nowe wpisy</string>
     <string name="sk_settings_show_interaction_counts">Pokaż dane ilości interakcji</string>
     <string name="sk_mark_media_as_sensitive">Oznacz jako wrażliwe</string>
     <string name="sk_user_post_notifications_on">Włączono powiadomienia dla postu %s</string>
     <string name="sk_user_post_notifications_off">Wyłączono powiadomienia dla postu %s</string>
-    <string name="sk_federated_timeline">Znana sieć fediverse</string>
-    <string name="sk_federated_timeline_info_banner">To są najnowsze post ze znanej sieci fediverse dla twojego serwera.</string>
+    <string name="sk_federated_timeline">Globalne</string>
+    <string name="sk_federated_timeline_info_banner">To są najnowsze post ze znanej sieci fediwersum dla twojego serwera.</string>
     <string name="sk_update_available">Megalodon %s jest dostępny do pobrania.</string>
     <string name="sk_update_ready">Megalodon %s został pobrany i jest gotowy do instalacji.</string>
-    <string name="sk_check_for_update">Szukaj uaktualnień</string>
-    <string name="sk_no_update_available">Brak dostępnych uaktualnień</string>
+    <string name="sk_check_for_update">Sprawdź dostępność aktualizacji</string>
+    <string name="sk_no_update_available">Brak dostępnych aktualizacji</string>
     <string name="sk_app_name">Megalodon</string>
     <string name="sk_pinned_posts">Przypięte</string>
-    <string name="sk_confirm_delete_and_redraft">Jesteś pewnien, że chcesz usunąć zmodyfikowany post\?</string>
-    <string name="sk_confirm_unpin_post">Jesteś pewien, że chcesz odpiąć ten post\?</string>
-    <string name="sk_image_description">Opis obrazka</string>
-    <string name="sk_confirm_delete_and_redraft_title">Usuń i zmodyfikuj post</string>
+    <string name="sk_confirm_delete_and_redraft">Jesteś pewnien, że chcesz usunąć zmodyfikowany wpis\?</string>
+    <string name="sk_confirm_unpin_post">Jesteś pewien, że chcesz odpiąć ten wpis\?</string>
+    <string name="sk_image_description">Opis zdjęcia</string>
+    <string name="sk_confirm_delete_and_redraft_title">Usuń i zmodyfikuj wpis</string>
     <string name="sk_list_timelines">Listy</string>
-    <string name="sk_follow_requests">Prośby o obserwowanie</string>
-    <string name="sk_accept_follow_request">Zaakceptuj prośby o obserwowanie</string>
-    <string name="sk_reject_follow_request">Odrzuć prośby o obserwowanie</string>
+    <string name="sk_follow_requests">Prośby o obserwację</string>
+    <string name="sk_accept_follow_request">Zaakceptuj prośby o obserwację</string>
+    <string name="sk_reject_follow_request">Odrzuć prośby o obserwację</string>
     <string name="sk_lists_with_user">Listy z %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Zawsze odkrywaj ostrzeżenia o zawartości</string>
     <string name="sk_disable_marquee">Wyłącz tekst przewijany w paskach tytułowych</string>
     <string name="sk_settings_contribute">Wspomóż Megalodon</string>
-    <string name="sk_settings_show_federated_timeline">Pokaż oś czasu znanej sieci Fediverse</string>
+    <string name="sk_settings_show_federated_timeline">Pokaż globalną oś czasu</string>
     <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
-    <string name="sk_visibility_unlisted">Nienotowany</string>
+    <string name="sk_visibility_unlisted">Niewidoczny</string>
+    <string name="sk_notification_type_status">Wpisy</string>
+    <string name="sk_notify_posts">Powiadomienia wpisów</string>
+    <string name="sk_settings_color_picker">Motyw</string>
+    <string name="sk_color_theme_pink">Różowy</string>
+    <string name="sk_color_theme_purple">Fioletowy</string>
+    <string name="sk_color_theme_green">Zielony</string>
+    <string name="sk_color_theme_blue">Niebieski</string>
+    <string name="sk_color_theme_brown">Brązowy</string>
+    <string name="sk_color_theme_yellow">Żółty</string>
+    <string name="sk_poll_allow_multiple">Pozwalaj na wybieranie wielu opcji</string>
+    <string name="sk_translate_post">Przetłumacz</string>
+    <string name="sk_translate_show_original">Pokaż oryginał</string>
+    <string name="sk_translated_using">Przetłumaczono przy użyciu %s</string>
+    <string name="sk_post_language">Język: %s</string>
+    <string name="sk_available_languages">Dostępne języki</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_confirm_clear_recent_languages">Czy na pewno chcesz wyczyścić ostatnio użyte języki\?</string>
+    <string name="sk_clear_recent_languages">Wyczyść ostatnio użyte języki</string>
 </resources>

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

@@ -38,4 +38,20 @@
     <string name="sk_settings_show_federated_timeline">Mostre a linha do tempo federada</string>
     <string name="sk_visibility_unlisted">Não-listado</string>
     <string name="sk_settings_show_interaction_counts">Mostrar contagens de interação</string>
+    <string name="sk_color_theme_purple">Roxo</string>
+    <string name="sk_color_theme_green">Verde</string>
+    <string name="sk_color_theme_blue">Azul</string>
+    <string name="sk_color_theme_brown">Marrom</string>
+    <string name="sk_color_theme_yellow">Amarelo</string>
+    <string name="sk_color_theme_pink">Rosa</string>
+    <string name="sk_notification_type_status">Postagens</string>
+    <string name="sk_settings_color_picker">Cor do tema</string>
+    <string name="sk_translate_post">Traduzir</string>
+    <string name="sk_translate_show_original">Mostrar original</string>
+    <string name="sk_translated_using">Traduzido usando %s</string>
+    <string name="sk_post_language">Idioma: %s</string>
+    <string name="sk_available_languages">Idiomas disponíveis</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_confirm_clear_recent_languages">Tem certeza de que deseja limpar os idiomas usados recentemente\?</string>
+    <string name="sk_clear_recent_languages">Limpar idiomas usados recentemente</string>
 </resources>

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

@@ -1,3 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="sk_notify_posts">Сповіщення про пости</string>
+    <string name="sk_settings_color_picker">Колірна тема</string>
+    <string name="sk_color_theme_purple">Фіолетовий</string>
+    <string name="sk_color_theme_green">Зелений</string>
+    <string name="sk_color_theme_blue">Синий</string>
+    <string name="sk_color_theme_brown">Коричневий</string>
+    <string name="sk_color_theme_yellow">Жовтий</string>
+    <string name="sk_poll_allow_multiple">Дозволити кілька виборів</string>
+    <string name="sk_translate_post">Перекласти</string>
+    <string name="sk_translate_show_original">Показати оригінал</string>
+    <string name="sk_translated_using">Перекладено через %s</string>
+    <string name="sk_post_language">Мова: %s</string>
+    <string name="sk_available_languages">Доступні мови</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_clear_recent_languages">Очистити нещодавно використані мови</string>
+    <string name="sk_settings_always_reveal_content_warnings">Завжди відкривати вміст</string>
+    <string name="sk_notification_type_status">Пости</string>
+    <string name="sk_color_theme_pink">Рожевий</string>
+    <string name="sk_confirm_clear_recent_languages">Ви впевнені, що хочете очистити нещодавно використані мови\?</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_pinned_posts">Закріплене</string>
+    <string name="sk_delete_and_redraft">Видалити та переробити</string>
+    <string name="sk_confirm_delete_and_redraft_title">Видалити та переробити пост</string>
+    <string name="sk_confirm_delete_and_redraft">Ви впевнені, що хочете видалити та переробити цей пост\?</string>
+    <string name="sk_pin_post">Закріпити у профіль</string>
+    <string name="sk_confirm_pin_post_title">Закріпити пост у профіль</string>
+    <string name="sk_confirm_pin_post">Чи хочете ви закріпити цей пост у ваш профіль\?</string>
+    <string name="sk_pinning">Закріпляємо пост…</string>
+    <string name="sk_unpin_post">Відкріпити з профілю</string>
+    <string name="sk_confirm_unpin_post_title">Відкріпити пост з профілю</string>
+    <string name="sk_confirm_unpin_post">Ви впевнені, що хочете відкріпити цей пост\?</string>
+    <string name="sk_unpinning">Відкріпляємо пост…</string>
+    <string name="sk_image_description">Опис зображення</string>
+    <string name="sk_visibility_unlisted">Не у списку</string>
+    <string name="sk_settings_show_replies">Показувати відповіді</string>
+    <string name="sk_settings_load_new_posts">Автоматично завантажувати нові пости</string>
+    <string name="sk_settings_show_interaction_counts">Показати кількість взаємодій</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_follow_requests">Запити на підписку</string>
+    <string name="sk_accept_follow_request">Прийняти запит на підписку</string>
+    <string name="sk_reject_follow_request">Відхилити запит на підписку</string>
+    <string name="sk_lists_with_user">Списки з %s</string>
+    <string name="sk_disable_marquee">Вимкнути прокручування тексту у рядках заголовка</string>
+    <string name="sk_settings_contribute">Допомогти у розробці Megalodon</string>
+    <string name="sk_mark_media_as_sensitive">Помітити медіа як чутливу</string>
+    <string name="sk_settings_show_boosts">Показувати бусти</string>
+    <string name="sk_user_post_notifications_on">Увімкнено сповіщення про пости для %s</string>
+    <string name="sk_user_post_notifications_off">Вимкнено сповіщення про пости для %s</string>
+    <string name="sk_federated_timeline">Федерація</string>
+    <string name="sk_federated_timeline_info_banner">Це найновіші публікації людей у вашій федерації.</string>
+    <string name="sk_update_available">Megalodon %s готовий до завантаження.</string>
+    <string name="sk_update_ready">Megalodon %s завантажений й готовий до встановлення.</string>
+    <string name="sk_check_for_update">Перевірити оновлення</string>
+    <string name="sk_no_update_available">Немає доступних оновлень</string>
+    <string name="sk_list_timelines">Списки</string>
+    <string name="sk_settings_show_federated_timeline">Показувати федеративну стрічку</string>
+</resources>

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

@@ -38,4 +38,13 @@
     <string name="sk_settings_show_federated_timeline">显示联邦时间轴</string>
     <string name="sk_follow_requests">关注请求</string>
     <string name="sk_settings_always_reveal_content_warnings">总是显示内容警告</string>
+    <string name="sk_settings_color_picker">主题色</string>
+    <string name="sk_color_theme_pink">粉</string>
+    <string name="sk_color_theme_purple">紫</string>
+    <string name="sk_color_theme_green">绿</string>
+    <string name="sk_color_theme_blue">蓝</string>
+    <string name="sk_color_theme_brown">棕</string>
+    <string name="sk_color_theme_yellow">黄</string>
+    <string name="sk_notification_type_status">嘟文</string>
+    <string name="sk_notify_posts">嘟文通知</string>
 </resources>

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

@@ -1,54 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="sk_app_name">Megalodon</string>
-  <string name="sk_pinned_posts">Pinned</string>
-  <string name="sk_delete_and_redraft">Delete and re-draft</string>
-  <string name="sk_confirm_delete_and_redraft_title">Delete and re-draft Post</string>
-  <string name="sk_confirm_delete_and_redraft">Are you sure you want to delete and re-draft this post?</string>
-  <string name="sk_pin_post">Pin to profile</string>
-  <string name="sk_confirm_pin_post_title">Pin post to profile</string>
-  <string name="sk_confirm_pin_post">Do you want to pin this post to your profile?</string>
-  <string name="sk_pinning">Pinning post…</string>
-  <string name="sk_unpin_post">Unpin from profile</string>
-  <string name="sk_confirm_unpin_post_title">Unpin post from profile</string>
-  <string name="sk_confirm_unpin_post">Are you sure you want to unpin this post?</string>
-  <string name="sk_unpinning">Unpinning post…</string>
-  <string name="sk_image_description">Image description</string>
-  <string name="sk_visibility_unlisted">Unlisted</string>
-  <string name="sk_settings_show_replies">Show replies</string>
-  <string name="sk_settings_show_boosts">Show boosts</string>
-  <string name="sk_settings_load_new_posts">Automatically load new posts</string>
-  <string name="sk_settings_show_interaction_counts">Show interaction counts</string>
-  <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
-  <string name="sk_mark_media_as_sensitive">Mark media as sensitive</string>
-  <string name="sk_user_post_notifications_on">Turned on post notifications for %s</string>
-  <string name="sk_user_post_notifications_off">Turned off post notifications for %s</string>
-  <string name="sk_federated_timeline">Federation</string>
-  <string name="sk_federated_timeline_info_banner">These are the most recent posts by the people in your federation.</string>
-  <string name="sk_update_available">Megalodon %s is ready to download.</string>
-  <string name="sk_update_ready">Megalodon %s is downloaded and ready to install.</string>
-  <string name="sk_check_for_update">Check for update</string>
-  <string name="sk_no_update_available">No update available</string>
-  <string name="sk_list_timelines">Lists</string>
-  <string name="sk_follow_requests">Follow requests</string>
-  <string name="sk_accept_follow_request">Accept follow request</string>
-  <string name="sk_reject_follow_request">Reject follow request</string>
-  <string name="sk_lists_with_user">Lists with %s</string>
-  <string name="sk_settings_always_reveal_content_warnings">Always reveal content warnings</string>
-  <string name="sk_disable_marquee">Disable scrolling text in title bars</string>
-  <string name="sk_settings_contribute">Contribute to Megalodon</string>
-  <string name="sk_settings_show_federated_timeline">Show federated timeline</string>
-  <string name="sk_notification_type_status">Posts</string>
-  <string name="sk_notify_posts">Post notifications</string>
-  <string name="sk_settings_color_picker">Color theme</string>
-  <string name="sk_color_theme_pink">Pink</string>
-  <string name="sk_color_theme_purple">Purple</string>
-  <string name="sk_color_theme_green">Green</string>
-  <string name="sk_color_theme_blue">Blue</string>
-  <string name="sk_color_theme_brown">Brown</string>
-  <string name="sk_color_theme_yellow">Yellow</string>
-  <string name="sk_poll_allow_multiple">Allow multiple choices</string>
-  <string name="sk_translate_post">Translate</string>
-	<string name="sk_translate_show_original">Show original</string>
-	<string name="sk_translated_using">Translated using %s</string>
-</resources>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_pinned_posts">Pinned</string>
+    <string name="sk_delete_and_redraft">Delete and re-draft</string>
+    <string name="sk_confirm_delete_and_redraft_title">Delete and re-draft Post</string>
+    <string name="sk_confirm_delete_and_redraft">Are you sure you want to delete and re-draft this post?</string>
+    <string name="sk_pin_post">Pin to profile</string>
+    <string name="sk_confirm_pin_post_title">Pin post to profile</string>
+    <string name="sk_confirm_pin_post">Do you want to pin this post to your profile?</string>
+    <string name="sk_pinning">Pinning post…</string>
+    <string name="sk_unpin_post">Unpin from profile</string>
+    <string name="sk_confirm_unpin_post_title">Unpin post from profile</string>
+    <string name="sk_confirm_unpin_post">Are you sure you want to unpin this post?</string>
+    <string name="sk_unpinning">Unpinning post…</string>
+    <string name="sk_image_description">Image description</string>
+    <string name="sk_visibility_unlisted">Unlisted</string>
+    <string name="sk_settings_show_replies">Show replies</string>
+    <string name="sk_settings_show_boosts">Show boosts</string>
+    <string name="sk_settings_load_new_posts">Automatically load new posts</string>
+    <string name="sk_settings_show_interaction_counts">Show interaction counts</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_mark_media_as_sensitive">Mark media as sensitive</string>
+    <string name="sk_user_post_notifications_on">Turned on post notifications for %s</string>
+    <string name="sk_user_post_notifications_off">Turned off post notifications for %s</string>
+    <string name="sk_federated_timeline">Federation</string>
+    <string name="sk_federated_timeline_info_banner">These are the most recent posts by the people in your federation.</string>
+    <string name="sk_update_available">Megalodon %s is ready to download.</string>
+    <string name="sk_update_ready">Megalodon %s is downloaded and ready to install.</string>
+    <string name="sk_check_for_update">Check for update</string>
+    <string name="sk_no_update_available">No update available</string>
+    <string name="sk_list_timelines">Lists</string>
+    <string name="sk_follow_requests">Follow requests</string>
+    <string name="sk_accept_follow_request">Accept follow request</string>
+    <string name="sk_reject_follow_request">Reject follow request</string>
+    <string name="sk_lists_with_user">Lists with %s</string>
+    <string name="sk_settings_always_reveal_content_warnings">Always reveal content warnings</string>
+    <string name="sk_disable_marquee">Disable scrolling text in title bars</string>
+    <string name="sk_settings_contribute">Contribute to Megalodon</string>
+    <string name="sk_settings_show_federated_timeline">Show federated timeline</string>
+    <string name="sk_notification_type_status">Posts</string>
+    <string name="sk_notify_posts">Post notifications</string>
+    <string name="sk_settings_color_picker">Color theme</string>
+    <string name="sk_color_theme_pink">Pink</string>
+    <string name="sk_color_theme_purple">Purple</string>
+    <string name="sk_color_theme_green">Green</string>
+    <string name="sk_color_theme_blue">Blue</string>
+    <string name="sk_color_theme_brown">Brown</string>
+    <string name="sk_color_theme_yellow">Yellow</string>
+    <string name="sk_poll_allow_multiple">Allow multiple choices</string>
+    <string name="sk_translate_post">Translate</string>
+    <string name="sk_translate_show_original">Show original</string>
+    <string name="sk_translated_using">Translated using %s</string>
+    <string name="sk_post_language">Language: %s</string>
+    <string name="sk_available_languages">Available languages</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_clear_recent_languages">Clear recently used languages</string>
+    <string name="sk_confirm_clear_recent_languages">Are you sure you want to clear your recently used languages?</string>
+    <string name="sk_welcome_title">Welcome!</string>
+    <string name="sk_welcome_text">The shark salutes you! To get started, please enter your home instance’s domain name below.</string>
+    <string name="sk_example_domain">example.social</string>
+</resources>

metadata/de-DE/changelogs/59.txt

@@ -0,0 +1,6 @@
+- Sprachauswahl hinzugefügt
+- Übersetz-Funktion hinzugefügt
+- Semantik bei Umfragen verbessert (Radio-Buttons, Checkboxen)
+- Mehrfachauswahl als Option bei Umfragen
+- Neuer Anmelde-Bildschirm
+- Fehlerbehebungen

metadata/en-US/changelogs/59.txt

@@ -1,4 +1,6 @@
+- Add language selector
+- Add translate function
 - Improve semantics for voting on polls (radio buttons and checkboxes)
 - Add option to allow voting for multiple options on polls
-- Add translate function
-- Bugfixes
+- New login screen
+- Bugfixes

metadata/es/changelogs/55.txt

@@ -0,0 +1,4 @@
+- Corrige la representación errónea de etiquetas HTML y activa el formato Markdown
+- Inicializa el <a href="https://translate.codeberg.org/projects/megalodon">proyecto de traducción vía Weblate</a>
+- Añade un alternador para la cronología federada
+- Las versiones 52-54 fueron ajustes menores para una versión para Google Play

metadata/es/changelogs/56.txt

@@ -0,0 +1,6 @@
+- Temas personalizados por @LucasGGamerM
+- Nuevo logotipo del texto "megalodón" enviado por @LucasGGamerM
+- Mejor búsqueda de emojis
+- Votación modificada (mostrar el voto propio, mostrar siempre el botón de voto, no cortar las respuestas largas)
+- Agregar las configuraciones de las notificaciones push
+- Corrección de errores

metadata/es/changelogs/59.txt

@@ -0,0 +1,5 @@
+- Se añadió un selector de idiomas
+- Se incluye una función para traducir
+- Mejora la semántica para votar en encuestas (botones de opción y casillas)
+- Permite votar por varias opciones en las encuestas
+- Corrige varios defectos

metadata/es/full_description.txt

@@ -1,17 +1,11 @@
-Megalodon es una versión modificada de la <a href="https://github.com/mastodon/mastodon-android">aplicación oficial de Mastodon para Android</a> que ha añadido opciones importantes que no tiene la versión oficial , como la línea de tiempo federada, la publicación sin listar, marcadores y un visor de la descripción de las imágenes.
+Megalodon es una versión modificada de la <a href="https://github.com/mastodon/mastodon-android">aplicación oficial de Mastodon para Android</a> que añade funcionalidades importantes que le faltan a esta, como la cronología federada, la publicación descatalogada y un visor de descripciones de imágenes.
 
-<b>Funcionalidades clave</b>
+<b>Funcionalidades importantes</b>
 
-— <b>Publicación sin listar</b>: Escribe de forma pública sin que la publicación se muestre en las tendencias, etiquetas o líneas de tiempo públicas.
-— <b>Línea de tiempo federada</b>: Visualiza todas las publicaciones de personas del resto de barrios del Fedivers a los que está conectada tu instancia.
-— <b>Visor de la descripción de las imágenes.</b>: Comprueba rápidamente si una imagen o un vídeo tiene un texto alternativo adjunto.
-— <b>Fijar publicaciones</b>: Fija tus publicaciones más importantes en tu perfil y mira qué han fijado otras personas en la pestaña Fijado.
-— <b>Marcadores</b>: Guarda rápidamente publicaciones y búscalas más tarde en la lista de marcadores.
-— <b>Seguimiento de etiquetas</b>: Visualiza nuevas publicaciones de etiquetas específicas directamente en la línea de tiempo, siguiendo estas etiquetas.
-— <b>Responder las solicitudes de seguimiento</b>: Acepta o rechaza solicitudes de seguimiento desde las notificaciones o en la lista de solicitudes de seguimiento dedicada.
-— <b>Eliminar y volver a escribir</b>: La característica tan querida que hizo posible la edición sin una función de edición real.
-
-<b>Funcionalidades oficiales no lanzadas, disponibles por adelantado</b>
-
-— Edición de publicaciones
-- Actualizador integrado para los lanzamientos de GitHub
+- <b>Publicación descatalogada</b>: haga envíos públicos sin que estos figuren en tendencias, etiquetas o cronologías públicas.
+- <b>Cronología federada</b>: vea todos los envíos públicos de las personas en las instalaciones del Fediverso que estén conectadas con su instalación hogar.
+- <b>Visor de descripciones de imágenes</b>: compruebe con rapidez si una imagen o un vídeo tiene texto alternativo.
+- <b>Anclaje de publicaciones</b>: ancle sus envíos más importantes a su perfil y vea lo que otros han anclado mediante la pestaña «Ancladas».
+- <b>Seguir etiquetas</b>: vea envíos etiquetados directamente en su cronología de inicio siguiéndolas.
+- <b>Respuesta a solicitudes de seguimiento</b>: acepte o rechace solicitudes de seguimiento desde sus notificaciones o desde la lista dedicada.
+- <b>Eliminar y reescribir</b>: la tan querida función que hizo posible editar los envíos ante la falta de una función Editar propiamente dicha.

metadata/fr-FR/changelogs/55.txt

@@ -0,0 +1,4 @@
+- Correction du rendu des balises HTML et activation du formatage Markdown
+- Initialisation du <a href="https://translate.codeberg.org/projects/megalodon">projet de traduction Weblate</a>
+- Ajout d'une option pour activer la chronologie fédérée
+- Les versions 52-54 contenaient de petits ajustements pour une sortie sur Google Play

metadata/fr-FR/changelogs/56.txt

@@ -0,0 +1,6 @@
+- Thèmes de couleurs personnalisés par @LucasGGamerM
+- Nouveau logo textuel "megalodon" soumis par @LucasGGamerM
+- Meilleure recherche d'emoji lors de la composition
+- Vote amélioré (afficher son propre vote, toujours afficher le bouton de vote, ne pas couper les réponses longues)
+- Ajout d'un paramètre de notification push pour les notifications de messages
+- Corrections de bogues

metadata/fr-FR/changelogs/59.txt

@@ -0,0 +1,5 @@
+- Ajout d'un sélecteur de langue
+- Ajout d'une fonction de traduction
+- Amélioration de la sémantique pour voter sur les sondages (boutons radio et cases à cocher)
+- Ajout d'une option pour permettre de voter pour plusieurs options dans les sondages
+- Corrections de bogues

metadata/fr-FR/full_description.txt

@@ -1,4 +1,4 @@
-Megalodon est une version modifiée de <a href="https://github.com/mastodon/mastodon-android">Mastodon officiel pour Android</a> ajoutant des fonctionnalités importantes qui manquent dans l'application officielle, telles que la timeline fédérée, la publication non répertoriée, les signets et une visionneuse de description d'image.
+Megalodon est une version modifiée de <a href="https://github.com/mastodon/mastodon-android">Mastodon officiel pour Android</a> ajoutant des fonctionnalités importantes qui manquent dans l'application officielle, telles que la timeline fédérée, la publication non répertoriée et une visionneuse de description d'image.
 
 <b>Principales fonctionnalités</b>
 
@@ -6,12 +6,6 @@ Megalodon est une version modifiée de <a href="https://github.com/mastodon/mast
 - <b>Timeline fédérée</b> : Affichez tous les messages publics des personnes de tout le voisinage du Fediverse auxquel votre instance est connectée.
 - <b>Visionneuse de description d'image</b> : Vérifiez rapidement si une image ou une vidéo est associée à un texte alternatif.
 - <b>Épingler des publications</b> : Épinglez vos publications les plus importantes à votre profil et voyez ce que les autres ont épinglé en utilisant l'onglet "Épinglé".
-- <b>Signets</b> : Enregistrez rapidement les messages et retrouvez-les plus tard dans la liste des signets.
 - <b>Suivez des hashtags</b> : Voir les nouveaux messages avec des hashtags spécifiques directement dans votre timeline d'accueil en les suivant.
 - <b>Répondre aux demandes de suivi</b> : Acceptez ou refusez les demandes de suivi à partir de vos notifications ou de la liste dédiée aux demandes de suivi.
 - <b>Supprimer et reformuler</b> : La fonctionnalité la plus appréciée qui rend l'édition possible sans fonction d'édition réelle.
-
-<b>Fonctionnalités officielles inédites, disponibles à l'avance</b>
-
-- Modification des publications
-- Mise à jour intégrée pour les versions de GitHub

metadata/id/full_description.txt

@@ -1,4 +1,4 @@
-Megalodon adalah versi modifikasi <a href="https://github.com/mastodon/mastodon-android">aplikasi Android Mastodon resmi</a> yang menambahkan fitur penting yang belum ada di aplikasi, seperti lini masa federasi, pengiriman tidak terdaftar, markah dan penampil deskripsi gambar.
+Megalodon adalah versi modifikasi <a href="https://github.com/mastodon/mastodon-android">aplikasi Android Mastodon resmi</a> yang menambahkan fitur penting yang belum ada di aplikasi, seperti lini masa federasi, pengiriman tidak terdaftar, dan penampil deskripsi gambar.
 
 <b>Fitur unggulan</b>
 
@@ -6,12 +6,6 @@ Megalodon adalah versi modifikasi <a href="https://github.com/mastodon/mastodon-
 - <b>Lini masa federasi</b>: Lihat semua kiriman publik dari orang-orang di semua tetangga Fediverse lainnya yang instansi rumah Anda terhubung.
 - <b>Penampil deskripsi gambar</b>: Periksa secara cepat jika gambar atau video nemiliki deskripsi alternatif.
 - <b>Menyematkan kiriman</b>: Sematkan kiriman penting Anda ke profil Anda dan lihat apa yang telah disematkan oleh orang lain menggunakan tab “Disematkan”.
-- <b>Markah</b>: Simpan kiriman secara cepat dan temukan nanti dalam tab Markah.
 - <b>Ikuti tagar</b>: Lihat kiriman baru dari tagar spesifik secara langsung dalam lini masa beranda Anda dengan mengikutinya.
 - <b>Menjawab permintaan pengikut</b>: Tolak atau terima permintaan pengikut dari notifikasi Anda atau daftar permintaan pengikut khusus.
 - <b>Hapus dan draf ulang</b>: Fitur yang banyak disukai yang membuat penyuntingan memungkinkan tanpa fungsi penyuntingan yang asli.
-
-<b>Fitur resmi yang belum dirilis, tersedia dari awal</b>
-
-- Menyunting kiriman
-- Pembaruan terintegrasi untuk rilis GitHub

metadata/ko/changelogs/50.txt

@@ -0,0 +1,4 @@
+- F-Droid에 릴리스하기 위한 파일을 준비
+- 자동 업데이트를 수정
+- 단색 아이콘을 런처 아이콘에 다시 추가
+- 게시글 밑의 잘못된 ‘타임라인에 비표시’ 아이콘을 교체

metadata/ko/changelogs/51.txt

@@ -0,0 +1,6 @@
+- 답글 작성 중에 원본 게시물을 볼 수 있도록 함 (“…님에게 답글”을 클릭하여)
+- 업스트림의 변경 및 버그 수정 병합
+- 사용하지 않는 “App Center” 코드 제거
+- Play Store를 위해 연합 타임라인이 없는 릴리스 추가
+- 쉬운 로그인을 위해 별도의 redirect URI 추가
+- 기여 링크 변경

metadata/ko/changelogs/55.txt

@@ -0,0 +1,4 @@
+- HTML 렌더링 깨짐 수정 및 마크다운 포맷 렌더링 활성화
+- <a href="https://translate.codeberg.org/projects/megalodon">Weblate 번역 프로젝트</a> 초기 설정
+- 연합 타임라인 전환 추가
+- 52~54 버전은 Google Play에 릴리스하기 위한 작은 조정임

metadata/ko/changelogs/56.txt

@@ -0,0 +1,6 @@
+- @LucasGGamerM 님의 색상 테마 사용자화
+- @LucasGGamerM 님이 제시한 새로운 "megalodon" 텍스트 로고
+- 게시물 작성 시 더 나은 에모지 검색
+- 투표 변경 (소유한 투표 표시, 항상 투표 버튼 표시, 긴 항목을 자르지 않음)
+- 게시물 알림 설정 추가
+- 버그 수정

metadata/ko/changelogs/59.txt

@@ -0,0 +1,5 @@
+- 언어 선택기 추가
+- 번역 기능 추가
+- 투표 기능의 보다 명확한 표현 (라디오 버튼 및 체크박스)
+- 투표 생성 시 다중 선택이 가능하도록 옵션 추가
+- 버그 수정

metadata/ko/full_description.txt

@@ -0,0 +1,11 @@
+Megalodon은 <a href="https://github.com/mastodon/mastodon-android">공식 마스토돈 안드로이드 앱</a>의 수정된 버전으로, 공식 앱에서 누락된 연합 타임라인, 타임라인에 비표시하여 게시, 이미지 설명 표시와 같은 중요한 기능들을 추가했습니다.
+
+<b>주요 기능</b>
+
+- <b>타임라인에 비표시하여 게시</b>: 모두가 볼 수 있지만 트렌드, 해시태그 및 공개된 타임라인에 보이지 않습니다.
+- <b>연합 타임라인</b>: 사용 중인 인스턴스에 연결된 연합우주의 사람들이 올린 모든 공개된 게시물을 확인하세요.
+- <b>이미지 설명 표시</b>: 이미지나 동영상에 대체 텍스트가 있는지 빠르게 확인하세요.
+- <b>게시물 고정</b>: 가장 중요한 게시물을 프로필에 고정하고 “고정됨” 탭으로 다른 사용자가 고정한 게시물을 확인하세요.
+- <b>해시태그 팔로우</b>: 특정 해시태그를 팔로우하고 해시태그가 포함된 새로운 게시물을 홈 타임라인에서 바로 확인하세요.
+- <b>팔로우 요청에 응답</b>: 알림 또는 전용 팔로우 요청 목록을 통해 팔로우 요청을 허가하거나 거부하세요.
+- <b>삭제하고 다시 쓰기</b>: 실제 수정 기능 없이도 수정이 가능하도록 해 많은 사랑을 받고 있는 기능입니다.

metadata/ko/short_description.txt

@@ -0,0 +1 @@
+분홍색이고 더 많은 기능이 있는 안드로이드용 마스토돈

metadata/ko/title.txt

@@ -0,0 +1 @@
+Megalodon

metadata/pl/short_description.txt

@@ -0,0 +1 @@
+Mastodon na Android ale jest różowy i ma więcej funkcji

metadata/pl/title.txt

@@ -0,0 +1 @@
+Megalodon

metadata/pt-BR/changelogs/55.txt

@@ -0,0 +1,4 @@
+- Corrigido o problema de renderização de tags HTML e habilitada a formatação Markdown de renderização
+- Criado o <a href="https://translate.codeberg.org/projects/megalodon">projeto de tradução Weblate</a>
+- Adicionada a opção de ativar ou desativar a linha do tempo Federada
+- As versões 52-54 foram pequenos ajustes para o lançamento na Google Play

metadata/pt-BR/changelogs/56.txt

@@ -0,0 +1,6 @@
+- Temas de cores personalizados por @LucasGGamerM
+- Novo logotipo de texto "megalodon" enviado por @LucasGGamerM
+- Melhor pesquisa de emojis durante a composição
+- Votação aprimorada (exibe o próprio voto, sempre exibe o botão de votação, não corta respostas longas)
+- Adicionar configuração de notificação push para notificações de postagem
+- Correções de bugs

metadata/pt-BR/changelogs/59.txt

@@ -0,0 +1,5 @@
+- Adicionado o seletor de idioma
+- Adicionada a função de tradução
+- Melhorada a semântica para votação em enquetes (botões de opção e caixas de seleção)
+- Adicionada a opção que permite a votação de várias opções nas enquetes
+- Correções de bugs

metadata/pt-BR/full_description.txt

@@ -1,4 +1,4 @@
-Megalodon é uma versão modificada do <a href="https://github.com/mastodon/mastodon-android">aplicativo oficial do Mastodon para Android</a> adicionando importantes funcionalidades que estão faltando no aplicativo oficial, como a linha do tempo federada, postagens não listadas, marcadores e um visualizador de descrições de imagem.
+Megalodon é uma versão modificada do <a href="https://github.com/mastodon/mastodon-android">aplicativo oficial do Mastodon para Android</a> adicionando importantes funcionalidades que estão faltando no aplicativo oficial, como a linha do tempo federada, postagens não listadas e um visualizador de descrições de imagem.
 
 <b>Principais recursos</b>
 
@@ -6,12 +6,6 @@ Megalodon é uma versão modificada do <a href="https://github.com/mastodon/mast
 - <b>Linha do tempo federada</b>: Veja todas as postagens públicas de pessoas em todo o Fediverso que sua instância está conectada.
 - <b>Visualizador de descrição de imagem</b>: Verifique rapidamente se uma imagem ou vídeo tem um texto alternativo anexado a ele.
 - <b>Fixando postagens</b>: Fixe suas postagens mais importantes em seu perfil e veja o que outras pessoas fixaram usando a guia "Fixado".
-- <b>Favoritos</b>: Salve postagens rapidamente e encontre-as mais tarde na lista de favoritos.
 - <b>Seguir hashtags</b>: Veja novas postagens de hashtags específicas diretamente em sua linha do tempo inicial seguindo-as.
 - <b>Respondendo a solicitações de seguir</b>: Aceite ou recuse pedidos para seguir de suas notificações ou da lista dedicada de solicitações de seguir.
 - <b>Excluir e reescrever</b>: O recurso muito amado que tornou a edição possível sem uma função de edição real.
-
-<b>Recursos oficiais inéditos, disponíveis com antecedência</b>
-
-- Editando postagens
-- Atualizador integrado para versões do GitHub

metadata/uk/changelogs/50.txt

@@ -0,0 +1,4 @@
+- Підготовлено файли для релізу у F-droid
+- Виправлено автоматичний оновлювач
+- Додано монохромні іконки назад до іконок панелі запуску
+- Змінено неправильну іконку unlisted у розширеному списку

metadata/uk/changelogs/51.txt

@@ -0,0 +1,6 @@
+- Увімкнено можливість відкривати оригінальний допис під час відповіді (натиснувши рядок "У відповідь...")
+ — Об’єднано зміни та виправлено помилки
+ - Видалено невикористаний код “App Center”.
+ - Додано випуск без федеративної стрічки для Play Store
+ - Додано спеціальний URI перенаправлення для полегшення входу
+ - Змінено посилання на допомогу у розробці

metadata/uk/changelogs/55.txt

@@ -0,0 +1,4 @@
+- Виправлено несправне відтворення тегів HTML і ввімкнено відтворення форматування Markdown
+ - Ініціалізація <a href="https://translate.codeberg.org/projects/megalodon">проекту перекладу Weblate</a>
+ - Додано перемикач для Федеративної стрічки
+ - Версії 52-54 були невеликими корективами для випуску у Play Store

metadata/uk/changelogs/56.txt

@@ -0,0 +1,6 @@
+- Кастомні кольорові теми від @LucasGGamerM
+ - Новий текстовий логотип "megalodon", представлений @LucasGGamerM
+ - Кращий пошук емодзі під час створення посту
+ - Налагоджене голосування (відображати власний голос, завжди відображати кнопку голосування, не обрізати довгі відповіді)
+ - Додано налаштування push-сповіщень для сповіщень про публікації
+ - Виправлення помилок

metadata/uk/changelogs/59.txt

@@ -0,0 +1,5 @@
+- Додано селектор мови
+- Додано функцію перекладу
+- Покращена семантика для голосування в опитуваннях (перемикачі та прапорці)
+- Додано опцію, щоб дозволити голосувати за кілька варіантів в опитуваннях
+- Виправлення помилок

metadata/uk/full_description.txt

@@ -0,0 +1,11 @@
+Megalodon є модифікована версія <a href="https://github.com/mastodon/mastodon-android">офіційного застосунку Mastodon для Android</a>, який додає важливі функції, яких немає у офіційному застосунку, наприклад федеративна стрічка, unlisted-публікації, а також переглядач опису зображення.
+
+<b>Ключеві функції</b>
+
+• <b>Unlisted-публікації</b>: Робіть пости публічно, але не показуйте його у трендах, хештегах чи публічних стрічках.
+• <b>Федеративна стрічка</b>: Дивіться усі публічні пости від людей зі усього Федісвіту!
+• <b>Переглядач опису зображення</b>: Швидко перевіряйте чи має медіа опис.
+• <b>Закріплення постів</b>: Закріпляйте ваші самі важливі пости у вашому профілі, а також дивіться, що закріпили люди у списку "Закріплене".
+• <b>Підписуйтеся на хештеги</b>: Ви можете бачити усі публікації під тегом на який підписані.
+• <b>Відповіді на запити до підписки</b>: Приймайте або відхиляйте запити на підписку через сповіщення чи віддільний список "Запити на підписку".
+• <b>Видалити та переробити</b>: Улюблена функція, яка уможливила редагування без фактичної функції редагування.

metadata/uk/short_description.txt

@@ -0,0 +1 @@
+Mastodon для Android, але рожевий й має більше функцій

metadata/uk/title.txt

@@ -0,0 +1 @@
+Megalodon