Merge branch 'fork'

2022-12-13 15:49:06 -03:00
parent 98e897d6a8 2bb4616e40
commit 5562c93855
49 changed files with 875 additions and 176 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
+++ b/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.MoshidonLoginFragment;
 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 MoshidonLoginFragment());
 			}else{
 				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 				AccountSession session;
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java
+++ b/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);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MoshidonLoginFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MoshidonLoginFragment.java
@@ -0,0 +1,259 @@
+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.TextWatcher;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.RadioButton;
+import android.widget.Space;
+import android.widget.TextView;
+import android.widget.Toolbar;
+
+import androidx.annotation.NonNull;
+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.utils.UiUtils;
+
+import java.util.ArrayList;
+import java.util.Objects;
+
+import me.grishka.appkit.FragmentStackActivity;
+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 MoshidonLoginFragment extends InstanceCatalogFragment {
+	private View headerView;
+
+	public MoshidonLoginFragment() {
+		super(R.layout.fragment_moshidon_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);
+		}
+	}
+}
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
+++ b/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.MoshidonLoginFragment;
 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, MoshidonLoginFragment.class, null);
 			dismiss();
 		}));

--- a/mastodon/src/main/res/drawable/ic_fluent_globe_20_regular.xml
+++ b/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>
--- a/mastodon/src/main/res/layout/display_item_text.xml
+++ b/mastodon/src/main/res/layout/display_item_text.xml
@@ -17,7 +17,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"
--- a/mastodon/src/main/res/layout/fragment_moshidon_welcome.xml
+++ b/mastodon/src/main/res/layout/fragment_moshidon_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>
--- a/mastodon/src/main/res/layout/header_megalodon_welcome.xml
+++ b/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>
--- a/mastodon/src/main/res/layout/item_megalodon_instance.xml
+++ b/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>
--- a/mastodon/src/main/res/values-ca-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
@@ -11,11 +11,11 @@
    <string name="sk_settings_load_new_posts">Carrega automàticament les publicacions noves</string>
    <string name="sk_federated_timeline">Federació</string>
    <string name="sk_federated_timeline_info_banner">Aquestes són les publicacions més recents de gent de la teua federació.</string>
-    <string name="sk_update_ready">Megalodon %s s\'ha baixat i està preparat per a instal·lar-se.</string>
+    <string name="sk_update_ready">Moshidon %s s\'ha baixat i està preparat per a instal·lar-se.</string>
    <string name="sk_accept_follow_request">Accepta la sol·licitud</string>
    <string name="sk_disable_marquee">Desactiva el desplaçament de text a les barres de títol</string>
    <string name="sk_user_post_notifications_on">Notificacions activades per a publicacions de: %s</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
    <string name="sk_pin_post">Fixa al perfil</string>
    <string name="sk_confirm_pin_post_title">Fixar al perfil</string>
    <string name="sk_confirm_delete_and_redraft">Segur que vols eliminar i tornar a escriure aquesta publicació\?</string>
@@ -25,10 +25,10 @@
    <string name="sk_visibility_unlisted">No llistat</string>
    <string name="sk_settings_show_boosts">Mostra els impulsos</string>
    <string name="sk_settings_show_interaction_counts">Mostra el recompte d\'interaccions</string>
-    <string name="sk_settings_app_version">Megalodon v. %1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v. %1$s (%2$d)</string>
    <string name="sk_user_post_notifications_off">Notificacions desactivades per a publicacions de: %s</string>
    <string name="sk_mark_media_as_sensitive">Marca el contingut com a sensible</string>
-    <string name="sk_update_available">Megalodon %s està preparat per a baixar-se.</string>
+    <string name="sk_update_available">Moshidon %s està preparat per a baixar-se.</string>
    <string name="sk_check_for_update">Comprova actualitzacions</string>
    <string name="sk_no_update_available">No hi ha cap actualització disponible</string>
    <string name="sk_list_timelines">Llistes</string>
@@ -36,6 +36,15 @@
    <string name="sk_reject_follow_request">Rebutja la sol·licitud</string>
    <string name="sk_lists_with_user">Llistes amb %s</string>
    <string name="sk_settings_always_reveal_content_warnings">Mostra sempre els avisos de contingut</string>
-    <string name="sk_settings_contribute">Contribueix a Megalodon</string>
+    <string name="sk_settings_contribute">Contribueix a Moshidon</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>
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
    <string name="sk_pinned_posts">Angeheftet</string>
    <string name="sk_delete_and_redraft">Löschen und neu erstellen</string>
    <string name="sk_confirm_delete_and_redraft_title">Beitrag löschen und neu erstellen</string>
@@ -19,14 +19,14 @@
    <string name="sk_settings_show_boosts">Geteilte Beiträge anzeigen</string>
    <string name="sk_settings_load_new_posts">Automatisch neue Beiträge laden</string>
    <string name="sk_settings_show_interaction_counts">Interaktions-Anzahlen anzeigen</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
    <string name="sk_mark_media_as_sensitive">Medien als sensibel markieren</string>
    <string name="sk_user_post_notifications_on">Benachrichtigungen über Beiträge von %s aktiviert</string>
    <string name="sk_user_post_notifications_off">Benachrichtigungen über Beiträge von %s deaktiviert</string>
    <string name="sk_federated_timeline">Föderation</string>
    <string name="sk_federated_timeline_info_banner">Das sind die neuesten Beiträge von Personen, die in der Föderation deines Servers sind.</string>
-    <string name="sk_update_available">Megalodon %s ist zum Herunterladen bereit.</string>
-    <string name="sk_update_ready">Megalodon %s wurde heruntergeladen und kann jetzt installiert werden.</string>
+    <string name="sk_update_available">Moshidon %s ist zum Herunterladen bereit.</string>
+    <string name="sk_update_ready">Moshidon %s wurde heruntergeladen und kann jetzt installiert werden.</string>
    <string name="sk_check_for_update">Auf Update prüfen</string>
    <string name="sk_no_update_available">Kein Update verfügbar</string>
    <string name="sk_list_timelines">Listen</string>
@@ -36,7 +36,7 @@
    <string name="sk_lists_with_user">Listen mit %s</string>
    <string name="sk_settings_always_reveal_content_warnings">Inhaltswarnungen immer ausklappen</string>
    <string name="sk_disable_marquee">Laufschrift in Titelleisten deaktivieren</string>
-    <string name="sk_settings_contribute">Zu Megalodon beitragen</string>
+    <string name="sk_settings_contribute">Zu Moshidon beitragen</string>
    <string name="sk_settings_show_federated_timeline">Föderierte Timeline anzeigen</string>
    <string name="sk_notify_posts">Beitrags-Benachrichtigungen</string>
    <string name="sk_settings_color_picker">Farbschema</string>
@@ -47,4 +47,13 @@
    <string name="sk_color_theme_yellow">Gelb</string>
    <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>
 </resources>
--- a/mastodon/src/main/res/values-es-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-es-rES/strings_sk.xml
@@ -2,30 +2,30 @@
 <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_app_name">Megalodon</string>
-    <string name="sk_unpinning">Quitando 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">Moshidon</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_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_federated_timeline_info_banner">Estas son las publicaciones más recientes de las personas de su federación.</string>
+    <string name="sk_update_available">Moshidon %s está listo para descargar.</string>
+    <string name="sk_update_ready">Moshidon %s se ha descargado y está listo para instalarse.</string>
    <string name="sk_check_for_update">Buscar actualizaciones</string>
    <string name="sk_no_update_available">No hay actualizaciones disponibles</string>
    <string name="sk_list_timelines">Listas</string>
@@ -35,7 +35,25 @@
    <string name="sk_lists_with_user">Listas con %s</string>
    <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_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_contribute">Contribuir a Moshidon</string>
+    <string name="sk_settings_show_federated_timeline">Mostrar cronología federada</string>
+    <string name="sk_settings_app_version">Moshidon 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>
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -13,12 +13,12 @@
    <string name="sk_settings_show_replies">Afficher les réponses</string>
    <string name="sk_settings_show_boosts">Afficher les boosts</string>
    <string name="sk_settings_load_new_posts">Charger automatiquement les nouveaux messages</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
    <string name="sk_mark_media_as_sensitive">Marquer le média comme sensible</string>
    <string name="sk_user_post_notifications_on">Notifications de message activées pour %s</string>
    <string name="sk_user_post_notifications_off">Désactivation des notifications de message pour %s</string>
-    <string name="sk_update_available">Megalodon %s est prête à être téléchargée.</string>
-    <string name="sk_update_ready">Megalodon %s est téléchargée et prête à être installée.</string>
+    <string name="sk_update_available">Moshidon %s est prête à être téléchargée.</string>
+    <string name="sk_update_ready">Moshidon %s est téléchargée et prête à être installée.</string>
    <string name="sk_check_for_update">Vérifier les mises à jour</string>
    <string name="sk_no_update_available">Pas de mise a jour disponible</string>
    <string name="sk_list_timelines">Listes</string>
@@ -28,9 +28,9 @@
    <string name="sk_lists_with_user">Listes avec %s</string>
    <string name="sk_settings_always_reveal_content_warnings">Toujours afficher les avertissements de contenu</string>
    <string name="sk_disable_marquee">Désactiver le défilement du texte dans les barres de titre</string>
-    <string name="sk_settings_contribute">Contribuez à Megalodon</string>
+    <string name="sk_settings_contribute">Contribuez à Moshidon</string>
    <string name="sk_settings_show_federated_timeline">Afficher la timeline fédérée</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
    <string name="sk_delete_and_redraft">Supprimer et rééditer</string>
    <string name="sk_pin_post">Épingler au profil</string>
    <string name="sk_confirm_pin_post_title">Épingler le message au profil</string>
@@ -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>
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -12,23 +12,23 @@
    <string name="sk_settings_show_boosts">Lihat boost</string>
    <string name="sk_settings_load_new_posts">Muat kiriman baru secara otomatis</string>
    <string name="sk_settings_show_interaction_counts">Tampilkan jumlah interaksi</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
    <string name="sk_user_post_notifications_on">Nyalakan notifikasi kiriman untuk %s</string>
    <string name="sk_user_post_notifications_off">Matikan notifikasi kiriman untuk %s</string>
    <string name="sk_federated_timeline">Federasi</string>
    <string name="sk_federated_timeline_info_banner">Kiriman terbaru dari orang-orang di federasi anda.</string>
-    <string name="sk_update_available">Megalodon %s siap untuk diunduh.</string>
-    <string name="sk_update_ready">Megalodon %s telah diunduh dan siap dipasang.</string>
+    <string name="sk_update_available">Moshidon %s siap untuk diunduh.</string>
+    <string name="sk_update_ready">Moshidon %s telah diunduh dan siap dipasang.</string>
    <string name="sk_check_for_update">Periksa pembaruan</string>
    <string name="sk_no_update_available">Tidak ada pembaruan</string>
    <string name="sk_list_timelines">Daftar</string>
    <string name="sk_unpinning">Menghapus sematan kiriman…</string>
    <string name="sk_accept_follow_request">Terima permintaan pengikut</string>
    <string name="sk_reject_follow_request">Tolak permintaan pengikut</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
    <string name="sk_confirm_delete_and_redraft">Hapus dan tulis ulang kiriman ini\?</string>
    <string name="sk_confirm_unpin_post">Apakah Anda yakin untuk menghapus sematan kiriman ini\?</string>
-    <string name="sk_settings_contribute">Kontribusi ke Megalodon</string>
+    <string name="sk_settings_contribute">Kontribusi ke Moshidon</string>
    <string name="sk_pinned_posts">Disematkan</string>
    <string name="sk_pin_post">Sematkan ke profil</string>
    <string name="sk_visibility_unlisted">Tidak terdaftar</string>
@@ -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>
--- a/mastodon/src/main/res/values-it-rIT/strings_sk.xml
+++ b/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">Moshidon</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">Moshidon 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">Moshidon %s è pronto da scaricare.</string>
+    <string name="sk_update_ready">Moshidon %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 Moshidon</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>
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/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">Moshidon</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
+    <string name="sk_update_available">Moshidon %s 버전을 다운로드할 수 있습니다.</string>
+    <string name="sk_update_ready">Moshidon %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">Moshidon에 기여</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>
--- a/mastodon/src/main/res/values-my/strings_sk.xml
+++ b/mastodon/src/main/res/values-my/strings_sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
    <string name="sk_delete_and_redraft">ဖျက်ပြီး ပြန်ရေးမည်</string>
    <string name="sk_pin_post">ပရိုဖိုင်းတွင် ပင်တွဲမည်</string>
    <string name="sk_pinning">ပင်တွဲနေသည်…</string>
@@ -10,12 +10,12 @@
    <string name="sk_image_description">ပုံတွင်ပါဝင်သော အကြောင်းအရာ</string>
    <string name="sk_visibility_unlisted">စာရင်းမလုပ်</string>
    <string name="sk_settings_show_boosts">Boost များကို ပြသမည်</string>
-    <string name="sk_settings_app_version">Megalodon - ဗားရှင်း %1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon - ဗားရှင်း %1$s (%2$d)</string>
    <string name="sk_mark_media_as_sensitive">ပုံ/ဗီဒီယိုအား ထိရှလွယ်သည်အဖြစ် မှတ်သားသည်</string>
    <string name="sk_user_post_notifications_off">%s အတွက် ပို့စ်နိုတီများကို ပိတ်လိုက်သည်</string>
    <string name="sk_federated_timeline">ဖက်ဒရေးရှင်း</string>
-    <string name="sk_update_available">Megalodon %s ကို ဒေါင်းလုဒ်ဆွဲလို့ရပါပြီ။</string>
-    <string name="sk_update_ready">Megalodon %s ကို ဒေါင်းလုဒ်ဆွဲပြီးပြီမလို့ အင်စတောလုပ်နိုင်ပါပြီ။</string>
+    <string name="sk_update_available">Moshidon %s ကို ဒေါင်းလုဒ်ဆွဲလို့ရပါပြီ။</string>
+    <string name="sk_update_ready">Moshidon %s ကို ဒေါင်းလုဒ်ဆွဲပြီးပြီမလို့ အင်စတောလုပ်နိုင်ပါပြီ။</string>
    <string name="sk_no_update_available">မည်သည့်အပ်ဒိတ်မျှ မရှိသေးပါ</string>
    <string name="sk_follow_requests">ဖောလိုဝါအဖြစ် တောင်းဆိုမှုများ</string>
    <string name="sk_accept_follow_request">ဖောလိုဝါအဖြစ်တောင်းဆိုမှုကို လက်ခံမည်</string>
--- a/mastodon/src/main/res/values-nl-rNL/strings_sk.xml
+++ b/mastodon/src/main/res/values-nl-rNL/strings_sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
    <string name="sk_pinned_posts">Vastgemaakt</string>
    <string name="sk_delete_and_redraft">Verwijderen en opnieuw opstellen</string>
    <string name="sk_confirm_delete_and_redraft_title">Verwijder en stel bericht opnieuw op</string>
@@ -20,14 +20,14 @@
    <string name="sk_settings_show_boosts">Boosts weergeven</string>
    <string name="sk_settings_load_new_posts">Automatisch nieuwe berichten laden</string>
    <string name="sk_settings_show_interaction_counts">Aantal interacties weergeven</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
    <string name="sk_mark_media_as_sensitive">Markeer media als gevoelig</string>
    <string name="sk_user_post_notifications_on">Berichtmeldingen aangezet voor %s</string>
    <string name="sk_user_post_notifications_off">Berichtmeldingen uitgezet voor %s</string>
    <string name="sk_federated_timeline">Federatie</string>
    <string name="sk_federated_timeline_info_banner">Dit zijn de meest recente berichten van de mensen in jouw federatie.</string>
-    <string name="sk_update_available">Megalodon %s is klaar om te downloaden.</string>
-    <string name="sk_update_ready">Megalodon %s is gedownload en klaar om te installeren.</string>
+    <string name="sk_update_available">Moshidon %s is klaar om te downloaden.</string>
+    <string name="sk_update_ready">Moshidon %s is gedownload en klaar om te installeren.</string>
    <string name="sk_check_for_update">Controleren op update</string>
    <string name="sk_no_update_available">Geen update beschikbaar</string>
    <string name="sk_list_timelines">Lijsten</string>
@@ -36,6 +36,6 @@
    <string name="sk_lists_with_user">Lijsten met %s</string>
    <string name="sk_settings_always_reveal_content_warnings">Onthul altijd inhoudswaarschuwingen</string>
    <string name="sk_disable_marquee">Schakel scrollende tekst in titelbalken uit</string>
-    <string name="sk_settings_contribute">Bijdragen aan Megalodon</string>
+    <string name="sk_settings_contribute">Bijdragen aan Moshidon</string>
    <string name="sk_settings_show_federated_timeline">Toon gefedereerde tijdlijn</string>
 </resources>
--- a/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
+++ b/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_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_app_name">Megalodon</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">Moshidon %s jest dostępny do pobrania.</string>
+    <string name="sk_update_ready">Moshidon %s został pobrany i jest gotowy do instalacji.</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">Moshidon</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_app_version">Megalodon v%1$s (%2$d)</string>
-    <string name="sk_visibility_unlisted">Nienotowany</string>
+    <string name="sk_settings_contribute">Wspomóż Moshidon</string>
+    <string name="sk_settings_show_federated_timeline">Pokaż globalną oś czasu</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</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>
--- a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
@@ -7,7 +7,7 @@
    <string name="sk_confirm_pin_post_title">Fixar postagem no perfil</string>
    <string name="sk_confirm_pin_post">Você deseja fixar esta postagem em seu perfil\?</string>
    <string name="sk_pinning">Fixando postagem…</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
    <string name="sk_pinned_posts">Fixado</string>
    <string name="sk_unpin_post">Desafixar do perfil</string>
    <string name="sk_confirm_unpin_post_title">Desafixar postagem do perfil</string>
@@ -18,13 +18,13 @@
    <string name="sk_settings_show_boosts">Mostrar boosts</string>
    <string name="sk_settings_load_new_posts">Carregar novas postagens automaticamente</string>
    <string name="sk_mark_media_as_sensitive">Marcar mídia como sensível</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
    <string name="sk_lists_with_user">Listas com %s</string>
    <string name="sk_user_post_notifications_on">Ativar as notificações de postagem para %s</string>
    <string name="sk_federated_timeline">Federação</string>
    <string name="sk_federated_timeline_info_banner">Estas são as postagens mais recentes das pessoas em sua federação.</string>
-    <string name="sk_update_available">Megalodon %s está pronto para baixar.</string>
-    <string name="sk_update_ready">Megalodon %s foi baixado e está pronto para instalar.</string>
+    <string name="sk_update_available">Moshidon %s está pronto para baixar.</string>
+    <string name="sk_update_ready">Moshidon %s foi baixado e está pronto para instalar.</string>
    <string name="sk_check_for_update">Verificar se há atualizações</string>
    <string name="sk_no_update_available">Nenhuma atualização disponível</string>
    <string name="sk_list_timelines">Listas</string>
@@ -34,8 +34,24 @@
    <string name="sk_reject_follow_request">Recusar solicitação para seguir</string>
    <string name="sk_settings_always_reveal_content_warnings">Sempre revelar avisos de conteúdo</string>
    <string name="sk_disable_marquee">Desative o texto de rolagem nas barras de título</string>
-    <string name="sk_settings_contribute">Contribua para o Megalodon</string>
+    <string name="sk_settings_contribute">Contribua para o Moshidon</string>
    <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>
--- a/mastodon/src/main/res/values-pt-rPT/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rPT/strings_sk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
    <string name="sk_pinned_posts">Fixado</string>
 </resources>
--- a/mastodon/src/main/res/values-ru-rRU/strings_sk.xml
+++ b/mastodon/src/main/res/values-ru-rRU/strings_sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
    <string name="sk_pinned_posts">Закрепленные</string>
    <string name="sk_delete_and_redraft">Удалить и исправить</string>
    <string name="sk_confirm_delete_and_redraft_title">Удалить и исправить пост</string>
@@ -14,5 +14,5 @@
    <string name="sk_image_description">Описание изображения</string>
    <string name="sk_visibility_unlisted">Скрытый</string>
    <string name="sk_mark_media_as_sensitive">Отметить медиафайл как деликатный</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
 </resources>
--- a/mastodon/src/main/res/values-sv-rSE/strings_sk.xml
+++ b/mastodon/src/main/res/values-sv-rSE/strings_sk.xml
@@ -13,12 +13,12 @@
    <string name="sk_settings_show_boosts">Visa puffar</string>
    <string name="sk_settings_load_new_posts">Ladda automatiskt nya inlägg</string>
    <string name="sk_settings_show_interaction_counts">Visa antal interaktioner</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
    <string name="sk_mark_media_as_sensitive">Markera media som känsligt</string>
    <string name="sk_user_post_notifications_off">Slå av inläggsnotifieringar för %s</string>
    <string name="sk_federated_timeline">Federation</string>
    <string name="sk_federated_timeline_info_banner">Dessa är de senaste inläggen av folk i din federation.</string>
-    <string name="sk_update_available">Megalodon %s är redo att ladda ner.</string>
+    <string name="sk_update_available">Moshidon %s är redo att ladda ner.</string>
    <string name="sk_check_for_update">Kolla efter uppdateringar</string>
    <string name="sk_no_update_available">Inga uppdateringar tillgängliga</string>
    <string name="sk_list_timelines">Listor</string>
@@ -28,14 +28,14 @@
    <string name="sk_lists_with_user">Listor med %s</string>
    <string name="sk_settings_always_reveal_content_warnings">Visa alltid innehållsvarningar</string>
    <string name="sk_disable_marquee">Slå av skrollande text i titelrader</string>
-    <string name="sk_settings_contribute">Bidra till Megalodon</string>
+    <string name="sk_settings_contribute">Bidra till Moshidon</string>
    <string name="sk_settings_show_federated_timeline">Visa federerad tidslinje</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
    <string name="sk_confirm_delete_and_redraft_title">Ta bort och skriv om inlägg</string>
    <string name="sk_confirm_delete_and_redraft">Är du säker på att du vill ta bort och skriva om detta inlägg\?</string>
    <string name="sk_confirm_pin_post_title">Nåla fast inlägg på profil</string>
    <string name="sk_confirm_pin_post">Vill du nåla fast detta inlägg på din profil\?</string>
    <string name="sk_confirm_unpin_post">Är du säker på att du vill ta bort detta inlägg\?</string>
    <string name="sk_user_post_notifications_on">Slå på inläggsnotifieringar för %s</string>
-    <string name="sk_update_ready">Megalodon %s är nerladdad och redo att installeras.</string>
+    <string name="sk_update_ready">Moshidon %s är nerladdad och redo att installeras.</string>
 </resources>
--- a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
+++ b/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">Moshidon</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">Moshidon 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">Допомогти у розробці Moshidon</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">Moshidon %s готовий до завантаження.</string>
+    <string name="sk_update_ready">Moshidon %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>
--- a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
@@ -16,17 +16,17 @@
    <string name="sk_visibility_unlisted">不公开</string>
    <string name="sk_federated_timeline">联邦时间轴</string>
    <string name="sk_federated_timeline_info_banner">这是在你的联邦宇宙中最新发布的嘟文。</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</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_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</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_update_available">Megalodon %s 已经可以下载了。</string>
-    <string name="sk_update_ready">Megalodon %s 已下载，准备安装。</string>
+    <string name="sk_update_available">Moshidon %s 已经可以下载了。</string>
+    <string name="sk_update_ready">Moshidon %s 已下载，准备安装。</string>
    <string name="sk_check_for_update">检查更新</string>
    <string name="sk_no_update_available">已经是最新版本</string>
    <string name="sk_list_timelines">列表</string>
@@ -34,8 +34,17 @@
    <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_settings_contribute">向 Moshidon 贡献</string>
    <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>
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -19,7 +19,7 @@
  <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_settings_app_version">Moshidon 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>
@@ -36,7 +36,7 @@
  <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_contribute">Contribute to Moshidon</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>
@@ -49,4 +49,16 @@
  <string name="sk_color_theme_yellow">Yellow</string>
  <string name="sk_color_theme_material_you">Material You</string>
  <string name="sk_not_supported">Not supported on your device</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 recent 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 to Moshidon!</string>
+  <string name="sk_welcome_text">To get started, please enter your home instance’s domain name below.</string>
+  <string name="sk_example_domain">example.social</string>
 </resources>