Adding the local timelines feature and some polishes

This reverts commit 68f88c29d3.

README.md

@@ -70,7 +70,7 @@ To bookmark a post, press the button between the Favorite and Share buttons on t
 
 To install this app on your Android device, download the [latest release from GitHub](https://github.com/LucasGGamerM/moshidon/releases/latest/download/moshidon.apk) and open it. You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.
 
-Moshidon makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Megalodon will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
+Moshidon makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Moshidon will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
 
 Moshidon is also available in [IzzyOnDroid repo](https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.moshinda), compatible with all F-Droid clients. The APK provided here is the same as the one included in the Releases.
 

mastodon/build.gradle

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

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

@@ -46,6 +46,7 @@ public class GlobalUserPreferences{
 	public static boolean bottomEncoding;
 	public static boolean collapseLongPosts;
 	public static boolean spectatorMode;
+	public static boolean autoHideFab;
 	public static String publishButtonText;
 	public static ThemePreference theme;
 	public static ColorPreference color;
@@ -99,6 +100,7 @@ public class GlobalUserPreferences{
 		bottomEncoding=prefs.getBoolean("bottomEncoding", false);
 		collapseLongPosts=prefs.getBoolean("collapseLongPosts", true);
 		spectatorMode=prefs.getBoolean("spectatorMode", false);
+		autoHideFab=prefs.getBoolean("autoHideFab", true);
 		publishButtonText=prefs.getString("publishButtonText", "");
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
@@ -147,6 +149,7 @@ public class GlobalUserPreferences{
 				.putBoolean("prefixRepliesWithRe", prefixRepliesWithRe)
 				.putBoolean("collapseLongPosts", collapseLongPosts)
 				.putBoolean("spectatorMode", spectatorMode)
+				.putBoolean("autoHideFab", autoHideFab)
 				.putString("publishButtonText", publishButtonText)
 				.putBoolean("bottomEncoding", bottomEncoding)
 				.putInt("theme", theme.ordinal())

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

@@ -99,7 +99,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		Account self=AccountSessionManager.getInstance().getAccount(accountID).self;
 		String accountName="@"+self.username+"@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
 		Notification.Builder builder;
-		Notification.Builder summaryNotification;
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O){
 			boolean hasGroup=false;
 			List<NotificationChannelGroup> channelGroups=nm.getNotificationChannelGroups();
@@ -122,28 +121,21 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				nm.createNotificationChannels(channels);
 			}
 			builder=new Notification.Builder(context, accountID+"_"+pn.notificationType);
-//			summaryNotification=new Notification.Builder(context, accountID);
 		}else{
 			builder=new Notification.Builder(context)
 					.setPriority(Notification.PRIORITY_DEFAULT)
 					.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
-			summaryNotification=new Notification.Builder(context)
-					.setPriority(Notification.PRIORITY_DEFAULT)
-					.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
 		}
 		Drawable avatar=ImageCache.getInstance(context).get(new UrlImageLoaderRequest(pn.icon, V.dp(50), V.dp(50)));
 		Intent contentIntent=new Intent(context, MainActivity.class);
 		contentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		contentIntent.putExtra("fromNotification", true);
 		contentIntent.putExtra("accountID", accountID);
-		contentIntent.putExtra("notificationID", notificationId);
 		if(notification!=null){
 			contentIntent.putExtra("notification", Parcels.wrap(notification));
 		}
-
 		builder.setContentTitle(pn.title)
 				.setContentText(pn.body)
-				.setContentTitle(pn.title)
 				.setStyle(new Notification.BigTextStyle().bigText(pn.body))
 				.setSmallIcon(R.drawable.ic_ntf_logo)
 				.setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
@@ -151,8 +143,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
-				.setColor(context.getColor(R.color.shortcut_icon_background))
-				.setGroup(accountID);
+				.setColor(context.getColor(R.color.shortcut_icon_background));
 
 		if (!GlobalUserPreferences.uniformNotificationIcon) {
 			builder.setSmallIcon(switch (pn.notificationType) {
@@ -174,9 +165,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		if(AccountSessionManager.getInstance().getLoggedInAccounts().size()>1){
 			builder.setSubText(accountName);
 		}
-
-		notificationId++;
-		nm.notify(accountID, GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId, builder.build());
-
+		nm.notify(accountID, GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId++, builder.build());
 	}
 }

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

@@ -302,7 +302,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 
 				if (fab!=null && GlobalUserPreferences.enableFabAutoHide) {
 //					This piece of code should make it so that the fab is always visible if the status list scroll view is at the item at the top
-					if(list.getChildLayoutPosition(list.getChildAt(0)) < 1){
+					if(list.getChildAt(0).getTop() == 0){
 						scrollDiff=THRESHHOLD+1;
 					}else{
 						if(dy > 0){
@@ -317,21 +317,23 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 								0,
 								fab.getHeight() * 2);
 						animate.setDuration(300);
-						animate.setFillAfter(true);
+//						animate.setFillAfter(true);
 						fab.startAnimation(animate);
+						fab.setEnabled(false);
 						fab.setVisibility(View.INVISIBLE);
 						scrollDiff = 0;
 					} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
 						if (scrollDiff > THRESHHOLD) {
-							fab.setVisibility(View.VISIBLE);
 							TranslateAnimation animate = new TranslateAnimation(
 									0,
 									0,
 									fab.getHeight() * 2,
 									0);
 							animate.setDuration(300);
-							animate.setFillAfter(true);
+//							animate.setFillAfter(true);
 							fab.startAnimation(animate);
+							fab.setEnabled(true);
+							fab.setVisibility(View.VISIBLE);
 							scrollDiff = 0;
 						} else {
 							scrollDiff += Math.abs(dy);

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

@@ -0,0 +1,70 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+import android.view.Menu;
+import android.view.MenuInflater;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
+import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.TimelineDefinition;
+import org.joinmastodon.android.utils.StatusFilterPredicate;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class CustomLocalTimelineFragment extends PinnableStatusListFragment {
+    //    private String name;
+    private String domain;
+
+    private String maxID;
+    @Override
+    protected boolean withComposeButton() {
+        return false;
+    }
+
+    @Override
+    public void onAttach(Activity activity){
+        super.onAttach(activity);
+        domain=getArguments().getString("domain");
+        updateTitle(domain);
+
+        setHasOptionsMenu(true);
+    }
+
+    private void updateTitle(String domain) {
+        this.domain = domain;
+        setTitle(this.domain);
+    }
+
+    @Override
+    protected TimelineDefinition makeTimelineDefinition() {
+        return TimelineDefinition.ofCustomLocalTimeline(domain);
+    }
+
+    @Override
+    protected void doLoadData(int offset, int count){
+        currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, count)
+                .setCallback(new SimpleCallback<>(this){
+                    @Override
+                    public void onSuccess(List<Status> result){
+                        if(!result.isEmpty())
+                            maxID=result.get(result.size()-1).id;
+                        if (getActivity() == null) return;
+                        result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+                        onDataLoaded(result, !result.isEmpty());
+                    }
+                })
+                .execNoAuth(domain);
+    }
+
+    @Override
+    protected void onShown(){
+        super.onShown();
+        if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
+            loadData();
+    }
+}

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

@@ -15,6 +15,7 @@ import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -30,6 +31,7 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
+import org.joinmastodon.android.model.CustomLocalTimeline;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.ListTimeline;
@@ -49,6 +51,7 @@ import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
 public class EditTimelinesFragment extends BaseRecyclerFragment<TimelineDefinition> implements ScrollableToTop {
@@ -60,6 +63,7 @@ public class EditTimelinesFragment extends BaseRecyclerFragment<TimelineDefiniti
     private final Map<MenuItem, TimelineDefinition> timelineByMenuItem = new HashMap<>();
     private final List<ListTimeline> listTimelines = new ArrayList<>();
     private final List<Hashtag> hashtags = new ArrayList<>();
+    private final List<CustomLocalTimeline> localTimelines = new ArrayList<>();
 
     public EditTimelinesFragment() {
         super(10);
@@ -128,6 +132,10 @@ public class EditTimelinesFragment extends BaseRecyclerFragment<TimelineDefiniti
             optionsMenu.performIdentifierAction(R.id.menu_add_timeline, 0);
             return true;
         }
+        if (item.getItemId() == R.id.menu_add_local_timelines) {
+            addNewLocalTimeline();
+            return true;
+        }
         TimelineDefinition tl = timelineByMenuItem.get(item);
         if (tl != null) {
             data.add(tl.copy());
@@ -138,6 +146,26 @@ public class EditTimelinesFragment extends BaseRecyclerFragment<TimelineDefiniti
         return true;
     }
 
+    private void addNewLocalTimeline() {
+        FrameLayout inputWrap = new FrameLayout(getContext());
+        EditText input = new EditText(getContext());
+        input.setHint(R.string.sk_example_domain);
+        input.setText(GlobalUserPreferences.publishButtonText.trim());
+        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
+        input.setLayoutParams(params);
+        inputWrap.addView(input);
+        new M3AlertDialogBuilder(getContext()).setTitle(R.string.mo_add_custom_server_local_timeline).setView(inputWrap)
+                .setPositiveButton(R.string.save, (d, which) -> {
+                    TimelineDefinition tl = TimelineDefinition.ofCustomLocalTimeline(input.getText().toString().trim());
+                    data.add(tl);
+                    saveTimelines();
+                })
+                .setNegativeButton(R.string.cancel, (d, which) -> {
+                })
+                .show();
+    }
+
     private void addTimelineToOptions(TimelineDefinition tl, Menu menu) {
         if (data.contains(tl)) return;
         MenuItem item = menu.add(0, View.generateViewId(), Menu.NONE, tl.getTitle(getContext()));
@@ -161,6 +189,9 @@ public class EditTimelinesFragment extends BaseRecyclerFragment<TimelineDefiniti
         SubMenu hashtagsMenu = menu.addSubMenu(R.string.sk_hashtag);
         hashtagsMenu.getItem().setIcon(R.drawable.ic_fluent_number_symbol_24_regular);
 
+        MenuItem addLocalTimelines = menu.add(0, R.id.menu_add_local_timelines, NONE, R.string.local_timeline);
+        addLocalTimelines.setIcon(R.drawable.ic_fluent_people_community_24_regular);
+
         makeBackItem(timelinesMenu);
         makeBackItem(listsMenu);
         makeBackItem(hashtagsMenu);

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

@@ -97,7 +97,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		};
 		HeaderStatusDisplayItem titleItem=extraText!=null ? new HeaderStatusDisplayItem(n.id, n.account, n.createdAt, this, accountID, n.status, extraText, n, null) : null;
 		if(n.status!=null){
-			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null, n, false, Filter.FilterContext.NOTIFICATIONS);
+			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null, n, false, Filter.FilterContext.NOTIFICATIONS, titleItem);
 			if(titleItem!=null){
 				for(StatusDisplayItem item:items){
 					if(item instanceof ImageStatusDisplayItem imgItem){
@@ -105,8 +105,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 					}
 				}
 			}
-			if(titleItem!=null)
-				items.add(0, titleItem);
 			return items;
 		}else if(titleItem!=null){
 			AccountCardStatusDisplayItem card=new AccountCardStatusDisplayItem(n.id, this,

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

@@ -26,6 +26,7 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MotionEvent;
+import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
@@ -361,6 +362,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		});
 
 		actionButton.setOnClickListener(this::onActionButtonClick);
+		actionButton.setOnLongClickListener(this::onActionButtonLongClick);
 		notifyButton.setOnClickListener(this::onNotifyButtonClick);
 		avatar.setOnClickListener(this::onAvatarClick);
 		cover.setOnClickListener(this::onCoverClick);
@@ -576,8 +578,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			for (Account.Role role : account.roles) {
 				TextView roleText = new TextView(getActivity(), null, 0, R.style.role_label);
 				roleText.setText(role.name);
-				GradientDrawable bg = (GradientDrawable) roleText.getBackground().mutate();
-				bg.setStroke(V.dp(2), Color.parseColor(role.color));
+				if (!TextUtils.isEmpty(role.color) && role.color.startsWith("#")) try {
+					GradientDrawable bg = (GradientDrawable) roleText.getBackground().mutate();
+					bg.setStroke(V.dp(2), Color.parseColor(role.color));
+				} catch (Exception ignored) {}
 				rolesView.addView(roleText);
 			}
 		}
@@ -706,6 +710,16 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else{
 			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled);
 		}
+		boolean hasMultipleAccounts = AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
+		MenuItem openWithAccounts = menu.findItem(R.id.open_with_account);
+		openWithAccounts.setVisible(hasMultipleAccounts);
+		SubMenu accountsMenu = openWithAccounts.getSubMenu();
+		if (hasMultipleAccounts) {
+			accountsMenu.clear();
+			UiUtils.populateAccountsMenu(accountID, accountsMenu, s-> UiUtils.openURL(
+					getActivity(), s.getID(), account.url, false
+			));
+		}
 		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getShortUsername()));
 		if(isOwnProfile)
 			return;
@@ -880,33 +894,33 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			currentPhotoViewer.offsetView(0, oldScrollY-scrollY);
 		}
 
-		int dy = scrollY - oldScrollY;
+		if(GlobalUserPreferences.enableFabAutoHide){
+			int dy = scrollY - oldScrollY;
 
-		if (dy > 0 && fab.getVisibility() == View.VISIBLE) {
-			TranslateAnimation animate = new TranslateAnimation(
-					0,
-					0,
-					0,
-					fab.getHeight() * 2);
-			animate.setDuration(300);
-			animate.setFillAfter(true);
-			fab.startAnimation(animate);
-			fab.setVisibility(View.INVISIBLE);
-			scrollDiff = 0;
-		} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
-			if (scrollDiff > 400) {
-				fab.setVisibility(View.VISIBLE);
+			if (dy > 0 && fab.getVisibility() == View.VISIBLE) {
 				TranslateAnimation animate = new TranslateAnimation(
 						0,
 						0,
-						fab.getHeight() * 2,
-						0);
+						0,
+						fab.getHeight() * 2);
 				animate.setDuration(300);
-				animate.setFillAfter(true);
 				fab.startAnimation(animate);
+				fab.setVisibility(View.INVISIBLE);
 				scrollDiff = 0;
-			} else {
-				scrollDiff += Math.abs(dy);
+			} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
+				if (scrollDiff > 400) {
+					fab.setVisibility(View.VISIBLE);
+					TranslateAnimation animate = new TranslateAnimation(
+							0,
+							0,
+							fab.getHeight() * 2,
+							0);
+					animate.setDuration(300);
+					fab.startAnimation(animate);
+					scrollDiff = 0;
+				} else {
+					scrollDiff += Math.abs(dy);
+				}
 			}
 		}
 	}
@@ -937,6 +951,31 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 	}
 
+	private boolean onActionButtonLongClick(View v) {
+		if (isOwnProfile || AccountSessionManager.getInstance().getLoggedInAccounts().size() < 2) return false;
+		UiUtils.pickAccount(getActivity(), accountID, R.string.sk_follow_as, R.drawable.ic_fluent_person_add_28_regular, session -> {
+			UiUtils.lookupAccount(getActivity(), account, session.getID(), accountID, acc -> {
+				if (acc == null) return;
+				new SetAccountFollowed(acc.id, true, true).setCallback(new Callback<>() {
+					@Override
+					public void onSuccess(Relationship relationship) {
+						Toast.makeText(
+								getActivity(),
+								getString(R.string.sk_followed_as, session.self.getShortUsername()),
+								Toast.LENGTH_SHORT
+						).show();
+					}
+
+					@Override
+					public void onError(ErrorResponse error) {
+						error.showToast(getActivity());
+					}
+				}).exec(session.getID());
+			});
+		}, null);
+		return true;
+	}
+
 	private void setActionProgressVisible(boolean visible){
 		actionButton.setTextVisible(!visible);
 		actionProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
@@ -983,7 +1022,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		pager.setUserInputEnabled(false);
 		actionButton.setText(R.string.done);
 		ArrayList<Animator> animators=new ArrayList<>();
-		Drawable overlay=getResources().getDrawable(R.drawable.edit_avatar_overlay).mutate();
+		Drawable overlay=getResources().getDrawable(R.drawable.edit_avatar_overlay, getActivity().getTheme()).mutate();
 		avatar.setForeground(overlay);
 		animators.add(ObjectAnimator.ofInt(overlay, "alpha", 0, 255));
 

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

@@ -232,6 +232,13 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.prefixRepliesWithRe=i.checked;
 			GlobalUserPreferences.save();
 		}));
+		items.add(new SwitchItem(R.string.mo_disable_reminder_to_add_alt_text, R.drawable.ic_fluent_image_alt_text_24_regular, GlobalUserPreferences.disableAltTextReminder, i->{
+			GlobalUserPreferences.showNoAltIndicator=i.checked;
+			GlobalUserPreferences.save();
+			needAppRestart=true;
+		}));
+
+
 
 		items.add(new HeaderItem(R.string.sk_timelines));
 		items.add(new SwitchItem(R.string.sk_settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{
@@ -265,12 +272,13 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new SwitchItem(R.string.sk_settings_show_no_alt_indicator, R.drawable.ic_fluent_important_24_regular, GlobalUserPreferences.showNoAltIndicator, i->{
 			GlobalUserPreferences.showNoAltIndicator=i.checked;
 			GlobalUserPreferences.save();
+			needAppRestart=true;
 		}));
-		items.add(new SwitchItem(R.string.sk_settings_collapse_long_posts, R.drawable.ic_fluent_chevron_down_24_filled, GlobalUserPreferences.collapseLongPosts, i->{
+		items.add(new SwitchItem(R.string.sk_settings_collapse_long_posts, R.drawable.ic_fluent_chevron_down_24_regular, GlobalUserPreferences.collapseLongPosts, i->{
 			GlobalUserPreferences.collapseLongPosts=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.sk_spectator_mode, R.drawable.ic_fluent_eye_24_regular, GlobalUserPreferences.spectatorMode, i->{
+		items.add(new SwitchItem(R.string.sk_settings_hide_interaction, R.drawable.ic_fluent_eye_24_regular, GlobalUserPreferences.spectatorMode, i->{
 			GlobalUserPreferences.spectatorMode=i.checked;
 			GlobalUserPreferences.save();
 			needAppRestart=true;

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

@@ -248,6 +248,6 @@ public class AccountActivationFragment extends ToolbarFragment{
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 //		Nav.goClearingStack(getActivity(), HomeFragment.class, args);
-		Nav.goClearingStack(getActivity(), OnboardingProfileSetupFragment.class, args);
+		Nav.goClearingStack(getActivity(), OnboardingFollowSuggestionsFragment.class, args);
 	}
 }

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

@@ -5,15 +5,12 @@ import android.app.ProgressDialog;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.LocaleList;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.RadioButton;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
@@ -23,7 +20,6 @@ import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.catalog.CatalogInstance;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-import org.joinmastodon.android.ui.utils.UiUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -31,6 +27,8 @@ import org.xml.sax.InputSource;
 
 import java.io.IOException;
 import java.net.IDN;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -50,7 +48,6 @@ import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.V;
-import me.grishka.appkit.views.UsableRecyclerView;
 import okhttp3.Call;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -112,46 +109,10 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 	}
 
 	protected List<CatalogInstance> sortInstances(List<CatalogInstance> result){
-		Map<String, List<CatalogInstance>> byLang=result.stream().collect(Collectors.groupingBy(ci->ci.language));
-		for(List<CatalogInstance> group:byLang.values()){
-			Collections.sort(group, (a, b)->{
-				double aa=Math.abs(DUNBAR-Math.log(a.lastWeekUsers));
-				double bb=Math.abs(DUNBAR-Math.log(b.lastWeekUsers));
-				return Double.compare(aa, bb);
-			});
-		}
-		// get the list of user-configured system languages
-		List<String> userLangs;
-		if(Build.VERSION.SDK_INT<24){
-			userLangs=Collections.singletonList(getResources().getConfiguration().locale.getLanguage());
-		}else{
-			LocaleList ll=getResources().getConfiguration().getLocales();
-			userLangs=new ArrayList<>(ll.size());
-			for(int i=0;i<ll.size();i++){
-				userLangs.add(ll.get(i).getLanguage());
-			}
-		}
-		// add instances in preferred languages to the top of the list, in the order of preference
+		Map<Boolean, List<CatalogInstance>> byLang=result.stream().sorted(Comparator.comparingInt((CatalogInstance ci)->ci.lastWeekUsers).reversed()).collect(Collectors.groupingBy(ci->ci.approvalRequired));
 		ArrayList<CatalogInstance> sortedList=new ArrayList<>();
-		for(String lang:userLangs){
-			List<CatalogInstance> langInstances=byLang.remove(lang);
-			if(langInstances!=null){
-				sortedList.addAll(langInstances);
-			}
-		}
-		// sort the remaining language groups by aggregate lastWeekUsers
-		class InstanceGroup{
-			public int activeUsers;
-			public List<CatalogInstance> instances;
-		}
-		byLang.values().stream().map(il->{
-			InstanceGroup group=new InstanceGroup();
-			group.instances=il;
-			for(CatalogInstance instance:il){
-				group.activeUsers+=instance.lastWeekUsers;
-			}
-			return group;
-		}).sorted(Comparator.comparingInt((InstanceGroup g)->g.activeUsers).reversed()).forEachOrdered(ig->sortedList.addAll(ig.instances));
+		sortedList.addAll(byLang.getOrDefault(false, Collections.emptyList()));
+		sortedList.addAll(byLang.getOrDefault(true, Collections.emptyList()));
 		return sortedList;
 	}
 
@@ -208,6 +169,20 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 				cancelLoadingInstanceInfo();
 			}
 		}
+		try{
+			new URI("https://"+domain+"/api/v1/instance"); // Validate the host by trying to parse the URI
+		}catch(URISyntaxException x){
+			showInstanceInfoLoadError(domain, x);
+			if(fakeInstance!=null){
+				fakeInstance.description=getString(R.string.error);
+				if(filteredData.size()>0 && filteredData.get(0)==fakeInstance){
+					if(list.findViewHolderForAdapterPosition(1) instanceof BindableViewHolder<?> ivh){
+						ivh.rebind();
+					}
+				}
+			}
+			return;
+		}
 		loadingInstanceDomain=domain;
 		loadingInstanceRequest=new GetInstance();
 		loadingInstanceRequest.setCallback(new Callback<>(){

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

@@ -64,7 +64,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 
 	private List<String> languages=Collections.emptyList();
 	private PopupMenu langFilterMenu, speedFilterMenu;
-	private SignupSpeedFilter currentSignupSpeedFilter=SignupSpeedFilter.INSTANT;
+	private SignupSpeedFilter currentSignupSpeedFilter=SignupSpeedFilter.ANY;
 	private String currentLanguage=null;
 	private boolean searchQueryMode;
 	private LinearLayout filtersWrap;
@@ -75,7 +75,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 	private FilterChipView categoryGeneral, categorySpecialInterests;
 	private List<FilterChipView> regionalFilters;
 	private CatalogInstance.Region chosenRegion;
-	private CategoryChoice categoryChoice;
+	private CategoryChoice categoryChoice=CategoryChoice.GENERAL;
 
 	public InstanceCatalogSignupFragment(){
 		super(R.layout.fragment_onboarding_common, 10);
@@ -371,6 +371,9 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 		if(instances.isEmpty()){
 			instances=data.stream().filter(ci->!ci.approvalRequired && ("general".equals(ci.category) || (ci.categories!=null && ci.categories.contains("general")))).collect(Collectors.toList());
 		}
+		if(instances.isEmpty()){
+			instances=data.stream().filter(ci->("general".equals(ci.category) || (ci.categories!=null && ci.categories.contains("general")))).collect(Collectors.toList());
+		}
 		if(instances.isEmpty()){
 			return;
 		}

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

@@ -2,8 +2,14 @@ package org.joinmastodon.android.fragments.onboarding;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.Html;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.style.StyleSpan;
+import android.text.style.TypefaceSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -64,7 +70,7 @@ public class InstanceRulesFragment extends ToolbarFragment{
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
 		View headerView=inflater.inflate(R.layout.item_list_header_simple, list, false);
 		TextView text=headerView.findViewById(R.id.text);
-		text.setText(getString(R.string.instance_rules_subtitle, instance.uri));
+		text.setText(Html.fromHtml(getString(R.string.instance_rules_subtitle, "<b>"+Html.escapeHtml(instance.uri)+"</b>")));
 
 		adapter=new MergeRecyclerAdapter();
 		adapter.addAdapter(new SingleViewRecyclerAdapter(headerView));

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

@@ -191,6 +191,13 @@ public class OnboardingFollowSuggestionsFragment extends BaseRecyclerFragment<Pa
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Relationship result){
+						relationships.put(id, result);
+						for(int i=0;i<list.getChildCount();i++){
+							if(list.getChildViewHolder(list.getChildAt(i)) instanceof SuggestionViewHolder svh && svh.getItem().account.id.equals(id)){
+								svh.rebind();
+								break;
+							}
+						}
 						numRunningFollowRequests--;
 						progress.setProgress(progress.getMax()-accountIdsToFollow.size()-numRunningFollowRequests);
 						followNextAccount(accountIdsToFollow, progress);
@@ -209,20 +216,7 @@ public class OnboardingFollowSuggestionsFragment extends BaseRecyclerFragment<Pa
 	private void proceed(){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		Nav.go(getActivity(), HomeFragment.class, args);
-		getActivity().getWindow().getDecorView().postDelayed(()->Nav.finish(this), 500);
-	}
-
-	@Override
-	protected boolean canGoBack(){
-		return true;
-	}
-
-	@Override
-	public void onToolbarNavigationClick(){
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		Nav.goClearingStack(getActivity(), HomeFragment.class, args);
+		Nav.go(getActivity(), OnboardingProfileSetupFragment.class, args);
 	}
 
 	private class SuggestionsAdapter extends UsableRecyclerView.Adapter<SuggestionViewHolder> implements ImageLoaderRecyclerAdapter{

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

@@ -151,8 +151,7 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 						AccountSessionManager.getInstance().updateAccountInfo(accountID, result);
 						Bundle args=new Bundle();
 						args.putString("account", accountID);
-						Nav.go(getActivity(), OnboardingFollowSuggestionsFragment.class, args);
-						getActivity().getWindow().getDecorView().postDelayed(()->Nav.finish(OnboardingProfileSetupFragment.this), 500);
+						Nav.goClearingStack(getActivity(), HomeFragment.class, args);
 					}
 
 					@Override
@@ -182,6 +181,11 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 			profileFieldsLayout.startDragging(view);
 			return true;
 		});
+		view.findViewById(R.id.delete).setOnClickListener(v->{
+			profileFieldsLayout.removeView(view);
+			if(addRow.getVisibility()==View.GONE)
+				addRow.setVisibility(View.VISIBLE);
+		});
 		return view;
 	}
 
@@ -222,16 +226,4 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 		img.setForeground(null);
 		ViewImageLoader.load(img, null, new UrlImageLoaderRequest(uri, size, size));
 	}
-
-	@Override
-	protected boolean canGoBack(){
-		return true;
-	}
-
-	@Override
-	public void onToolbarNavigationClick(){
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		Nav.goClearingStack(getActivity(), HomeFragment.class, args);
-	}
 }

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

@@ -14,7 +14,7 @@ import java.util.List;
  * Represents a user of Mastodon and their associated profile.
  */
 @Parcel
-public class Account extends BaseModel{
+public class Account extends BaseModel implements Searchable{
 	// Base attributes
 
 	/**
@@ -135,6 +135,11 @@ public class Account extends BaseModel{
 
 	public List<Role> roles;
 
+	@Override
+	public String getQuery() {
+		return url;
+	}
+
 	@Parcel
 	public static class Role {
 		public String name;

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

@@ -0,0 +1,19 @@
+package org.joinmastodon.android.model;
+
+import org.joinmastodon.android.api.RequiredField;
+import org.parceler.Parcel;
+
+import java.util.List;
+
+@Parcel
+public class CustomLocalTimeline extends BaseModel{
+    @RequiredField
+    public String domain;
+
+    @Override
+    public String toString(){
+        return "Hashtag{"+
+                ", url='"+domain+'\''+
+                '}';
+    }
+}

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

@@ -121,7 +121,7 @@ public class Instance extends BaseModel{
 		ci.domain=uri;
 		ci.normalizedDomain=IDN.toUnicode(uri);
 		ci.description=Html.fromHtml(shortDescription).toString().trim();
-		if(languages!=null){
+		if(languages!=null && languages.size() > 0){
 			ci.language=languages.get(0);
 			ci.languages=languages;
 		}else{

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

@@ -0,0 +1,5 @@
+package org.joinmastodon.android.model;
+
+public interface Searchable {
+	String getQuery();
+}

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

@@ -11,7 +11,7 @@ import java.time.Instant;
 import java.util.List;
 
 @Parcel
-public class Status extends BaseModel implements DisplayItemsParent{
+public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 	@RequiredField
 	public String id;
 	@RequiredField
@@ -163,4 +163,9 @@ public class Status extends BaseModel implements DisplayItemsParent{
 		s.filtered = List.of();
 		return s;
 	}
+
+	@Override
+	public String getQuery() {
+		return url;
+	}
 }

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

@@ -10,6 +10,7 @@ import androidx.annotation.StringRes;
 
 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.fragments.CustomLocalTimelineFragment;
 import org.joinmastodon.android.fragments.HashtagTimelineFragment;
 import org.joinmastodon.android.fragments.HomeTimelineFragment;
 import org.joinmastodon.android.fragments.ListTimelineFragment;
@@ -27,7 +28,7 @@ public class TimelineDefinition {
 
     private @Nullable String listId;
     private @Nullable String listTitle;
-
+    private @Nullable String domain;
     private @Nullable String hashtagName;
 
     public static TimelineDefinition ofList(String listId, String listTitle) {
@@ -47,6 +48,12 @@ public class TimelineDefinition {
         return def;
     }
 
+    public static TimelineDefinition ofCustomLocalTimeline(String domain) {
+        TimelineDefinition def = new TimelineDefinition(TimelineType.CUSTOM_LOCAL_TIMELINE);
+        def.domain = domain;
+        return def;
+    }
+
     public static TimelineDefinition ofHashtag(Hashtag hashtag) {
         return ofHashtag(hashtag.name);
     }
@@ -78,6 +85,7 @@ public class TimelineDefinition {
             case POST_NOTIFICATIONS -> ctx.getString(R.string.sk_timeline_posts);
             case LIST -> listTitle;
             case HASHTAG -> hashtagName;
+            case CUSTOM_LOCAL_TIMELINE -> domain;
         };
     }
 
@@ -89,6 +97,7 @@ public class TimelineDefinition {
             case POST_NOTIFICATIONS -> Icon.POST_NOTIFICATIONS;
             case LIST -> Icon.LIST;
             case HASHTAG -> Icon.HASHTAG;
+            case CUSTOM_LOCAL_TIMELINE -> Icon.CUSTOM_LOCAL_TIMELINE;
         };
     }
 
@@ -100,6 +109,7 @@ public class TimelineDefinition {
             case LIST -> new ListTimelineFragment();
             case HASHTAG -> new HashtagTimelineFragment();
             case POST_NOTIFICATIONS -> new NotificationsListFragment();
+            case CUSTOM_LOCAL_TIMELINE -> new CustomLocalTimelineFragment();
         };
     }
 
@@ -125,6 +135,7 @@ public class TimelineDefinition {
         if (type != that.type) return false;
         if (type == TimelineType.LIST) return Objects.equals(listId, that.listId);
         if (type == TimelineType.HASHTAG) return Objects.equals(hashtagName.toLowerCase(), that.hashtagName.toLowerCase());
+        if (type == TimelineType.CUSTOM_LOCAL_TIMELINE) return Objects.equals(domain.toLowerCase(), that.domain.toLowerCase());
         return true;
     }
 
@@ -133,6 +144,8 @@ public class TimelineDefinition {
         int result = type.ordinal();
         result = 31 * result + (listId != null ? listId.hashCode() : 0);
         result = 31 * result + (hashtagName.toLowerCase() != null ? hashtagName.toLowerCase().hashCode() : 0);
+        result = 31 * result + (domain.toLowerCase() != null ? domain.toLowerCase().hashCode() : 0);
+
         return result;
     }
 
@@ -142,6 +155,7 @@ public class TimelineDefinition {
         def.listId = listId;
         def.listTitle = listTitle;
         def.hashtagName = hashtagName;
+        def.domain = domain;
         def.icon = icon == null ? null : Icon.values()[icon.ordinal()];
         return def;
     }
@@ -152,11 +166,13 @@ public class TimelineDefinition {
             args.putString("listID", listId);
         } else if (type == TimelineType.HASHTAG) {
             args.putString("hashtag", hashtagName);
+        } else if (type == TimelineType.CUSTOM_LOCAL_TIMELINE) {
+            args.putString("domain", domain);
         }
         return args;
     }
 
-    public enum TimelineType { HOME, LOCAL, FEDERATED, POST_NOTIFICATIONS, LIST, HASHTAG }
+    public enum TimelineType { HOME, LOCAL, FEDERATED, POST_NOTIFICATIONS, LIST, HASHTAG, CUSTOM_LOCAL_TIMELINE }
 
     public enum Icon {
         HEART(R.drawable.ic_fluent_heart_24_regular, R.string.sk_icon_heart),
@@ -219,7 +235,8 @@ public class TimelineDefinition {
         FEDERATED(R.drawable.ic_fluent_earth_24_regular, R.string.sk_timeline_federated, true),
         POST_NOTIFICATIONS(R.drawable.ic_fluent_chat_24_regular, R.string.sk_timeline_posts, true),
         LIST(R.drawable.ic_fluent_people_24_regular, R.string.sk_list, true),
-        HASHTAG(R.drawable.ic_fluent_number_symbol_24_regular, R.string.sk_hashtag, true);
+        HASHTAG(R.drawable.ic_fluent_number_symbol_24_regular, R.string.sk_hashtag, true),
+        CUSTOM_LOCAL_TIMELINE(R.drawable.ic_fluent_people_community_24_regular, R.string.sk_timeline_local, true);
 
         public final int iconRes, nameRes;
         public final boolean hidden;

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

@@ -205,6 +205,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 				String accountID = session.getID();
 				args.putString("account", accountID);
 				UiUtils.lookupStatus(v.getContext(), item.status, accountID, item.accountID, status -> {
+					if (status == null) return;
 					args.putParcelable("replyTo", Parcels.wrap(status));
 					Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
 				});
@@ -312,11 +313,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			favorite.setSelected(!item.status.favourited);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setFavorited(item.status, !item.status.favourited, r->{
 				if (item.status.favourited) {
-					if(GlobalUserPreferences.reduceMotion){
-						v.startAnimation(opacityIn);
-					}else{
-						v.startAnimation(animSet);
-					}
+					v.startAnimation(GlobalUserPreferences.reduceMotion ? opacityIn : animSet);
 				} else {
 					v.startAnimation(opacityIn);
 				}

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

@@ -481,7 +481,9 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			if (hasMultipleAccounts && accountsMenu != null) {
 				openWithAccounts.setVisible(true);
 				accountsMenu.clear();
-				populateAccountsMenu(accountsMenu);
+				UiUtils.populateAccountsMenu(item.accountID, accountsMenu, s-> UiUtils.openURL(
+						item.parentFragment.getActivity(), s.getID(), item.status.url, false
+				));
 			} else if (openWithAccounts != null) {
 				openWithAccounts.setVisible(false);
 			}

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

@@ -32,6 +32,7 @@ import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -99,6 +100,10 @@ public abstract class StatusDisplayItem{
 	}
 
 	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?> fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, boolean disableTranslate, Filter.FilterContext filterContext){
+		return buildItems(fragment, status, accountID, parentObject, knownAccounts, inset, addFooter, notification, disableTranslate, filterContext, null);
+	}
+
+	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?> fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, boolean disableTranslate, Filter.FilterContext filterContext, StatusDisplayItem titleItem){
 		String parentID=parentObject.getID();
 		ArrayList<StatusDisplayItem> items=new ArrayList<>();
 
@@ -195,6 +200,8 @@ public abstract class StatusDisplayItem{
 			item.index=i++;
 		}
 
+		if (titleItem != null) items.add(0, titleItem);
+
 		if (!statusForContent.filterRevealed) {
 			return new ArrayList<>(List.of(
 					new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, items)

mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java

@@ -87,6 +87,7 @@ import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.SearchResults;
+import org.joinmastodon.android.model.Searchable;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
@@ -107,8 +108,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -693,12 +696,6 @@ public class UiUtils{
 		TypedArray ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
 		button.setBackground(ta.getDrawable(0));
 		ta.recycle();
-		ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
-		if(relationship.blocking)
-			button.setTextColor(button.getResources().getColorStateList(R.color.error_600));
-		else
-			button.setTextColor(ta.getColorStateList(0));
-		ta.recycle();
 	}
 
 	public static void performAccountAction(Activity activity, Account account, String accountID, Relationship relationship, Button button, Consumer<Boolean> progressCallback, Consumer<Relationship> resultCallback) {
@@ -984,6 +981,8 @@ public class UiUtils{
 	public static void pickInteractAs(Context context, String accountID, Status sourceStatus, Predicate<Status> checkInteracted, InteractionPerformer interactionPerformer, @StringRes int interactAsRes, @StringRes int interactedAsAccountRes, @StringRes int alreadyInteractedRes, @DrawableRes int iconRes) {
 		pickAccount(context, accountID, interactAsRes, iconRes, session -> {
 			lookupStatus(context, sourceStatus, session.getID(), accountID, status -> {
+				if (status == null) return;
+
 				if (checkInteracted.test(status)) {
 					Toast.makeText(context, alreadyInteractedRes, Toast.LENGTH_SHORT).show();
 					return;
@@ -999,17 +998,33 @@ public class UiUtils{
 		}, null);
 	}
 
-	public static void lookupStatus(Context context, Status queryStatus, String targetAccountID, @Nullable String sourceAccountID, Consumer<Status> statusConsumer) {
+	public static void lookupStatus(Context context, Status queryStatus, String targetAccountID, @Nullable String sourceAccountID, Consumer<Status> resultConsumer) {
+		lookup(context, queryStatus, targetAccountID, sourceAccountID, GetSearchResults.Type.STATUSES, resultConsumer, results ->
+			!results.statuses.isEmpty() ? Optional.of(results.statuses.get(0)) : Optional.empty()
+		);
+	}
+
+	public static void lookupAccount(Context context, Account queryAccount, String targetAccountID, @Nullable String sourceAccountID, Consumer<Account> resultConsumer) {
+		lookup(context, queryAccount, targetAccountID, sourceAccountID, GetSearchResults.Type.ACCOUNTS, resultConsumer, results ->
+				!results.accounts.isEmpty() ? Optional.of(results.accounts.get(0)) : Optional.empty()
+		);
+	}
+
+	public static <T extends Searchable> void lookup(Context context, T query, String targetAccountID, @Nullable String sourceAccountID, @Nullable GetSearchResults.Type type, Consumer<T> resultConsumer, Function<SearchResults, Optional<T>> extractResult) {
 		if (sourceAccountID != null && targetAccountID.startsWith(sourceAccountID.substring(0, sourceAccountID.indexOf('_')))) {
-			statusConsumer.accept(queryStatus);
+			resultConsumer.accept(query);
 			return;
 		}
 
-		new GetSearchResults(queryStatus.url, GetSearchResults.Type.STATUSES, true).setCallback(new Callback<>() {
+		new GetSearchResults(query.getQuery(), type, true).setCallback(new Callback<>() {
 					@Override
 					public void onSuccess(SearchResults results) {
-						if (!results.statuses.isEmpty()) statusConsumer.accept(results.statuses.get(0));
-						else Toast.makeText(context, R.string.sk_resource_not_found, Toast.LENGTH_SHORT).show();
+						Optional<T> result = extractResult.apply(results);
+						if (result.isPresent()) resultConsumer.accept(result.get());
+						else {
+							Toast.makeText(context, R.string.sk_resource_not_found, Toast.LENGTH_SHORT).show();
+							resultConsumer.accept(null);
+						}
 					}
 
 					@Override
@@ -1245,6 +1260,17 @@ public class UiUtils{
 		return intent;
 	}
 
+	public static void populateAccountsMenu(String excludeAccountID, Menu menu, Consumer<AccountSession> onClick) {
+		List<AccountSession> sessions=AccountSessionManager.getInstance().getLoggedInAccounts();
+		sessions.stream().filter(s -> !s.getID().equals(excludeAccountID)).forEach(s -> {
+			String username = "@"+s.self.username+"@"+s.domain;
+			menu.add(username).setOnMenuItemClickListener((c) -> {
+				onClick.accept(s);
+				return true;
+			});
+		});
+	}
+
 	/**
 	 * Wraps a View.OnClickListener to filter multiple clicks in succession.
 	 * Useful for buttons that perform some action that changes their state asynchronously.

mastodon/src/main/res/drawable-v24/ic_launcher_monochrome.xml

@@ -1,18 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group android:scaleX="2.5091188"
-      android:scaleY="2.5091188">
+    android:width="43.043dp"
+    android:height="43.043dp"
+    android:viewportWidth="43.043"
+    android:viewportHeight="43.043">
+
+  <group android:scaleX="0.68"
+      android:scaleY="0.68"
+      android:translateX="6.8"
+      android:translateY="6.8">
     <path
-        android:pathData="m13.779,16.29c-1.097,0 -1.983,0.387 -2.658,1.141 -0.655,0.754 -0.981,1.771 -0.981,3.053l0,6.27L12.622,26.754L12.622,20.668c0,-1.284 0.539,-1.935 1.618,-1.935 1.192,0 1.791,0.773 1.791,2.3l0,3.331l2.468,0l0,-3.331c0,-1.527 0.598,-2.3 1.791,-2.3 1.078,0 1.618,0.651 1.618,1.935l0,6.085l2.482,0l0,-6.27c0,-1.281 -0.326,-2.299 -0.981,-3.053 -0.676,-0.754 -1.56,-1.141 -2.658,-1.141 -1.27,0 -2.232,0.488 -2.868,1.466L17.265,18.794 16.646,17.756C16.01,16.778 15.049,16.29 13.779,16.29Z"
+        android:pathData="m13.779,14.841c-1.097,0 -1.983,0.387 -2.658,1.141 -0.655,0.754 -0.981,1.771 -0.981,3.053l0,6.27L12.622,25.304L12.622,19.219c0,-1.284 0.539,-1.935 1.618,-1.935 1.192,0 1.791,0.773 1.791,2.3l0,3.331l2.468,0l0,-3.331c0,-1.527 0.598,-2.3 1.791,-2.3 1.078,0 1.618,0.651 1.618,1.935l0,6.085l2.482,0l0,-6.27c0,-1.281 -0.326,-2.299 -0.981,-3.053 -0.676,-0.754 -1.56,-1.141 -2.658,-1.141 -1.27,0 -2.232,0.488 -2.868,1.466L17.265,17.345 16.646,16.306C16.01,15.329 15.049,14.841 13.779,14.841Z"
         android:strokeWidth="0.796"
         android:fillColor="#000000"/>
     <path
-        android:pathData="m29.087,26.754q-1.113,0 -1.986,-0.493 -0.873,-0.507 -1.366,-1.366 -0.479,-0.873 -0.479,-1.958 0,-1.07 0.479,-1.944 0.493,-0.873 1.366,-1.366 0.873,-0.507 1.986,-0.507 1.099,0 1.972,0.507 0.873,0.493 1.352,1.366 0.493,0.873 0.493,1.944 0,1.085 -0.493,1.958 -0.479,0.859 -1.352,1.366 -0.873,0.493 -1.972,0.493zM29.087,25.049q0.535,0 0.986,-0.254 0.451,-0.254 0.718,-0.732 0.268,-0.479 0.268,-1.127 0,-0.634 -0.268,-1.113 -0.268,-0.479 -0.718,-0.732 -0.451,-0.254 -0.986,-0.254 -0.535,0 -0.986,0.254 -0.451,0.254 -0.732,0.732 -0.268,0.479 -0.268,1.113 0,0.634 0.268,1.127 0.282,0.479 0.732,0.732 0.451,0.254 0.986,0.254z"
+        android:pathData="m29.087,25.304q-1.113,0 -1.986,-0.493 -0.873,-0.507 -1.366,-1.366 -0.479,-0.873 -0.479,-1.958 0,-1.07 0.479,-1.944 0.493,-0.873 1.366,-1.366 0.873,-0.507 1.986,-0.507 1.099,0 1.972,0.507 0.873,0.493 1.352,1.366 0.493,0.873 0.493,1.944 0,1.085 -0.493,1.958 -0.479,0.859 -1.352,1.366 -0.873,0.493 -1.972,0.493zM29.087,23.6q0.535,0 0.986,-0.254 0.451,-0.254 0.718,-0.732 0.268,-0.479 0.268,-1.127 0,-0.634 -0.268,-1.113 -0.268,-0.479 -0.718,-0.732 -0.451,-0.254 -0.986,-0.254 -0.535,0 -0.986,0.254 -0.451,0.254 -0.732,0.732 -0.268,0.479 -0.268,1.113 0,0.634 0.268,1.127 0.282,0.479 0.732,0.732 0.451,0.254 0.986,0.254z"
         android:strokeWidth="0.687"
-        android:fillColor="#000000"/>
+        android:fillColor="#000000" />
   </group>
 </vector>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<selector>
+			<item android:state_focused="true">
+				<shape>
+					<stroke android:color="?colorM3Primary" android:width="2dp"/>
+					<corners android:radius="4dp"/>
+				</shape>
+			</item>
+			<item>
+				<shape>
+					 <stroke android:color="?colorM3Outline" android:width="1dp"/>
+					 <corners android:radius="4dp"/>
+				</shape>
+			</item>
+		</selector>
+	</item>
+</layer-list>

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

@@ -4,5 +4,5 @@
     android:shape="rectangle">
     <corners android:radius="4sp" />
     <solid android:color="?colorBackgroundLight" />
-    <stroke android:width="2dp" android:color="#00ff00" />
+    <stroke android:width="2dp" android:color="?android:colorAccent" />
 </shape>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7,21Q6.175,21 5.588,20.413Q5,19.825 5,19V6H4V4H9V3H15V4H20V6H19V19Q19,19.825 18.413,20.413Q17.825,21 17,21ZM17,6H7V19Q7,19 7,19Q7,19 7,19H17Q17,19 17,19Q17,19 17,19ZM9,17H11V8H9ZM13,17H15V8H13ZM7,6V19Q7,19 7,19Q7,19 7,19Q7,19 7,19Q7,19 7,19Z"/>
+</vector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M4.22 8.47c0.293-0.293 0.767-0.293 1.06 0L12 15.19l6.72-6.72c0.293-0.293 0.767-0.293 1.06 0 0.293 0.293 0.293 0.767 0 1.06l-7.25 7.25c-0.293 0.293-0.767 0.293-1.06 0L4.22 9.53c-0.293-0.293-0.293-0.767 0-1.06z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M15.114 25.719c-0.396-0.408-0.746-0.861-1.04-1.35C13.418 24.453 12.725 24.5 12 24.5c-5.111 0-8.5-2.111-8.5-4.785V19l0.007-0.145C3.58 18.095 4.22 17.5 5 17.5h8.624c0.234-0.535 0.529-1.038 0.875-1.5H5c-1.657 0-3 1.343-3 3v0.715C2 23.433 6.21 26 12 26c1.101 0 2.145-0.098 3.114-0.281zM18 8c0-3.314-2.686-6-6-6S6 4.686 6 8s2.686 6 6 6 6-2.686 6-6zM7.5 8c0-2.485 2.015-4.5 4.5-4.5s4.5 2.015 4.5 4.5-2.015 4.5-4.5 4.5S7.5 10.485 7.5 8zm13 19c3.59 0 6.5-2.91 6.5-6.5S24.09 14 20.5 14 14 16.91 14 20.5s2.91 6.5 6.5 6.5zm0-11c0.276 0 0.5 0.224 0.5 0.5V20h3.5c0.276 0 0.5 0.224 0.5 0.5S24.776 21 24.5 21H21v3.5c0 0.276-0.224 0.5-0.5 0.5S20 24.776 20 24.5V21h-3.5c-0.276 0-0.5-0.224-0.5-0.5s0.224-0.5 0.5-0.5H20v-3.5c0-0.276 0.224-0.5 0.5-0.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -2,20 +2,22 @@
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group android:scaleX="2.5091188"
-      android:scaleY="2.5091188">
+    android:viewportWidth="43.043"
+    android:viewportHeight="43.043">
+  <group android:scaleX="0.73"
+      android:scaleY="0.73"
+      android:translateX="5.810805"
+      android:translateY="5.810805">
     <path
         android:pathData="M0,0h43.043v43.043h-43.043z"
         android:strokeWidth="1.53886"
         android:fillColor="#282c37"/>
     <path
-        android:pathData="m13.779,16.29c-1.097,0 -1.983,0.387 -2.658,1.141 -0.655,0.754 -0.981,1.771 -0.981,3.053l0,6.27L12.622,26.754L12.622,20.668c0,-1.284 0.539,-1.935 1.618,-1.935 1.192,0 1.791,0.773 1.791,2.3l0,3.331l2.468,0l0,-3.331c0,-1.527 0.598,-2.3 1.791,-2.3 1.078,0 1.618,0.651 1.618,1.935l0,6.085l2.482,0l0,-6.27c0,-1.281 -0.326,-2.299 -0.981,-3.053 -0.676,-0.754 -1.56,-1.141 -2.658,-1.141 -1.27,0 -2.232,0.488 -2.868,1.466L17.265,18.794 16.646,17.756C16.01,16.778 15.049,16.29 13.779,16.29Z"
+        android:pathData="m13.779,14.841c-1.097,0 -1.983,0.387 -2.658,1.141 -0.655,0.754 -0.981,1.771 -0.981,3.053l0,6.27L12.622,25.304L12.622,19.219c0,-1.284 0.539,-1.935 1.618,-1.935 1.192,0 1.791,0.773 1.791,2.3l0,3.331l2.468,0l0,-3.331c0,-1.527 0.598,-2.3 1.791,-2.3 1.078,0 1.618,0.651 1.618,1.935l0,6.085l2.482,0l0,-6.27c0,-1.281 -0.326,-2.299 -0.981,-3.053 -0.676,-0.754 -1.56,-1.141 -2.658,-1.141 -1.27,0 -2.232,0.488 -2.868,1.466L17.265,17.345 16.646,16.306C16.01,15.329 15.049,14.841 13.779,14.841Z"
         android:strokeWidth="0.796"
         android:fillColor="#eed7f4"/>
     <path
-        android:pathData="m29.087,26.754q-1.113,0 -1.986,-0.493 -0.873,-0.507 -1.366,-1.366 -0.479,-0.873 -0.479,-1.958 0,-1.07 0.479,-1.944 0.493,-0.873 1.366,-1.366 0.873,-0.507 1.986,-0.507 1.099,0 1.972,0.507 0.873,0.493 1.352,1.366 0.493,0.873 0.493,1.944 0,1.085 -0.493,1.958 -0.479,0.859 -1.352,1.366 -0.873,0.493 -1.972,0.493zM29.087,25.049q0.535,0 0.986,-0.254 0.451,-0.254 0.718,-0.732 0.268,-0.479 0.268,-1.127 0,-0.634 -0.268,-1.113 -0.268,-0.479 -0.718,-0.732 -0.451,-0.254 -0.986,-0.254 -0.535,0 -0.986,0.254 -0.451,0.254 -0.732,0.732 -0.268,0.479 -0.268,1.113 0,0.634 0.268,1.127 0.282,0.479 0.732,0.732 0.451,0.254 0.986,0.254z"
+        android:pathData="m29.087,25.304q-1.113,0 -1.986,-0.493 -0.873,-0.507 -1.366,-1.366 -0.479,-0.873 -0.479,-1.958 0,-1.07 0.479,-1.944 0.493,-0.873 1.366,-1.366 0.873,-0.507 1.986,-0.507 1.099,0 1.972,0.507 0.873,0.493 1.352,1.366 0.493,0.873 0.493,1.944 0,1.085 -0.493,1.958 -0.479,0.859 -1.352,1.366 -0.873,0.493 -1.972,0.493zM29.087,23.6q0.535,0 0.986,-0.254 0.451,-0.254 0.718,-0.732 0.268,-0.479 0.268,-1.127 0,-0.634 -0.268,-1.113 -0.268,-0.479 -0.718,-0.732 -0.451,-0.254 -0.986,-0.254 -0.535,0 -0.986,0.254 -0.451,0.254 -0.732,0.732 -0.268,0.479 -0.268,1.113 0,0.634 0.268,1.127 0.282,0.479 0.732,0.732 0.451,0.254 0.986,0.254z"
         android:strokeWidth="0.687"
         android:fillColor="#eed7f4"
         android:strokeColor="#00000000"/>

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

@@ -1,18 +1,19 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group android:scaleX="2.5091188"
-      android:scaleY="2.5091188">
+    android:width="43.043dp"
+    android:height="43.043dp"
+    android:viewportWidth="43.043"
+    android:viewportHeight="43.043">
+
+  <group android:scaleX="0.68"
+      android:scaleY="0.68">
     <path
-        android:pathData="m13.779,16.29c-1.097,0 -1.983,0.387 -2.658,1.141 -0.655,0.754 -0.981,1.771 -0.981,3.053l0,6.27L12.622,26.754L12.622,20.668c0,-1.284 0.539,-1.935 1.618,-1.935 1.192,0 1.791,0.773 1.791,2.3l0,3.331l2.468,0l0,-3.331c0,-1.527 0.598,-2.3 1.791,-2.3 1.078,0 1.618,0.651 1.618,1.935l0,6.085l2.482,0l0,-6.27c0,-1.281 -0.326,-2.299 -0.981,-3.053 -0.676,-0.754 -1.56,-1.141 -2.658,-1.141 -1.27,0 -2.232,0.488 -2.868,1.466L17.265,18.794 16.646,17.756C16.01,16.778 15.049,16.29 13.779,16.29Z"
+        android:pathData="m13.779,14.841c-1.097,0 -1.983,0.387 -2.658,1.141 -0.655,0.754 -0.981,1.771 -0.981,3.053l0,6.27L12.622,25.304L12.622,19.219c0,-1.284 0.539,-1.935 1.618,-1.935 1.192,0 1.791,0.773 1.791,2.3l0,3.331l2.468,0l0,-3.331c0,-1.527 0.598,-2.3 1.791,-2.3 1.078,0 1.618,0.651 1.618,1.935l0,6.085l2.482,0l0,-6.27c0,-1.281 -0.326,-2.299 -0.981,-3.053 -0.676,-0.754 -1.56,-1.141 -2.658,-1.141 -1.27,0 -2.232,0.488 -2.868,1.466L17.265,17.345 16.646,16.306C16.01,15.329 15.049,14.841 13.779,14.841Z"
         android:strokeWidth="0.796"
         android:fillColor="#000000"/>
     <path
-        android:pathData="m29.087,26.754q-1.113,0 -1.986,-0.493 -0.873,-0.507 -1.366,-1.366 -0.479,-0.873 -0.479,-1.958 0,-1.07 0.479,-1.944 0.493,-0.873 1.366,-1.366 0.873,-0.507 1.986,-0.507 1.099,0 1.972,0.507 0.873,0.493 1.352,1.366 0.493,0.873 0.493,1.944 0,1.085 -0.493,1.958 -0.479,0.859 -1.352,1.366 -0.873,0.493 -1.972,0.493zM29.087,25.049q0.535,0 0.986,-0.254 0.451,-0.254 0.718,-0.732 0.268,-0.479 0.268,-1.127 0,-0.634 -0.268,-1.113 -0.268,-0.479 -0.718,-0.732 -0.451,-0.254 -0.986,-0.254 -0.535,0 -0.986,0.254 -0.451,0.254 -0.732,0.732 -0.268,0.479 -0.268,1.113 0,0.634 0.268,1.127 0.282,0.479 0.732,0.732 0.451,0.254 0.986,0.254z"
+        android:pathData="m29.087,25.304q-1.113,0 -1.986,-0.493 -0.873,-0.507 -1.366,-1.366 -0.479,-0.873 -0.479,-1.958 0,-1.07 0.479,-1.944 0.493,-0.873 1.366,-1.366 0.873,-0.507 1.986,-0.507 1.099,0 1.972,0.507 0.873,0.493 1.352,1.366 0.493,0.873 0.493,1.944 0,1.085 -0.493,1.958 -0.479,0.859 -1.352,1.366 -0.873,0.493 -1.972,0.493zM29.087,23.6q0.535,0 0.986,-0.254 0.451,-0.254 0.718,-0.732 0.268,-0.479 0.268,-1.127 0,-0.634 -0.268,-1.113 -0.268,-0.479 -0.718,-0.732 -0.451,-0.254 -0.986,-0.254 -0.535,0 -0.986,0.254 -0.451,0.254 -0.732,0.732 -0.268,0.479 -0.268,1.113 0,0.634 0.268,1.127 0.282,0.479 0.732,0.732 0.451,0.254 0.986,0.254z"
         android:strokeWidth="0.687"
-        android:fillColor="#000000"/>
+        android:fillColor="#000000" />
   </group>
 </vector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -8,9 +8,10 @@
 
     <TextView
         android:id="@+id/text"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="start|center_vertical"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
         android:padding="16dp"
         android:textAppearance="@style/m3_title_medium"
         android:textColor="?android:textColorSecondary"
@@ -20,11 +21,11 @@
         android:id="@+id/reveal_btn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="end|center_vertical"
+        android:layout_gravity="center_vertical"
         android:padding="16dp"
         android:text="@string/tap_to_reveal"
         android:singleLine="true"
         android:ellipsize="end"
         android:textColor="?android:textColorSecondary" />
 
-</FrameLayout>
+</LinearLayout>

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

@@ -64,7 +64,7 @@
 			android:id="@+id/favorite"
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
-			android:layout_gravity="center_vertical"
+			android:layout_gravity="center"
 			android:drawableStart="@drawable/ic_fluent_star_24_selector"
 			android:drawablePadding="8dp"
 			android:paddingHorizontal="8dp"

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

@@ -90,7 +90,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_toEndOf="@id/self_avatar"
-						android:layout_marginTop="2sp"
+						android:paddingTop="4sp"
 						android:minHeight="24sp"
 						android:ellipsize="end"
 						android:singleLine="true"
@@ -344,7 +344,7 @@
 			android:tintMode="src_in"
 			android:contentDescription="@string/add_media"
 			android:tooltipText="@string/add_media"
-			android:src="@drawable/ic_fluent_image_24_regular"/>
+			android:src="@drawable/ic_fluent_image_add_24_regular"/>
 
 		<ImageButton
 			android:id="@+id/btn_poll"

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

@@ -9,7 +9,8 @@
 	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1">
+		android:layout_weight="1"
+		android:fillViewport="true">
 
 		<LinearLayout
 			android:layout_width="match_parent"
@@ -28,6 +29,11 @@
 				android:textColor="?colorM3OnSurface"
 				android:text="@string/confirm_email_subtitle"/>
 
+			<Space
+				android:layout_width="1dp"
+				android:layout_height="0px"
+				android:layout_weight="1"/>
+			
 			<ImageView
 				android:layout_width="230dp"
 				android:layout_height="wrap_content"
@@ -37,6 +43,11 @@
 				android:adjustViewBounds="true"
 				android:src="@drawable/confirm_email_art"/>
 
+			<Space
+				android:layout_width="1dp"
+				android:layout_height="0px"
+				android:layout_weight="1"/>
+
 		</LinearLayout>
 
 	</ScrollView>

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

@@ -40,17 +40,17 @@
 		android:background="@drawable/bg_onboarding_panel">
 
 		<Button
-			android:id="@+id/btn_skip"
+			android:id="@+id/btn_next"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginStart="16dp"
 			android:layout_marginTop="8dp"
 			android:layout_marginBottom="16dp"
 			style="@style/Widget.Mastodon.M3.Button.Tonal"
-			android:text="@string/skip"/>
+			android:text="@string/follow_all"/>
 
 		<Button
-			android:id="@+id/btn_next"
+			android:id="@+id/btn_skip"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginStart="16dp"
@@ -58,7 +58,7 @@
 			android:layout_marginTop="8dp"
 			android:layout_marginBottom="16dp"
 			style="@style/Widget.Mastodon.M3.Button.Filled"
-			android:text="@string/follow_all"/>
+			android:text="@string/skip"/>
 
 	</LinearLayout>
 

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

@@ -64,6 +64,7 @@
 			android:contentDescription="@string/clear"
 			android:stateListAnimator="@null"
 			android:elevation="0dp"
+			android:tint="?colorM3OnSurfaceVariant"
 			android:src="@drawable/ic_m3_cancel"/>
 
 	</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>

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

@@ -2,32 +2,43 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="horizontal"
 	android:layout_width="match_parent"
-	android:layout_height="56dp"
-	android:paddingStart="16dp"
-	android:paddingEnd="8dp"
+	android:layout_height="wrap_content"
+	android:paddingStart="8dp"
+	android:paddingEnd="16dp"
 	android:clipToPadding="false"
 	android:background="?colorM3Background">
 
 	<ImageView
 		android:id="@+id/dragger_thingy"
-		android:layout_width="56dp"
-		android:layout_height="56dp"
-		android:layout_alignParentEnd="true"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:layout_alignParentStart="true"
+		android:layout_marginEnd="8dp"
 		android:scaleType="center"
 		android:tint="?colorM3OnSurface"
+		android:contentDescription="@string/reorder"
 		android:src="@drawable/ic_drag_handle_24px"/>
 
+	<ImageButton
+		android:id="@+id/delete"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:layout_alignParentEnd="true"
+		android:layout_marginStart="8dp"
+		android:scaleType="center"
+		android:tint="?colorM3OnSurface"
+		android:background="?android:actionBarItemBackground"
+		android:contentDescription="@string/delete"
+		android:src="@drawable/ic_delete_24px"/>
+
 	<EditText
 		android:id="@+id/content"
 		android:layout_width="match_parent"
-		android:layout_height="24dp"
-		android:layout_marginTop="6dp"
-		android:layout_toStartOf="@id/dragger_thingy"
-		android:background="@null"
-		android:padding="0dp"
-		android:textAppearance="@style/m3_body_large"
-		android:textColor="?colorM3OnSurfaceVariant"
-		android:textColorHint="?colorM3OnSurfaceVariant"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="8dp"
+		android:layout_toEndOf="@id/dragger_thingy"
+		android:layout_toStartOf="@id/delete"
+		style="@style/Widget.Mastodon.M3.EditText"
 		android:inputType="textCapSentences"
 		android:hint="@string/field_content"
 		android:saveEnabled="false"
@@ -36,14 +47,13 @@
 	<EditText
 		android:id="@+id/title"
 		android:layout_width="match_parent"
-		android:layout_height="20dp"
-		android:layout_toStartOf="@id/dragger_thingy"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="8dp"
+		android:layout_marginBottom="8dp"
+		android:layout_toEndOf="@id/dragger_thingy"
+		android:layout_toStartOf="@id/delete"
 		android:layout_below="@id/content"
-		android:background="@null"
-		android:padding="0dp"
-		android:textAppearance="@style/m3_body_medium"
-		android:textColor="?colorM3OnSurfaceVariant"
-		android:textColorHint="?colorM3OnSurfaceVariant"
+		style="@style/Widget.Mastodon.M3.EditText"
 		android:inputType="textCapSentences"
 		android:hint="@string/field_label"
 		android:saveEnabled="false"

mastodon/src/main/res/menu/profile.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/open_with_account" android:title="@string/sk_open_with_account" android:icon="@drawable/ic_fluent_person_swap_24_regular">
+		<menu android:id="@+id/accounts" />
+	</item>
 	<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular"/>
 	<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_mute_24_regular"/>
 	<item android:id="@+id/block" android:title="@string/block_user" android:icon="@drawable/ic_fluent_person_prohibited_24_regular"/>

mastodon/src/main/res/menu/profile_own.xml

@@ -2,6 +2,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:id="@+id/followed_hashtags" android:title="@string/sk_hashtags_you_follow" android:icon="@drawable/ic_fluent_number_symbol_24_regular"/>
 	<item android:id="@+id/bookmarks" android:title="@string/bookmarks" android:icon="@drawable/ic_fluent_bookmark_multiple_24_regular" android:showAsAction="always"/>
+	<item android:id="@+id/open_with_account" android:title="@string/sk_open_with_account" android:icon="@drawable/ic_fluent_person_swap_24_regular">
+		<menu android:id="@+id/accounts" />
+	</item>
 	<item android:id="@+id/manage_user_lists" android:title="@string/sk_your_lists" android:icon="@drawable/ic_fluent_people_24_regular"/>
 	<item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_fluent_star_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/scheduled" android:title="@string/sk_unsent_posts" android:icon="@drawable/ic_fluent_folder_open_24_regular" android:showAsAction="always"/>

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

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">الخطوات الأولى</string>
+	<string name="get_started">إنشاء حساب</string>
+	<string name="already_have_account">لدي حساب بالفعل</string>
 	<string name="log_in">تسجيلُ الدخول</string>
 	<string name="next">التالي</string>
+	<string name="loading_instance">جارٍ جلب معلومات الخادم…</string>
 	<string name="error">خطأ</string>
+	<string name="not_a_mastodon_instance">لا يبدو أنّ %s كخادم ماستدون.</string>
 	<string name="ok">حسنًا</string>
 	<string name="preparing_auth">جَارٍ الإعدَادُ لِلمُصادَقَة…</string>
 	<string name="finishing_auth">يُنهي المصادقة…</string>
@@ -226,15 +229,16 @@
 	<string name="back">العودة</string>
 	<string name="instance_catalog_title">يتكوّن ماستدون من مستخدمين موزّعين عبر خوادم مختلفة.</string>
 	<string name="instance_catalog_subtitle">اختر خادمًا بناءً على اهتماماتك، منطقتك أو يمكنك حتى اختيارُ مجتمعٍ ذي غرضٍ عام. وسيضل بامكانك التواصل مع المستخدمين من الخوادم الأخرى.</string>
-	<string name="search_communities">ابحث عن خادم أو أدخل رابطه</string>
-	<string name="instance_rules_title">بعض القواعد الأساسية</string>
-	<string name="instance_rules_subtitle">خذ دقيقة لمراجعة القواعد التي حددها وفرضها مديروا %s.</string>
-	<string name="signup_title">دعنا نجهزك في %s</string>
+	<string name="search_communities">اسم الخادم أو عنوان URL</string>
+	<string name="instance_rules_title">قواعد الخادم</string>
+	<string name="instance_rules_subtitle">من خلال المتابعة، أنت توافق على اتباع القواعد التالية التي تم تعيينها وإنفاذها من قبل مشرفي %s.</string>
+	<string name="signup_title">إنشاء حساب</string>
 	<string name="edit_photo">حرّر</string>
-	<string name="display_name">الاسم العلني</string>
+	<string name="display_name">الاسم</string>
 	<string name="username">اسم المستخدم</string>
 	<string name="email">البريد الإلكتروني</string>
 	<string name="password">كلمة المرور</string>
+	<string name="confirm_password">تأكيد كلمة المرور</string>
 	<string name="password_note">ضمّن الأحرف الكبيرة والأحرف الخاصة والأرقام لزيادة قوة كلمة المرور.</string>
 	<string name="category_academia">أكاديمي</string>
 	<string name="category_activism">النشطاء</string>
@@ -249,8 +253,10 @@
 	<string name="category_music">موسيقى</string>
 	<string name="category_regional">إقليمي</string>
 	<string name="category_tech">تقني</string>
-	<string name="confirm_email_title">شيءٌ أخير</string>
-	<string name="confirm_email_subtitle">أنقر على الرابط المرسل إليك لاستيثاق حسابك.</string>
+	<string name="confirm_email_title">تحقق من صندوق الوارد الخاص بك</string>
+	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">اضغط على الرابط الذي أرسلناه لك للتحقق من %s. سننتظر هنا.</string>
+	<string name="confirm_email_didnt_get">ألم تحصل على رابط؟</string>
 	<string name="resend">أعد الإرسال</string>
 	<string name="open_email_app">افتح تطبيق البريد الإلكتروني</string>
 	<string name="resent_email">أُرسلت رسالة التأكيد</string>
@@ -342,7 +348,7 @@
 	<string name="open_in_browser">افتح في المتصفح</string>
 	<string name="hide_boosts_from_user">اخف ما أعاد %s تدوينه</string>
 	<string name="show_boosts_from_user">أظهر ما أعاد %s تدوينه</string>
-	<string name="signup_reason">لماذا ترغب في الانضمام؟</string>
+	<string name="signup_reason">لماذا تريد الانضمام؟</string>
 	<string name="signup_reason_note">هذا سوف يساعدنا في مراجعة تطبيقك.</string>
 	<string name="clear">امسح</string>
 	<string name="profile_header">الصورة الفوقية</string>
@@ -459,8 +465,54 @@
 	<!-- %s is file size -->
 	<string name="download_update">جارٍ التنزيل (%s)</string>
 	<string name="install_update">تثبيت</string>
-	<string name="privacy_policy_title">ماستدون وخصوصيتك</string>
-	<string name="privacy_policy_subtitle">على الرغم من أن تطبيق ماستدون لا يجمع أي بيانات، فإن الخادم الذي قمت بالتسجيل من خلاله قد تكون له سياسة مختلفة. خذ دقيقة للمراجعة والموافقة على سياسة خصوصية التطبيق ماستدون وسياسة الخصوصية للخادم الخاص بك.</string>
+	<string name="privacy_policy_title">خصوصيتك</string>
+	<string name="privacy_policy_subtitle">على الرغم من أن تطبيق ماستدون لا يجمع أي بيانات، فإن الخادم الذي قمت بالتسجيل من خلاله قد تكون له سياسة مختلفة.\n\nإذا لم توافق على سياسة %s، يمكنك العودة واختيار خادم مختلف.</string>
 	<string name="i_agree">أنا مُوافِق</string>
 	<string name="empty_list">هذه القائمة فارغة</string>
+	<string name="instance_signup_closed">هذا الخادم لا يقبل التسجيلات الجديدة.</string>
+	<string name="text_copied">نُسِخ إلى الحافظة</string>
+	<string name="add_bookmark">إضافة إلى الفواصل المرجعية</string>
+	<string name="remove_bookmark">إزالة الفاصلة المرجعية</string>
+	<string name="bookmarks">الفواصل المرجعية</string>
+	<string name="your_favorites">مفضّلاتك</string>
+	<string name="login_title">مرحبا بك مجددًا</string>
+	<string name="login_subtitle">قم بتسجيل الدخول باستخدام الخادم حيث قمتَ بإنشاء حسابك فيه.</string>
+	<string name="server_url">رابط الخادم</string>
+	<string name="welcome_page1_title">ما هو ماستدون؟</string>
+	<string name="welcome_page1_text">تخيل أن لديك عنوان بريد إلكتروني ينتهي بـ @example.com.\n\n رغم ذلك يمكنك إرسال واستقبال رسائل البريد الإلكتروني من أي شخص، حتى إذا كان بريدهم الإلكتروني الخاص ينتهي بـ @gmail.com أو @icloud.com أو @example.com.</string>
+	<string name="welcome_page2_title">ماستدون هكذا.</string>
+	<string name="welcome_page2_text">قد يكون مُعرّفُك @gothgirl654@example.social ، ولكنه بإمكانك متابعة وإعادة تدوين ومحادثة @fallout5ever@example.online.</string>
+	<string name="welcome_page3_title">كيف يمكنني اختيار خادم؟</string>
+	<string name="welcome_page3_text">يختار الأشخاص المختلفون خوادم مختلفة لأي عدد من الأسباب. يعد art.example مكانًا رائعًا للفنانين ، بينما قد يكون glasgow.example اختيارًا جيدًا للاسكتلنديين. \n\n لا يمكنك أن تخطئ في أي من الخوادم التي نوصي بها ، لذلك بغض النظر عن أي واحد تختاره (أو إذا قمت بإدخال الخادم الخاص بك في شريط البحث) ، فلن يفوتك أي شيء في أي مكان.</string>
+	<string name="signup_random_server_explain">سوف نختار خادماً بناءً على لغتك إذا قمت بالمتابعة دون إجراء إختيار.</string>
+	<string name="server_filter_any_language">أي لغة</string>
+	<string name="server_filter_instant_signup">تسجيل فوري</string>
+	<string name="server_filter_manual_review">مراجعة يدوية</string>
+	<string name="server_filter_any_signup_speed">أي سرعة تسجيل</string>
+	<string name="server_filter_region_europe">أوروبا</string>
+	<string name="server_filter_region_north_america">أمريكا الشمالية</string>
+	<string name="server_filter_region_south_america">أمريكا الجنوبية</string>
+	<string name="server_filter_region_africa">أفريقيا</string>
+	<string name="server_filter_region_asia">آسيا</string>
+	<string name="server_filter_region_oceania">أوقيانوسيا</string>
+	<string name="not_accepting_new_members">لا يقبل  استقبال أعضاء جدد</string>
+	<string name="category_special_interests">المصالح الخاصة</string>
+	<string name="signup_passwords_dont_match">كلمات المرور غير متطابقة</string>
+	<string name="pick_server_for_me">اختر لي</string>
+	<string name="profile_add_row">إضافة صف</string>
+	<string name="profile_setup">إعداد الملف الشخصي</string>
+	<string name="profile_setup_subtitle">يمكنك دائماً إكمال هذا في وقت لاحق في علامة التبويب الملف الشخصي.</string>
+	<string name="profile_setup_explanation">يمكنك إضافة ما يصل إلى أربعة حقول شخصية لأي شيء تريده. الموقع، الروابط، الضمائر - السماء هي الحد الأقصى.</string>
+	<string name="popular_on_mastodon">مشهور على ماستدون</string>
+	<string name="follow_all">اتبع الكل</string>
+	<string name="server_rules_disagree">لا أوافق</string>
+	<string name="privacy_policy_explanation">بالمختصر: نحن لا نجمع أو نعالج أي شيء.</string>
+	<!-- %s is server domain -->
+	<string name="server_policy_disagree">لايتفق مع %s</string>
+	<string name="profile_bio">نبذة عنك</string>
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">متابعة المستخدمين…</string>
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s لا يسمح بالتسجيلات من %2$s. جرب واحدا أو &lt;a&gt;اختار خادم مختلف&lt;/a&gt;.</string>
+	<string name="signup_username_taken">اِسم المُستَخدِم هذا مأخوذٌ بالفعل.</string>
 </resources>

mastodon/src/main/res/values-be-rBY/strings.xml

@@ -1,16 +1,432 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Пачаць</string>
+	<string name="get_started">Стварыць уліковы запіс</string>
+	<string name="already_have_account">У мяне ўжо ёсць уліковы запіс</string>
 	<string name="log_in">Увайсці</string>
 	<string name="next">Далей</string>
+	<string name="loading_instance">Атрыманне інфармацыі аб серверы…</string>
 	<string name="error">Памылка</string>
+	<string name="not_a_mastodon_instance">Здаецца, %s не з\'яўляецца серверам Mastodon.</string>
 	<string name="ok">Добра</string>
+	<string name="preparing_auth">Падрыхтоўка да аўтэнтыфікацыі…</string>
+	<string name="finishing_auth">Завяршэнне аўтэнтыфікацыі…</string>
+	<string name="user_boosted">%s пашырыў</string>
+	<string name="in_reply_to">У адказ %s</string>
 	<string name="notifications">Апавяшчэнні</string>
+	<string name="user_followed_you">падпісаўся(-лася) на вас</string>
+	<string name="user_sent_follow_request">адправіў запыт на падпіску</string>
+	<string name="user_favorited">упадабаў(-ла) ваш допіс</string>
+	<string name="notification_boosted">пашырыў(-ла) ваш допіс</string>
+	<string name="poll_ended">апытанне завершана</string>
+	<string name="time_seconds">%dсек</string>
+	<string name="time_minutes">%dхв</string>
+	<string name="time_hours">%dгадз</string>
+	<string name="time_days">%dдз</string>
 	<string name="share_toot_title">Абагуліць</string>
 	<string name="settings">Налады</string>
+	<string name="publish">Апублікаваць</string>
+	<string name="discard_draft">Скасаваць чарнавік?</string>
+	<string name="discard">Скасаваць</string>
 	<string name="cancel">Скасаваць</string>
+	<plurals name="followers">
+		<item quantity="one">падпісчык</item>
+		<item quantity="few">падпісчыка</item>
+		<item quantity="many">падпісчыкаў</item>
+		<item quantity="other">падпісчыкаў</item>
+	</plurals>
+	<plurals name="following">
+		<item quantity="one">падпісаны</item>
+		<item quantity="few">падпісаны</item>
+		<item quantity="many">падпісаны</item>
+		<item quantity="other">падпісаны</item>
+	</plurals>
+	<plurals name="posts">
+		<item quantity="one">допіс</item>
+		<item quantity="few">допісы</item>
+		<item quantity="many">допісаў</item>
+		<item quantity="other">допісаў</item>
+	</plurals>
+	<string name="posts">Допісы</string>
+	<string name="posts_and_replies">Допісы і адказы</string>
+	<string name="media">Медыя</string>
+	<string name="profile_about">Інфармацыя</string>
+	<string name="button_follow">Падпісацца</string>
+	<string name="button_following">Вы падпісаны</string>
+	<string name="edit_profile">Рэдагаваць профіль</string>
+	<string name="mention_user">Згадаць %s</string>
+	<string name="share_user">Абагуліць %s</string>
+	<string name="mute_user">Ігнараваць %s</string>
+	<string name="unmute_user">Не ігнараваць %s</string>
+	<string name="block_user">Заблакіраваць %s</string>
+	<string name="unblock_user">Разблакіраваць %s</string>
+	<string name="report_user">Паскардзіцца на %s</string>
+	<string name="block_domain">Заблакіраваць %s</string>
+	<string name="unblock_domain">Разблакіраваць %s</string>
+	<plurals name="x_posts">
+		<item quantity="one">%,d допіс</item>
+		<item quantity="few">%,d допісы</item>
+		<item quantity="many">%,d допісаў</item>
+		<item quantity="other">%,d допісаў</item>
+	</plurals>
+	<string name="profile_joined">Далучыўся</string>
+	<string name="done">Гатова</string>
+	<string name="loading">Загрузка…</string>
+	<string name="field_label">Метка</string>
+	<string name="field_content">Змесціва</string>
+	<string name="saving">Захаванне…</string>
+	<string name="post_from_user">Допіс ад %s</string>
+	<string name="poll_option_hint">Варыянт %d</string>
+	<plurals name="x_minutes">
+		<item quantity="one">%d хвіліна</item>
+		<item quantity="few">%d хвіліны</item>
+		<item quantity="many">%d хвілін</item>
+		<item quantity="other">%d хвілін</item>
+	</plurals>
+	<plurals name="x_hours">
+		<item quantity="one">%d гадзіна</item>
+		<item quantity="few">%d гадзіны</item>
+		<item quantity="many">%d гадзін</item>
+		<item quantity="other">%d гадзін</item>
+	</plurals>
+	<plurals name="x_days">
+		<item quantity="one">%d дзень</item>
+		<item quantity="few">%d дні</item>
+		<item quantity="many">%d дзён</item>
+		<item quantity="other">%d дзён</item>
+	</plurals>
+	<string name="compose_poll_duration">Працягласць: %s</string>
+	<plurals name="x_seconds_left">
+		<item quantity="one">%d секунда засталася</item>
+		<item quantity="few">%d секунды засталося</item>
+		<item quantity="many">%d секунд засталося</item>
+		<item quantity="other">%d секунд засталося</item>
+	</plurals>
+	<plurals name="x_minutes_left">
+		<item quantity="one">%d хвіліна засталася</item>
+		<item quantity="few">%d хвіліны засталося</item>
+		<item quantity="many">%d хвілін засталося</item>
+		<item quantity="other">%d хвілін засталося</item>
+	</plurals>
+	<plurals name="x_hours_left">
+		<item quantity="one">%d гадзіна засталася</item>
+		<item quantity="few">%d гадзіны засталося</item>
+		<item quantity="many">%d гадзін засталося</item>
+		<item quantity="other">%d гадзін засталося</item>
+	</plurals>
+	<plurals name="x_days_left">
+		<item quantity="one">%d дзень застаўся</item>
+		<item quantity="few">%d дні засталося</item>
+		<item quantity="many">%d дзён засталося</item>
+		<item quantity="other">%d дзён засталося</item>
+	</plurals>
+	<plurals name="x_voters">
+		<item quantity="one">%,d прагаласаваў</item>
+		<item quantity="few">%,d прагаласавала</item>
+		<item quantity="many">%,d прагаласавала</item>
+		<item quantity="other">%,d прагаласавала</item>
+	</plurals>
+	<string name="poll_closed">Завершана</string>
+	<string name="confirm_mute_title">Ігнараваць уліковы запіс</string>
+	<string name="confirm_mute">Ігнараваць %s?</string>
+	<string name="do_mute">Ігнараваць</string>
+	<string name="confirm_unmute_title">Не ігнараваць уліковы запіс</string>
+	<string name="confirm_unmute">Не ігнараваць %s?</string>
+	<string name="do_unmute">Не ігнараваць</string>
+	<string name="confirm_block_title">Заблакіраваць уліковы запіс</string>
+	<string name="confirm_block_domain_title">Заблакіраваць дамен</string>
+	<string name="confirm_block">Заблакіраваць %s?</string>
+	<string name="do_block">Заблакіраваць</string>
+	<string name="confirm_unblock_title">Разблакіраваць уліковы запіс</string>
+	<string name="confirm_unblock_domain_title">Разблакіраваць дамен</string>
+	<string name="confirm_unblock">Разблакіраваць %s?</string>
+	<string name="do_unblock">Разблакіраваць</string>
+	<string name="button_muted">Ігнаруецца</string>
+	<string name="button_blocked">Заблакіраваны</string>
+	<string name="action_vote">Прагаласаваць</string>
+	<string name="tap_to_reveal">Націсніце, каб паказаць</string>
+	<string name="delete">Выдаліць</string>
+	<string name="confirm_delete_title">Выдаліць допіс</string>
+	<string name="confirm_delete">Вы ўпэўненыя, што хочаце выдаліць гэты допіс?</string>
+	<string name="deleting">Выдаленне…</string>
+	<string name="notification_channel_audio_player">Прайграванне аўдыя</string>
+	<string name="play">Прайграць</string>
+	<string name="pause">Прыпыніць</string>
+	<string name="log_out">Выйсці</string>
+	<string name="add_account">Дадаць уліковы запіс</string>
+	<string name="search_hint">Пошук</string>
+	<string name="hashtags">Хэштэгі</string>
+	<string name="news">Навіны</string>
+	<string name="for_you">Для вас</string>
+	<string name="all_notifications">Усе</string>
+	<string name="mentions">Згадванні</string>
+	<plurals name="x_people_talking">
+		<item quantity="one">%d чалавек размаўляе</item>
+		<item quantity="few">%d чалавекі размаўляе</item>
+		<item quantity="many">%d чалавек размаўляе</item>
+		<item quantity="other">%d чалавек размаўляе</item>
+	</plurals>
+	<plurals name="discussed_x_times">
+		<item quantity="one">Абмяркоўвалася %d раз</item>
+		<item quantity="few">Абмяркоўвалася %d разы</item>
+		<item quantity="many">Абмяркоўвалася %d разоў</item>
+		<item quantity="other">Абмяркоўвалася %d разоў</item>
+	</plurals>
+	<string name="report_title">Паскардзіцца на %s</string>
+	<string name="report_choose_reason">Што не так з гэтым допісам?</string>
+	<string name="report_choose_reason_account">Што не так з %s?</string>
+	<string name="report_choose_reason_subtitle">Выберыце найлепшы варыянт</string>
+	<string name="report_reason_personal">Мне не падабаецца</string>
+	<string name="report_reason_personal_subtitle">Гэта не тое, што вы хочаце бачыць</string>
+	<string name="report_reason_spam">Гэта спам</string>
+	<string name="report_reason_spam_subtitle">Шкодныя спасылкі, фальшывыя ўзаемадзеянні або адказы, што паўтараюцца</string>
+	<string name="report_reason_violation">Гэта парушае правілы сервера</string>
+	<string name="report_reason_violation_subtitle">Вам вядома, што гэта парушае пэўныя правілы</string>
+	<string name="report_reason_other">Гэта нешта іншае</string>
+	<string name="report_reason_other_subtitle">Гэта праблема не падпадае ні пад адну з катэгорыі</string>
+	<string name="report_choose_rule">Якія правілы былі парушаны?</string>
+	<string name="report_choose_rule_subtitle">Абярыце ўсе варыянты, што падыходзяць</string>
+	<string name="report_choose_posts">Ці ёсць допісы, якія пацвярджаюць гэтую скаргу?</string>
+	<string name="report_choose_posts_subtitle">Абярыце ўсе варыянты, што падыходзяць</string>
+	<string name="report_comment_title">Што-небудзь яшчэ, што мы павінны ведаць?</string>
+	<string name="report_comment_hint">Дадатковыя каментарыі</string>
+	<string name="sending_report">Адпраўка скаргі…</string>
+	<string name="report_sent_title">Дзякуй за вашу скаргу, мы яе разгледзім.</string>
+	<string name="report_sent_subtitle">Пакуль мы разглядаем яе, вы можаце прыняць меры супраць %s.</string>
+	<string name="unfollow_user">Адпісацца ад %s</string>
+	<string name="unfollow">Адпісацца</string>
+	<string name="mute_user_explain">Вы не ўбачыце іх допісы або пашырэнні ў сваёй хатняй стужцы. Яны не даведаюцца, што вы іх ігнаруеце.</string>
+	<string name="block_user_explain">Яны больш не змогуць падпісвацца на вас або бачыць вашыя допісы, але змогуць бачыць, што яны былі заблакіраваны.</string>
+	<string name="report_personal_title">Не хочаце бачыць гэта?</string>
+	<string name="report_personal_subtitle">Калі вы бачыце на Mastodon нешта, што вам не падабаецца, вы можаце выдаліць чалавека са свайго асяроддзя.</string>
+	<string name="back">Назад</string>
+	<string name="instance_catalog_title">Mastodon складаецца з карыстальнікаў на розных серверах.</string>
+	<string name="instance_catalog_subtitle">Выбірайце сервер у залежнасці ад вашых інтарэсаў, рэгіёна або выберыце сервер агульнага прызначэння. Вы па-ранейшаму можаце ўзаемадзейнічаць з усімі, незалежна ад сервера.</string>
+	<string name="edit_photo">рэдагаваць</string>
+	<string name="password_note">Выкарыстоўвайце вялікія літары, спецыяльныя сімвалы і лічбы, каб павялічыць надзейнасць пароля.</string>
+	<string name="category_academia">Акадэмія</string>
+	<string name="category_activism">Актывізм</string>
+	<string name="category_all">Усе</string>
+	<string name="category_art">Мастацтва</string>
+	<string name="category_food">Ежа</string>
+	<string name="category_furry">Furry</string>
+	<string name="category_games">Гульні</string>
+	<string name="category_general">Асноўныя</string>
+	<string name="category_journalism">Журналістыка</string>
+	<string name="category_lgbt">ЛГБТ</string>
+	<string name="category_music">Музыка</string>
+	<string name="category_regional">Рэгіянальныя</string>
+	<string name="category_tech">Тэхналогіі</string>
+	<!-- %s is the email address -->
+	<string name="resend">Адправіць паўторна</string>
+	<string name="open_email_app">Адкрыць праграму для пошты</string>
+	<string name="resent_email">Электронны ліст з пацвярджэннем адпраўлены</string>
+	<string name="compose_hint">Напішыце тое, аб чым думаеце</string>
+	<string name="content_warning">Папярэджанне аб змесціве</string>
+	<string name="add_image_description">Дадаць апісанне відарыса…</string>
+	<string name="retry_upload">Паўтарыць запампоўку</string>
+	<string name="edit_image">Рэдагаваць відарыс</string>
+	<string name="save">Захаваць</string>
+	<string name="add_alt_text">Дадаць альтэрнатыўны тэкст</string>
+	<string name="alt_text_subtitle">Альтэрнатыўны тэкст апісвае вашы фатаграфіі для людзей са слабым зрокам ці без яго. Паспрабуйце ўключыць дастаткова дэталяў, каб быў зразумелы кантэкст.</string>
+	<string name="alt_text_hint">напрыклад, Сабака падазрона азіраецца з прыжмуранымі вачыма на камеру.</string>
+	<string name="visibility_public">Публічны</string>
+	<string name="visibility_followers_only">Толькі для падпісчыкаў</string>
+	<string name="visibility_private">Толькі людзі, якіх я згадаў</string>
+	<string name="search_all">Усе</string>
+	<string name="search_people">Людзі</string>
+	<string name="recent_searches">Нядаўнія запыты</string>
+	<string name="step_x_of_n">Крок %1$d з %2$d</string>
+	<string name="skip">Прапусціць</string>
+	<string name="notification_type_follow">Новыя падпісчыкі</string>
+	<string name="notification_type_favorite">Абраныя</string>
+	<string name="notification_type_reblog">Пашырэнні</string>
+	<string name="notification_type_mention">Згадванні</string>
+	<string name="notification_type_poll">Апытанні</string>
+	<string name="choose_account">Выберыце ўліковы запіс</string>
+	<string name="err_not_logged_in">Спачатку ўвайдзіце ў Mastodon</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Вы не можаце дадаць больш за %d далучэнне</item>
+		<item quantity="few">Вы не можаце дадаць больш за %d далучэнні</item>
+		<item quantity="many">Вы не можаце дадаць больш за %d далучэнняў</item>
+		<item quantity="other">Вы не можаце дадаць больш за %d далучэнняў</item>
+	</plurals>
+	<string name="media_attachment_unsupported_type">Тып файла %s не падтрымліваецца</string>
+	<string name="media_attachment_too_big">Памер файла %1$s перавышае абмежаванне ў %2$s МБ</string>
+	<string name="settings_theme">Знешні выгляд</string>
+	<string name="theme_auto">Аўтаматычна</string>
+	<string name="theme_light">Светлая</string>
+	<string name="theme_dark">Цёмная</string>
+	<string name="theme_true_black">Сапраўдны чорны рэжым</string>
+	<string name="settings_behavior">Паводзіны</string>
+	<string name="settings_gif">Прайграваць аніміраваныя аватары і эмодзі</string>
+	<string name="settings_custom_tabs">Выкарыстоўваць убудаваны браўзер</string>
+	<string name="settings_notifications">Апавяшчэнні</string>
+	<string name="notify_me_when">Паведаміце мне, калі</string>
+	<string name="notify_anyone">кожны</string>
+	<string name="notify_follower">падпісчык</string>
+	<string name="notify_followed">на каго я падпісаны</string>
+	<string name="notify_none">ніхто</string>
+	<string name="notify_favorites">Дадае мой допіс у абранае</string>
+	<string name="notify_follow">Падпісаўся на мяне</string>
+	<string name="notify_reblog">Пашырае мой допіс</string>
+	<string name="notify_mention">Згадвае мяне</string>
+	<string name="settings_boring">Нудная зона</string>
+	<string name="settings_account">Налады ўліковага запісу</string>
+	<string name="settings_contribute">Унесці ўклад у Mastodon</string>
+	<string name="settings_tos">Умовы выкарыстання</string>
+	<string name="settings_privacy_policy">Палітыка прыватнасці</string>
+	<string name="settings_spicy">Вострая зона</string>
+	<string name="settings_clear_cache">Ачысціць кэш медыя</string>
+	<string name="settings_app_version">Mastodon для Android v%1$s (%2$d)</string>
+	<string name="media_cache_cleared">Кэш медыя ачышчаны</string>
+	<string name="confirm_log_out">Вы ўпэўненыя, што хочаце выйсці?</string>
+	<string name="sensitive_content">Далікатны змест</string>
+	<string name="sensitive_content_explain">Аўтар пазначыў гэты медыя файл як далікатны. Націсніце, каб паказаць.</string>
+	<string name="media_hidden">Націсніце, каб паказаць</string>
+	<string name="avatar_description">Перайсці да профілю %s</string>
+	<string name="more_options">Больш опцый</string>
+	<string name="reveal_content">Паказаць змест</string>
+	<string name="hide_content">Схаваць змест</string>
+	<string name="new_post">Новы допіс</string>
+	<string name="button_reply">Адказаць</string>
+	<string name="button_reblog">Пашырыць</string>
+	<string name="button_favorite">Абранае</string>
+	<string name="button_share">Абагуліць</string>
+	<string name="media_no_description">Медыя без апісання</string>
+	<string name="add_media">Дадаць медыя</string>
+	<string name="add_poll">Дадаць апытанне</string>
+	<string name="emoji">Эмодзі</string>
+	<string name="post_visibility">Бачнасць допісу</string>
+	<string name="home_timeline">Хатняя стужка</string>
+	<string name="my_profile">Мой профіль</string>
+	<string name="media_viewer">Праграма для прагляду медыя</string>
+	<string name="follow_user">Падпісацца на %s</string>
+	<string name="unfollowed_user">Адпісацца ад %s</string>
+	<string name="followed_user">Цяпер вы падпісаны на %s</string>
+	<string name="open_in_browser">Адкрыць у браўзеры</string>
+	<string name="hide_boosts_from_user">Схаваць пашырэнні ад %s</string>
+	<string name="show_boosts_from_user">Паказаць пашырэнні ад %s</string>
+	<string name="signup_reason_note">Гэта дапаможа нам разгледзець вашу заяўку.</string>
+	<string name="clear">Ачысціць</string>
+	<string name="profile_header">Відарыс шапкі</string>
+	<string name="profile_picture">Аватар</string>
+	<string name="reorder">Упарадкаваць</string>
+	<string name="download">Спампаваць</string>
+	<string name="permission_required">Патрабуецца дазвол</string>
+	<string name="storage_permission_to_download">Праграме патрэбны доступ да сховішча, каб захаваць гэты файл.</string>
+	<string name="open_settings">Адкрыць налады</string>
+	<string name="error_saving_file">Памылка пры захаванні файла</string>
+	<string name="file_saved">Файл захаваны</string>
+	<string name="downloading">Спампоўванне…</string>
+	<string name="no_app_to_handle_action">Няма праграмы для выканання гэтага дзеяння</string>
+	<string name="local_timeline">Супольнасць</string>
+	<string name="trending_posts_info_banner">Допісы, што набіраюць папулярнасць у вашым кутку Mastodon.</string>
+	<string name="trending_hashtags_info_banner">Хэштэгі, што набіраюць папулярнасць у вашым кутку Mastodon.</string>
+	<string name="trending_links_info_banner">Навіна, якая найбольш абмяркоўваецца ў вашым кутку Mastodon.</string>
+	<string name="local_timeline_info_banner">Гэта самыя апошнія допісы людзей, якія выкарыстоўваюць той жа сервер Mastodon, што і вы.</string>
+	<string name="dismiss">Адхіліць</string>
+	<string name="see_new_posts">Паказаць новыя допісы</string>
+	<string name="load_missing_posts">Загрузіць адсутныя допісы</string>
+	<string name="follow_back">Падпісацца ў адказ</string>
+	<string name="button_follow_pending">Чакаюць</string>
+	<string name="follows_you">Падпісаны(-а) на вас</string>
+	<string name="manually_approves_followers">Уручную пацвярджае падпісчыкаў</string>
+	<string name="current_account">Бягучы ўліковы запіс</string>
+	<string name="log_out_account">Выйсці з %s</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<plurals name="x_followers">
+		<item quantity="one">%,d падпісчык</item>
+		<item quantity="few">%,d падпісчыка</item>
+		<item quantity="many">%,d падпісчыкаў</item>
+		<item quantity="other">%,d падпісчыкаў</item>
+	</plurals>
+	<plurals name="x_following">
+		<item quantity="one">%,d падпіска</item>
+		<item quantity="few">%,d падпіскі</item>
+		<item quantity="many">%,d падпісак</item>
+		<item quantity="other">%,d падпісак</item>
+	</plurals>
+	<plurals name="x_favorites">
+		<item quantity="one">%,d абраны</item>
+		<item quantity="few">%,d абраныя</item>
+		<item quantity="many">%,d абраных</item>
+		<item quantity="other">%,d абраных</item>
+	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d рэпост</item>
+		<item quantity="few">%,d рэпосты</item>
+		<item quantity="many">%,d пашырэнняў</item>
+		<item quantity="other">%,d пашырэнняў</item>
+	</plurals>
+	<string name="timestamp_via_app">%1$s праз %2$s</string>
+	<string name="time_now">толькі што</string>
+	<string name="post_info_reblogs">Пашырэнні</string>
+	<string name="post_info_favorites">Абраныя</string>
+	<string name="edit_history">Гісторыя рэдагавання</string>
+	<string name="last_edit_at_x">Апошняе рэдагаванне %s</string>
+	<string name="time_just_now">толькі што</string>
+	<plurals name="x_seconds_ago">
+		<item quantity="one">%d секунду таму</item>
+		<item quantity="few">%d секунды таму</item>
+		<item quantity="many">%d секунд таму</item>
+		<item quantity="other">%d секунд таму</item>
+	</plurals>
+	<plurals name="x_minutes_ago">
+		<item quantity="one">%d хвіліну таму</item>
+		<item quantity="few">%d хвіліны таму</item>
+		<item quantity="many">%d хвілін таму</item>
+		<item quantity="other">%d хвілін таму</item>
+	</plurals>
+	<string name="edited_timestamp">адрэдагавана %s</string>
+	<string name="edit_original_post">Зыходны допіс</string>
+	<string name="edit_text_edited">Тэкст адрэдагавана</string>
+	<string name="edit_spoiler_added">Папярэджанне аб змесціве дададзена</string>
+	<string name="edit_spoiler_edited">Папярэджанне аб змесціве адрэдагавана</string>
+	<string name="edit_spoiler_removed">Папярэджанне аб змесціве выдалена</string>
+	<string name="edit_poll_added">Апытанне дададзена</string>
+	<string name="edit_poll_edited">Апытанне адрэдагавана</string>
+	<string name="edit_poll_removed">Апытанне выдалена</string>
+	<string name="edit_media_added">Медыя дададзены</string>
+	<string name="edit_media_removed">Медыя выдалены</string>
+	<string name="edit_media_reordered">Медыя пераўпарадкаваны</string>
+	<string name="edit_marked_sensitive">Пазначаны як далікатны</string>
+	<string name="edit_marked_not_sensitive">Пазначаны як неадчувальны</string>
+	<string name="edit_multiple_changed">Допіс адрэдагавана</string>
+	<string name="edit">Рэдагаваць</string>
+	<string name="discard_changes">Скасаваць змены?</string>
+	<string name="upload_failed">Не ўдалося запампаваць</string>
+	<string name="file_size_bytes">%d байтаў</string>
+	<string name="file_size_kb">%.2f КБ</string>
+	<string name="file_size_mb">%.2f МБ</string>
+	<string name="file_size_gb">%.2f ГБ</string>
+	<string name="file_upload_progress">%1$s з %2$s</string>
+	<string name="file_upload_time_remaining">Засталося %s</string>
+	<string name="upload_error_connection_lost">Ваша прылада страціла злучэнне з Інтэрнэтам</string>
+	<string name="upload_processing">Апрацоўка…</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Mastodon для Android %s гатовы да спампоўкі.</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">Mastodon для Android %s спампаваны і гатовы да ўсталявання.</string>
 	<!-- %s is file size -->
+	<string name="download_update">Спампаваць (%s)</string>
+	<string name="install_update">Усталяваць</string>
+	<string name="i_agree">Я згодны</string>
+	<string name="empty_list">Гэты ліст пусты</string>
+	<string name="instance_signup_closed">Гэты сервер не прымае новыя рэгістрацыі.</string>
+	<string name="text_copied">Скапіявана ў буфер абмену</string>
+	<string name="add_bookmark">Закладка</string>
+	<string name="remove_bookmark">Выдаліць закладку</string>
+	<string name="bookmarks">Закладкі</string>
+	<string name="your_favorites">Вашы абраныя</string>
+	<string name="login_title">З вяртаннем</string>
+	<string name="login_subtitle">Увайдзіце з дапамогай сервера, на якім вы стварылі свой уліковы запіс.</string>
+	<string name="server_url">URL-адрас сервера</string>
+	<string name="welcome_page1_text">Уявіце, што ў вас ёсць адрас электроннай пошты, які заканчваецца на @example.com.\n\nВы па-ранейшаму можаце адпраўляць і атрымліваць электронныя лісты ад каго захочаце, нават калі іх электронная пошта заканчваецца на @gmail.com, @icloud.com або @example.com.</string>
+	<string name="welcome_page2_title">Mastodon такі.</string>
+	<string name="welcome_page2_text">Ваш ідэнтыфікатар можа быць @gothgirl654@example.social, але вы ўсё яшчэ можаце падпісвацца, пашыраць і перапісвацца з @fallout5ever@example.online.</string>
+	<string name="welcome_page3_title">Як выбраць сервер?</string>
+	<string name="welcome_page3_text">Розныя людзі выбіраюць розныя серверы па розных прычынах. art.example з\'яўляецца выдатным месцам для мастакоў, у той час як glasgow.example можа быць добрым выбарам для шатландцаў.\n\nВы не памыліцеся ні з адным з нашых рэкамендаваных сервераў, так што незалежна ад таго, які вы выбераце (або калі ўведзяце ваш уласны ў радку пошуку сервера), вы нідзе нічога не прапусціце.</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

mastodon/src/main/res/values-bn-rBD/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">শুরু করুন</string>
 	<string name="log_in">লগ ইন করুন</string>
 	<string name="next">পরবর্তী</string>
 	<string name="ok">ঠিক আছে</string>
@@ -38,8 +37,12 @@
 	<string name="for_you">আপনার জন্য</string>
 	<string name="all_notifications">সকল</string>
 	<string name="mentions">উল্লেখ</string>
+	<!-- %s is the email address -->
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

mastodon/src/main/res/values-bs-rBA/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Kreni</string>
 	<string name="log_in">Loguj se</string>
 	<string name="next">Dalje</string>
 	<string name="error">Greška</string>
@@ -129,14 +128,7 @@
 	<string name="report_personal_title">Ne želite ovo vidjeti?</string>
 	<string name="report_personal_subtitle">Kada vidite nešto nepoželjno na Mastodon-u, možete blokirati odredjeni profil.</string>
 	<string name="back">Nazad</string>
-	<string name="instance_rules_title">Važna pravila</string>
-	<string name="instance_rules_subtitle">Pogledajte pravila koja je odredila %s administracija.</string>
-	<string name="signup_title">Krenimo sa postavkama na %s</string>
 	<string name="edit_photo">uredi</string>
-	<string name="display_name">vaše ime</string>
-	<string name="username">korisničko ime</string>
-	<string name="email">email</string>
-	<string name="password">lozinka</string>
 	<string name="password_note">Koristite velika slova, brojeve i oznake da bi osigurali lozinku.</string>
 	<string name="category_academia">Akademija</string>
 	<string name="category_activism">Aktivizam</string>
@@ -151,8 +143,7 @@
 	<string name="category_music">Muzika</string>
 	<string name="category_regional">Regionalno</string>
 	<string name="category_tech">Tehnika</string>
-	<string name="confirm_email_title">Zadnja stvar</string>
-	<string name="confirm_email_subtitle">Kliknite na link koji smo vam poslali u email-u da se verifikujete.</string>
+	<!-- %s is the email address -->
 	<string name="resend">Ponovo poslato</string>
 	<string name="open_email_app">Otvori email</string>
 	<string name="resent_email">Email za verifikaciju poslat</string>
@@ -238,7 +229,6 @@
 	<string name="unfollowed_user">Ne pratite %s</string>
 	<string name="followed_user">Sada pratite %s</string>
 	<string name="open_in_browser">Otvori u pregledniku</string>
-	<string name="signup_reason">zašto se želite pridružiti?</string>
 	<string name="signup_reason_note">Ovo nam pomaže prilikom odobravanja vašeg zahtjeva.</string>
 	<string name="clear">Briši</string>
 	<string name="profile_header">Slika zaglavlja</string>
@@ -255,4 +245,7 @@
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

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

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Comença</string>
+	<string name="get_started">Crea un compte</string>
+	<string name="already_have_account">Ja tinc un compte</string>
 	<string name="log_in">Inicia sessió</string>
 	<string name="next">Següent</string>
+	<string name="loading_instance">S\'està recuperant la informació del servidor…</string>
 	<string name="error">Error</string>
+	<string name="not_a_mastodon_instance">Sembla que %s no és un servidor de Mastodon.</string>
 	<string name="ok">D\'acord</string>
 	<string name="preparing_auth">Preparant l\'autenticació…</string>
 	<string name="finishing_auth">Finalitzant l\'autenticació…</string>
@@ -170,15 +173,15 @@
 	<string name="back">Enrere</string>
 	<string name="instance_catalog_title">Mastodon està format per usuaris de diferents servidors.</string>
 	<string name="instance_catalog_subtitle">Tria un servidor en funció dels teus interessos, regió o un de propòsit general. Seguiràs podent connectar amb tothom, independentment del servidor.</string>
-	<string name="search_communities">Cerca servidors o introdueix l\'URL</string>
-	<string name="instance_rules_title">Algunes normes bàsiques</string>
-	<string name="instance_rules_subtitle">Pren un minut per revisar les normes establertes i aplicades pels administradors de %s.</string>
-	<string name="signup_title">Deixa que et posem en marxa a %s</string>
+	<string name="search_communities">Nom del servidor o URL</string>
+	<string name="instance_rules_title">Normes del servidor</string>
+	<string name="signup_title">Crear un compte</string>
 	<string name="edit_photo">edita</string>
-	<string name="display_name">nom visible</string>
-	<string name="username">nom d\'usuari</string>
-	<string name="email">correu electrònic</string>
-	<string name="password">contrasenya</string>
+	<string name="display_name">Nom</string>
+	<string name="username">Nom d\'usuari</string>
+	<string name="email">Correu electrònic</string>
+	<string name="password">Contrasenya</string>
+	<string name="confirm_password">Confirmar contrasenya</string>
 	<string name="password_note">Inclou lletres majúscules, caràcters especials i números per augmentar la seguretat de la teva contrasenya.</string>
 	<string name="category_academia">Acadèmic</string>
 	<string name="category_activism">Activisme</string>
@@ -193,8 +196,9 @@
 	<string name="category_music">Música</string>
 	<string name="category_regional">Regional</string>
 	<string name="category_tech">Tecnologia</string>
-	<string name="confirm_email_title">Una última cosa</string>
-	<string name="confirm_email_subtitle">Toca l\'enllaç del correu electrònic que t\'hem enviat per a confirmar el teu compte.</string>
+	<string name="confirm_email_title">Comprova la teva safata d\'entrada</string>
+	<!-- %s is the email address -->
+	<string name="confirm_email_didnt_get">No has rebut l\'enllaç?</string>
 	<string name="resend">Reenvia</string>
 	<string name="open_email_app">Obre l\'aplicació de correu</string>
 	<string name="resent_email">S’ha enviat el correu electrònic de confirmació</string>
@@ -282,7 +286,6 @@
 	<string name="open_in_browser">Obre al navegador</string>
 	<string name="hide_boosts_from_user">Amaga els impulsos de %s</string>
 	<string name="show_boosts_from_user">Mostra els impulsos de %s</string>
-	<string name="signup_reason">per què vols unir-te?</string>
 	<string name="signup_reason_note">Això ens ajudarà a revisar la teva petició.</string>
 	<string name="clear">Esborra</string>
 	<string name="profile_header">Imatge de capçalera</string>
@@ -375,8 +378,6 @@
 	<!-- %s is file size -->
 	<string name="download_update">Baixa (%s)</string>
 	<string name="install_update">Instal·la</string>
-	<string name="privacy_policy_title">Mastodon i la teva privacitat</string>
-	<string name="privacy_policy_subtitle">Tot i que l\'aplicació Mastodon no recull cap dada, el servidor mitjançant el qual et registres pot tenir una política diferent. Pren un minut per revisar i acceptar la política de privadesa de l\'aplicació Mastodon i la política de privadesa del teu servidor.</string>
 	<string name="i_agree">D’acord</string>
 	<string name="empty_list">Aquesta llista està buida</string>
 	<string name="instance_signup_closed">Aquest servidor no accepta nous registres.</string>
@@ -384,4 +385,11 @@
 	<string name="add_bookmark">Marca</string>
 	<string name="remove_bookmark">Elimina el marcador</string>
 	<string name="bookmarks">Marcadors</string>
+	<string name="your_favorites">Els meus preferits</string>
+	<string name="login_title">Hola de nou</string>
+	<string name="login_subtitle">Inicia sessió amb el servidor on vas crear el compte.</string>
+	<string name="server_url">URL del servidor</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

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

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-</resources>
+    <string name="mo_color_palette_nord">Nord</string>
+    <string name="mo_relocate_publish_button">Recol·loca el botó de publicació</string>
+    <string name="mo_disable_dividers">Desactiva els divisors de publicacions</string>
+</resources>

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

@@ -246,4 +246,11 @@
     <string name="sk_searching">Cercant…</string>
     <string name="sk_save_draft">Voleu desar l\'esborrany\?</string>
     <string name="sk_settings_show_no_alt_indicator">Indicador dels textos alternatius inexistents</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">Afegeix «re:» a les respostes als avisos de contingut</string>
+    <string name="sk_filtered">Filtrat: %s</string>
+    <string name="sk_expand">Amplia</string>
+    <string name="sk_collapse">Tanca</string>
+    <string name="sk_settings_collapse_long_posts">Acurta les publicacions llargues</string>
+    <string name="sk_signed_up">registrat</string>
+    <string name="sk_spectator_mode">Mode d\'espectador</string>
 </resources>

mastodon/src/main/res/values-cs-rCZ/strings.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Začínáme</string>
+	<string name="get_started">Vytvořit účet</string>
+	<string name="already_have_account">Již mám účet</string>
 	<string name="log_in">Přihlásit se</string>
 	<string name="next">Další</string>
+	<string name="loading_instance">Načítání informací o serveru…</string>
 	<string name="error">Chyba</string>
+	<string name="not_a_mastodon_instance">%s se nezdá být Mastodon serverem.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Příprava na autentizaci…</string>
 	<string name="finishing_auth">Dokončení autentizace…</string>
@@ -198,15 +201,7 @@
 	<string name="back">Zpět</string>
 	<string name="instance_catalog_title">Mastodon tvoří uživatelé z různých serverů.</string>
 	<string name="instance_catalog_subtitle">Vyberte si server podle na svých zájmů, regionu nebo obecného účelu. Stále se můžete spojit se všemi bez ohledu na server.</string>
-	<string name="search_communities">Hledat server nebo zadat URL</string>
-	<string name="instance_rules_title">Některá základní pravidla</string>
-	<string name="instance_rules_subtitle">Udělejte si chvíli čas a zkontrolujte pravidla, která admini %s nastavili a vynucují.</string>
-	<string name="signup_title">Pojďme si nastavit %s</string>
 	<string name="edit_photo">upravit</string>
-	<string name="display_name">zobrazované jméno</string>
-	<string name="username">uživatelské jméno</string>
-	<string name="email">e-mail</string>
-	<string name="password">heslo</string>
 	<string name="password_note">Použijte velká písmena, speciální znaky a čísla, abyste zvýšili sílu hesla.</string>
 	<string name="category_academia">Akademická sféra</string>
 	<string name="category_activism">Aktivismus</string>
@@ -221,8 +216,7 @@
 	<string name="category_music">Hudba</string>
 	<string name="category_regional">Regionální</string>
 	<string name="category_tech">Technologie</string>
-	<string name="confirm_email_title">Ještě jedna věc</string>
-	<string name="confirm_email_subtitle">Klepněte na odkaz, který jsme vám poslali e-mailem, abyste účet ověřili.</string>
+	<!-- %s is the email address -->
 	<string name="resend">Poslat znovu</string>
 	<string name="open_email_app">Otevřít e-mailovou aplikaci</string>
 	<string name="resent_email">Potvrzující e-mail byl odeslán</string>
@@ -312,7 +306,6 @@
 	<string name="open_in_browser">Otevřít v prohlížeči</string>
 	<string name="hide_boosts_from_user">Skrýt boosty od %s</string>
 	<string name="show_boosts_from_user">Zobrazit boosty od %s</string>
-	<string name="signup_reason">proč se chcete zaregistrovat?</string>
 	<string name="signup_reason_note">Toto nám pomůže posoudit vaši žádost.</string>
 	<string name="clear">Vyčistit</string>
 	<string name="profile_header">Obrázek v záhlaví</string>
@@ -417,8 +410,6 @@
 	<!-- %s is file size -->
 	<string name="download_update">Stáhnout (%s)</string>
 	<string name="install_update">Instalovat</string>
-	<string name="privacy_policy_title">Mastodon a vaše soukromí</string>
-	<string name="privacy_policy_subtitle">Ačkoliv aplikace Mastodon neshromažďuje žádná data, server, na kterém se registrujete, může mít jiné zásady. Věnujte minutu kontrole a odsouhlasení zásad soukromí aplikace Mastodon a vašeho serveru.</string>
 	<string name="i_agree">Souhlasím</string>
 	<string name="empty_list">Tento seznam je prázdný</string>
 	<string name="instance_signup_closed">Tento server nepřijímá nové registrace.</string>
@@ -427,4 +418,15 @@
 	<string name="remove_bookmark">Odstranit ze záložek</string>
 	<string name="bookmarks">Záložky</string>
 	<string name="your_favorites">Vaše oblíbení</string>
+	<string name="login_title">Vítejte zpět</string>
+	<string name="login_subtitle">Přihlaste se pomocí serveru, kde jste vytvořili svůj účet.</string>
+	<string name="server_url">URL serveru</string>
+	<string name="welcome_page1_text">Představte si, že máte e-mailovou adresu, která končí @example.com.\n\nStále můžete od kohokoliv odesílat a přijímat e-maily, i když jejich e-mail končí na @gmail.com nebo @icloud.com nebo @example.com.</string>
+	<string name="welcome_page2_title">Takový je Mastodon.</string>
+	<string name="welcome_page2_text">Vaše uživatelské jméno může být @gothgirl654@example.social, ale stále můžete sledovat, boostovat a chatovat s @fallout5ever@example.online.</string>
+	<string name="welcome_page3_title">Jak si vybrat server?</string>
+	<string name="welcome_page3_text">Různí lidé si vybírají různé servery z různých důvodů. Art.example je skvělým místem pro umělce, zatímco glasgow.example může být dobrou volbou pro Skoty.\n\nS žádným z našich doporučených serverů nemůžete udělat chybu, takže bez ohledu na to, který z nich si vyberete (nebo pokud zadáte svůj vlastní do vyhledávacího řádku serveru), nikde neprohloupíte.</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

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

@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="get_started">Opret konto</string>
+	<string name="already_have_account">Jeg har allerede en konto</string>
+	<string name="log_in">Log ind</string>
+	<string name="next">Næste</string>
+	<string name="loading_instance">Henter serverinfo…</string>
+	<string name="error">Fejl</string>
+	<string name="not_a_mastodon_instance">%s ser ikke ud til at være en Mastodon-server.</string>
+	<string name="ok">Ok</string>
+	<string name="preparing_auth">Forbereder godkendelse…</string>
+	<string name="finishing_auth">Afslutter godkendelse…</string>
+	<string name="user_boosted">%s boostede</string>
+	<string name="in_reply_to">Som svar til %s</string>
+	<string name="notifications">Meddelelser</string>
+	<string name="user_followed_you">begyndte at følge dig</string>
+	<string name="user_sent_follow_request">sendte dig en følgeanmodning</string>
+	<string name="user_favorited">favoritmarkerede dit indlæg</string>
+	<string name="notification_boosted">boostede dit indlæg</string>
+	<string name="poll_ended">afstemning afsluttet</string>
+	<string name="time_seconds">%ds</string>
+	<string name="time_minutes">%d m</string>
+	<string name="time_hours">%d t</string>
+	<string name="time_days">%d d</string>
+	<string name="share_toot_title">Del</string>
+	<string name="settings">Indstillinger</string>
+	<string name="publish">Offentliggør</string>
+	<string name="discard_draft">Kassér kladde?</string>
+	<string name="discard">Kassér</string>
+	<string name="cancel">Fortryd</string>
+	<plurals name="followers">
+		<item quantity="one">følger</item>
+		<item quantity="other">følgere</item>
+	</plurals>
+	<plurals name="following">
+		<item quantity="one">følger</item>
+		<item quantity="other">følger</item>
+	</plurals>
+	<plurals name="posts">
+		<item quantity="one">indlæg</item>
+		<item quantity="other">indlæg</item>
+	</plurals>
+	<string name="posts">Indlæg</string>
+	<string name="posts_and_replies">Indlæg og svar</string>
+	<string name="media">Medier</string>
+	<string name="profile_about">Om</string>
+	<string name="button_follow">Følg</string>
+	<string name="button_following">Følger</string>
+	<string name="edit_profile">Redigér profil</string>
+	<string name="mention_user">Nævn %s</string>
+	<string name="share_user">Del %s</string>
+	<string name="mute_user">Skjul %s (mute)</string>
+	<string name="unmute_user">Vis %s igen (unmute)</string>
+	<string name="block_user">Bloker %s</string>
+	<string name="unblock_user">Fjern blokering af %s</string>
+	<string name="report_user">Indberet %s</string>
+	<string name="block_domain">Bloker %s</string>
+	<string name="unblock_domain">Fjern blokering af %s</string>
+	<plurals name="x_posts">
+		<item quantity="one">%,d indlæg</item>
+		<item quantity="other">%,d indlæg</item>
+	</plurals>
+	<string name="profile_joined">Tilmeldt</string>
+	<string name="done">Udført</string>
+	<string name="loading">Indlæser…</string>
+	<string name="field_label">Mærkat</string>
+	<string name="field_content">Indhold</string>
+	<string name="saving">Gemmer…</string>
+	<string name="post_from_user">Indlæg fra %s</string>
+	<string name="poll_option_hint">Valgmulighed %d</string>
+	<plurals name="x_minutes">
+		<item quantity="one">%d minut</item>
+		<item quantity="other">%d minutter</item>
+	</plurals>
+	<plurals name="x_hours">
+		<item quantity="one">%d time</item>
+		<item quantity="other">%d timer</item>
+	</plurals>
+	<plurals name="x_days">
+		<item quantity="one">%d dag</item>
+		<item quantity="other">%d dage</item>
+	</plurals>
+	<string name="compose_poll_duration">Varighed: %s</string>
+	<plurals name="x_seconds_left">
+		<item quantity="one">%d sekund tilbage</item>
+		<item quantity="other">%d sekunder tilbage</item>
+	</plurals>
+	<plurals name="x_minutes_left">
+		<item quantity="one">%d minut tilbage</item>
+		<item quantity="other">%d minutter tilbage</item>
+	</plurals>
+	<plurals name="x_hours_left">
+		<item quantity="one">%d time tilbage</item>
+		<item quantity="other">%d timer tilbage</item>
+	</plurals>
+	<plurals name="x_days_left">
+		<item quantity="one">%d dag tilbage</item>
+		<item quantity="other">%d dage tilbage</item>
+	</plurals>
+	<plurals name="x_voters">
+		<item quantity="one">%,d stemme</item>
+		<item quantity="other">%,d stemmer</item>
+	</plurals>
+	<string name="poll_closed">Lukket</string>
+	<string name="confirm_mute_title">Skjul konto</string>
+	<string name="confirm_mute">Bekræft at du vil skjule %s</string>
+	<string name="do_mute">Skjul (mute)</string>
+	<string name="confirm_unmute_title">Vis bruger igen (unmute)</string>
+	<string name="confirm_unmute">Bekræft at du vil se %s igen</string>
+	<string name="do_unmute">Vis igen (unmute)</string>
+	<string name="confirm_block_title">Bloker bruger</string>
+	<string name="confirm_block_domain_title">Bloker domæne</string>
+	<string name="confirm_block">Bekræft at du vil blokere %s</string>
+	<string name="do_block">Bloker</string>
+	<string name="confirm_unblock_title">Fjern blokering af bruger</string>
+	<string name="confirm_unblock_domain_title">Fjern blokering af domæne</string>
+	<string name="confirm_unblock">Bekræft at du vil fjerne blokering af %s</string>
+	<string name="do_unblock">Fjern blokering</string>
+	<string name="button_muted">Skjult (muted)</string>
+	<string name="button_blocked">Blokeret</string>
+	<string name="action_vote">Stem</string>
+	<string name="tap_to_reveal">Tryk for at vise</string>
+	<string name="delete">Slet</string>
+	<string name="confirm_delete_title">Slet indlæg</string>
+	<string name="confirm_delete">Er du sikker på, at du vil slette dette indlæg?</string>
+	<string name="deleting">Sletter…</string>
+	<string name="notification_channel_audio_player">Afspilning af lyd</string>
+	<string name="play">Afspil</string>
+	<string name="pause">Sæt på pause</string>
+	<string name="log_out">Log ud</string>
+	<string name="add_account">Tilføj konto</string>
+	<string name="search_hint">Søg</string>
+	<string name="hashtags">Hashtags</string>
+	<string name="news">Nyheder</string>
+	<string name="for_you">Til dig</string>
+	<string name="all_notifications">Alle</string>
+	<string name="mentions">Omtaler</string>
+	<plurals name="x_people_talking">
+		<item quantity="one">%d person deltager</item>
+		<item quantity="other">%d personer deltager</item>
+	</plurals>
+	<plurals name="discussed_x_times">
+		<item quantity="one">Diskuteret %d gang</item>
+		<item quantity="other">Diskuteret %d gange</item>
+	</plurals>
+	<string name="report_title">Indberet %s</string>
+	<string name="report_choose_reason">Hvad er der galt med dette indlæg?</string>
+	<string name="report_choose_reason_account">Hvad er der galt med %s?</string>
+	<string name="report_choose_reason_subtitle">Vælg en passende grund</string>
+	<string name="report_reason_personal">Jeg bryder mig ikke om det</string>
+	<string name="report_reason_personal_subtitle">Det er ikke noget, man ønsker at se</string>
+	<string name="report_reason_spam">Det er spam</string>
+	<string name="report_reason_spam_subtitle">Ondsindede links, falske interaktioner, eller gentagne svar</string>
+	<string name="report_reason_violation">Det overtræder serverreglerne</string>
+	<string name="report_reason_violation_subtitle">Du kender til specifikke regler som det er i strid med</string>
+	<string name="report_reason_other">Det er noget andet</string>
+	<string name="report_reason_other_subtitle">Problemet passer ikke ind i andre kategorier</string>
+	<string name="report_choose_rule">Hvilke regler overtrædes?</string>
+	<string name="report_choose_rule_subtitle">Vælg alle relevante</string>
+	<string name="report_choose_posts">Er der indlæg, som kan bekræfte denne anmeldelse?</string>
+	<string name="report_choose_posts_subtitle">Vælg alle relevante</string>
+	<string name="report_comment_title">Er der andet, vi bør vide?</string>
+	<string name="report_comment_hint">Yderligere kommentarer</string>
+	<string name="sending_report">Sender rapport…</string>
+	<string name="report_sent_title">Tak for anmeldelsen, der vil blive set nærmere på dette.</string>
+	<string name="report_sent_subtitle">Mens dette gennemgås, kan du selv bortfiltrere indlæg fra %s.</string>
+	<string name="unfollow_user">Følg ikke længere %s</string>
+	<string name="unfollow">Følg ikke længere</string>
+	<string name="mute_user_explain">Du vil ikke se den pågældendes indlæg eller boosts i din tidslinje. Vedkommende vil ikke få besked om dæmpningen.</string>
+	<string name="block_user_explain">Vedkommende vil ikke længere kunne følge dig eller se dine indlæg, men vedkommende kan se blokeringen.</string>
+	<string name="report_personal_title">Ønsker du ikke at se dette?</string>
+	<string name="report_personal_subtitle">Når du ser noget, du ikke kan lide på Mastodon, kan du fjerne personen fra din tidslinje.</string>
+	<string name="back">Tilbage</string>
+	<string name="instance_catalog_title">Mastodon er skabt af brugere på forskellige servere.</string>
+	<string name="instance_catalog_subtitle">Vælg en server baseret på dine interesser, region eller et generelt formål. Du kan stadig forbinde med alle, uanset serveren.</string>
+	<string name="search_communities">Server-navn eller URL</string>
+	<string name="instance_rules_title">Serverregler</string>
+	<string name="instance_rules_subtitle">Ved at fortsætte accepterer du at følge følgende regler, der er vedtaget og håndhævet af %ss moderatorer.</string>
+	<string name="signup_title">Opret konto</string>
+	<string name="edit_photo">rediger</string>
+	<string name="display_name">Navn</string>
+	<string name="username">Brugernavn</string>
+	<string name="email">Email</string>
+	<string name="password">Adgangskode</string>
+	<string name="confirm_password">Bekræft adgangskode</string>
+	<string name="password_note">Inkluder store bogstaver, specialtegn og tal for at gøre din adgangskode stærkere.</string>
+	<string name="category_academia">Forskning og højere uddannelser</string>
+	<string name="category_activism">Aktivisme</string>
+	<string name="category_all">Alt</string>
+	<string name="category_art">Kunst</string>
+	<string name="category_food">Mad</string>
+	<string name="category_furry">Pelsdyr</string>
+	<string name="category_games">Spil</string>
+	<string name="category_general">Generelt</string>
+	<string name="category_journalism">Journalistik</string>
+	<string name="category_lgbt">LGBT</string>
+	<string name="category_music">Musik</string>
+	<string name="category_regional">Regionalt</string>
+	<string name="category_tech">Teknologi</string>
+	<string name="confirm_email_title">Tjek din indbakke</string>
+	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Tryk på linket vi sendte dig for at bekræfte %s. Vi venter lige her.</string>
+	<string name="confirm_email_didnt_get">Fandt du ikke et link?</string>
+	<string name="resend">Send igen</string>
+	<string name="open_email_app">Åben email-app</string>
+	<string name="resent_email">Bekræftelses-email sendt</string>
+	<string name="compose_hint">Skriv hvad du har på hjerte</string>
+	<string name="content_warning">Indholdsadvarsel</string>
+	<string name="add_image_description">Tilføj billede beskrivelse…</string>
+	<string name="retry_upload">Forsøg upload igen</string>
+	<string name="edit_image">Rediger billede</string>
+	<string name="save">Gem</string>
+	<string name="add_alt_text">Tilføj alternativ tekst</string>
+	<string name="alt_text_subtitle">Alternativ tekst beskriver dine fotos af hensyn til svagtseende og blinde. Nøjs med at skrive lige nøjagtig så detaljeret at sammenhængen er tydelig.</string>
+	<string name="alt_text_hint">f.eks. en hund, der ser sig mistænkeligt omkring med sammenknebne øjne på kameraet.</string>
+	<string name="visibility_public">Offentlig</string>
+	<string name="visibility_followers_only">Kun følgere</string>
+	<string name="visibility_private">Kun personer jeg nævner</string>
+	<string name="search_all">Alle</string>
+	<string name="search_people">Personer</string>
+	<string name="recent_searches">Seneste søgninger</string>
+	<string name="step_x_of_n">Trin %1$d af %2$d</string>
+	<string name="skip">Spring over</string>
+	<string name="notification_type_follow">Nye følgere</string>
+	<string name="notification_type_favorite">Favoritmarkeringer</string>
+	<string name="notification_type_reblog">Boosts</string>
+	<string name="notification_type_mention">Omtaler</string>
+	<string name="notification_type_poll">Afstemninger</string>
+	<string name="choose_account">Vælg konto</string>
+	<string name="err_not_logged_in">Log venligst ind på Mastodon først</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Du kan ikke tilføje mere end %d medievedhæftning</item>
+		<item quantity="other">Du kan ikke tilføje mere end %d medievedhæftninger</item>
+	</plurals>
+	<string name="media_attachment_unsupported_type">Filen %s er af en type der ikke understøttes</string>
+	<string name="media_attachment_too_big">Størrelsen på filen %1$s overskrider grænsen på %2$s MB</string>
+	<string name="settings_theme">Visuel fremtræden</string>
+	<string name="theme_auto">Automatisk</string>
+	<string name="theme_light">Lys</string>
+	<string name="theme_dark">Mørk</string>
+	<string name="theme_true_black">Sand sort tilstand</string>
+	<string name="settings_behavior">Opførsel</string>
+	<string name="settings_gif">Spil animerede avatarer og emoji</string>
+	<string name="settings_custom_tabs">Benyt in-app browser</string>
+	<string name="settings_notifications">Meddelelser</string>
+	<string name="notify_me_when">Giv mig besked når</string>
+	<string name="notify_anyone">hvem som helst</string>
+	<string name="notify_follower">en følger</string>
+	<string name="notify_followed">nogen jeg følger</string>
+	<string name="notify_none">ingen</string>
+	<string name="notify_favorites">Favoritmarkerede mit indlæg</string>
+	<string name="notify_follow">Følger mig</string>
+	<string name="notify_reblog">Booster mit indlæg</string>
+	<string name="notify_mention">Nævner mig</string>
+	<string name="settings_boring">Den kedelige zone</string>
+	<string name="settings_account">Kontoindstillinger</string>
+	<string name="settings_contribute">Bidrag til Mastodon</string>
+	<string name="settings_tos">Vilkår og Betingelser</string>
+	<string name="settings_privacy_policy">Privatlivspolitik</string>
+	<string name="settings_spicy">Den krydrede zone</string>
+	<string name="settings_clear_cache">Ryd mediecache</string>
+	<string name="settings_app_version">Mastodon til Android v%1$s (%2$d)</string>
+	<string name="media_cache_cleared">Mediecache ryddet</string>
+	<string name="confirm_log_out">Er du sikker på, at du vil logge ud?</string>
+	<string name="sensitive_content">Følsomt indhold</string>
+	<string name="sensitive_content_explain">Forfatteren markerede dette medie som følsomt. Tryk for at afsløre.</string>
+	<string name="media_hidden">Tryk for at vise</string>
+	<string name="avatar_description">Gå til %ss profil</string>
+	<string name="more_options">Flere muligheder</string>
+	<string name="reveal_content">Afslør indhold</string>
+	<string name="hide_content">Skjul indhold</string>
+	<string name="new_post">Nyt indlæg</string>
+	<string name="button_reply">Svar</string>
+	<string name="button_reblog">Boost</string>
+	<string name="button_favorite">Favorit</string>
+	<string name="button_share">Del</string>
+	<string name="media_no_description">Medier uden beskrivelse</string>
+	<string name="add_media">Tilføj medier</string>
+	<string name="add_poll">Tilføj en afstemning</string>
+	<string name="emoji">Emoji</string>
+	<string name="post_visibility">Synlighed af indlæg</string>
+	<string name="home_timeline">Hjemmetidslinje</string>
+	<string name="my_profile">Min profil</string>
+	<string name="media_viewer">Mediefremviser</string>
+	<string name="follow_user">Følg %s</string>
+	<string name="unfollowed_user">Følg ikke længere %s</string>
+	<string name="followed_user">Du følger nu %s</string>
+	<string name="open_in_browser">Åbn i browser</string>
+	<string name="hide_boosts_from_user">Skjul boosts fra %s</string>
+	<string name="show_boosts_from_user">Vis boosts fra %s</string>
+	<string name="signup_reason">Hvorfor ønsker du at tilmelde dig?</string>
+	<string name="signup_reason_note">Dette hjælper os med at vurdere din ansøgning.</string>
+	<string name="clear">Ryd</string>
+	<string name="profile_header">Overskriftsbillede</string>
+	<string name="profile_picture">Profilbillede</string>
+	<string name="reorder">Omarranger</string>
+	<string name="download">Download</string>
+	<string name="permission_required">Tilladelse kræves</string>
+	<string name="storage_permission_to_download">Appen skal have adgang til din lagerplads for at gemme denne fil.</string>
+	<string name="open_settings">Åbn Indstillinger</string>
+	<string name="error_saving_file">Fejl under lagring af fil</string>
+	<string name="file_saved">Fil gemt</string>
+	<string name="downloading">Downloader…</string>
+	<string name="no_app_to_handle_action">Der er ingen app til at udføre denne handling</string>
+	<string name="local_timeline">Fællesskab</string>
+	<string name="trending_posts_info_banner">Dette er indlæg der tiltrækker sig opmærksomhed i dit hjørne af Mastodon.</string>
+	<string name="trending_hashtags_info_banner">Dette er hashtags der tiltrækker sig opmærksomhed i dit hjørne af Mastodon.</string>
+	<string name="trending_links_info_banner">Dette er de nyheder, der deles mest i dit hjørne af Mastodon.</string>
+	<string name="local_timeline_info_banner">Disse er de seneste indlæg af medlemmer på din Mastodon-server.</string>
+	<string name="dismiss">Afvis</string>
+	<string name="see_new_posts">Se nye indlæg</string>
+	<string name="load_missing_posts">Indlæs manglende indlæg</string>
+	<string name="follow_back">Følg Tilbage</string>
+	<string name="button_follow_pending">Afventer</string>
+	<string name="follows_you">Følger dig</string>
+	<string name="manually_approves_followers">Godkender følgere manuelt</string>
+	<string name="current_account">Nuværende konto</string>
+	<string name="log_out_account">Log %s ud</string>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<plurals name="x_followers">
+		<item quantity="one">%,d følger</item>
+		<item quantity="other">%,d følgere</item>
+	</plurals>
+	<plurals name="x_following">
+		<item quantity="one">%,d følger</item>
+		<item quantity="other">%,d følgere</item>
+	</plurals>
+	<plurals name="x_favorites">
+		<item quantity="one">%,d favoritmarkering</item>
+		<item quantity="other">%,d favoritmarkeringer</item>
+	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d boost</item>
+		<item quantity="other">%,d boosts</item>
+	</plurals>
+	<string name="timestamp_via_app">%1$s via %2$s</string>
+	<string name="time_now">nu</string>
+	<string name="post_info_reblogs">Boosts</string>
+	<string name="post_info_favorites">Favoritmarkeringer</string>
+	<string name="edit_history">Rediger historik</string>
+	<string name="last_edit_at_x">Senest ændret: %s</string>
+	<string name="time_just_now">lige nu</string>
+	<plurals name="x_seconds_ago">
+		<item quantity="one">%d sekund siden</item>
+		<item quantity="other">%d sekunder siden</item>
+	</plurals>
+	<plurals name="x_minutes_ago">
+		<item quantity="one">%d minut siden</item>
+		<item quantity="other">%d minutter siden</item>
+	</plurals>
+	<string name="edited_timestamp">redigerede %s</string>
+	<string name="edit_original_post">Oprindeligt indlæg</string>
+	<string name="edit_text_edited">Tekst redigeret</string>
+	<string name="edit_spoiler_added">Indholdsadvarsel tilføjet</string>
+	<string name="edit_spoiler_edited">Indholdsadvarsel tilføjet</string>
+	<string name="edit_spoiler_removed">Indholdsadvarsel fjernet</string>
+	<string name="edit_poll_added">Afstemning tilføjet</string>
+	<string name="edit_poll_edited">Afstemning redigeret</string>
+	<string name="edit_poll_removed">Afstemning fjernet</string>
+	<string name="edit_media_added">Medier tilføjet</string>
+	<string name="edit_media_removed">Medier fjernet</string>
+	<string name="edit_media_reordered">Medie omarrangeret</string>
+	<string name="edit_marked_sensitive">Marker som følsom</string>
+	<string name="edit_marked_not_sensitive">Markeret ikke følsom</string>
+	<string name="edit_multiple_changed">Indlæg redigeret</string>
+	<string name="edit">Rediger</string>
+	<string name="discard_changes">Fortryd ændringer?</string>
+	<string name="upload_failed">Upload mislykkedes</string>
+	<string name="file_size_bytes">%d bytes</string>
+	<string name="file_size_kb">%.2f KB</string>
+	<string name="file_size_mb">%.2f MB</string>
+	<string name="file_size_gb">%.2f GB</string>
+	<string name="file_upload_progress">%1$s af %2$s</string>
+	<string name="file_upload_time_remaining">%s tilbage</string>
+	<string name="upload_error_connection_lost">Din enhed har mistet forbindelsen til internettet</string>
+	<string name="upload_processing">Behandler…</string>
+	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Mastodon til Android %s er klar til download.</string>
+	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">Mastodon til Android %s er downloadet og klar til at installere.</string>
+	<!-- %s is file size -->
+	<string name="download_update">Download (%s)</string>
+	<string name="install_update">Installer</string>
+	<string name="privacy_policy_title">Dit privatliv</string>
+	<string name="i_agree">Jeg accepterer</string>
+	<string name="empty_list">Denne liste er tom</string>
+	<string name="instance_signup_closed">Denne server er ikke åben for nye tilmeldinger.</string>
+	<string name="text_copied">Kopieret til udklipsholderen</string>
+	<string name="add_bookmark">Bogmærk</string>
+	<string name="remove_bookmark">Fjern bogmærke</string>
+	<string name="bookmarks">Bogmærker</string>
+	<string name="your_favorites">Dine Favoritter</string>
+	<string name="login_title">Velkommen tilbage</string>
+	<string name="login_subtitle">Log ind med serveren hvor du oprettede din bruger.</string>
+	<string name="server_url">Server-URL</string>
+	<string name="welcome_page1_title">Hvad er Mastodon?</string>
+	<string name="welcome_page1_text">Det svarer til at du har en e-mailadresse, der slutter med @eksempel.dk.\n\nAlligevel kan du stadig både sende og modtage e-mails fra alle, selv om deres e-mail ender på @gmail.com eller @icloud.com eller @eksempel.dk.</string>
+	<string name="welcome_page2_title">Mastodon er ligesådan.</string>
+	<string name="welcome_page2_text">Dit brugernavn kan være @goth654@eksempel.social, men du kan stadig følge, booste, og chatte med @denanden@eksempel.online.</string>
+	<string name="welcome_page3_title">Hvordan vælger jeg en server?</string>
+	<string name="welcome_page3_text">Forskellige mennesker vælger forskellige servere af mange forskellige grunde. art.example er et godt sted for kunstnere, mens glasgow.example kan være et godt pluk for skotter.\n\nDu kan ikke gå galt i byen med en af vores anbefalingsservere, så uanset hvilken du vælger (eller hvis du indtaster din egen i serversøgelinjen), vil du aldrig gå glip af noget nogen steder.</string>
+	<string name="signup_random_server_explain">Vi vælger en server baseret på dit sprog, hvis du fortsætter uden at foretage et valg.</string>
+	<string name="server_filter_any_language">Hvilket som helst sprog</string>
+	<string name="server_filter_instant_signup">Øjeblikkelig tilmelding</string>
+	<string name="server_filter_manual_review">Manuel evaluering</string>
+	<string name="server_filter_any_signup_speed">Hvilken som helst tilmeldingshastghed</string>
+	<string name="server_filter_region_europe">Europa</string>
+	<string name="server_filter_region_north_america">Nordamerika</string>
+	<string name="server_filter_region_south_america">Sydamerika</string>
+	<string name="server_filter_region_africa">Afrika</string>
+	<string name="server_filter_region_asia">Asien</string>
+	<string name="server_filter_region_oceania">Oceania</string>
+	<string name="not_accepting_new_members">Ikke åben for nye medlemmer</string>
+	<string name="category_special_interests">Særlige Interesser</string>
+	<string name="signup_passwords_dont_match">Adgangskoderne er ikke ens</string>
+	<string name="pick_server_for_me">Vælg for mig</string>
+	<string name="profile_add_row">Tilføj række</string>
+	<string name="profile_setup">Profilopsætning</string>
+	<string name="profile_setup_subtitle">Du kan altid afslutte dette senere i fanen Profil.</string>
+	<string name="profile_setup_explanation">Du kan tilføje op til fire profilfelter til lige, hvad du ønsker. Placering, links, pronomener — du bestemmer.</string>
+	<string name="popular_on_mastodon">Populært på Mastodon</string>
+	<string name="follow_all">Følg alle</string>
+	<string name="server_rules_disagree">Ikke enig</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+</resources>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Loslegen</string>
+	<string name="get_started">Konto erstellen</string>
 	<string name="already_have_account">Ich habe bereits ein Konto</string>
 	<string name="log_in">Anmelden</string>
 	<string name="next">Weiter</string>
@@ -8,30 +8,26 @@
 	<string name="error">Fehler</string>
 	<string name="not_a_mastodon_instance">%s scheint kein Mastodon-Server zu sein.</string>
 	<string name="ok">OK</string>
-	<string name="preparing_auth">Authentifizierung wird vorbereitet …</string>
+	<string name="preparing_auth">Authentifizierung wird vorbereitet …</string>
 	<string name="finishing_auth">Authentifizierung wird abgeschlossen …</string>
 	<string name="user_boosted">%s hat diesen Beitrag geteilt</string>
 	<string name="in_reply_to">Als Antwort auf %s</string>
 	<string name="notifications">Benachrichtigungen</string>
-
 	<string name="user_followed_you">folgt dir jetzt</string>
 	<string name="user_sent_follow_request">hat dir eine Follower-Anfrage gesendet</string>
 	<string name="user_favorited">favorisierte</string>
 	<string name="notification_boosted">teilte</string>
 	<string name="poll_ended">Abstimmung beendet</string>
-
 	<string name="time_seconds">vor %d Sekunden</string>
 	<string name="time_minutes">vor %d Minuten</string>
 	<string name="time_hours">vor %d Stunden</string>
 	<string name="time_days">vor %d Tagen</string>
-
 	<string name="share_toot_title">Teilen</string>
 	<string name="settings">Einstellungen</string>
 	<string name="publish">Veröffentlichen</string>
 	<string name="discard_draft">Entwurf verwerfen?</string>
 	<string name="discard">Verwerfen</string>
 	<string name="cancel">Abbrechen</string>
-
 	<plurals name="followers">
 		<item quantity="one">Follower</item>
 		<item quantity="other">Follower</item>
@@ -66,7 +62,7 @@
 	</plurals>
 	<string name="profile_joined">Beigetreten</string>
 	<string name="done">Fertig</string>
-	<string name="loading">Wird geladen …</string>
+	<string name="loading">Wird geladen …</string>
 	<string name="field_label">Beschriftung</string>
 	<string name="field_content">Inhalt</string>
 	<string name="saving">wird gespeichert …</string>
@@ -177,12 +173,12 @@
 	<string name="back">Zurück</string>
 	<string name="instance_catalog_title">Mastodon wird von Benutzer*innen auf verschiedenen Servern gestaltet.</string>
 	<string name="instance_catalog_subtitle">Wähle einen Server basierend auf deinen Interessen oder deiner Region – oder einfach einen allgemeinen. Du kannst trotzdem mit jedem interagieren, egal auf welchem Server.</string>
-	<string name="search_communities">Server suchen oder Link eingeben</string>
-	<string name="instance_rules_title">Serverregeln</string>
-	<string name="instance_rules_subtitle">Nimm dir eine Minute Zeit und lies die Serverregeln von %s durch.</string>
-	<string name="signup_title">Okay, lass uns mit %s anfangen</string>
+	<string name="search_communities">Servername oder -adresse</string>
+	<string name="instance_rules_title">Server-Regeln</string>
+	<string name="instance_rules_subtitle">Mit dem Fortfahren erklärst du dich damit einverstanden, die folgenden Regeln zu befolgen, die von den %s-Moderatoren aufgestellt und umgesetzt werden.</string>
+	<string name="signup_title">Konto erstellen</string>
 	<string name="edit_photo">bearbeiten</string>
-	<string name="display_name">Anzeigename</string>
+	<string name="display_name">Name</string>
 	<string name="username">Profilname</string>
 	<string name="email">E-Mail</string>
 	<string name="password">Passwort</string>
@@ -193,7 +189,7 @@
 	<string name="category_all">Alle</string>
 	<string name="category_art">Kunst</string>
 	<string name="category_food">Essen</string>
-	<string name="category_furry">Furries</string>
+	<string name="category_furry">Furry</string>
 	<string name="category_games">Spiele</string>
 	<string name="category_general">Allgemein</string>
 	<string name="category_journalism">Journalismus</string>
@@ -201,16 +197,16 @@
 	<string name="category_music">Musik</string>
 	<string name="category_regional">Regional</string>
 	<string name="category_tech">Technik</string>
-	<string name="confirm_email_title">Eine letzte Sache noch</string>
+	<string name="confirm_email_title">Überprüfe deinen Posteingang</string>
 	<!-- %s is the email address -->
-	<string name="confirm_email_subtitle">Tippe auf den Link, den wir dir per E-Mail geschickt haben, um dein Konto zu verifizieren.</string>
-	<string name="confirm_email_didnt_get">Keinen Link bekommen?</string>
+	<string name="confirm_email_subtitle">Klicke auf den Link, den wir dir geschickt haben, um %s zu bestätigen. Wir warten hier auf dich.</string>
+	<string name="confirm_email_didnt_get">Kein Link erhalten?</string>
 	<string name="resend">Erneut abschicken</string>
 	<string name="open_email_app">E-Mail-App öffnen</string>
 	<string name="resent_email">Bestätigung per E-Mail zugeschickt</string>
-	<string name="compose_hint">Was gibt\'s Neues? Was geht dir durch den Kopf? Was liegt dir am Herzen?</string>
+	<string name="compose_hint">Was gibt\'s Neues?</string>
 	<string name="content_warning">Inhaltswarnung</string>
-	<string name="add_image_description">Bildbeschreibung hinzufügen …</string>
+	<string name="add_image_description">Bildbeschreibung hinzufügen …</string>
 	<string name="retry_upload">Erneut hochladen</string>
 	<string name="edit_image">Bild bearbeiten</string>
 	<string name="save">Speichern</string>
@@ -292,7 +288,7 @@
 	<string name="open_in_browser">Im Browser öffnen</string>
 	<string name="hide_boosts_from_user">geteilte Beiträge von %s ausblenden</string>
 	<string name="show_boosts_from_user">geteilte Beiträge von %s anzeigen</string>
-	<string name="signup_reason">Weshalb möchtest du beitreten?</string>
+	<string name="signup_reason">Warum möchtest du beitreten?</string>
 	<string name="signup_reason_note">Das erleichtert uns die Prüfung deiner Anmeldung.</string>
 	<string name="clear">Leeren</string>
 	<string name="profile_header">Titelbild</string>
@@ -304,7 +300,7 @@
 	<string name="open_settings">Einstellungen öffnen</string>
 	<string name="error_saving_file">Fehler beim Speichern der Datei</string>
 	<string name="file_saved">Datei gespeichert</string>
-	<string name="downloading">wird heruntergeladen …</string>
+	<string name="downloading">wird heruntergeladen …</string>
 	<string name="no_app_to_handle_action">Es gibt keine App, um diese Aktion auszuführen</string>
 	<string name="local_timeline">Lokal</string>
 	<string name="trending_posts_info_banner">Dies sind Beiträge, die auf deinem Mastodon-Server gerade angesagt sind.</string>
@@ -320,7 +316,6 @@
 	<string name="manually_approves_followers">Manuelles Genehmigen von Followern</string>
 	<string name="current_account">Aktuelles Konto</string>
 	<string name="log_out_account">%s abmelden</string>
-
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<plurals name="x_followers">
 		<item quantity="one">%,d Follower</item>
@@ -350,7 +345,7 @@
 		<item quantity="other">vor %d Sekunden</item>
 	</plurals>
 	<plurals name="x_minutes_ago">
-		<item quantity="one">vor %d Minute</item>
+		<item quantity="one">vor %d Minute</item>
 		<item quantity="other">vor %d Minuten</item>
 	</plurals>
 	<string name="edited_timestamp">bearbeitet %s</string>
@@ -378,7 +373,7 @@
 	<string name="file_upload_progress">%1$s von %2$s</string>
 	<string name="file_upload_time_remaining">%s verbleibend</string>
 	<string name="upload_error_connection_lost">Dein Gerät hat gerade keinen Zugang zum Internet</string>
-	<string name="upload_processing">Wird verarbeitet …</string>
+	<string name="upload_processing">Wird verarbeitet …</string>
 	<!-- %s is version like 1.2.3 -->
 	<string name="update_available">Mastodon für Android %s ist zum Herunterladen bereit.</string>
 	<!-- %s is version like 1.2.3 -->
@@ -386,39 +381,54 @@
 	<!-- %s is file size -->
 	<string name="download_update">(%s) herunterladen</string>
 	<string name="install_update">Installieren</string>
-	<string name="privacy_policy_title">Mastodon und der Schutz deiner Daten</string>
-	<string name="privacy_policy_subtitle">Obwohl die Mastodon-App keinerlei Daten sammelt, könnte der Server, über den du dich registriert hast, eine abweichende Datenschutzerklärung haben. Nimm dir einen Moment Zeit, um die Datenschutzbestimmungen sowohl der App als auch deiner Mastodon-Instanz durchzulesen und sie zu akzeptieren.</string>
+	<string name="privacy_policy_title">Deine Privatsphäre</string>
+	<string name="privacy_policy_subtitle">Auch wenn die Mastodon-App keine Daten sammelt, kann der Server, über den du dich anmeldest, eine andere Richtlinie haben.\n\nWenn du mit der Richtlinie für %s nicht einverstanden bist, kannst du zurückkehren und einen anderen Server wählen.</string>
 	<string name="i_agree">Ich stimme zu</string>
 	<string name="empty_list">Diese Liste ist leer</string>
 	<string name="instance_signup_closed">Dieser Server akzeptiert keine neuen Registrierungen.</string>
 	<string name="text_copied">In die Zwischenablage kopiert</string>
-	<string name="add_bookmark">Lesezeichen setzen</string>
+	<string name="add_bookmark">Lesezeichen hinzufügen</string>
 	<string name="remove_bookmark">Lesezeichen entfernen</string>
 	<string name="bookmarks">Lesezeichen</string>
 	<string name="your_favorites">Deine Favoriten</string>
 	<string name="login_title">Willkommen zurück</string>
 	<string name="login_subtitle">Melde dich mit dem Server an, auf dem du dein Konto erstellt hast.</string>
 	<string name="server_url">Serveradresse</string>
-	<!-- {logo} is a placeholder that is replaced with the Mastodon logo image at runtime. Please copy it into your translation as is. -->
-	<string name="welcome_page1_title">Was ist {logo}?</string>
-	<string name="welcome_page1_text">Stellen Sie sich vor, Sie haben eine E-Mail-Adresse mit der Endung @example.com.\n\nSie können weiterhin E-Mails von jeder Person senden und empfangen, auch wenn deren E-Mail-Adresse auf @gmail.com oder @icloud.com oder @example.com endet.</string>
+	<string name="welcome_page1_title">Was ist Mastodon?</string>
+	<string name="welcome_page1_text">Angenommen, du hast eine E-Mail-Adresse, die mit @example.com endet.\n\nDu kannst immer noch E-Mails von allen empfangen, auch wenn deren E-Mail-Adresse mit @gmail.com, @icloud.com oder @example.com endet.</string>
 	<string name="welcome_page2_title">Mastodon ist genau so.</string>
-	<string name="welcome_page2_text">Ihr Handle könnte @gothgirl654@example.social sein, aber Sie können trotzdem @fallout5ever@example.online folgen, rebloggen und mit ihm chatten.</string>
-	<string name="welcome_page3_title">Wie wählt man einen Server aus?</string>
-	<string name="welcome_page3_text">Verschiedene Leute wählen verschiedene Server aus verschiedenen Gründen. art.example ist ein großartiger Ort für Künstler, während glasgow.example eine gute Wahl für Schotten ist. Sie können mit keinem unserer empfohlenen Server etwas falsch machen, also egal welchen Sie wählen (oder ob Sie Ihren eigenen in die Serversuchleiste eingeben), Sie werden nirgendwo etwas verpassen.</string>
-	<string name="signup_random_server_explain">Wir wählen einen Server auf der Grundlage Ihrer Sprache, wenn Sie fortfahren, ohne eine Auswahl zu treffen.</string>
-	<string name="server_filter_any_language">Beliebige Sprache</string>
-	<string name="server_filter_instant_signup">Instant Sign-up</string>
+	<string name="welcome_page2_text">Dein Nutzer*innenname könnte @GothGirl654@example.social sein, aber du kannst trotzdem @fallout5ever@example.online folgen, deren Beiträge teilen und dich mit der Person unterhalten.</string>
+	<string name="welcome_page3_title">Wie wähle ich einen Server aus?</string>
+	<string name="welcome_page3_text">Unterschiedliche Menschen wählen aus verschiedenen Gründen unterschiedliche Server. art.example ist ein toller Ort für Künstler*innen, während glasgow.example eine gute Wahl für Schott*innen sein könnte.\n\nWähle nach Möglichkeit einen kleinen Server aus, mit dessen Regeln du dich wohl fühlst und der dir vertrauenswürdig erscheint (über die Server-Suchleiste kannst du dich direkt mit dem Server deines Vertrauens verbinden).</string>
+	<string name="signup_random_server_explain">Wenn du ohne Auswahl fortfährst, wählen wir einen Server in deiner Sprache aus.</string>
+	<string name="server_filter_any_language">Alle Sprachen</string>
+	<string name="server_filter_instant_signup">Schnellregistrierung</string>
 	<string name="server_filter_manual_review">Manuelle Überprüfung</string>
-	<string name="server_filter_any_signup_speed">Beliebige Anmeldegeschwindigkeit</string>
+	<string name="server_filter_any_signup_speed">Beliebige Registrierungsdauer</string>
 	<string name="server_filter_region_europe">Europa</string>
-	<string name="server_filter_region_north_america">Nord Amerika</string>
-	<string name="server_filter_region_south_america">Süd Amerika</string>
+	<string name="server_filter_region_north_america">Nordamerika</string>
+	<string name="server_filter_region_south_america">Südamerika</string>
 	<string name="server_filter_region_africa">Afrika</string>
 	<string name="server_filter_region_asia">Asien</string>
 	<string name="server_filter_region_oceania">Ozeanien</string>
-	<string name="not_accepting_new_members">Keine neuen Mitglieder aufnehmen</string>
+	<string name="not_accepting_new_members">Keine Aufnahme neuer Mitglieder</string>
 	<string name="category_special_interests">Besondere Interessen</string>
 	<string name="signup_passwords_dont_match">Passwörter stimmen nicht überein</string>
-	<string name="loading_fediverse_resource_title">Ich habe im Fediverse nachgeschaut...</string>
-</resources>
+	<string name="pick_server_for_me">Wähle für mich aus</string>
+	<string name="profile_add_row">Zeile hinzufügen</string>
+	<string name="profile_setup">Profil einrichten</string>
+	<string name="profile_setup_subtitle">Du kannst dies jederzeit später auf dem Profil-Reiter vervollständigen.</string>
+	<string name="profile_setup_explanation">Du kannst bis zu vier Profilfelder für alles, was du möchtest, hinzufügen. Standort, Links, Pronomen - deiner Fantasie sind hier keine Grenzen gesetzt.</string>
+	<string name="popular_on_mastodon">Beliebt auf Mastodon</string>
+	<string name="follow_all">Allen folgen</string>
+	<string name="server_rules_disagree">Ablehnen</string>
+	<string name="privacy_policy_explanation">TL;DR: Wir sammeln oder verarbeiten keine persönlichen Daten.</string>
+	<!-- %s is server domain -->
+	<string name="server_policy_disagree">%s nicht zustimmen</string>
+	<string name="profile_bio">Über mich</string>
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Benutzer*innen wird gefolgt …</string>
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s lässt keine Anmeldungen von %2$s zu. Versuche einen anderen oder &lt;a&gt;wähle einen anderen Server&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Dieser Benutzername ist bereits vergeben.</string>
+</resources>

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

@@ -25,4 +25,5 @@
     <string name="mo_fab_compose">Verfassen</string>
     <string name="mo_sending_error">Fehler beim Veröffentlichen</string>
     <string name="mo_filtered">Gefiltert: %s</string>
+    <string name="mo_disable_reminder_to_add_alt_text">Erinnerung zum Hinzufügen einer Bildbeschreibung deaktivieren</string>
 </resources>

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

@@ -250,4 +250,15 @@
     <string name="sk_settings_see_new_posts_button">“Neue Beiträge anzeigen”-Button</string>
     <string name="sk_settings_server_version">Server-Version: %s</string>
     <string name="sk_notify_poll_results">Umfrage-Ergebnisse</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">CWs beim Antworten “re:” voranstellen</string>
+    <string name="sk_filtered">Gefiltert: %s</string>
+    <string name="sk_expand">Erweitern</string>
+    <string name="sk_collapse">Einklappen</string>
+    <string name="sk_settings_collapse_long_posts">Sehr lange Beiträge einklappen</string>
+    <string name="sk_unfinished_attachments">Anhänge richtig stellen\?</string>
+    <string name="sk_settings_hide_interaction">Interaktions-Buttons verstecken</string>
+    <string name="sk_unfinished_attachments_message">Einige Anhänge sind nicht fertig hochgeladen.</string>
+    <string name="sk_followed_as">Mit %s gefolgt</string>
+    <string name="sk_settings_hide_fab">Verfassen-Button automatisch ausblenden</string>
+    <string name="sk_follow_as">Mit anderem Account folgen</string>
 </resources>

mastodon/src/main/res/values-el-rGR/strings.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<!-- %s is the email address -->
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

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

@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Empezar</string>
+	<string name="get_started">Crear cuenta</string>
+	<string name="already_have_account">Ya tengo una cuenta</string>
 	<string name="log_in">Iniciar sesión</string>
 	<string name="next">Siguiente</string>
+	<string name="loading_instance">Recuperando información del servidor…</string>
 	<string name="error">Error</string>
+	<string name="not_a_mastodon_instance">%s no parece ser un servidor de Mastodon.</string>
 	<string name="ok">Aceptar</string>
 	<string name="preparing_auth">Preparando para autenticación…</string>
-	<string name="finishing_auth">Terminando autenticación…</string>
-	<string name="user_boosted">%s reblogueado</string>
+	<string name="finishing_auth">Finalizando autenticación…</string>
+	<string name="user_boosted">%s reblogueó</string>
 	<string name="in_reply_to">En respuesta a %s</string>
 	<string name="notifications">Notificaciones</string>
-	<string name="user_followed_you">te siguió</string>
-	<string name="user_sent_follow_request">te quiere seguir</string>
-	<string name="user_favorited">ha marcado como favorita tu publicación</string>
-	<string name="notification_boosted">ha reblogueado tu publicación</string>
+	<string name="user_followed_you">ha empezado a seguirte</string>
+	<string name="user_sent_follow_request">te envió una solicitud de seguimiento</string>
+	<string name="user_favorited">marcó como favorita</string>
+	<string name="notification_boosted">reblogueó</string>
 	<string name="poll_ended">encuesta finalizada</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
 	<string name="time_hours">%dh</string>
 	<string name="time_days">%dd</string>
 	<string name="share_toot_title">Compartir</string>
-	<string name="settings">Configuración</string>
+	<string name="settings">Ajustes</string>
 	<string name="publish">Publicar</string>
-	<string name="discard_draft">¿Descartar el borrador?</string>
+	<string name="discard_draft">¿Descartar borrador?</string>
 	<string name="discard">Descartar</string>
 	<string name="cancel">Cancelar</string>
 	<plurals name="followers">
@@ -38,19 +41,19 @@
 		<item quantity="other">publicaciones</item>
 	</plurals>
 	<string name="posts">Publicaciones</string>
-	<string name="posts_and_replies">Publicaciones y Respuestas</string>
+	<string name="posts_and_replies">Publicaciones y respuestas</string>
 	<string name="media">Multimedia</string>
 	<string name="profile_about">Acerca de</string>
 	<string name="button_follow">Seguir</string>
 	<string name="button_following">Siguiendo</string>
-	<string name="edit_profile">Editar Perfil</string>
+	<string name="edit_profile">Editar perfil</string>
 	<string name="mention_user">Mencionar a %s</string>
 	<string name="share_user">Compartir %s</string>
 	<string name="mute_user">Silenciar a %s</string>
-	<string name="unmute_user">Des-silenciar a %s</string>
+	<string name="unmute_user">Dejar de silenciar a %s</string>
 	<string name="block_user">Bloquear a %s</string>
 	<string name="unblock_user">Desbloquear a %s</string>
-	<string name="report_user">Reportar a %s</string>
+	<string name="report_user">Denunciar a %s</string>
 	<string name="block_domain">Bloquear %s</string>
 	<string name="unblock_domain">Desbloquear %s</string>
 	<plurals name="x_posts">
@@ -100,11 +103,11 @@
 	</plurals>
 	<string name="poll_closed">Cerrado</string>
 	<string name="confirm_mute_title">Silenciar cuenta</string>
-	<string name="confirm_mute">Confirmar para silenciar %s</string>
+	<string name="confirm_mute">Confirmar para silenciar a %s</string>
 	<string name="do_mute">Silenciar</string>
-	<string name="confirm_unmute_title">Des-silenciar cuenta</string>
-	<string name="confirm_unmute">Confirmar para des-silenciar a %s</string>
-	<string name="do_unmute">Des-silenciar</string>
+	<string name="confirm_unmute_title">Dejar de silenciar cuenta</string>
+	<string name="confirm_unmute">Confirmar para dejar de silenciar a %s</string>
+	<string name="do_unmute">Dejar de silenciar</string>
 	<string name="confirm_block_title">Bloquear cuenta</string>
 	<string name="confirm_block_domain_title">Bloquear dominio</string>
 	<string name="confirm_block">Confirmar para bloquear a %s</string>
@@ -119,7 +122,7 @@
 	<string name="tap_to_reveal">Toca para mostrar</string>
 	<string name="delete">Eliminar</string>
 	<string name="confirm_delete_title">Eliminar publicación</string>
-	<string name="confirm_delete">¿Estás seguro de que deseas eliminar esta publicación?</string>
+	<string name="confirm_delete">¿Confirma que quiere eliminar esta publicación?</string>
 	<string name="deleting">Eliminando…</string>
 	<string name="notification_channel_audio_player">Reproducción de audio</string>
 	<string name="play">Reproducir</string>
@@ -127,7 +130,7 @@
 	<string name="log_out">Cerrar sesión</string>
 	<string name="add_account">Añadir cuenta</string>
 	<string name="search_hint">Buscar</string>
-	<string name="hashtags">Hashtags</string>
+	<string name="hashtags">Etiquetas</string>
 	<string name="news">Noticias</string>
 	<string name="for_you">Para ti</string>
 	<string name="all_notifications">Todas</string>
@@ -140,13 +143,13 @@
 		<item quantity="one">Debatido %d vez</item>
 		<item quantity="other">Debatido %d veces</item>
 	</plurals>
-	<string name="report_title">Reportar %s</string>
+	<string name="report_title">Denunciar a %s</string>
 	<string name="report_choose_reason">¿Cuál es el problema con esta publicación?</string>
 	<string name="report_choose_reason_account">¿Cuál es el problema con %s?</string>
-	<string name="report_choose_reason_subtitle">Selecciona la mejor opción</string>
+	<string name="report_choose_reason_subtitle">Seleccione la mejor opción</string>
 	<string name="report_reason_personal">No me gusta</string>
 	<string name="report_reason_personal_subtitle">No es algo que quieras ver</string>
-	<string name="report_reason_spam">Es spam</string>
+	<string name="report_reason_spam">Es publicidad no deseada</string>
 	<string name="report_reason_spam_subtitle">Enlaces maliciosos, interacciones falsas o respuestas repetitivas</string>
 	<string name="report_reason_violation">Viola las reglas del servidor</string>
 	<string name="report_reason_violation_subtitle">Eres consciente de que infringe normas específicas</string>
@@ -154,31 +157,23 @@
 	<string name="report_reason_other_subtitle">El problema no encaja en otras categorías</string>
 	<string name="report_choose_rule">¿Qué normas se están violando?</string>
 	<string name="report_choose_rule_subtitle">Selecciona todos los que correspondan</string>
-	<string name="report_choose_posts">¿Hay alguna publicación que respalde este informe?</string>
+	<string name="report_choose_posts">¿Hay alguna publicación que respalde esta denuncia?</string>
 	<string name="report_choose_posts_subtitle">Selecciona todos los que correspondan</string>
 	<string name="report_comment_title">¿Hay algo más que deberíamos saber?</string>
 	<string name="report_comment_hint">Comentarios adicionales</string>
-	<string name="sending_report">Enviando el informe…</string>
-	<string name="report_sent_title">Gracias por informar, estudiaremos el caso.</string>
+	<string name="sending_report">Enviando denuncia…</string>
+	<string name="report_sent_title">Gracias por denunciar; estudiaremos el caso.</string>
 	<string name="report_sent_subtitle">Mientras revisamos esto, puedes tomar medidas contra %s.</string>
 	<string name="unfollow_user">Dejar de seguir a %s</string>
 	<string name="unfollow">Dejar de seguir</string>
 	<string name="mute_user_explain">No verás sus publicaciones o reblogueos en tu línea temporal. No sabrán que han sido silenciados.</string>
 	<string name="block_user_explain">Ya no podrán seguir o ver tus mensajes, pero pueden ver si han sido bloqueados.</string>
 	<string name="report_personal_title">¿No quieres ver esto?</string>
-	<string name="report_personal_subtitle">Cuando veas algo que no te gusta en Mastodon, puedes quitar a la persona de tu experiencia.</string>
+	<string name="report_personal_subtitle">Cuando vea en Mastodon algo que no le agrada, puede sacar a la persona de su experiencia.</string>
 	<string name="back">Atrás</string>
 	<string name="instance_catalog_title">Mastodon está hecho por usuarios den diferentes servidores.</string>
 	<string name="instance_catalog_subtitle">Selecciona un servidor basado en tus intereses, región o un propósito general. Aun así puedes conectarte con todo el mundo, sin importar el servidor.</string>
-	<string name="search_communities">Busca servidores o introduce la URL</string>
-	<string name="instance_rules_title">Algunas reglas básicas</string>
-	<string name="instance_rules_subtitle">Tómate un minuto para revisar las reglas establecidas y aplicadas por las personas que administran %s.</string>
-	<string name="signup_title">Deja que te preparemos en %s</string>
 	<string name="edit_photo">editar</string>
-	<string name="display_name">nombre a mostrar</string>
-	<string name="username">nombre de usuario</string>
-	<string name="email">correo electrónico</string>
-	<string name="password">contraseña</string>
 	<string name="password_note">Incluye letras mayúsculas, caracteres especiales y números para aumentar la fuerza de tu contraseña.</string>
 	<string name="category_academia">Académico</string>
 	<string name="category_activism">Activismo</string>
@@ -193,8 +188,7 @@
 	<string name="category_music">Música</string>
 	<string name="category_regional">Regional</string>
 	<string name="category_tech">Tecnología</string>
-	<string name="confirm_email_title">Una última cosa</string>
-	<string name="confirm_email_subtitle">Toque el enlace que le enviamos por correo electrónico para verificar su cuenta.</string>
+	<!-- %s is the email address -->
 	<string name="resend">Reenviar</string>
 	<string name="open_email_app">Abrir aplicación de email</string>
 	<string name="resent_email">Correo de confirmación enviado</string>
@@ -282,7 +276,6 @@
 	<string name="open_in_browser">Abrir en el navegador</string>
 	<string name="hide_boosts_from_user">Ocultar reblogueos de %s</string>
 	<string name="show_boosts_from_user">Mostrar reblogueos de %s</string>
-	<string name="signup_reason">¿por qué quieres unirte?</string>
 	<string name="signup_reason_note">Esto nos ayudará a revisar su solicitud.</string>
 	<string name="clear">Borrar</string>
 	<string name="profile_header">Imagen de cabecera</string>
@@ -375,7 +368,23 @@
 	<!-- %s is file size -->
 	<string name="download_update">Descargar (%s)</string>
 	<string name="install_update">Instalar</string>
-	<string name="privacy_policy_title">Mastodon y su privacidad</string>
-	<string name="privacy_policy_subtitle">Aunque la aplicación de Mastodon no recolecta ningún dato, el servidor al que se registre puede tener una política diferente. Tómese un minuto para revisar y aceptar las políticas de privacidad de la aplicación de Mastodon y las políticas de privacidad de su servidor.</string>
 	<string name="i_agree">Acepto</string>
+	<string name="empty_list">Esta lista está vacía</string>
+	<string name="instance_signup_closed">Este servidor no acepta altas nuevas.</string>
+	<string name="text_copied">Copiado en el portapapeles</string>
+	<string name="add_bookmark">Marcadores</string>
+	<string name="remove_bookmark">Eliminar marcador</string>
+	<string name="bookmarks">Marcadores</string>
+	<string name="your_favorites">Sus favoritos</string>
+	<string name="login_title">Qué bueno verle de nuevo</string>
+	<string name="login_subtitle">Inicie sesión con el servidor donde creó su cuenta.</string>
+	<string name="server_url">URL del servidor</string>
+	<string name="welcome_page1_text">Imagina que tienes una dirección de correo electrónico que termina con @ejemplo.com.\n\nPuedes enviar y recibir correos electrónicos de cualquier persona, incluso si su correo electrónico termina en @gmail.com o @icloud.com o @ejemplo.com.</string>
+	<string name="welcome_page2_title">Mastodon es parecido.</string>
+	<string name="welcome_page2_text">Tu cuenta puede ser @gothgirl654@example.social, pero puedes seguir, rebloguear, y chatear con @fallout5ever@example.online.</string>
+	<string name="welcome_page3_title">¿Cómo elijo un servidor?</string>
+	<string name="welcome_page3_text">Diferentes personas eligen diferentes servidores por diferentes motivos. Por ejemplo, art.example es un buen lugar para artistas, mientras que madrid.example puede ser una buena elección para los madrileños.\n\nNo te equivocarás con ninguno de nuestros servidores recomendados, por lo que independientemente del que escojas (o si introduces tu propio servidor en la barra de búsqueda), no te perderás ni una en ningún lugar.</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

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

@@ -257,4 +257,6 @@
     <string name="sk_unfinished_attachments">¿Corregir adjuntos\?</string>
     <string name="sk_unfinished_attachments_message">Algunos adjuntos no han terminado de subirse.</string>
     <string name="sk_settings_prefix_reply_cw_with_re">Añadir \"re:\" a respuestas a Advertencias de Contenido</string>
+    <string name="sk_spectator_mode">Modo espectador</string>
+    <string name="sk_settings_hide_interaction">Ocultar los botones interactivos</string>
 </resources>

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

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Nola hasi</string>
+	<string name="get_started">Sortu kontua</string>
+	<string name="already_have_account">Badut kontua dagoeneko</string>
 	<string name="log_in">Hasi saioa</string>
 	<string name="next">Hurrengoa</string>
+	<string name="loading_instance">Zerbitzariaren informazioa berreskuratzen…</string>
 	<string name="error">Errorea</string>
+	<string name="not_a_mastodon_instance">%s(e) k ez dirudi Mastodon instantzia bat denik.</string>
 	<string name="ok">Ados</string>
 	<string name="preparing_auth">Autentifikaziorako prestatzen…</string>
 	<string name="finishing_auth">Autentikazioa bukatzen…</string>
@@ -170,15 +173,15 @@
 	<string name="back">Atzera</string>
 	<string name="instance_catalog_title">Mastodon zerbitzari desberdinetako erabiltzaileez egina dago.</string>
 	<string name="instance_catalog_subtitle">Aukeratu zerbitzari bat zure interesen, eskualdearen edo helburuen arabera. Pertsona guztiekin konektatu ahal izango duzu, zerbitzaria zein den kontuan hartu gabe.</string>
-	<string name="search_communities">Bilatu zerbitzariak edo idatzi URL-a</string>
-	<string name="instance_rules_title">Oinarrizko arau batzuk</string>
-	<string name="instance_rules_subtitle">Hartu minutu bat %s-en administratzaileek ezarri eta aplikatutako arauak berrikusteko.</string>
-	<string name="signup_title">%s zerbitzariko kontua prestatuko dizugu</string>
+	<string name="search_communities">Zerbitzari izena edo URLa</string>
+	<string name="instance_rules_title">Zerbitzariaren arauak</string>
+	<string name="signup_title">Sortu kontua</string>
 	<string name="edit_photo">editatu</string>
-	<string name="display_name">pantaila-izena</string>
-	<string name="username">erabiltzaile-izena</string>
-	<string name="email">eposta</string>
-	<string name="password">pasahitza</string>
+	<string name="display_name">Izena</string>
+	<string name="username">Erabiltzaile-izena</string>
+	<string name="email">Eposta</string>
+	<string name="password">Pasahitza</string>
+	<string name="confirm_password">Berretsi pasahitza</string>
 	<string name="password_note">Sartu letra larriak, karaktere bereziak eta zenbakiak zure pasahitzaren segurtasuna areagotzeko.</string>
 	<string name="category_academia">Akademia</string>
 	<string name="category_activism">Aktibismoa</string>
@@ -193,8 +196,8 @@
 	<string name="category_music">Musika</string>
 	<string name="category_regional">Herrialdekoa</string>
 	<string name="category_tech">Teknologia</string>
-	<string name="confirm_email_title">Eta azkenik...</string>
-	<string name="confirm_email_subtitle">Sakatu epostaz bidali dizugun loturan zure kontua egiaztatzeko.</string>
+	<string name="confirm_email_title">Egiaztatu zure sarrerako ontzia</string>
+	<!-- %s is the email address -->
 	<string name="resend">Berbidali</string>
 	<string name="open_email_app">Ireki eposta aplikazioa</string>
 	<string name="resent_email">Berretzi eposta bidaltzea</string>
@@ -282,7 +285,7 @@
 	<string name="open_in_browser">Ireki nabigatzailean</string>
 	<string name="hide_boosts_from_user">Ezkutatu %s(r)en bultzadak</string>
 	<string name="show_boosts_from_user">Erakutsi %s(r)en bultzadak</string>
-	<string name="signup_reason">zergatik elkartu nahi duzu?</string>
+	<string name="signup_reason">Zergatik elkartu nahi duzu?</string>
 	<string name="signup_reason_note">Honek zure eskaera berrikustean lagunduko digu.</string>
 	<string name="clear">Garbitu</string>
 	<string name="profile_header">Goiburu irudia</string>
@@ -375,8 +378,7 @@
 	<!-- %s is file size -->
 	<string name="download_update">(%s) deskargatu</string>
 	<string name="install_update">Instalatu</string>
-	<string name="privacy_policy_title">Mastodon eta zure pribatutasuna</string>
-	<string name="privacy_policy_subtitle">Mastodon aplikazioak daturik jasotzen ez duen arren, izena ematen duzun zerbitzariak beste politika bat izan dezake. Eskaini minutu bat Mastodon aplikazioaren pribatutasun politika eta zure zerbitzariaren pribatutasun politika berrikusteko eta ados zaudela ziurtatzeko.</string>
+	<string name="privacy_policy_title">Zure pribatutasuna</string>
 	<string name="i_agree">Ados nago</string>
 	<string name="empty_list">Zerrenda hau hutsik dago</string>
 	<string name="instance_signup_closed">Zerbitzari honek ez ditu izen-emate berriak onartzen.</string>
@@ -385,4 +387,31 @@
 	<string name="remove_bookmark">Kendu laster-marka</string>
 	<string name="bookmarks">Laster-markak</string>
 	<string name="your_favorites">Zure gogokoak</string>
+	<string name="login_title">Ongi etorri berriro ere</string>
+	<string name="login_subtitle">Hasi saioa kontua sortu zenuen zerbitzariarekin.</string>
+	<string name="server_url">Zerbitzariaren URLa</string>
+	<string name="welcome_page1_title">Zer da Mastodon?</string>
+	<string name="welcome_page1_text">Imajinatu zure helbide elektronikoa adibidea.eus-en amaitzen dela. \n\n Oraindik edonoren mezu elektronikoak bidali eta jaso ditzakezu, baita posta elektronikoa @gmail.com edo @icloud.com edo @adibidea.eus helbideetan amaitzen bada ere.</string>
+	<string name="welcome_page2_title">Mastodon antzekoa da.</string>
+	<string name="welcome_page2_text">Zure kontua \"@pertsona1@mastodon.eus\" izan liteke, baina oraindik ere jarraitu, bultzatu edo txateatu dezakezu \"@pertsona2@mastodon.social\" edo bestelako edozein kontu.</string>
+	<string name="welcome_page3_title">Nola aukeratzen dut zerbitzari bat?</string>
+	<string name="welcome_page3_text">Hainbat pertsonak zerbitzari bat baino gehiago aukeratzen dituzte arrazoi ezberdinengatik. Adibidez, art.example leku ona da artistentzat eta mastodon.eus, berriz, euskaldunentzat. Gure gomendioetako zerbitzariekin, ez duzu hanka sartuko eta edozein dela ere zure aukera, beste zerbitzarietako kideekin harremana izan dezakezu (bilaketa-barran bilatuz).</string>
+	<string name="server_filter_any_language">Edozein hizkuntza</string>
+	<string name="server_filter_instant_signup">Berehalako erregistroa</string>
+	<string name="server_filter_region_europe">Europa</string>
+	<string name="server_filter_region_north_america">Ipar Amerika</string>
+	<string name="server_filter_region_south_america">Hego Amerika</string>
+	<string name="server_filter_region_africa">Afrika</string>
+	<string name="server_filter_region_asia">Asia</string>
+	<string name="server_filter_region_oceania">Ozeania</string>
+	<string name="not_accepting_new_members">Ez da kide berririk onartzen</string>
+	<string name="signup_passwords_dont_match">Pasahitzak ez datoz bat</string>
+	<string name="profile_add_row">Gehitu errenkada</string>
+	<string name="follow_all">Jarraitu denak</string>
+	<string name="server_rules_disagree">Ez ados</string>
+	<!-- %s is server domain -->
+	<string name="profile_bio">Biografia</string>
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_username_taken">Erabiltzaile-izen hau hartuta dago.</string>
 </resources>

mastodon/src/main/res/values-fa-rIR/strings.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="get_started">ایجاد حساب</string>
+	<string name="already_have_account">من از قبل حساب‌کاربری دارم</string>
+	<string name="log_in">ورود</string>
+	<string name="next">بعدی</string>
+	<string name="loading_instance">درحال بازیابی اطلاعات سرور…</string>
+	<string name="error">خطا</string>
+	<string name="ok">تأیید</string>
+	<string name="preparing_auth">درحال آماده‌سازی برای احرازهویت…</string>
+	<string name="finishing_auth">درحال تکمیل احرازهویت…</string>
+	<string name="in_reply_to">در پاسخ به %s</string>
+	<string name="notifications">اعلان‌ها</string>
+	<string name="user_followed_you">شما را دنبال می‌کند</string>
+	<string name="user_sent_follow_request">یک درخواست دنبال کردن برای شما ارسال کرد</string>
+	<string name="user_favorited">‫‬ فرسته‌تان را پسندید</string>
+	<string name="notification_boosted">مطلب شما را به‌اشتراک گذاشت</string>
+	<string name="poll_ended">نظرسنجی به پایان رسید</string>
+	<string name="time_seconds">%dثانیه</string>
+	<string name="time_minutes">%dدقیقه</string>
+	<string name="time_hours">%dساعت</string>
+	<string name="time_days">%dروز</string>
+	<string name="share_toot_title">اشتراک‌گذاری</string>
+	<string name="settings">تنظیمات</string>
+	<string name="publish">انتشار</string>
+	<string name="discard_draft">پیش‌نویس‌ کنار گذاشته شود؟</string>
+	<string name="discard">صرف‌نظر کردن</string>
+	<string name="cancel">لغو</string>
+	<string name="posts">پست‌ها</string>
+	<string name="posts_and_replies">پست‌ها و پاسخ‌ها</string>
+	<string name="media">رسانه</string>
+	<string name="profile_about">درباره</string>
+	<string name="button_follow">فالو</string>
+	<string name="share_user">اشتراک‌گذاری %s</string>
+	<string name="mute_user">بی‌صدا %s</string>
+	<string name="block_user">مسدود %s</string>
+	<string name="unblock_user">رفع مسدودیت %s</string>
+	<string name="profile_joined">عضو شد</string>
+	<string name="done">انجام شد</string>
+	<string name="loading">درحال بارگذاری…</string>
+	<string name="field_label">برچسب</string>
+	<string name="field_content">محتوا</string>
+	<string name="saving">درحال ذخیره‌سازی…</string>
+	<string name="do_mute">بی‌صدا</string>
+	<string name="do_block">مسدود</string>
+	<string name="action_vote">رأی</string>
+	<string name="delete">حذف</string>
+	<string name="confirm_delete_title">حذف پست</string>
+	<string name="play">پخش</string>
+	<string name="pause">توقف</string>
+	<string name="search_hint">جستجو</string>
+	<string name="hashtags">هشتگ‌ها</string>
+	<string name="news">اخبار</string>
+	<string name="for_you">برای شما</string>
+	<string name="all_notifications">همه</string>
+	<string name="report_title">گزارش کردن %s</string>
+	<string name="report_reason_personal">من این را دوست ندارم</string>
+	<string name="report_reason_spam">این هرزنامه است</string>
+	<string name="back">بازگشت</string>
+	<string name="edit_photo">ویرایش</string>
+	<string name="category_activism">فعالیت</string>
+	<string name="category_all">همه</string>
+	<string name="category_art">هنر</string>
+	<string name="category_food">غذا</string>
+	<string name="category_games">بازی‌ها</string>
+	<string name="category_lgbt">LGBT</string>
+	<string name="category_music">موسیقی</string>
+	<string name="category_regional">منطقه‌ای</string>
+	<string name="category_tech">فناوری</string>
+	<!-- %s is the email address -->
+	<string name="resend">ارسال دوباره</string>
+	<string name="save">ذخیره</string>
+	<string name="visibility_public">عمومی</string>
+	<string name="search_all">همه</string>
+	<string name="search_people">افراد</string>
+	<string name="skip">بعدی</string>
+	<string name="notification_type_favorite">علاقه‌مندی‌ها</string>
+	<string name="notification_type_poll">نظرسنجی‌ها</string>
+	<string name="choose_account">انتخاب حساب</string>
+	<string name="theme_auto">خودکار</string>
+	<string name="theme_light">روشن</string>
+	<string name="theme_dark">تاریک</string>
+	<string name="new_post">پست جدید</string>
+	<string name="button_reply">پاسخ</string>
+	<string name="button_favorite">برگزیده‌</string>
+	<string name="button_share">اشتراک‌گذاری</string>
+	<string name="emoji">ایموجی</string>
+	<string name="clear">پاک‌کردن</string>
+	<string name="download">دانلود</string>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<string name="time_now">اکنون</string>
+	<string name="time_just_now">همين الان</string>
+	<string name="edit">ویرایش</string>
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is file size -->
+	<string name="install_update">نصب</string>
+	<string name="i_agree">موافقم</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+</resources>

mastodon/src/main/res/values-fi-rFI/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Aloita</string>
 	<string name="log_in">Kirjaudu sisään</string>
 	<string name="next">Seuraava</string>
 	<string name="error">Virhe</string>
@@ -17,9 +16,6 @@
 	<string name="all_notifications">Kaikki</string>
 	<string name="back">Takaisin</string>
 	<string name="edit_photo">muokkaa</string>
-	<string name="display_name">näyttönimi</string>
-	<string name="email">sähköposti</string>
-	<string name="password">salasana</string>
 	<string name="category_academia">Akateeminen</string>
 	<string name="category_activism">Aktivismi</string>
 	<string name="category_all">Kaikki</string>
@@ -33,6 +29,7 @@
 	<string name="category_music">Musiikki</string>
 	<string name="category_regional">Alueellinen</string>
 	<string name="category_tech">Teknologia</string>
+	<!-- %s is the email address -->
 	<string name="save">Tallenna</string>
 	<string name="theme_auto">Automaattinen</string>
 	<string name="theme_light">Vaalea</string>
@@ -53,4 +50,7 @@
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

mastodon/src/main/res/values-fil-rPH/strings.xml

@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Magsimula</string>
+	<string name="get_started">Gumawa ng account</string>
+	<string name="already_have_account">Mayroon na akong account</string>
 	<string name="log_in">Mag-log in</string>
 	<string name="next">Sunod</string>
+	<string name="loading_instance">Pagkuha ng impormasyon sa server…</string>
 	<string name="error">Nag-Error</string>
+	<string name="not_a_mastodon_instance">%s hindi lumilitaw para maging Mastodon server.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Paghahanda para sa pagpapatunay…</string>
 	<string name="finishing_auth">Natapos na ang pagpapatunay…</string>
 	<string name="user_boosted">%s reblogged</string>
-	<string name="in_reply_to">Sa sumagot sa %s</string>
+	<string name="in_reply_to">Bilang tugon kay %s</string>
 	<string name="notifications">Mga abiso</string>
 	<string name="user_followed_you">sinundan ka</string>
 	<string name="user_sent_follow_request">may nagpadala sa iyo ng follow request</string>
@@ -39,7 +42,7 @@
 	</plurals>
 	<string name="posts">Mga Post</string>
 	<string name="posts_and_replies">Mga post at Mga tugon</string>
-	<string name="media">Medya</string>
+	<string name="media">Media</string>
 	<string name="profile_about">Tungkol</string>
 	<string name="button_follow">Sundan</string>
 	<string name="button_following">Sumusunod</string>
@@ -48,9 +51,9 @@
 	<string name="share_user">Ibahagi %s</string>
 	<string name="mute_user">I-mute %s</string>
 	<string name="unmute_user">I-unmute %s</string>
-	<string name="block_user">Na-Block %s</string>
-	<string name="unblock_user">Na-Unblock %s</string>
-	<string name="report_user">Na-report %s</string>
+	<string name="block_user">I-Block %s</string>
+	<string name="unblock_user">I-Unblock %s</string>
+	<string name="report_user">I-Report %s</string>
 	<string name="block_domain">Na-Block %s</string>
 	<string name="unblock_domain">Na-Unblock %s</string>
 	<plurals name="x_posts">
@@ -63,7 +66,7 @@
 	<string name="field_label">Label</string>
 	<string name="field_content">Nilalaman</string>
 	<string name="saving">Pag-save…</string>
-	<string name="post_from_user">Post galing %s</string>
+	<string name="post_from_user">Post mula kay %s</string>
 	<string name="poll_option_hint">Pagpipilian %d</string>
 	<plurals name="x_minutes">
 		<item quantity="one">%d minuto</item>
@@ -95,7 +98,7 @@
 		<item quantity="other">%d natitirang araw</item>
 	</plurals>
 	<plurals name="x_voters">
-		<item quantity="one">%, d botante</item>
+		<item quantity="one">%,d botante</item>
 		<item quantity="other">%,d botante</item>
 	</plurals>
 	<string name="poll_closed">Sarado</string>
@@ -108,20 +111,22 @@
 	<string name="confirm_block_title">I-Block Ang Account</string>
 	<string name="confirm_block_domain_title">I-Block Ang Domain</string>
 	<string name="confirm_block">Kumpirmahin ang pag-block %s</string>
-	<string name="do_block">Block</string>
+	<string name="do_block">I-Block</string>
 	<string name="confirm_unblock_title">I-Unblock ang Account</string>
 	<string name="confirm_unblock_domain_title">I-Unblock ang Domain</string>
 	<string name="confirm_unblock">Kumpirmahin ang pag-unblock%s</string>
-	<string name="do_unblock">Unblock</string>
+	<string name="do_unblock">I-Unblock</string>
 	<string name="button_muted">Naka-mute</string>
 	<string name="button_blocked">Na-block</string>
 	<string name="action_vote">Bumoto</string>
-	<string name="tap_to_reveal">I-Tap para ipakita</string>
+	<string name="tap_to_reveal">I-Tap para makita</string>
 	<string name="delete">Tanggalin</string>
 	<string name="confirm_delete_title">Burahin ang Post</string>
 	<string name="confirm_delete">Sigurado ka bang gusto mong burahin ang post na ito?</string>
+	<string name="deleting">Pagtanggal…</string>
 	<string name="notification_channel_audio_player">Pag-playback ng Audio</string>
 	<string name="play">I-play</string>
+	<string name="pause">I-Pause</string>
 	<string name="log_out">Mag-Sign out</string>
 	<string name="add_account">Magdagdag ng account</string>
 	<string name="search_hint">Maghanap</string>
@@ -138,7 +143,7 @@
 		<item quantity="one">Tinalakay %d oras</item>
 		<item quantity="other">Tinalakay %d oras</item>
 	</plurals>
-	<string name="report_title">Na-report %s</string>
+	<string name="report_title">I-Report %s</string>
 	<string name="report_choose_reason">Ano ang mali sa post na ito?</string>
 	<string name="report_choose_reason_account">Ano ang mali sa %s?</string>
 	<string name="report_choose_reason_subtitle">Piliin ang pinakamahusay na tugma</string>
@@ -146,8 +151,8 @@
 	<string name="report_reason_personal_subtitle">Hindi ito isang bagay na nais mong makita</string>
 	<string name="report_reason_spam">Ito ay spam</string>
 	<string name="report_reason_spam_subtitle">Nakakahamak na mga link, pekeng pakikipag-ugnayan, o paulit-ulit na mga tugon</string>
-	<string name="report_reason_violation">Lumalabag ito sa mga patakaran ng server</string>
-	<string name="report_reason_violation_subtitle">Alam mo na nilalabag nito ang mga tiyak na patakaran</string>
+	<string name="report_reason_violation">Lumalabag ito sa mga panuntunan ng server</string>
+	<string name="report_reason_violation_subtitle">Alam mo na lumalabag ito sa mga partikular na panuntunan</string>
 	<string name="report_reason_other">Ito may iba pa</string>
 	<string name="report_reason_other_subtitle">Ang isyu ay hindi umaangkop sa iba pang mga kategorya</string>
 	<string name="report_choose_rule">Aling mga patakaran ang nilabag?</string>
@@ -156,10 +161,230 @@
 	<string name="report_choose_posts_subtitle">Piliin ang lahat na aaply</string>
 	<string name="report_comment_title">Mayroon pa bang dapat nating malaman?</string>
 	<string name="report_comment_hint">Mga Karagdagang Komento</string>
+	<string name="sending_report">Pagpapadala ng Ulat…</string>
 	<string name="report_sent_title">Salamat sa pag-uulat, titingnan namin ito.</string>
 	<string name="report_sent_subtitle">Habang sinusuri namin ito, maaari kang gumawa ng aksyon laban sa %s.</string>
+	<string name="unfollow_user">I-Unfollow %s</string>
+	<string name="unfollow">I-unfollow</string>
+	<string name="mute_user_explain">Hindi mo makikita ang kanilang mga post o reblogs sa iyong home feed. Hindi nila malalaman na sila ay na-mute.</string>
+	<string name="block_user_explain">Hindi na nila magagawang sundin o makita ang iyong mga post, ngunit maaari nilang makita kung na-block sila.</string>
+	<string name="report_personal_title">Ayaw mong makita ito?</string>
+	<string name="report_personal_subtitle">Kapag nakakita ka ng mga bagay na hindi mo gusto sa Mastodon, maaari mong alisin ang tao mula sa iyong karanasan.</string>
+	<string name="back">Bumalik</string>
+	<string name="instance_catalog_title">Ang Mastodon ay gawa sa mga user sa iba\'t ibang mga server.</string>
+	<string name="instance_catalog_subtitle">Pumili ng server batay sa iyong mga interes, rehiyon, o isang pangkalahatang layunin. Maaari ka pa ring kumonekta sa lahat, anuman ang server.</string>
+	<string name="edit_photo">i-edit</string>
+	<string name="password_note">Isama ang mga malalaking titik, mga espesyal na character, at mga numero para madagdagan ang lakas ng iyong password.</string>
+	<string name="category_academia">Academia</string>
+	<string name="category_activism">Activism</string>
+	<string name="category_all">Lahat</string>
+	<string name="category_art">Sining</string>
+	<string name="category_food">Pagkain</string>
+	<string name="category_furry">Furry</string>
+	<string name="category_games">Mga Laro</string>
+	<string name="category_general">Pangkalahatan</string>
+	<string name="category_journalism">Pamamahayag</string>
+	<string name="category_lgbt">LGBT</string>
+	<string name="category_music">Musika</string>
+	<string name="category_regional">Rehiyon</string>
+	<string name="category_tech">Tech</string>
+	<!-- %s is the email address -->
+	<string name="resend">Muling ipadala</string>
+	<string name="open_email_app">Buksan ang email app</string>
+	<string name="resent_email">Kumpirmasyon ng email napadala</string>
+	<string name="compose_hint">I-Type o i-paste kung ano ang nasa isip mo</string>
+	<string name="content_warning">Babala sa nilalaman</string>
+	<string name="add_image_description">Magdagdag ng paglalarawan ng imahe…</string>
+	<string name="retry_upload">Muling subukan ang pag-upload</string>
+	<string name="edit_image">I-edit ang imahe</string>
+	<string name="save">I-save</string>
+	<string name="add_alt_text">Magdagdag ng teksto ng alt</string>
+	<string name="alt_text_subtitle">Inilalarawan ng Alt text ang iyong mga larawan para sa mga taong may mababa o walang paningin. Subukang isama lamang ang sapat na detalye para maunawaan ang konteksto.</string>
+	<string name="alt_text_hint">hal. Ang aso ay nakatingin sa paligid na kahina-hinala na may makitid na mga mata sa camera.</string>
+	<string name="visibility_public">Publiko</string>
+	<string name="visibility_followers_only">Mga tagasunod lamang</string>
+	<string name="visibility_private">Mga tao lang ang binabanggit ko</string>
+	<string name="search_all">Lahat</string>
+	<string name="search_people">Mga Tao</string>
+	<string name="recent_searches">Kamakailang mga paghahanap</string>
+	<string name="step_x_of_n">Hakbang %1$d of %2$d</string>
+	<string name="skip">Laktawan</string>
+	<string name="notification_type_follow">Mga Bagong Follower</string>
+	<string name="notification_type_favorite">Mga Paborito</string>
+	<string name="notification_type_reblog">Mga Reblog</string>
+	<string name="notification_type_mention">Mga binangit</string>
+	<string name="notification_type_poll">Mga botohan</string>
+	<string name="choose_account">Pumili ng account</string>
+	<string name="err_not_logged_in">Pakiusap mag-log in muna sa Mastodon</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Hindi ka maaaring magdagdag ng higit sa %d media attachment</item>
+		<item quantity="other">Hindi ka maaaring magdagdag ng higit sa %d media attachment</item>
+	</plurals>
+	<string name="media_attachment_unsupported_type">Ang File %s ay hindi suportadong uri</string>
+	<string name="media_attachment_too_big">Ang File %1$s ay lumampas sa limitasyon ng laki ng %2$s MB</string>
+	<string name="settings_theme">Visual na hitsura</string>
+	<string name="theme_auto">Awtomatiko</string>
+	<string name="theme_light">Ilaw</string>
+	<string name="theme_dark">Madilim</string>
+	<string name="theme_true_black">Tunay na maitim na mode</string>
+	<string name="settings_behavior">Pag-uugali</string>
+	<string name="settings_gif">Maglaro ng mga animated na avatar at emoji</string>
+	<string name="settings_custom_tabs">Gumamit ng in-app browser</string>
+	<string name="settings_notifications">Mga abiso</string>
+	<string name="notify_me_when">Abisuhan ako kapag</string>
+	<string name="notify_anyone">sinuman</string>
+	<string name="notify_follower">isang tagasunod</string>
+	<string name="notify_followed">isang taong sinusundan ko</string>
+	<string name="notify_none">walang simuman</string>
+	<string name="notify_favorites">Paborito Ang aking post</string>
+	<string name="notify_follow">Sumusunod sa akin</string>
+	<string name="notify_reblog">Reblogs ang aking post</string>
+	<string name="notify_mention">Banggitin ako</string>
+	<string name="settings_boring">Ang nakababagot na zone</string>
+	<string name="settings_account">Mga setting ng Account</string>
+	<string name="settings_contribute">Mag-ambag sa Mastodon</string>
+	<string name="settings_tos">Mga tuntunin ng serbisyo</string>
+	<string name="settings_privacy_policy">Patakaran sa Pagkapribado</string>
+	<string name="settings_spicy">Ang maanghang na zone</string>
+	<string name="settings_clear_cache">I-Clear ang cache ng media</string>
+	<string name="settings_app_version">Mastodon para sa Android v%1$s (%2$d)</string>
+	<string name="media_cache_cleared">Na-clear ang cache ng Media</string>
+	<string name="confirm_log_out">Sigurado ka bang gusto mong mag-sign out?</string>
+	<string name="sensitive_content">Sensitibong nilalaman</string>
+	<string name="sensitive_content_explain">Minarkahan ng may-akda ang media na ito bilang sensitibo. I-tap para makita.</string>
+	<string name="media_hidden">I-Tap para mapakita</string>
+	<string name="avatar_description">Pumunta sa profile ng %s</string>
+	<string name="more_options">Higit pang mga pagpipilian</string>
+	<string name="reveal_content">Ipakita ang nilalaman</string>
+	<string name="hide_content">Itago ang nilalaman</string>
+	<string name="new_post">Bagong post</string>
+	<string name="button_reply">Tumugon</string>
+	<string name="button_reblog">Reblog</string>
+	<string name="button_favorite">Paborito</string>
+	<string name="button_share">Ibahagi</string>
+	<string name="media_no_description">Media nang walang paglalarawan</string>
+	<string name="add_media">Magdagdag ng media</string>
+	<string name="add_poll">Magdagdag ng botohan</string>
+	<string name="emoji">Emoji</string>
+	<string name="post_visibility">Kakayahang makita ang Post</string>
+	<string name="home_timeline">Timeline ng tahanan</string>
+	<string name="my_profile">Aking profile</string>
+	<string name="media_viewer">Media tagapanood</string>
+	<string name="follow_user">I-follow %s</string>
+	<string name="unfollowed_user">I-Unfollow %s</string>
+	<string name="followed_user">Sinusundan mo ngayon ang %s</string>
+	<string name="open_in_browser">Buksan sa browser</string>
+	<string name="hide_boosts_from_user">Itago ang mga reblog mula sa %s</string>
+	<string name="show_boosts_from_user">Ipakita ang mga reblog mula sa %s</string>
+	<string name="signup_reason_note">Makakatulong ito sa amin na suriin ang iyong aplikasyon.</string>
+	<string name="clear">I-Clear</string>
+	<string name="profile_header">Imahe ng Header</string>
+	<string name="profile_picture">Larawan ng Profile</string>
+	<string name="reorder">Muling ayusin</string>
+	<string name="download">I-download</string>
+	<string name="permission_required">Kinakailangan ang pahintulot</string>
+	<string name="storage_permission_to_download">Ang app ay nangangailangan ng access sa iyong storage para i-save ang file na ito.</string>
+	<string name="open_settings">Buksan ang mga setting</string>
+	<string name="error_saving_file">Error sa pag-save ng file</string>
+	<string name="file_saved">Nai-save ang File</string>
+	<string name="downloading">Nagda-download…</string>
+	<string name="no_app_to_handle_action">Walang app para mahawakan ang pagkilos na ito</string>
+	<string name="local_timeline">Komunidad</string>
+	<string name="trending_posts_info_banner">Ito ang mga post na nakakakuha ng traksyon sa iyong sulok ng Mastodon.</string>
+	<string name="trending_hashtags_info_banner">Ito ang mga hashtags na nakakakuha ng traksyon sa iyong sulok ng Mastodon.</string>
+	<string name="trending_links_info_banner">Ito ang mga kuwento ng balita na ibinabahagi ang pinaka sa iyong sulok ng Mastodon.</string>
+	<string name="local_timeline_info_banner">Ito ang pinakahuling mga post ng mga taong gumagamit ng parehong Mastodon server tulad mo.</string>
+	<string name="dismiss">I-dismiss</string>
+	<string name="see_new_posts">Tingnan ang mga bagong post</string>
+	<string name="load_missing_posts">Mag-Load ng nawawalang mga post</string>
+	<string name="follow_back">Sundan Pabalik</string>
+	<string name="button_follow_pending">Nakabinbin</string>
+	<string name="follows_you">Sinundan ka</string>
+	<string name="manually_approves_followers">Manu-manong aprubahan ang mga tagasunod</string>
+	<string name="current_account">Kasalukuyang account</string>
+	<string name="log_out_account">Mag-Log out %s</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<plurals name="x_followers">
+		<item quantity="one">%,d tagasunod</item>
+		<item quantity="other">%,d tagasunod</item>
+	</plurals>
+	<plurals name="x_following">
+		<item quantity="one">%, d Sumusunod</item>
+		<item quantity="other">%, d Sumusunod</item>
+	</plurals>
+	<plurals name="x_favorites">
+		<item quantity="one">%, d Paborito</item>
+		<item quantity="other">%, d paborito</item>
+	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%, d reblog</item>
+		<item quantity="other">%, d reblog</item>
+	</plurals>
+	<string name="timestamp_via_app">%1$s sa pamamagitan ng %2$s</string>
+	<string name="time_now">ngayon</string>
+	<string name="post_info_reblogs">Mga Reblog</string>
+	<string name="post_info_favorites">Mga Paborito</string>
+	<string name="edit_history">I-Edit ang kasaysayan</string>
+	<string name="last_edit_at_x">Huling edit %s</string>
+	<string name="time_just_now">ngayon lang</string>
+	<plurals name="x_seconds_ago">
+		<item quantity="one">%d segundo ang nakalipas</item>
+		<item quantity="other">%d segundo ang nakalipas</item>
+	</plurals>
+	<plurals name="x_minutes_ago">
+		<item quantity="one">%d minuto ang nakalipas</item>
+		<item quantity="other">%d minuto ang nakalipas</item>
+	</plurals>
+	<string name="edited_timestamp">edited %s</string>
+	<string name="edit_original_post">Orihinal na post</string>
+	<string name="edit_text_edited">Na-edit ang teksto</string>
+	<string name="edit_spoiler_added">Idinagdag ang babala ng nilalaman</string>
+	<string name="edit_spoiler_edited">Na-edit ang babala ng nilalaman</string>
+	<string name="edit_spoiler_removed">Inalis ang babala ng nilalaman</string>
+	<string name="edit_poll_added">Ang Poll ay nadagdag</string>
+	<string name="edit_poll_edited">Na-edit ang Poll</string>
+	<string name="edit_poll_removed">Inalis ang Poll</string>
+	<string name="edit_media_added">Idinagdag ang Media</string>
+	<string name="edit_media_removed">Inalis ang Media</string>
+	<string name="edit_media_reordered">Muling inayos ng Media</string>
+	<string name="edit_marked_sensitive">Minarkahang sensitibo</string>
+	<string name="edit_marked_not_sensitive">Minarkahan hindi sensitibo</string>
+	<string name="edit_multiple_changed">Na-edit ang Post</string>
+	<string name="edit">I-edit</string>
+	<string name="discard_changes">Baliwalain ang mga pagbabago?</string>
+	<string name="upload_failed">Nabigo ang pag-Upload</string>
+	<string name="file_size_bytes">%d bytes</string>
+	<string name="file_size_kb">%.2f KB</string>
+	<string name="file_size_mb">%.2f MB</string>
+	<string name="file_size_gb">%.2f GB</string>
+	<string name="file_upload_progress">%1$s of %2$s</string>
+	<string name="file_upload_time_remaining">%s ang natitira</string>
+	<string name="upload_error_connection_lost">Nawala ang koneksyon ng iyong device sa internet</string>
+	<string name="upload_processing">Pagproseso…</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Ang Mastodon para sa Android %s ay handa nang i-download.</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">Ang Mastodon para sa Android %s ay nai-download at handa nang mai-install.</string>
 	<!-- %s is file size -->
+	<string name="download_update">I-Download (%s)</string>
+	<string name="install_update">I-install</string>
+	<string name="i_agree">Sang-ayon ako</string>
+	<string name="empty_list">Walang laman ang listahang ito</string>
+	<string name="instance_signup_closed">Ang server na ito ay hindi tumatanggap ng mga bagong pagrerehistro.</string>
+	<string name="text_copied">Kinopya sa clipboard</string>
+	<string name="add_bookmark">Bookmark</string>
+	<string name="remove_bookmark">Alisin ang bookmark</string>
+	<string name="bookmarks">Mga bookmark</string>
+	<string name="your_favorites">Ang Iyong Mga Paborito</string>
+	<string name="login_title">Maligayang pagbalik,</string>
+	<string name="login_subtitle">Mag-Log in gamit ang server kung saan mo nilikha ang iyong account.</string>
+	<string name="server_url">Ang URL ng server</string>
+	<string name="welcome_page1_text">Isipin na mayroon kang isang email address na nagtatapos sa @example. com. \n \nMaaari ka pa ring magpadala at tumanggap ng mga email mula sa sinuman, kahit na ang kanilang email ay nagtatapos sa @gmail.com o @icloud.com o @example.com.</string>
+	<string name="welcome_page2_title">Mastodon ay tulad na.</string>
+	<string name="welcome_page2_text">Ang iyong hawakan ay maaaring @gothgirl654@example.social, ngunit maaari mo pa ring sundin, reblog, at makipag-chat sa @fallout5ever@example.online.</string>
+	<string name="welcome_page3_title">Paano ako pumili ng server?</string>
+	<string name="welcome_page3_text">Ang iba \'t ibang mga tao ay pumili ng iba\' t ibang mga server para sa anumang bilang ng mga kadahilanan. sining.ang halimbawa ay isang magandang lugar para sa mga artista, habang ang glasgow.halimbawa ay maaaring maging isang mahusay na pick para sa Scots.\n \nhindi ka maaaring magkamali sa alinman sa aming mga inirekumendang server, kaya anuman ang pipiliin mo (o kung ipinasok mo ang iyong sarili sa search bar ng server), hindi ka makaligtaan ng isang matalo kahit saan.</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Premiers pas</string>
+	<string name="get_started">Créer un compte</string>
+	<string name="already_have_account">J\'ai déjà un compte</string>
 	<string name="log_in">Se connecter</string>
 	<string name="next">Suivant</string>
 	<string name="loading_instance">Récupération des informations serveur…</string>
@@ -172,15 +173,15 @@
 	<string name="back">Retour</string>
 	<string name="instance_catalog_title">Mastodon est composé d’utilisateurs sur différents serveurs.</string>
 	<string name="instance_catalog_subtitle">Choisissez un serveur en fonction de vos intérêts, de votre région ou alors rejoignez un serveur général. Vous pouvez toujours vous connecter avec tout le monde, quel que soit le serveur.</string>
-	<string name="search_communities">Rechercher des serveurs ou entrer une URL</string>
-	<string name="instance_rules_title">Quelques règles de base</string>
-	<string name="instance_rules_subtitle">Prenez une minute pour revoir les règles définies et appliquées par les administrateurs de %s.</string>
-	<string name="signup_title">Mettons les choses en place pour %s</string>
+	<string name="search_communities">Nom ou URL du serveur</string>
+	<string name="instance_rules_title">Règles du serveur</string>
+	<string name="signup_title">Créer un compte</string>
 	<string name="edit_photo">modifier</string>
-	<string name="display_name">nom affiché</string>
-	<string name="username">nom d’utilisateur</string>
-	<string name="email">courriel</string>
-	<string name="password">mot de passe</string>
+	<string name="display_name">Nom</string>
+	<string name="username">Nom d’utilisateur</string>
+	<string name="email">E-mail</string>
+	<string name="password">Mot de passe</string>
+	<string name="confirm_password">Confirmez le mot de passe</string>
 	<string name="password_note">Inclure les lettres majuscules, les caractères spéciaux et les chiffres pour augmenter la force de votre mot de passe.</string>
 	<string name="category_academia">Universitaire</string>
 	<string name="category_activism">Activisme</string>
@@ -195,8 +196,9 @@
 	<string name="category_music">Musique</string>
 	<string name="category_regional">Régional</string>
 	<string name="category_tech">Technologie</string>
-	<string name="confirm_email_title">Une dernière chose</string>
-	<string name="confirm_email_subtitle">Appuyez sur le lien que nous vous avons envoyé par courriel pour vérifier votre compte.</string>
+	<string name="confirm_email_title">Consultez votre boîte de réception</string>
+	<!-- %s is the email address -->
+	<string name="confirm_email_didnt_get">Vous n\'avez pas reçu de lien ?</string>
 	<string name="resend">Renvoyer</string>
 	<string name="open_email_app">Ouvrir l’application courriel</string>
 	<string name="resent_email">Courriel de confirmation envoyé</string>
@@ -284,7 +286,7 @@
 	<string name="open_in_browser">Ouvrir dans le navigateur</string>
 	<string name="hide_boosts_from_user">Masquer les partages de %s</string>
 	<string name="show_boosts_from_user">Afficher les partages de %s</string>
-	<string name="signup_reason">pourquoi voulez-vous vous inscrire ?</string>
+	<string name="signup_reason">Pourquoi voulez-vous vous inscrire ?</string>
 	<string name="signup_reason_note">Cela nous aidera à examiner votre demande.</string>
 	<string name="clear">Effacer</string>
 	<string name="profile_header">Image d’en-tête</string>
@@ -377,17 +379,45 @@
 	<!-- %s is file size -->
 	<string name="download_update">Téléchargement (%s)</string>
 	<string name="install_update">Installer</string>
-	<string name="privacy_policy_title">Mastodon et votre vie privée</string>
-	<string name="privacy_policy_subtitle">Bien que l’application Mastodon ne collecte aucune donnée, le serveur auquel vous vous inscrivez peut avoir une politique différente. Prenez une minute pour examiner et accepter la politique de confidentialité de l’application Mastodon ainsi que celle de votre serveur.</string>
+	<string name="privacy_policy_title">Votre Confidentialité</string>
 	<string name="i_agree">J’accepte</string>
 	<string name="empty_list">Cette liste est vide</string>
 	<string name="instance_signup_closed">Ce serveur n\'accepte pas les nouvelles inscriptions.</string>
 	<string name="text_copied">Copié dans le presse-papier</string>
-	<string name="add_bookmark">Favoris</string>
+	<string name="add_bookmark">Ajouter aux marque-pages</string>
 	<string name="remove_bookmark">Retirer des favoris</string>
-	<string name="bookmarks">Favoris</string>
+	<string name="bookmarks">Marque-pages</string>
 	<string name="your_favorites">Vos favoris</string>
 	<string name="login_title">Content de vous revoir</string>
 	<string name="login_subtitle">Connectez-vous avec le serveur sur lequel vous avez créé votre compte.</string>
 	<string name="server_url">URL du serveur</string>
+	<string name="welcome_page1_title">Qu’est-ce que Mastodon ?</string>
+	<string name="welcome_page1_text">Imaginez que vous ayez une adresse e-mail qui se termine par @example.com.\n\nVous pouvez toujours envoyer et recevoir des e-mails de n\'importe qui, même si leur e-mail se termine par @gmail.com ou @icloud.com ou @example.com.</string>
+	<string name="welcome_page2_title">Mastodon est comme ça.</string>
+	<string name="welcome_page2_text">Votre identifiant devrait être @gothgirl654@example.social, mais vous pouvez toujours suivre, rebloguer et discuter avec @fallout5ever@example.online.</string>
+	<string name="welcome_page3_title">Comment choisir un serveur?</string>
+	<string name="welcome_page3_text">Différentes personnes choisissent différents serveurs pour un certain nombre de raisons. art.example est un lieu idéal pour les artistes, tandis que glasgow.example pourrait être un bon choix pour les Écossais.\n\nVous ne pouvez pas vous tromper avec l\'un de nos serveurs recommandés et ainsi, quel que soit celui que vous choisissez (ou si vous entrez le vôtre dans la barre de recherche du serveur), vous ne manquerez jamais une info quelque part.</string>
+	<string name="server_filter_any_language">N\'importe quelle langue</string>
+	<string name="server_filter_instant_signup">Inscription instantanée</string>
+	<string name="server_filter_manual_review">Approbation manuelle</string>
+	<string name="server_filter_region_europe">Europe</string>
+	<string name="server_filter_region_north_america">Amérique du Nord</string>
+	<string name="server_filter_region_south_america">Amérique du Sud</string>
+	<string name="server_filter_region_africa">Afrique</string>
+	<string name="server_filter_region_asia">Asie</string>
+	<string name="server_filter_region_oceania">Océanie</string>
+	<string name="not_accepting_new_members">N\'accepte pas de nouveaux membres</string>
+	<string name="category_special_interests">Intérêt particulier</string>
+	<string name="signup_passwords_dont_match">Les mots de passe ne correspondent pas</string>
+	<string name="pick_server_for_me">Choisir pour moi</string>
+	<string name="profile_add_row">Ajouter une ligne</string>
+	<string name="profile_setup">Configuration du profil</string>
+	<string name="follow_all">Tout suivre</string>
+	<string name="server_rules_disagree">Refuser</string>
+	<string name="privacy_policy_explanation">TL;DR : Nous ne collectons ni ne traitons rien.</string>
+	<!-- %s is server domain -->
+	<string name="server_policy_disagree">En désaccord avec %s</string>
+	<string name="profile_bio">Biographie</string>
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

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

@@ -246,7 +246,7 @@
     <string name="sk_reported">signalé</string>
     <string name="sk_sign_ups">Utilisateurs s\'inscrivant</string>
     <string name="sk_new_reports">Nouveaux signalements</string>
-    <string name="sk_settings_show_new_posts_button">Bouton \"Afficher les nouveaux messages\"</string>
+    <string name="sk_settings_see_new_posts_button">Bouton \"Afficher les nouveaux messages\"</string>
     <string name="sk_instance_features">Fonctionnalités des instances</string>
     <string name="sk_settings_local_only_explanation">Votre instance locale doit prendre en charge la publication locale uniquement pour que cela fonctionne. La plupart des versions modifiées de Mastodon le font, mais pas Mastodon.</string>
     <string name="sk_notify_poll_results">Résultats du sondage</string>
@@ -258,4 +258,6 @@
     <string name="sk_filtered">Filtré : %s</string>
     <string name="sk_unfinished_attachments">Corriger les pièces jointes \?</string>
     <string name="sk_unfinished_attachments_message">Certaines pièces jointes n\'ont pas fini de se télécharger.</string>
+    <string name="sk_spectator_mode">Mode spectateur</string>
+    <string name="sk_settings_hide_interaction">Masquer les boutons d\'interaction</string>
 </resources>

mastodon/src/main/res/values-ga-rIE/strings.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<!-- %s is the email address -->
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

mastodon/src/main/res/values-gd-rGB/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Dèan toiseach-tòiseachaidh</string>
 	<string name="log_in">Clàraich a-steach</string>
 	<string name="next">Air adhart</string>
 	<string name="error">Mearachd</string>
@@ -198,15 +197,7 @@
 	<string name="back">Air ais</string>
 	<string name="instance_catalog_title">Tha cleachdaichean Mhastodon air iomadh frithealaiche eadar-dhealaichte.</string>
 	<string name="instance_catalog_subtitle">Tagh frithealaiche stèidhichte air d’ ùidhean, air far a bheil thu no fear coitcheann. ’S urrainn dhut conaltradh leis a h-uile duine fhathast ge b’ e am frithealaiche.</string>
-	<string name="search_communities">Lorg frithealaiche no cuir a-steach URL</string>
-	<string name="instance_rules_title">Riaghailtean bunasach</string>
-	<string name="instance_rules_subtitle">Gabh mionaid a’ toirt uil air na riaghailtean a shuidhich ’s a dh’èignicheas rianairean %s.</string>
-	<string name="signup_title">Suidhicheamaid %s dhut</string>
 	<string name="edit_photo">deasaich</string>
-	<string name="display_name">ainm-taisbeanaidh</string>
-	<string name="username">ainm-cleachdaiche</string>
-	<string name="email">post-d</string>
-	<string name="password">facal-faire</string>
 	<string name="password_note">Gabh a-steach litrichean mòra, caractaran sònraichte agus àireamhan airson am facal-faire agad a dhèanamh nas treasa.</string>
 	<string name="category_academia">Sgoilearachd</string>
 	<string name="category_activism">Iomairteachd</string>
@@ -221,8 +212,7 @@
 	<string name="category_music">Ceòl</string>
 	<string name="category_regional">Sgìreil</string>
 	<string name="category_tech">Teicneolas</string>
-	<string name="confirm_email_title">Aon rud eile</string>
-	<string name="confirm_email_subtitle">Thoir gnogag air a’ cheangal a chuir sinn thugad air a’ phost-d airson an cunntas agad a dhearbhadh.</string>
+	<!-- %s is the email address -->
 	<string name="resend">Cuir a-rithist</string>
 	<string name="open_email_app">Fosgail aplacaid a’ phuist-d</string>
 	<string name="resent_email">Chaidh post-d dearbhaidh a chur</string>
@@ -312,7 +302,6 @@
 	<string name="open_in_browser">Fosgail sa bhrabhsair</string>
 	<string name="hide_boosts_from_user">Falaich na brosnachaidhean o %s</string>
 	<string name="show_boosts_from_user">Seall na brosnachaidhean o %s</string>
-	<string name="signup_reason">carson a bu mhiann leat ballrachd fhaighinn?</string>
 	<string name="signup_reason_note">Bidh e nas fhasa dhuinn lèirmheas a dhèanamh air d’ iarrtas.</string>
 	<string name="clear">Falamhaich</string>
 	<string name="profile_header">Dealbh a’ bhanna-chinn</string>
@@ -417,8 +406,9 @@
 	<!-- %s is file size -->
 	<string name="download_update">Luchdaich a-nuas (%s)</string>
 	<string name="install_update">Stàlaich</string>
-	<string name="privacy_policy_title">Mastodon is do phrìobhaideachd</string>
-	<string name="privacy_policy_subtitle">Ged nach cruinnich aplacaid Mastodon fhèin dàta sam bith, dh’fhaoidte gu bheil poileasaidh eadar-dhealaichte aig an fhrithealaiche leis a chlàraicheas tu. Gabh mionaid a’ toirt sùil air ’s ag aontachadh ri poileasaidh prìobhaideachd aplacaid Mastodon agus poileasaidh prìobhaideachd an fhrithealaiche agad.</string>
 	<string name="i_agree">Gabhaidh mi ris</string>
 	<string name="empty_list">Tha an liosta seo falamh</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

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

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="get_started">Crear conta</string>
+	<string name="already_have_account">Xa teño unha conta</string>
 	<string name="log_in">Acceder</string>
 	<string name="next">Seguinte</string>
+	<string name="loading_instance">Obtendo info do servidor…</string>
 	<string name="error">Erro</string>
+	<string name="not_a_mastodon_instance">%s non semella ser un servidor Mastodon.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Preparándose para a autenticación…</string>
 	<string name="finishing_auth">Rematando coa autenticación…</string>
@@ -170,15 +173,7 @@
 	<string name="back">Volver</string>
 	<string name="instance_catalog_title">Mastodon fórmano as persoas das diferentes comunidades.</string>
 	<string name="instance_catalog_subtitle">Elixe unha comunidade en función dos teus intereses, rexión ou de propósito xeral. Poderás conectar con calquera outra usuaria igualmente, independentemente da comunidade que elixas.</string>
-	<string name="search_communities">Busca un servidor ou escribe URL</string>
-	<string name="instance_rules_title">Algunhas regras básicas</string>
-	<string name="instance_rules_subtitle">Adica un minuto a revisar as regras establecidas pola administración de %s.</string>
-	<string name="signup_title">Imos crear a túa conta en %s</string>
 	<string name="edit_photo">editar</string>
-	<string name="display_name">nome público</string>
-	<string name="username">identificador</string>
-	<string name="email">email</string>
-	<string name="password">contrasinal</string>
 	<string name="password_note">Inclúe letras maiúsculas, caracteres especiais e números para aumentar a calidade do contrasinal.</string>
 	<string name="category_academia">Academia</string>
 	<string name="category_activism">Activismo</string>
@@ -193,8 +188,7 @@
 	<string name="category_music">Música</string>
 	<string name="category_regional">Rexional</string>
 	<string name="category_tech">Tecnoloxía</string>
-	<string name="confirm_email_title">O último detalle</string>
-	<string name="confirm_email_subtitle">Preme na ligazón que che enviamos ao email para verificar a conta.</string>
+	<!-- %s is the email address -->
 	<string name="resend">Reenviar</string>
 	<string name="open_email_app">Abrir app de email</string>
 	<string name="resent_email">Enviado o email de confirmación</string>
@@ -282,7 +276,6 @@
 	<string name="open_in_browser">Abrir nun navegador</string>
 	<string name="hide_boosts_from_user">Agochar promocións de @%s</string>
 	<string name="show_boosts_from_user">Mostrar promocións de %s</string>
-	<string name="signup_reason">por que queres unirte?</string>
 	<string name="signup_reason_note">Esto axudaranos a revisar a tua solicitude.</string>
 	<string name="clear">Limpar</string>
 	<string name="profile_header">Imaxe de cabeceira</string>
@@ -375,8 +368,6 @@
 	<!-- %s is file size -->
 	<string name="download_update">Descargar (%s)</string>
 	<string name="install_update">Instalar</string>
-	<string name="privacy_policy_title">Mastodon e a túa privacidade</string>
-	<string name="privacy_policy_subtitle">Aínda que a app Mastodon non recolle ningún dato, o servidor no que abriches a conta podería ter unha política diferente. Toma un intre para revisar e aceptar a política de privacidade da app Mastodon e a política de privacidade do teu servidor.</string>
 	<string name="i_agree">Acepto</string>
 	<string name="empty_list">A lista está baleira</string>
 	<string name="instance_signup_closed">O servidor non acepta novos rexistros.</string>
@@ -385,4 +376,15 @@
 	<string name="remove_bookmark">Eliminar marcador</string>
 	<string name="bookmarks">Marcadores</string>
 	<string name="your_favorites">Publicacións Favoritas</string>
+	<string name="login_title">Benvida outra vez</string>
+	<string name="login_subtitle">Accede co servidor onde creaches a conta.</string>
+	<string name="server_url">URL do servidor</string>
+	<string name="welcome_page1_text">Imaxina que tes un enderezo de email que remata con @exemplo.com.\n\nPodes recibir e enviar mensaxes con calquera persoa, incluso se o seu email remata en @gmail.com ou @icloud.com ou @exemplo.com.</string>
+	<string name="welcome_page2_title">Mastodon é o mesmo.</string>
+	<string name="welcome_page2_text">O teu identificador pode ser @rula654@exemplo.social, pero podes seguir, promover e conversar con @gz4libre@exemplo.online.</string>
+	<string name="welcome_page3_title">Como elexir un servidor?</string>
+	<string name="welcome_page3_text">Pode haber moitas razóns para elexir un servidor. art.exemplo é un bo lugar para artistas, mentras glasgow.exemplo podería ser axeitado para persoas escocesas.\n\nNon terás problemas con calquera dos servidores recomendados, así que independentemente do que elixas (ou se escribes o teu propio na caixa de busca) non botarás nada en falta.</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

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

@@ -252,9 +252,11 @@
     <string name="sk_notify_poll_results">Resultados da enquisa</string>
     <string name="sk_collapse">Contraer</string>
     <string name="sk_unfinished_attachments_message">Algúns arquivos adxuntos aínda non remataron de cargarse.</string>
-    <string name="sk_settings_prefix_reply_cw_with_re">Prefixo resposta CW con \"re:\"</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">Prefixar a resposta de AC con \"re:\"</string>
     <string name="sk_filtered">Filtrados: %s</string>
     <string name="sk_expand">Expandir</string>
     <string name="sk_settings_collapse_long_posts">Contraer publicacións moi longas</string>
     <string name="sk_unfinished_attachments">Arranxar arquivos adxuntos\?</string>
+    <string name="sk_spectator_mode">Modo espectador</string>
+    <string name="sk_settings_hide_interaction">Ocultar botóns de interacción</string>
 </resources>

mastodon/src/main/res/values-hi-rIN/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">शुरू करें</string>
 	<string name="log_in">लॉग इन करें</string>
 	<string name="next">आगे</string>
 	<string name="ok">ठीक है</string>
@@ -38,8 +37,12 @@
 	<string name="for_you">आपके लिए</string>
 	<string name="all_notifications">सभी</string>
 	<string name="mentions">उल्लेख</string>
+	<!-- %s is the email address -->
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

mastodon/src/main/res/values-hr-rHR/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Započni</string>
 	<string name="log_in">Prijavi se</string>
 	<string name="next">Nastavi</string>
 	<string name="error">Pogreška</string>
@@ -179,14 +178,7 @@
 	<string name="report_personal_title">Ne želiš vidjeti ovo?</string>
 	<string name="report_personal_subtitle">Kada vidiš nešto što ti se ne sviđa na Mastodonu, možeš ukloniti osobu iz svog iskustva.</string>
 	<string name="back">Natrag</string>
-	<string name="instance_rules_title">Neka osnovna pravila</string>
-	<string name="instance_rules_subtitle">Uzmi minutu za čitanje pravila koje provode %s administratori.</string>
-	<string name="signup_title">Hajmo te postaviti na %s</string>
 	<string name="edit_photo">uredi</string>
-	<string name="display_name">prikazano ime</string>
-	<string name="username">korisničko ime</string>
-	<string name="email">e-pošta</string>
-	<string name="password">lozinka</string>
 	<string name="password_note">Upotrijebi velika slova, posebne znakove i brojeve kako bi podigao jačinu tvoje lozinke.</string>
 	<string name="category_academia">Akademija</string>
 	<string name="category_activism">Aktivizam</string>
@@ -201,8 +193,7 @@
 	<string name="category_music">Glazba</string>
 	<string name="category_regional">Lokalno</string>
 	<string name="category_tech">Tehnologija</string>
-	<string name="confirm_email_title">Još jedna stvar</string>
-	<string name="confirm_email_subtitle">Dodirni vezu koju smo ti poslali e-poštom da potvrdiš svoj račun.</string>
+	<!-- %s is the email address -->
 	<string name="resend">Ponovno pošalji</string>
 	<string name="open_email_app">Otvori aplikaciju za e-poštu</string>
 	<string name="resent_email">Poslana je e-mail potvrda</string>
@@ -288,7 +279,6 @@
 	<string name="unfollowed_user">Otpratio si %s</string>
 	<string name="followed_user">Sada pratiš %s</string>
 	<string name="open_in_browser">Otvori u pregledniku</string>
-	<string name="signup_reason">zašto se želiš pridružiti?</string>
 	<string name="signup_reason_note">Ovo će nam pomoći da razmotrimo vašu prijavu.</string>
 	<string name="clear">Poništi</string>
 	<string name="profile_header">Slika zaglavlja</string>
@@ -306,4 +296,7 @@
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

mastodon/src/main/res/values-hu-rHU/strings.xml

@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Kezdjünk bele</string>
+	<string name="get_started">Fiók létrehozása</string>
+	<string name="already_have_account">Már van fiókom</string>
 	<string name="log_in">Bejelentkezés</string>
 	<string name="next">Következő</string>
+	<string name="loading_instance">Kiszolgáló információinak lekérése…</string>
 	<string name="error">Hiba</string>
+	<string name="not_a_mastodon_instance">%s nem néz ki Mastodon kiszolgálónak.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Felkészülés a hitelesítésre…</string>
 	<string name="finishing_auth">Hitelesítés befejezése…</string>
-	<string name="user_boosted">%s reblogolta</string>
+	<string name="user_boosted">%s megtolta</string>
 	<string name="in_reply_to">Válaszolva %s számára</string>
 	<string name="notifications">Értesítések</string>
-	<string name="user_followed_you">követ téged</string>
+	<string name="user_followed_you">bekövetett</string>
 	<string name="user_sent_follow_request">követési kérelmet küldött neked</string>
 	<string name="user_favorited">kedvencnek jelölte a bejegyzésedet</string>
 	<string name="notification_boosted">megtolta a bejegyzésedet</string>
@@ -63,7 +66,7 @@
 	<string name="field_label">Címke</string>
 	<string name="field_content">Tartalom</string>
 	<string name="saving">Mentés…</string>
-	<string name="post_from_user">Poszt %s-tól</string>
+	<string name="post_from_user">Poszt tőle: %s</string>
 	<string name="poll_option_hint">%d. opció</string>
 	<plurals name="x_minutes">
 		<item quantity="one">%d perc</item>
@@ -78,6 +81,14 @@
 		<item quantity="other">%d nap</item>
 	</plurals>
 	<string name="compose_poll_duration">Időtartam: %s</string>
+	<plurals name="x_seconds_left">
+		<item quantity="one">%d másodperc van hátra</item>
+		<item quantity="other">%d másodperc van hátra</item>
+	</plurals>
+	<plurals name="x_minutes_left">
+		<item quantity="one">%d perc van hátra</item>
+		<item quantity="other">%d perc van hátra</item>
+	</plurals>
 	<plurals name="x_hours_left">
 		<item quantity="one">%d óra van hátra</item>
 		<item quantity="other">%d óra van hátra</item>
@@ -162,15 +173,16 @@
 	<string name="back">Vissza</string>
 	<string name="instance_catalog_title">A Mastodon különböző szervereken lévő felhasználókból áll.</string>
 	<string name="instance_catalog_subtitle">Válasszon egy szervert az érdeklődési köre, régiója alapján vagy egy általános célú szervert. A szervertől függetlenül továbbra is mindenkivel kapcsolatba léphetsz.</string>
-	<string name="search_communities">Szerver keresése vagy URL megadása</string>
-	<string name="instance_rules_title">Néhány alapszabály</string>
-	<string name="instance_rules_subtitle">Szánj egy percet a %s adminjai által meghatározott és betartatott szabályok áttekintésére.</string>
-	<string name="signup_title">Állítsuk be a fiókod a %s kiszolgálón</string>
+	<string name="search_communities">Kiszolgáló neve vagy URL</string>
+	<string name="instance_rules_title">Kiszolgáló Szabályai</string>
+	<string name="instance_rules_subtitle">A folytatással beleegyezel, hogy követed a következő szabályokat, melyeket a %s moderatorai állítottak és tartatnak be.</string>
+	<string name="signup_title">Fiók Létrehozása</string>
 	<string name="edit_photo">szerkesztés</string>
-	<string name="display_name">megjelenített név</string>
-	<string name="username">felhasználónév</string>
-	<string name="email">e-mail</string>
-	<string name="password">jelszó</string>
+	<string name="display_name">Név</string>
+	<string name="username">Felhasználónév</string>
+	<string name="email">Email</string>
+	<string name="password">Jelszó</string>
+	<string name="confirm_password">Jelszó megerősítése</string>
 	<string name="password_note">A jelszó erősségének növelése érdekében használjon nagybetűket, speciális karaktereket és számokat.</string>
 	<string name="category_academia">Egyetem/Felsőoktatás</string>
 	<string name="category_activism">Aktivizmus</string>
@@ -185,8 +197,10 @@
 	<string name="category_music">Zene</string>
 	<string name="category_regional">Regionális</string>
 	<string name="category_tech">Tech</string>
-	<string name="confirm_email_title">Még egy apróság</string>
-	<string name="confirm_email_subtitle">Kattints a linkre, amit emailben küldtünk, hogy megerősítsd a fiókod.</string>
+	<string name="confirm_email_title">Nézd meg a bejővő emailfiókodat</string>
+	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Kattints a hivatkozásra, melyet a %s ellenőrzése céljából küldtünk neked. Mi addig itt várunk.</string>
+	<string name="confirm_email_didnt_get">Nem kaptad meg a hivatkozást?</string>
 	<string name="resend">Újraküldés</string>
 	<string name="open_email_app">E-mail alkalmazás megnyitása</string>
 	<string name="resent_email">Megerősítő email elküldve</string>
@@ -214,6 +228,10 @@
 	<string name="notification_type_poll">Szavazások</string>
 	<string name="choose_account">Fiók kiválasztása</string>
 	<string name="err_not_logged_in">Először jelentkezz be a Mastodonra</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Nem adhatsz hozzá egynél több csatolmányt</item>
+		<item quantity="other">Nem adhatsz hozzá %d-nél több csatolmányt</item>
+	</plurals>
 	<string name="media_attachment_unsupported_type">%s fájl nem támogatott</string>
 	<string name="media_attachment_too_big">Ez a fájl (%1$s) túllépi a %2$s MB-os feltöltési korlátot</string>
 	<string name="settings_theme">Kinézet</string>
@@ -270,7 +288,7 @@
 	<string name="open_in_browser">Megnyitás böngészőben</string>
 	<string name="hide_boosts_from_user">%s megtolásainak elrejtése</string>
 	<string name="show_boosts_from_user">%s megtolásainak mutatása</string>
-	<string name="signup_reason">miért akarsz csatlakozni?</string>
+	<string name="signup_reason">Miért szeretnél csatlakozni?</string>
 	<string name="signup_reason_note">Ez segít nekünk átnézni a jelentkezésedet.</string>
 	<string name="clear">Törlés</string>
 	<string name="profile_header">Fejléc kép</string>
@@ -290,7 +308,7 @@
 	<string name="trending_links_info_banner">Ezek azok a sztorik, amiket a legtöbbet osztanak meg a Mastodon-szobádban.</string>
 	<string name="local_timeline_info_banner">Ezek a legújabb posztok ugyanazon a Mastodon szerveren, ahol te is vagy.</string>
 	<string name="dismiss">Elvetés</string>
-	<string name="see_new_posts">Megnézem az új bejegyzéseket</string>
+	<string name="see_new_posts">Új bejegyzések megtekintése</string>
 	<string name="load_missing_posts">Hiányzó bejegyzések betöltése</string>
 	<string name="follow_back">Visszakövetés</string>
 	<string name="button_follow_pending">Függőben</string>
@@ -363,8 +381,8 @@
 	<!-- %s is file size -->
 	<string name="download_update">(%s) letöltése</string>
 	<string name="install_update">Telepítés</string>
-	<string name="privacy_policy_title">Mastodon és az adatvédelmed</string>
-	<string name="privacy_policy_subtitle">Bár a Mastodon alkalmazás nem gyűjt adatokat, a szerver, amelyen keresztül regisztrálsz, eltérő irányelvekkel rendelkezhet. Szánj egy percet a Mastodon alkalmazás adatvédelmi szabályzatának és a kiszolgáló adatvédelmi szabályzatának áttekintésére és elfogadására.</string>
+	<string name="privacy_policy_title">Személyes Adatbiztonság</string>
+	<string name="privacy_policy_subtitle">Bár a Mastodon app nem gyűjt adatokat, a kiszolgáló, melyen bejelentkezel rendelkezhet más szabályokkal.\n\nHa nem értesz egyet a %s szabályzatával, visszamehetsz és választhatsz egy másik kiszolgálót.</string>
 	<string name="i_agree">Elfogadom</string>
 	<string name="empty_list">A lista üres</string>
 	<string name="instance_signup_closed">Ez a szerver nem fogad új regisztrációkat.</string>
@@ -373,4 +391,44 @@
 	<string name="remove_bookmark">Könyvjelző eltávolítása</string>
 	<string name="bookmarks">Könyvjelzők</string>
 	<string name="your_favorites">Kedvencek</string>
+	<string name="login_title">Üdv újra</string>
+	<string name="login_subtitle">Azon a kiszolgálón jelentkezz be, ahol a fiókodat létrehoztad.</string>
+	<string name="server_url">Kiszolgáló URL</string>
+	<string name="welcome_page1_title">Mi a Mastodon?</string>
+	<string name="welcome_page1_text">Képzeld el, hogy az emailcímed @example.com-ra végződik.\n\nEttől még küldhtesz és fogadhatsz emailt bárkitől, akkor is, ha a címük @gmail.com-ra, @icloud.com-ra vagy @example.com-ra végződik.</string>
+	<string name="welcome_page2_title">Ilyen a Mastodon.</string>
+	<string name="welcome_page2_text">Lehet, hogy az azonosítód @gothgirl654@example.social, de ettől még követheted, megtolhatod és csetelhetsz @fallout5ever@example.online-nal.</string>
+	<string name="welcome_page3_title">Hogyan választok kiszolgálót?</string>
+	<string name="welcome_page3_text">Az emberek különböző okok miatt választanak más és más kiszolgálót. Az art.example egy jó hely lehet a művészek számára, miközben a glasgow.example a skótoknak lehet megfelelő.\n\nAz általunk javasolt kiszolgálókkal nem lehet probléma, de teljesen mindegy, hogy melyiket választod (vagy ha saját kiszolgálót használsz a keresőmezőben), nem maradsz le semmiről egy kiszolgálón sem.</string>
+	<string name="signup_random_server_explain">Választunk egy kiszolgálót a saját nyelvedhez, ha választás nélkül folytatod.</string>
+	<string name="server_filter_any_language">Bármely Nyelv</string>
+	<string name="server_filter_instant_signup">Azonnali Regisztráció</string>
+	<string name="server_filter_manual_review">Kézi Felülvizsgálat</string>
+	<string name="server_filter_any_signup_speed">Bármely Regisztrációs Sebesség</string>
+	<string name="server_filter_region_europe">Európa</string>
+	<string name="server_filter_region_north_america">Észak-Amerika</string>
+	<string name="server_filter_region_south_america">Dél-Amerika</string>
+	<string name="server_filter_region_africa">Afrika</string>
+	<string name="server_filter_region_asia">Ázsia</string>
+	<string name="server_filter_region_oceania">Óceánia</string>
+	<string name="not_accepting_new_members">Nem fogad új tagokat</string>
+	<string name="category_special_interests">Különleges Érdeklődés</string>
+	<string name="signup_passwords_dont_match">Jelszavak nem egyeznek</string>
+	<string name="pick_server_for_me">Válassz egyet nekem</string>
+	<string name="profile_add_row">Sor hozzáadása</string>
+	<string name="profile_setup">Profilbeállítás</string>
+	<string name="profile_setup_subtitle">Ezt később is bármikor kitöltheted a Profil fülön.</string>
+	<string name="profile_setup_explanation">Legfeljebb négy profilmezőt adhatsz hozzá bármiről, amiről csak akarsz. Helyadatok, hivatkozások, szólítások/névmások — határ a csillagos ég.</string>
+	<string name="popular_on_mastodon">Népszerű Mastodonon</string>
+	<string name="follow_all">Összes követése</string>
+	<string name="server_rules_disagree">Elutasítás</string>
+	<string name="privacy_policy_explanation">TL;DR: Nem gyűjtünk és nem dolgozunk fel semmit.</string>
+	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Nem egyezek bele a %s szabályzatába</string>
+	<string name="profile_bio">Bemutatkozás</string>
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Felhasználók bekövetése…</string>
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s nem engedélyez feliratkozásokat innen: %2$s. Próbálj meg egy másikat, vagy &lt;a&gt;válassz másik kiszolgálót&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Ez a felhasználónév már foglalt.</string>
 </resources>

mastodon/src/main/res/values-hy-rAM/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Սկսել</string>
 	<string name="log_in">Մուտք գործել</string>
 	<string name="next">Հաջորդը</string>
 	<string name="error">Սխալ</string>
@@ -48,8 +47,12 @@
 	<string name="block_user">Արգելափակել%s</string>
 	<string name="unblock_user">Հանել արգելափակումից %s</string>
 	<string name="report_user">Բողոքել %s</string>
+	<!-- %s is the email address -->
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

mastodon/src/main/res/values-ig-rNG/strings.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="get_started">Igodo: ịbi_do
+ibi_do
+Faịlụ: eriri. xml</string>
+	<!-- %s is the email address -->
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is file size -->
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+</resources>

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

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Mulai</string>
+	<string name="get_started">Buat akun</string>
+	<string name="already_have_account">Saya sudah memiliki akun</string>
 	<string name="log_in">Masuk</string>
 	<string name="next">Selanjutnya</string>
+	<string name="loading_instance">Mengambil info server…</string>
 	<string name="error">Kesalahan</string>
+	<string name="not_a_mastodon_instance">%s sepertinya bukan server Mastodon.</string>
 	<string name="ok">Oke</string>
 	<string name="preparing_auth">Menyiapkan untuk otentikasi…</string>
 	<string name="finishing_auth">Menyelesaikan otentikasi…</string>
@@ -156,15 +159,7 @@
 	<string name="back">Kembali</string>
 	<string name="instance_catalog_title">Mastodon dibuat oleh pengguna di server yang berbeda-beda.</string>
 	<string name="instance_catalog_subtitle">Pilih sebuah server berdasarkan minat atau wilayah Anda, atau yang umum. Anda masih dapat berkomunikasi dengan semua orang, tanpa memedulikan server yang Anda berada.</string>
-	<string name="search_communities">Cari server atau masukkan URL</string>
-	<string name="instance_rules_title">Beberapa aturan dasar</string>
-	<string name="instance_rules_subtitle">Luangkan beberapa menit untuk melihat peraturan yang ditetapkan oleh admin %s.</string>
-	<string name="signup_title">Mari kita siapkan Anda di %s</string>
 	<string name="edit_photo">sunting</string>
-	<string name="display_name">nama tampilan</string>
-	<string name="username">nama pengguna</string>
-	<string name="email">surel</string>
-	<string name="password">kata sandi</string>
 	<string name="password_note">Tambahkan huruf besar, karakter spesial, dan nomor untuk meningkatkan kekuatan kata sandi Anda.</string>
 	<string name="category_academia">Akademisi</string>
 	<string name="category_activism">Aktivisme</string>
@@ -179,8 +174,7 @@
 	<string name="category_music">Musik</string>
 	<string name="category_regional">Regional</string>
 	<string name="category_tech">Teknologi</string>
-	<string name="confirm_email_title">Satu hal lagi</string>
-	<string name="confirm_email_subtitle">Ketuk tautan yang kami kirim ke Anda melalui surel untuk memverifikasi akun Anda.</string>
+	<!-- %s is the email address -->
 	<string name="resend">Kirim ulang</string>
 	<string name="open_email_app">Buka aplikasi surel</string>
 	<string name="resent_email">Surel konfirmasi terkirim</string>
@@ -258,7 +252,7 @@
 	<string name="add_poll">Tambahkan pemungutan suara</string>
 	<string name="emoji">Emoji</string>
 	<string name="post_visibility">Keterlihatan kiriman</string>
-	<string name="home_timeline">Linimasa beranda</string>
+	<string name="home_timeline">Lini masa beranda</string>
 	<string name="my_profile">Profil saya</string>
 	<string name="media_viewer">Penampil media</string>
 	<string name="follow_user">Ikuti %s</string>
@@ -267,7 +261,6 @@
 	<string name="open_in_browser">Buka di peramban</string>
 	<string name="hide_boosts_from_user">Sembunyikan pembagian dari %s</string>
 	<string name="show_boosts_from_user">Tampilkan pembagian dari %s</string>
-	<string name="signup_reason">mengapa Anda ingin bergabung?</string>
 	<string name="signup_reason_note">Ini akan membantu kami meninjau aplikasi Anda.</string>
 	<string name="clear">Hapus</string>
 	<string name="profile_header">Gambar tajuk</string>
@@ -354,9 +347,23 @@
 	<!-- %s is file size -->
 	<string name="download_update">Unduh (%s)</string>
 	<string name="install_update">Pasang</string>
-	<string name="privacy_policy_title">Mastodon dan privasi Anda</string>
-	<string name="privacy_policy_subtitle">Walaupun aplikasi Mastodon tidak mengumpulkan data apa pun, server yang Anda daftar di sana mungkin memiliki kebijakan yang berbeda. Luangkan beberapa menit untuk melihat dan menerima kebijakan privasi aplikasi Mastodon dan kebijakan privasi server Anda.</string>
 	<string name="i_agree">Saya Setuju</string>
 	<string name="empty_list">Daftar ini kosong</string>
 	<string name="instance_signup_closed">Server ini tidak menerima pendaftaran baru.</string>
+	<string name="text_copied">Disalin ke papan klip</string>
+	<string name="add_bookmark">Markah</string>
+	<string name="remove_bookmark">Hapus markah</string>
+	<string name="bookmarks">Markah</string>
+	<string name="your_favorites">Favorit Anda</string>
+	<string name="login_title">Selamat Datang Kembali</string>
+	<string name="login_subtitle">Masuk dengan server di mana Anda buat akun Anda.</string>
+	<string name="server_url">URL Server</string>
+	<string name="welcome_page1_text">Bayangkan Anda memikiki alamat surel yang berakhiran @contoh.com.\n\nAnda masih bisa mengirim dan menerima surel dari siapa pun, bahkan jika alamat surel mereka berakhiran @gmail.com atau @icloud.com atau @contoh.com.</string>
+	<string name="welcome_page2_title">Mastodon seperti itu.</string>
+	<string name="welcome_page2_text">Alamat akun Anda bisa seperti @gadisgothic654@contoh.social, tetapi Anda masih dapat mengikuti, membagikan, dan mengobrol dengan @fallout5selamanya@contoh.online.</string>
+	<string name="welcome_page3_title">Bagaimana saya memilih server?</string>
+	<string name="welcome_page3_text">Kebanyakan orang memilih server berbeda karena berbagai alasan. seni.contoh adalah tempat yang cocok bagi artis, sedangkan glasgow.example mungkin pilihan yang baik untuk para Scots.\n\nAnda tidak bisa salah dengan server yang kami rekomendasikan, jadi server apa yang Anda pilih (atau jika Anda memasukkan Anda sendiri di bilah pencarian server), Anda tidak akan melewatkan apa pun di mana pun.</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

mastodon/src/main/res/values-is-rIS/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Byrjum á þessu</string>
+	<string name="get_started">Búa til notandaaðgang</string>
+	<string name="already_have_account">Ég er þegar með notandaaðgang</string>
 	<string name="log_in">Skrá inn</string>
 	<string name="next">Næsta</string>
 	<string name="loading_instance">Sæki upplýsingar um netþjón…</string>
@@ -173,15 +174,16 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="back">Til baka</string>
 	<string name="instance_catalog_title">Mastodon samanstendur af notendum á mismunandi netþjónum.</string>
 	<string name="instance_catalog_subtitle">Veldu netþjón út frá svæðinu þínu, áhugamálum, nú eða einhvern almennan. Þú getur samt spjallað við hvern sem er á Mastodon, burtséð frá á hvaða netþjóni þú ert.</string>
-	<string name="search_communities">Leitaðu að netþjónum eða settu inn slóð</string>
-	<string name="instance_rules_title">Nokkrar grunnreglur</string>
-	<string name="instance_rules_subtitle">Gefðu þér mínútu til að kynna þér reglurnar sem stjórnendur %s munu sjá um að framfylgja.</string>
-	<string name="signup_title">Komum þér í gang á %s</string>
+	<string name="search_communities">Nafn þjóns eða vefslóð</string>
+	<string name="instance_rules_title">Reglur netþjónsins</string>
+	<string name="instance_rules_subtitle">Með því að halda áfram, samþykkir þú að fylgja eftirfarandi reglum sem settar eru af umsjónarmönnum %s, sem sjá um að þeim sé fylgt.</string>
+	<string name="signup_title">Búa til notandaaðgang</string>
 	<string name="edit_photo">breyta</string>
-	<string name="display_name">birtingarnafn</string>
-	<string name="username">notandanafn</string>
-	<string name="email">tölvupóstur</string>
-	<string name="password">lykilorð</string>
+	<string name="display_name">Nafn</string>
+	<string name="username">Notandanafn</string>
+	<string name="email">Tölvupóstfang</string>
+	<string name="password">Lykilorð</string>
+	<string name="confirm_password">Staðfestu lykilorðið</string>
 	<string name="password_note">Settu hástafi, sértákn og tölustafi til að auka styrk lykilorðins þíns.</string>
 	<string name="category_academia">Akademískt</string>
 	<string name="category_activism">Aðgerðasinnar</string>
@@ -196,8 +198,10 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="category_music">Tónlist</string>
 	<string name="category_regional">Svæðisbundið</string>
 	<string name="category_tech">Tækni</string>
-	<string name="confirm_email_title">Eitt að lokum</string>
-	<string name="confirm_email_subtitle">Ýttu á tengilinn sem við sendum þér til að staðfesta tölvupóstfangið þitt.</string>
+	<string name="confirm_email_title">Athugaðu innhólfið þitt</string>
+	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Ýttu á tengilinn sem við sendum þér til að staðfesta %s. Við bíðum á meðan.</string>
+	<string name="confirm_email_didnt_get">Fékkstu ekki neinn tengil?</string>
 	<string name="resend">Endursenda</string>
 	<string name="open_email_app">Opna tölvupóstforrit</string>
 	<string name="resent_email">Staðfestingartölvupóstur sendur</string>
@@ -285,7 +289,7 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="open_in_browser">Opna í vafra</string>
 	<string name="hide_boosts_from_user">Fela endurbirtingar frá %s</string>
 	<string name="show_boosts_from_user">Sýna endurbirtingar frá %s</string>
-	<string name="signup_reason">hvers vegna vilt þú taka þátt?</string>
+	<string name="signup_reason">Hvers vegna vilt þú taka þátt?</string>
 	<string name="signup_reason_note">Þetta mun hjálpa okkur við að yfirfara umsóknina þína.</string>
 	<string name="clear">Hreinsa</string>
 	<string name="profile_header">Mynd í síðuhaus</string>
@@ -378,8 +382,8 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<!-- %s is file size -->
 	<string name="download_update">Sækja (%s)</string>
 	<string name="install_update">Setja upp</string>
-	<string name="privacy_policy_title">Mastodon og friðhelgi þín</string>
-	<string name="privacy_policy_subtitle">Þó svo að Mastodon-forritið safni ekki neinum gögnum, má samt vera að netþjónninn sem þú skráðir þig á hafi aðra stefnu hvað slíkt varðar. Taktu þér tíma til að yfirfara og samþykkja persónuverndarstefnu Mastodon-forritsins og einnig hjá netþjóninum þínum.</string>
+	<string name="privacy_policy_title">Friðhelgi þín</string>
+	<string name="privacy_policy_subtitle">Þó svo að Mastodon-forritið safni engum gögnum, þá getur netþjónninn sem þú skráir þig á haft aðra stefnu varðandi þetta.\n\nEf þú samþykkir ekki stefnuna hjá %s, geturðu farið til baka og valið annan netþjón.</string>
 	<string name="i_agree">Ég samþykki</string>
 	<string name="empty_list">Þessi listi er tómur</string>
 	<string name="instance_signup_closed">Þessi netþjónn tekur ekki við nýjum skráningum.</string>
@@ -391,4 +395,41 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="login_title">Velkomin aftur</string>
 	<string name="login_subtitle">Skráðu þig inn á netþjóninn þar sem þú útbjóst notandaaðganginn þinn.</string>
 	<string name="server_url">Vefslóð netþjóns</string>
+	<string name="welcome_page1_title">Hvað er Mastodon?</string>
+	<string name="welcome_page1_text">Ímyndaðu þér að þú sért með tölvupóstfang sem endar á @lén.is.\n\nÞú getur alltaf tekið við og sent tölvupóst til allra, jafnvel þótt tölvupóstfangið þeirra endi á @gmail.com, @icloud.com eða @lén.is.</string>
+	<string name="welcome_page2_title">Mastodon er eins og þetta.</string>
+	<string name="welcome_page2_text">Auðkennið þitt gæti verið @gothgirl654@example.social, en þú getur samt fylgst með, endurbirt og spjallað við @fallout5ever@example.online.</string>
+	<string name="welcome_page3_title">Hvernig vel ég netþjón?</string>
+	<string name="welcome_page3_text">Mismunandi fólk velur sér mismunandi netþjóna af ýmsum ólíkum ástæðum. Netþjónninn art.example er frábær staður fyrir listafólk, á meðan glasgow.example gæti verið góður kostur fyrir suma skota.\n\nÞú getur eiginlega ekki lent á röngum stað á neinum að þeim netþjónum sem við mælum með, þannig að hvern þeirra sem þú velur (eða ef þú setur inn þinn eigin netþjón í leitarreitinn), þá ættirðu ekki að missa af neinu neinsstaðar.</string>
+	<string name="signup_random_server_explain">Við munum velja netþjón út frá tungumálinu þínu, ef þú heldur áfram án þess að velja neitt.</string>
+	<string name="server_filter_any_language">Hvaða tungumál sem er</string>
+	<string name="server_filter_instant_signup">Nýskráning á stundinni</string>
+	<string name="server_filter_manual_review">Handvirk yfirferð</string>
+	<string name="server_filter_any_signup_speed">Hvaða afgreiðsluhraði nýskráninga sem er</string>
+	<string name="server_filter_region_europe">Evrópa</string>
+	<string name="server_filter_region_north_america">Norður-Ameríka</string>
+	<string name="server_filter_region_south_america">Suður-Ameríka</string>
+	<string name="server_filter_region_africa">Afríka</string>
+	<string name="server_filter_region_asia">Asía</string>
+	<string name="server_filter_region_oceania">Eyjaálfa</string>
+	<string name="not_accepting_new_members">Tekur ekki við nýjum meðlimum</string>
+	<string name="category_special_interests">Sérstök áhugamál</string>
+	<string name="signup_passwords_dont_match">Lykilorðin samsvara ekki</string>
+	<string name="pick_server_for_me">Velja fyrir mig</string>
+	<string name="profile_add_row">Bæta við röð</string>
+	<string name="profile_setup">Uppsetning notandasniðs</string>
+	<string name="profile_setup_subtitle">Þú getur alltaf klárað þetta síðar á notendasniðaflipanum.</string>
+	<string name="profile_setup_explanation">Þú getur bætt við allt að fjórum gagnasviðum að eigin vali. Staðsetning, tenglar, fornöfn - ímyndunaraflið er einu takmörkin.</string>
+	<string name="popular_on_mastodon">Vinsælt á Mastodon</string>
+	<string name="follow_all">Fylgjast með öllum</string>
+	<string name="server_rules_disagree">Ósammála</string>
+	<string name="privacy_policy_explanation">Athugaðu: Við söfnum ekki eða vinnum með neinar upplýsingar.</string>
+	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Ósammála %s</string>
+	<string name="profile_bio">Æviágrip</string>
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Fylgist með notendum…</string>
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s leyfir ekki nýskráningar frá %2$s. Veldu eitthvað annað lén eða &lt;a&gt;veldu annan netþjón&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Þetta notandanafn er þegar í notkun.</string>
 </resources>

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

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Iniziamo</string>
+	<string name="get_started">Crea un profilo</string>
+	<string name="already_have_account">Ho già un account</string>
 	<string name="log_in">Accedi</string>
 	<string name="next">Avanti</string>
+	<string name="loading_instance">Recupero delle informazioni sul server…</string>
 	<string name="error">Errore</string>
+	<string name="not_a_mastodon_instance">%s non sembra essere un server Mastodon.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Preparazione all\'autenticazione…</string>
 	<string name="finishing_auth">Completamento autenticazione…</string>
@@ -35,10 +38,10 @@
 	</plurals>
 	<plurals name="posts">
 		<item quantity="one">post</item>
-		<item quantity="other">posts</item>
+		<item quantity="other">post</item>
 	</plurals>
-	<string name="posts">Posts</string>
-	<string name="posts_and_replies">Post e Risposte</string>
+	<string name="posts">Post</string>
+	<string name="posts_and_replies">Post e risposte</string>
 	<string name="media">Media</string>
 	<string name="profile_about">Info</string>
 	<string name="button_follow">Segui</string>
@@ -55,7 +58,7 @@
 	<string name="unblock_domain">Sblocca %s</string>
 	<plurals name="x_posts">
 		<item quantity="one">%,d post</item>
-		<item quantity="other">%,d posts</item>
+		<item quantity="other">%,d post</item>
 	</plurals>
 	<string name="profile_joined">Iscritto</string>
 	<string name="done">Fatto</string>
@@ -170,15 +173,16 @@
 	<string name="back">Indietro</string>
 	<string name="instance_catalog_title">Mastodon è fatto di utenti in diverse comunità.</string>
 	<string name="instance_catalog_subtitle">Scegli una comunità basata sui tuoi interessi, regionale o una generica. Puoi comunque connetterti con tutti, indipendentemente dalla comunità.</string>
-	<string name="search_communities">Cerca servers o inserisci URL</string>
-	<string name="instance_rules_title">Alcune regole di base</string>
-	<string name="instance_rules_subtitle">Prenditi un minuto per rivedere le regole impostate e applicate dagli amministratori di %s.</string>
-	<string name="signup_title">Facciamo in modo che sia configurato su %s</string>
+	<string name="search_communities">Nome del server o URL</string>
+	<string name="instance_rules_title">Regole del server</string>
+	<string name="instance_rules_subtitle">Continuando, accetti di seguire le seguenti regole stabilite e applicate dai moderatori di %s.</string>
+	<string name="signup_title">Crea un profilo</string>
 	<string name="edit_photo">modifica</string>
-	<string name="display_name">nome visualizzato</string>
-	<string name="username">nome utente</string>
-	<string name="email">email</string>
-	<string name="password">password</string>
+	<string name="display_name">Nome</string>
+	<string name="username">Nome utente</string>
+	<string name="email">Email</string>
+	<string name="password">Password</string>
+	<string name="confirm_password">Conferma la password</string>
 	<string name="password_note">Includi lettere maiuscole, caratteri speciali e numeri per aumentare la forza della tua password.</string>
 	<string name="category_academia">Accademia</string>
 	<string name="category_activism">Attivismo</string>
@@ -193,8 +197,10 @@
 	<string name="category_music">Musica</string>
 	<string name="category_regional">Regionale</string>
 	<string name="category_tech">Tecnologia</string>
-	<string name="confirm_email_title">Un\'ultima cosa</string>
-	<string name="confirm_email_subtitle">Tocca il link che ti abbiamo inviato per verificare il tuo account.</string>
+	<string name="confirm_email_title">Controlla la tua casella di posta</string>
+	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Tocca il collegamento che ti abbiamo inviato per verificare %s. Aspetteremo proprio qui.</string>
+	<string name="confirm_email_didnt_get">Non hai ricevuto un collegamento?</string>
 	<string name="resend">Invia di nuovo</string>
 	<string name="open_email_app">Apri l\'app email</string>
 	<string name="resent_email">Email di conferma inviata</string>
@@ -282,7 +288,7 @@
 	<string name="open_in_browser">Apri nel browser</string>
 	<string name="hide_boosts_from_user">Nascondi le condivisioni di %s</string>
 	<string name="show_boosts_from_user">Mostra le condivisioni di %s</string>
-	<string name="signup_reason">perché vuoi unirti?</string>
+	<string name="signup_reason">Perché vuoi unirti?</string>
 	<string name="signup_reason_note">Questo ci aiuterà ad esaminare la tua richiesta.</string>
 	<string name="clear">Cancella</string>
 	<string name="profile_header">Immagine di intestazione</string>
@@ -302,8 +308,8 @@
 	<string name="trending_links_info_banner">Queste sono le notizie che vengono condivise più nel tuo angolo di Mastodon.</string>
 	<string name="local_timeline_info_banner">Questi sono i post più recenti delle persone che utilizzano il tuo stesso server Mastodon.</string>
 	<string name="dismiss">Ignora</string>
-	<string name="see_new_posts">Visualizza nuovi posts</string>
-	<string name="load_missing_posts">Carica i posts mancanti</string>
+	<string name="see_new_posts">Visualizza nuovi post</string>
+	<string name="load_missing_posts">Carica i post mancanti</string>
 	<string name="follow_back">Segui anche tu</string>
 	<string name="button_follow_pending">In attesa</string>
 	<string name="follows_you">Ha iniziato a seguirti</string>
@@ -331,7 +337,7 @@
 	<string name="time_now">ora</string>
 	<string name="post_info_reblogs">Condivisioni</string>
 	<string name="post_info_favorites">Preferiti</string>
-	<string name="edit_history">Modifica cronologia</string>
+	<string name="edit_history">Cronologia delle modifiche</string>
 	<string name="last_edit_at_x">Ultima modifica: %s</string>
 	<string name="time_just_now">proprio ora</string>
 	<plurals name="x_seconds_ago">
@@ -375,8 +381,8 @@
 	<!-- %s is file size -->
 	<string name="download_update">Scarica (%s)</string>
 	<string name="install_update">Installa</string>
-	<string name="privacy_policy_title">Mastodon e la tua privacy</string>
-	<string name="privacy_policy_subtitle">Sebbene l\'app Mastodon non raccolga alcun dato, il server tramite il quale ti iscrivi potrebbe avere una politica diversa. Prenditi un minuto per rivedere e accettare l\'informativa sulla privacy dell\'app Mastodon e l\'informativa sulla privacy del tuo server.</string>
+	<string name="privacy_policy_title">La tua privacy</string>
+	<string name="privacy_policy_subtitle">Sebbene l\'app Mastodon non raccolga alcun dato, il server attraverso il quale ti registri potrebbe avere una politica diversa.\n\nSe non sei d\'accordo con la politica per %s, puoi tornare indietro e scegliere un server diverso.</string>
 	<string name="i_agree">Accetto</string>
 	<string name="empty_list">Questo elenco è vuoto</string>
 	<string name="instance_signup_closed">Questo server non accetta nuove registrazioni.</string>
@@ -385,4 +391,44 @@
 	<string name="remove_bookmark">Rimuovi segnalibro</string>
 	<string name="bookmarks">Segnalibri</string>
 	<string name="your_favorites">I Tuoi Preferiti</string>
+	<string name="login_title">Bentornato/a</string>
+	<string name="login_subtitle">Accedi con il server in cui hai creato il tuo account.</string>
+	<string name="server_url">URL del server</string>
+	<string name="welcome_page1_title">Che cos\'è Mastodon?</string>
+	<string name="welcome_page1_text">Immaginate di avere un indirizzo email che termina con @example.com.\n\nPotete ancora inviare e ricevere email da chiunque, anche se la loro email termina in @gmail.com o @icloud.com o @example.com.</string>
+	<string name="welcome_page2_title">Mastodon è così.</string>
+	<string name="welcome_page2_text">Il tuo pseudonimo potrebbe essere @gothgirl654@example.social, ma puoi ancora seguire, condividere e chattare con @fallout5ever@example.online.</string>
+	<string name="welcome_page3_title">Come scegliere un server?</string>
+	<string name="welcome_page3_text">Diverse persone scelgono server diversi per vari motivi. art.example è un server ottimo per gli artisti, mentre glasgow.example è una buona scelta per i Scozzesi. \n\nNon si può sbagliare con nessuno dei nostri server consigliati, e qualsiasi server scegli (o se cerchi un altro che conosci tu usando la barra di ricerca dei server) non perderai mai un colpo.</string>
+	<string name="signup_random_server_explain">Sceglieremo un server in base alla tua lingua se continui senza effettuare una selezione.</string>
+	<string name="server_filter_any_language">Qualsiasi lingua</string>
+	<string name="server_filter_instant_signup">Iscrizione immediata</string>
+	<string name="server_filter_manual_review">Revisione manuale</string>
+	<string name="server_filter_any_signup_speed">Qualsiasi velocità di iscrizione</string>
+	<string name="server_filter_region_europe">Europa</string>
+	<string name="server_filter_region_north_america">America del nord</string>
+	<string name="server_filter_region_south_america">America del sud</string>
+	<string name="server_filter_region_africa">Africa</string>
+	<string name="server_filter_region_asia">Asia</string>
+	<string name="server_filter_region_oceania">Oceania</string>
+	<string name="not_accepting_new_members">Non accetta nuovi membri</string>
+	<string name="category_special_interests">Interessi speciali</string>
+	<string name="signup_passwords_dont_match">Le password non corrispondono</string>
+	<string name="pick_server_for_me">Scegli per me</string>
+	<string name="profile_add_row">Aggiungi riga</string>
+	<string name="profile_setup">Configurazione del profilo</string>
+	<string name="profile_setup_subtitle">Puoi sempre completarlo più tardi nella scheda Profilo.</string>
+	<string name="profile_setup_explanation">Puoi aggiungere fino a quattro campi del profilo per tutto ciò che desideri. Posizione, collegamenti, pronomi — il limite è il cielo.</string>
+	<string name="popular_on_mastodon">Popolare su Mastodon</string>
+	<string name="follow_all">Segui tutto</string>
+	<string name="server_rules_disagree">Non sono d\'accordo</string>
+	<string name="privacy_policy_explanation">TL;DR: Non raccogliamo, né elaboriamo nulla.</string>
+	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Non sono d\'accordo con %s</string>
+	<string name="profile_bio">Biografia</string>
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Seguendo gli utenti…</string>
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s non consente iscrizioni da %2$s. Provane uno diverso o &lt;a&gt;scegli un altro server&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Questo nome utente è già in uso.</string>
 </resources>

mastodon/src/main/res/values-iw-rIL/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">בואו נתחיל</string>
 	<string name="log_in">התחברו</string>
 	<string name="next">הבא</string>
 	<string name="error">שגיאה</string>
@@ -92,8 +91,12 @@
 	<string name="category_general">כללי</string>
 	<string name="category_journalism">עיתונאות</string>
 	<string name="category_lgbt">להט״ב</string>
+	<!-- %s is the email address -->
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

mastodon/src/main/res/values-ja-rJP/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">はじめよう</string>
 	<string name="log_in">ログイン</string>
 	<string name="next">次へ</string>
 	<string name="error">エラー</string>
@@ -156,15 +155,7 @@
 	<string name="back">戻る</string>
 	<string name="instance_catalog_title">Mastodonはさまざまなコミュニティによって作られています</string>
 	<string name="instance_catalog_subtitle">あなたの趣味</string>
-	<string name="search_communities">サーバーまたはURLを検索</string>
-	<string name="instance_rules_title">いくつかのルールがあります</string>
-	<string name="instance_rules_subtitle">1分少々時間を取って、%s の管理者が定めたルールを確認してください。</string>
-	<string name="signup_title">さあ %s でセットアップしましょう</string>
 	<string name="edit_photo">編集</string>
-	<string name="display_name">表示名</string>
-	<string name="username">ユーザーネーム</string>
-	<string name="email">メールアドレス</string>
-	<string name="password">パスワード</string>
 	<string name="password_note">パスワードの強度を高めるため、英大文字・数字・特殊文字を含めてください。</string>
 	<string name="category_academia">アカデミア</string>
 	<string name="category_activism">アクティビズム</string>
@@ -179,8 +170,7 @@
 	<string name="category_music">ミュージック</string>
 	<string name="category_regional">地域</string>
 	<string name="category_tech">技術</string>
-	<string name="confirm_email_title">最後に</string>
-	<string name="confirm_email_subtitle">メールで送られたリンクへアクセスし、アカウントを認証してください。</string>
+	<!-- %s is the email address -->
 	<string name="resend">再送信</string>
 	<string name="open_email_app">メールアプリを開く</string>
 	<string name="resent_email">確認メールを再送信しました</string>
@@ -267,7 +257,6 @@
 	<string name="open_in_browser">ブラウザで開く</string>
 	<string name="hide_boosts_from_user">%sさんのブーストを非表示</string>
 	<string name="show_boosts_from_user">%sさんのブーストを表示</string>
-	<string name="signup_reason">なぜ参加したいと思ったのですか？</string>
 	<string name="signup_reason_note">申請を承認する際に役立つメッセージを添えてください.</string>
 	<string name="clear">クリア</string>
 	<string name="profile_header">ヘッダー画像</string>
@@ -354,8 +343,6 @@
 	<!-- %s is file size -->
 	<string name="download_update">ダウンロード (%s)</string>
 	<string name="install_update">インストール</string>
-	<string name="privacy_policy_title">Mastodonとあなたのプライバシー</string>
-	<string name="privacy_policy_subtitle">Mastodonアプリはいかなるデータも収集しませんが、サインアップするサーバーは別のポリシーを持っている場合があります。Mastodonアプリのプライバシーポリシーとサーバーのプライバシーポリシーを確認をし、同意してください。</string>
 	<string name="i_agree">同意する</string>
 	<string name="empty_list">このリストは空です。</string>
 	<string name="instance_signup_closed">このサーバーは新規登録を受け付けていません。</string>
@@ -364,4 +351,7 @@
 	<string name="remove_bookmark">ブックマークから削除</string>
 	<string name="bookmarks">ブックマーク</string>
 	<string name="your_favorites">お気に入り</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Aha bdu tura</string>
+	<string name="get_started">Snulfu-d amiḍan</string>
+	<string name="already_have_account">Γur-i yakan amiḍan</string>
 	<string name="log_in">Qqen</string>
 	<string name="next">Uḍfiṛ</string>
 	<string name="error">Tuccḍa</string>
@@ -165,15 +166,7 @@
 	<string name="report_personal_title">Ur tebɣiḍ ara ad twaliḍ aya?</string>
 	<string name="report_personal_subtitle">Mi ara twaliḍ kra ur ak•am-neɛǧib ara ɣef Mastodon, tzemreḍ ad tekkseḍ amdan-nni seg tirmit-ik•im.</string>
 	<string name="back">Tuɣalin</string>
-	<string name="search_communities">Nadi timɣiwnin neɣ sekcem URL</string>
-	<string name="instance_rules_title">Kra n yilugan igejdanen</string>
-	<string name="instance_rules_subtitle">Mudd kra n tesdatin i usenqed n yilugan yettusbadun akked yettusnasen sɣur yinedbalen %s.</string>
-	<string name="signup_title">Aha ad nebdu asbadu ɣef %s</string>
 	<string name="edit_photo">ẓreg</string>
-	<string name="display_name">isem ara d-yettwaskanen</string>
-	<string name="username">isem n useqdac</string>
-	<string name="email">imayl</string>
-	<string name="password">awal uffir</string>
 	<string name="password_note">Seddu isekkilen imeqqranen, isekkilen imaẓlayen d wuṭṭunen i useǧhed ugar n wawal-ik•im uffir.</string>
 	<string name="category_academia">Akadimi</string>
 	<string name="category_activism">Tinuɣmest</string>
@@ -188,8 +181,7 @@
 	<string name="category_music">Aẓawan</string>
 	<string name="category_regional">Amnaḍan</string>
 	<string name="category_tech">Atiknikan</string>
-	<string name="confirm_email_title">Taɣawsa taneggarut</string>
-	<string name="confirm_email_subtitle">Sit ɣef useɣwen i ak-n-uznen i wakken ad tesneqdeḍ amiḍan-ik.</string>
+	<!-- %s is the email address -->
 	<string name="resend">Ales tuzna</string>
 	<string name="open_email_app">Ldi asnas n yimayl</string>
 	<string name="resent_email">Asentem n tuzna n yimayl</string>
@@ -274,7 +266,6 @@
 	<string name="unfollowed_user">Y•Teḥbes aḍfar n %s</string>
 	<string name="followed_user">Aql-ak·akem teṭṭafareḍ %s</string>
 	<string name="open_in_browser">Ldi deg yiminig</string>
-	<string name="signup_reason">acimi tebγiḍ ad ternuḍ iman-ik•im?</string>
 	<string name="signup_reason_note">Aya ad aɣ-iɛiwen ad nessenqed tuttra-inek•inem.</string>
 	<string name="clear">Sfeḍ</string>
 	<string name="profile_header">Tugna n uqerru</string>
@@ -311,11 +302,14 @@
 	<string name="upload_failed">Asali yecceḍ</string>
 	<string name="file_upload_time_remaining">%s i d-yeqqimen</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Mastodon i Android %s yewjed i usader.</string>
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
 	<string name="download_update">Asider (%s)</string>
 	<string name="install_update">Sbedd</string>
-	<string name="privacy_policy_title">Maṣṭudun akked ttbaḍnit-ik·im</string>
 	<string name="add_bookmark">Creḍ</string>
 	<string name="your_favorites">Imenyifen-ik·im</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

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

@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">시작하기</string>
+	<string name="get_started">계정 생성</string>
+	<string name="already_have_account">이미 계정이 있습니다</string>
 	<string name="log_in">로그인</string>
 	<string name="next">다음</string>
+	<string name="loading_instance">서버 정보 받아오는 중...</string>
 	<string name="error">오류</string>
+	<string name="not_a_mastodon_instance">%s는 마스토돈 서버인 것 같지 않습니다.</string>
 	<string name="ok">확인</string>
-	<string name="preparing_auth">인증 준비중…</string>
+	<string name="preparing_auth">인증 준비 중…</string>
 	<string name="finishing_auth">인증을 끝마치는 중…</string>
 	<string name="user_boosted">%s 님이 리블로그함</string>
-	<string name="in_reply_to">%s 님에게 답글</string>
+	<string name="in_reply_to">%s 님에게 답장</string>
 	<string name="notifications">알림</string>
 	<string name="user_followed_you">나를 팔로우함</string>
 	<string name="user_sent_follow_request">나에게 팔로우 요청을 보냄</string>
-	<string name="user_favorited">당신의 게시물을 마음에 들어했습니다</string>
+	<string name="user_favorited">당신의 게시물을 좋아합니다</string>
 	<string name="notification_boosted">내 게시물을 리블로그했습니다</string>
 	<string name="poll_ended">투표 종료됨</string>
-	<string name="time_seconds">%d 초</string>
-	<string name="time_minutes">%d 분</string>
-	<string name="time_hours">%d 시간</string>
-	<string name="time_days">%d 일</string>
+	<string name="time_seconds">%d초</string>
+	<string name="time_minutes">%d분</string>
+	<string name="time_hours">%d시간</string>
+	<string name="time_days">%d일</string>
 	<string name="share_toot_title">공유</string>
 	<string name="settings">설정</string>
 	<string name="publish">게시</string>
-	<string name="discard_draft">작성 중인 글을 삭제하시겠습니까?</string>
-	<string name="discard">저장하지 않음</string>
+	<string name="discard_draft">작성 중인 글을 지우시겠습니까?</string>
+	<string name="discard">지우기</string>
 	<string name="cancel">취소</string>
 	<plurals name="followers">
 		<item quantity="other">팔로워</item>
@@ -59,7 +62,7 @@
 	<string name="field_label">라벨</string>
 	<string name="field_content">내용</string>
 	<string name="saving">저장 중...</string>
-	<string name="post_from_user">%s의 게시물</string>
+	<string name="post_from_user">%s 님의 게시물</string>
 	<string name="poll_option_hint">옵션 %d</string>
 	<plurals name="x_minutes">
 		<item quantity="other">%d분</item>
@@ -121,19 +124,19 @@
 	<string name="all_notifications">모두</string>
 	<string name="mentions">멘션</string>
 	<plurals name="x_people_talking">
-		<item quantity="other">%d 명이 말하고 있음</item>
+		<item quantity="other">%d명이 말하고 있음</item>
 	</plurals>
 	<plurals name="discussed_x_times">
 		<item quantity="other">%d번 언급됨</item>
 	</plurals>
 	<string name="report_title">%s 신고</string>
 	<string name="report_choose_reason">이 게시물에 어떤 문제가 있나요?</string>
-	<string name="report_choose_reason_account">%s에 어떤 문제가 있나요?</string>
+	<string name="report_choose_reason_account">%s 님에게 어떤 문제가 있나요?</string>
 	<string name="report_choose_reason_subtitle">가장 알맞은 것을 선택하세요</string>
 	<string name="report_reason_personal">마음에 안 듭니다</string>
 	<string name="report_reason_personal_subtitle">내가 보기 싫은 종류에 속합니다</string>
 	<string name="report_reason_spam">스팸입니다</string>
-	<string name="report_reason_spam_subtitle">악성 링크, 반응 스팸, 또는 반복적인 답글</string>
+	<string name="report_reason_spam_subtitle">악성 링크, 반응 스팸, 또는 반복적인 답장</string>
 	<string name="report_reason_violation">서버 규칙을 위반합니다</string>
 	<string name="report_reason_violation_subtitle">특정 규칙을 위반합니다</string>
 	<string name="report_reason_other">기타</string>
@@ -144,27 +147,28 @@
 	<string name="report_choose_posts_subtitle">해당하는 사항을 모두 선택하세요</string>
 	<string name="report_comment_title">우리가 더 알아야 할 내용이 있나요?</string>
 	<string name="report_comment_hint">추가 의견</string>
-	<string name="sending_report">신고 보내는 중..</string>
-	<string name="report_sent_title">신고해주셔서 감사합니다, 중재자분들이 확인할 예정입니다.</string>
+	<string name="sending_report">신고 보내는 중...</string>
+	<string name="report_sent_title">신고해주셔서 감사합니다, 중재자들이 확인할 예정입니다.</string>
 	<string name="report_sent_subtitle">서버의 중재자들이 이것을 심사하는 동안, 당신은 %s에 대한 행동을 취할 수 있습니다.</string>
 	<string name="unfollow_user">%s 팔로우 해제</string>
 	<string name="unfollow">팔로우 해제</string>
-	<string name="mute_user_explain">그의 게시물이나 리블로그가 내 홈 피드에 보이지 않습니다. 그는 뮤트 당했다는 사실을 알지 못합니다.</string>
-	<string name="block_user_explain">그는 나를 팔로우 하거나 내 게시물을 볼 수 없게 됩니다, 하지만 내가 차단한 사실은 알 수 있습니다.</string>
+	<string name="mute_user_explain">상대방의 게시물이나 리블로그가 내 홈 피드에 보이지 않습니다. 상대방은 뮤트 당했다는 사실을 알지 못합니다.</string>
+	<string name="block_user_explain">상대방은 나를 팔로우 하거나 내 게시물을 볼 수 없게 됩니다, 하지만 내가 차단한 사실은 알 수 있습니다.</string>
 	<string name="report_personal_title">이런 것을 보지 않길 원하나요?</string>
 	<string name="report_personal_subtitle">마스토돈에서 보기 싫은 것을 보았다면, 해당하는 사람을 지울 수 있습니다.</string>
-	<string name="back">뒤로가기</string>
+	<string name="back">뒤로 가기</string>
 	<string name="instance_catalog_title">마스토돈은 여러 다른 서버에 존재하는 사용자들로 이루어져 있습니다.</string>
 	<string name="instance_catalog_subtitle">당신의 관심사, 지역에 맞거나 일반적인 목적의 서버 중에서 원하는 것을 고르세요. 어떤 서버를 고르더라도, 다른 모두와 소통할 수 있습니다.</string>
-	<string name="search_communities">서버를 검색하거나 URL 입력</string>
-	<string name="instance_rules_title">몇 개의 규칙이 있습니다</string>
-	<string name="instance_rules_subtitle">%s의 관리자들이 정한 규칙들에 대해 살펴보세요.</string>
-	<string name="signup_title">%s에 가입하기 위한 정보들을 입력하세요</string>
+	<string name="search_communities">서버이름 혹은 URL</string>
+	<string name="instance_rules_title">서버 규칙</string>
+	<string name="instance_rules_subtitle">계속 진행하는 것으로 %s의 중재자들에 의해 정해지고 관리되는 규칙들에 동의하는 것으로 간주합니다.</string>
+	<string name="signup_title">계정 생성</string>
 	<string name="edit_photo">수정</string>
-	<string name="display_name">표시되는 이름</string>
+	<string name="display_name">이름</string>
 	<string name="username">사용자명</string>
 	<string name="email">이메일</string>
 	<string name="password">암호</string>
+	<string name="confirm_password">암호 확인</string>
 	<string name="password_note">대문자, 특수문자, 숫자를 포함해서 암호의 강도를 높이세요.</string>
 	<string name="category_academia">학술</string>
 	<string name="category_activism">사회운동</string>
@@ -179,8 +183,10 @@
 	<string name="category_music">음악</string>
 	<string name="category_regional">지역</string>
 	<string name="category_tech">기술</string>
-	<string name="confirm_email_title">마지막으로</string>
-	<string name="confirm_email_subtitle">계정을 확인하기 위해 우리가 보낸 이메일의 링크를 누르세요.</string>
+	<string name="confirm_email_title">받은 편지함을 확인하세요</string>
+	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">%s에 인증하기 위해 우리가 보낸 링크를 누르세요. 여기서 기다리겠습니다.</string>
+	<string name="confirm_email_didnt_get">링크를 못 받으셨나요?</string>
 	<string name="resend">재전송</string>
 	<string name="open_email_app">이메일 앱 열기</string>
 	<string name="resent_email">확인용 이메일이 보내졌습니다</string>
@@ -202,7 +208,7 @@
 	<string name="step_x_of_n">%2$d개 중 %1$d번째 단계</string>
 	<string name="skip">건너뛰기</string>
 	<string name="notification_type_follow">새 팔로워</string>
-	<string name="notification_type_favorite">마음에 들어함</string>
+	<string name="notification_type_favorite">좋아함</string>
 	<string name="notification_type_reblog">리블로그</string>
 	<string name="notification_type_mention">멘션</string>
 	<string name="notification_type_poll">투표</string>
@@ -227,10 +233,10 @@
 	<string name="notify_follower">팔로워</string>
 	<string name="notify_followed">내가 팔로우 하는 사람</string>
 	<string name="notify_none">아무도 없음</string>
-	<string name="notify_favorites">내 게시물을 마음에 들어함</string>
+	<string name="notify_favorites">내 게시물을 좋아함</string>
 	<string name="notify_follow">나를 팔로우함</string>
 	<string name="notify_reblog">내 게시물을 공유함</string>
-	<string name="notify_mention">나에게 멘션</string>
+	<string name="notify_mention">나를 멘션함</string>
 	<string name="settings_boring">지루한 영역</string>
 	<string name="settings_account">계정 설정</string>
 	<string name="settings_contribute">마스토돈에 기여</string>
@@ -240,16 +246,16 @@
 	<string name="settings_clear_cache">미디어 캐시 지우기</string>
 	<string name="settings_app_version">안드로이드용 마스토돈 v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">미디어 캐시 지워짐</string>
-	<string name="confirm_log_out">정말로 로그아웃 하시겠습니까?</string>
+	<string name="confirm_log_out">정말로 로그아웃하시겠습니까?</string>
 	<string name="sensitive_content">민감한 내용</string>
 	<string name="sensitive_content_explain">작성자가 미디어를 민감하다고 설정했습니다. 눌러서 확인합니다.</string>
 	<string name="media_hidden">눌러서 확인</string>
-	<string name="avatar_description">%s의 프로필로 이동</string>
+	<string name="avatar_description">%s 님의 프로필로 이동</string>
 	<string name="more_options">추가 옵션</string>
 	<string name="reveal_content">내용 보기</string>
 	<string name="hide_content">내용 숨기기</string>
 	<string name="new_post">새 게시물</string>
-	<string name="button_reply">답글</string>
+	<string name="button_reply">답장</string>
 	<string name="button_reblog">리블로그</string>
 	<string name="button_favorite">좋아요</string>
 	<string name="button_share">공유</string>
@@ -257,16 +263,16 @@
 	<string name="add_media">미디어 추가</string>
 	<string name="add_poll">투표 추가</string>
 	<string name="emoji">에모지</string>
-	<string name="post_visibility">게시물 공개범위</string>
+	<string name="post_visibility">게시물 공개 범위</string>
 	<string name="home_timeline">홈 타임라인</string>
 	<string name="my_profile">내 프로필</string>
 	<string name="media_viewer">미디어 뷰어</string>
-	<string name="follow_user">%s 님을 팔로우</string>
+	<string name="follow_user">%s 팔로우</string>
 	<string name="unfollowed_user">%s 님을 팔로우 해제했습니다</string>
 	<string name="followed_user">이제 %s 님을 팔로우 합니다</string>
 	<string name="open_in_browser">브라우저에서 열기</string>
-	<string name="hide_boosts_from_user">%s의 리블로그를 숨기기</string>
-	<string name="show_boosts_from_user">%s의 리블로그를 보이기</string>
+	<string name="hide_boosts_from_user">%s 님의 리블로그 숨기기</string>
+	<string name="show_boosts_from_user">%s 님의 리블로그 보이기</string>
 	<string name="signup_reason">가입하려는 이유가 무엇인가요?</string>
 	<string name="signup_reason_note">이 정보는 우리가 심사를 하는 데에 참고할 수 있습니다.</string>
 	<string name="clear">모두 지우기</string>
@@ -279,7 +285,7 @@
 	<string name="open_settings">설정 열기</string>
 	<string name="error_saving_file">파일 저장 오류</string>
 	<string name="file_saved">파일 저장됨</string>
-	<string name="downloading">다운로드중…</string>
+	<string name="downloading">다운로드 중…</string>
 	<string name="no_app_to_handle_action">이 동작을 처리할 앱이 없습니다</string>
 	<string name="local_timeline">커뮤니티</string>
 	<string name="trending_posts_info_banner">당신이 속한 마스토돈 서버에서 관심을 끌고 있는 게시물들입니다.</string>
@@ -288,25 +294,25 @@
 	<string name="local_timeline_info_banner">당신과 같은 마스토돈 서버에 존재하는 사람들이 공유한 최신 게시물들입니다.</string>
 	<string name="dismiss">지우기</string>
 	<string name="see_new_posts">새 게시물 보기</string>
-	<string name="load_missing_posts">빈 게시물 불러오기</string>
+	<string name="load_missing_posts">놓친 게시물 불러오기</string>
 	<string name="follow_back">맞팔로우</string>
-	<string name="button_follow_pending">대기중</string>
+	<string name="button_follow_pending">대기 중</string>
 	<string name="follows_you">나를 팔로우합니다</string>
 	<string name="manually_approves_followers">수동으로 팔로워 승인</string>
 	<string name="current_account">현재 계정</string>
 	<string name="log_out_account">%s 로그아웃</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<plurals name="x_followers">
-		<item quantity="other">%,d 명의 팔로워</item>
+		<item quantity="other">%,d명의 팔로워</item>
 	</plurals>
 	<plurals name="x_following">
-		<item quantity="other">%,d 명의 팔로잉</item>
+		<item quantity="other">%,d명의 팔로잉</item>
 	</plurals>
 	<plurals name="x_favorites">
-		<item quantity="other">%,d 개의 관심글</item>
+		<item quantity="other">%,d개의 좋아요</item>
 	</plurals>
 	<plurals name="x_reblogs">
-		<item quantity="other">%,d 개의 리블로그</item>
+		<item quantity="other">%,d개의 리블로그</item>
 	</plurals>
 	<string name="timestamp_via_app">%1$s에 %2$s에서</string>
 	<string name="time_now">방금</string>
@@ -321,45 +327,81 @@
 	<plurals name="x_minutes_ago">
 		<item quantity="other">%d분 전</item>
 	</plurals>
-	<string name="edited_timestamp">%s에 수정함</string>
+	<string name="edited_timestamp">%s(전)에 수정함</string>
 	<string name="edit_original_post">원본 게시물</string>
 	<string name="edit_text_edited">내용을 수정함</string>
-	<string name="edit_spoiler_added">열람 주의 추가됨</string>
-	<string name="edit_spoiler_edited">열람 주의 수정됨</string>
-	<string name="edit_spoiler_removed">열람 주의 삭제됨</string>
+	<string name="edit_spoiler_added">열람 주의 추가함</string>
+	<string name="edit_spoiler_edited">열람 주의 수정함</string>
+	<string name="edit_spoiler_removed">열람 주의 삭제함</string>
 	<string name="edit_poll_added">투표를 추가함</string>
 	<string name="edit_poll_edited">투표를 수정함</string>
 	<string name="edit_poll_removed">투표를 삭제함</string>
 	<string name="edit_media_added">미디어를 추가함</string>
-	<string name="edit_media_removed">영상물을 뺌</string>
-	<string name="edit_media_reordered">미디어 순서 바뀜</string>
-	<string name="edit_marked_sensitive">민감함으로 설정됨</string>
-	<string name="edit_marked_not_sensitive">민감하지 않음으로 설정됨</string>
-	<string name="edit_multiple_changed">게시물 수정됨</string>
+	<string name="edit_media_removed">미디어를 삭제함</string>
+	<string name="edit_media_reordered">미디어 순서를 바꿈</string>
+	<string name="edit_marked_sensitive">민감함으로 설정함</string>
+	<string name="edit_marked_not_sensitive">민감하지 않음으로 설정함</string>
+	<string name="edit_multiple_changed">게시물 수정함</string>
 	<string name="edit">수정</string>
-	<string name="discard_changes">변경사항을 삭제하겠습니까?</string>
+	<string name="discard_changes">변경 사항을 지우시겠습니까?</string>
 	<string name="upload_failed">업로드 실패</string>
-	<string name="file_size_bytes">%d바이트</string>
-	<string name="file_size_kb">%.2fkB</string>
-	<string name="file_size_mb">%.2fMB</string>
-	<string name="file_size_gb">%.2fGB</string>
+	<string name="file_size_bytes">%d bytes</string>
+	<string name="file_size_kb">%.2f kB</string>
+	<string name="file_size_mb">%.2f MB</string>
+	<string name="file_size_gb">%.2f GB</string>
 	<string name="file_upload_progress">%1$s / %2$s</string>
 	<string name="file_upload_time_remaining">%s 남음</string>
 	<string name="upload_error_connection_lost">디바이스의 인터넷 연결이 끊어졌습니다</string>
-	<string name="upload_processing">처리중…</string>
+	<string name="upload_processing">처리 중…</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_available">안드로이드용 마스토돈 %s 버전을 다운로드 할 수 있습니다.</string>
+	<string name="update_available">안드로이드용 마스토돈 %s 버전을 다운로드할 수 있습니다.</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_ready">안드로이드용 마스토돈 %s 버전이 다운로드 되었으며 설치할 준비가 되었습니다.</string>
+	<string name="update_ready">안드로이드용 마스토돈 %s 버전을 다운로드하였으며 설치할 수 있습니다.</string>
 	<!-- %s is file size -->
 	<string name="download_update">다운로드 (%s)</string>
 	<string name="install_update">설치</string>
-	<string name="privacy_policy_title">마스토돈 및 개인정보</string>
-	<string name="privacy_policy_subtitle">마스토돈 앱은 아무런 데이터도 수집하지 않지만, 가입한 서버의 정책은 다를 수도 있습니다. 잠시 시간을 들여 마스토돈 앱과 서버의 개인정보 정책을 확인한 후 동의해 주세요.</string>
+	<string name="privacy_policy_title">귀하의 개인정보</string>
+	<string name="privacy_policy_subtitle">마스토돈 앱은 아무런 정보도 수집하지 않지만, 당신이 가입하는 서버는 다른 정책을 가질 수 있습니다.\n\n만약 %s의 정책에 동의하지 않는다면, 뒤로 돌아가서 다른 서버를 고를 수 있습니다.</string>
 	<string name="i_agree">동의합니다</string>
 	<string name="empty_list">리스트에 아무 것도 없습니다</string>
 	<string name="instance_signup_closed">이 서버는 가입이 막혀 있는 상태입니다.</string>
+	<string name="text_copied">클립보드에 복사됨</string>
 	<string name="add_bookmark">보관</string>
+	<string name="remove_bookmark">보관한 게시물 삭제</string>
 	<string name="bookmarks">보관함</string>
-	<string name="your_favorites">좋아요</string>
+	<string name="your_favorites">내 좋아요</string>
+	<string name="login_title">돌아오신 것을 환영합니다</string>
+	<string name="login_subtitle">계정을 생성한 서버에 로그인하세요.</string>
+	<string name="server_url">서버 URL</string>
+	<string name="welcome_page1_title">마스토돈이란?</string>
+	<string name="welcome_page1_text">당신이 @example.com으로 끝나는 이메일 주소를 갖고 있다고 상상해보세요.\n\n당신은 이메일이 @gmail.com이나 @icloud.com 또는 @example.com으로 끝나는 모두에게 이메일을 보내거나 받을 수 있습니다.</string>
+	<string name="welcome_page2_title">마스토돈도 그렇답니다.</string>
+	<string name="welcome_page2_text">당신의 핸들이 @gothgirl654@example.social이더라도, 당신은 언제나 @fallout5ever@example.online을 팔로우하거나 리블로그, 대화할 수 있습니다.</string>
+	<string name="welcome_page3_title">서버는 어떻게 선택하나요?</string>
+	<string name="welcome_page3_text">다른 사람들은 여러가지 이유로 서로 다른 서버들을 선택합니다. art.example은 예술가들에게 훌륭한 곳인 반면, glasgow.example은 스코틀랜드인들에게 좋은 선택이 될 수 있습니다.\n\n저희가 추천하는 서버를 선택하면 잘못될 일이 없으므로, 당신은 어떠한 서버를 선택하더라도(또는 서버 검색란에 직접 입력하더라도) 어디서나 소식을 놓치지 않을 것입니다.</string>
+	<string name="signup_random_server_explain">아무 것도 고르지 않은 경우, 당신의 언어에 따라 서버를 골라드립니다.</string>
+	<string name="server_filter_any_language">모든 언어</string>
+	<string name="server_filter_instant_signup">즉시 가입</string>
+	<string name="server_filter_manual_review">수동 리뷰</string>
+	<string name="server_filter_any_signup_speed">모든 가입 속도</string>
+	<string name="server_filter_region_europe">유럽</string>
+	<string name="server_filter_region_north_america">북아메리카</string>
+	<string name="server_filter_region_south_america">남아메리카</string>
+	<string name="server_filter_region_africa">아프리카</string>
+	<string name="server_filter_region_asia">아시아</string>
+	<string name="server_filter_region_oceania">오세아니아</string>
+	<string name="not_accepting_new_members">새로운 가입을 받지 않습니다</string>
+	<string name="category_special_interests">특별한 관심사</string>
+	<string name="signup_passwords_dont_match">암호가 일치하지 않습니다</string>
+	<string name="pick_server_for_me">나를 위한 추천</string>
+	<string name="profile_add_row">열 추가</string>
+	<string name="profile_setup">프로필 설정</string>
+	<string name="profile_setup_subtitle">나중에 언제든지 프로필 탭에서 완성할 수 있습니다.</string>
+	<string name="follow_all">모두 팔로우</string>
+	<string name="server_rules_disagree">동의 안 함</string>
+	<string name="privacy_policy_explanation">요약: 우리는 어떤 정보도 수집하거나 처리하지 않습니다.</string>
+	<!-- %s is server domain -->
+	<string name="server_policy_disagree">%s에 대해 비동의</string>
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

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

@@ -73,7 +73,7 @@
     <string name="sk_enable_delete_notifications">알림 삭제 활성화</string>
     <string name="sk_settings_publish_button_text">게시 버튼 텍스트</string>
     <string name="sk_settings_publish_button_text_title">게시 버튼 사용자화</string>
-    <string name="sk_settings_translate_only_opened">열린 게시글만 번역</string>
+    <string name="sk_settings_translate_only_opened">열린 게시물만 번역하기</string>
     <string name="sk_delete_notification">알림 삭제</string>
     <string name="sk_settings_translation_availability_note_available">%s 인스턴스는 번역을 지원합니다!</string>
     <string name="sk_settings_translation_availability_note_unavailable">%s 인스턴스는 번역을 지원하지 않는 것 같습니다.</string>
@@ -235,14 +235,28 @@
     <string name="sk_settings_show_no_alt_indicator">대체 텍스트 누락 여부 표시</string>
     <string name="sk_settings_show_alt_indicator">대체 텍스트 설정 여부 표시</string>
     <string name="sk_notify_poll_results">투표 결과</string>
-    <string name="sk_settings_local_only_explanation">이 작업은 사용하시는 인스턴스가 로컬에만 게시하는 것을 지원해야 합니다. 대부분의 수정된 Mastodon 버전에서 지원하지만, 공식 Mastodon은 지원하지 않습니다.</string>
+    <string name="sk_settings_local_only_explanation">옵션이 동작하려면 사용하시는 인스턴스가 로컬에만 게시하는 것을 지원해야 합니다. 대부분의 수정된 Mastodon 버전에서 지원하지만, 공식 Mastodon은 지원하지 않습니다.</string>
     <string name="sk_separator">·</string>
-    <string name="sk_settings_glitch_instance">Glitch는 Mastodon의 포크(수정된 버전)입니다 – 이 옵션은 Glitch에서 지원하는 로컬에만 게시 구현을 활성화합니다</string>
-    <string name="sk_settings_support_local_only">서버에서 로컬에만 게시하는 것을 지원합니다</string>
+    <string name="sk_settings_glitch_instance">Glitch 로컬에만 게시 모드</string>
+    <string name="sk_settings_support_local_only">서버가 로컬에만 게시하는 것을 지원함</string>
     <string name="sk_inline_local_only">로컬에만 게시</string>
     <string name="sk_inline_direct">멘션한 사람에게만 게시</string>
     <string name="sk_instance_features">인스턴스 기능 목록</string>
     <string name="sk_settings_glitch_mode_explanation">사용하시는 인스턴스가 Glitch에서 실행 중인 경우 활성화하세요. Hometown이나 Akkoma의 경우 활성화할 필요가 없습니다.</string>
     <string name="sk_settings_see_new_posts_button">\"새 게시물 보기\" 버튼</string>
     <string name="sk_settings_server_version">서버 버전: %s</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">열람주의 게시물 답글에 “re:” 추가</string>
+    <string name="sk_filtered">%s 필터로 걸러짐</string>
+    <string name="sk_collapse">접기</string>
+    <string name="sk_expand">펼치기</string>
+    <string name="sk_unfinished_attachments">첨부 파일을 수정하시겠습니까\?</string>
+    <string name="sk_unfinished_attachments_message">일부 첨부 파일의 업로드가 완료되지 않았습니다.</string>
+    <string name="sk_new_reports">새로운 신고</string>
+    <string name="sk_signed_up">가입했습니다</string>
+    <string name="sk_reported">신고했습니다</string>
+    <string name="sk_sign_ups">유저가 가입 중</string>
+    <string name="sk_local_only">로컬 인스턴스 전용</string>
+    <string name="sk_settings_collapse_long_posts">아주 긴 게시물 접기</string>
+    <string name="sk_spectator_mode">관객 모드</string>
+    <string name="sk_settings_hide_interaction">상호작용 버튼 가리기</string>
 </resources>

mastodon/src/main/res/values-my-rMM/strings.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="get_started">အကောင့်ဖန်တီးမည်</string>
+	<string name="already_have_account">အကောင့်ရှိပြီးသားပါ</string>
+	<string name="log_in">လော့ဂ်အင်ဝင်မည်</string>
+	<string name="next">ရှေ့သို့</string>
+	<string name="loading_instance">ဆာဗာအချက်အလက်များကို ရယူနေသည်…</string>
+	<string name="error">Error</string>
+	<string name="not_a_mastodon_instance">%s ဟာ Mastodon ဆာဗာတစ်ခုဖြစ်ပုံမရပါဘူး။</string>
+	<string name="ok">အိုကေ</string>
+	<string name="preparing_auth">အထောက်အထားစိစစ်ရန် ပြင်ဆင်နေသည်…</string>
+	<string name="finishing_auth">အထောက်အထားစိစစ်ခြင်းကို အပြီးသတ်နေသည်…</string>
+	<string name="user_boosted">%s က ရီဘလော့လုပ်ထားသည်</string>
+	<string name="in_reply_to">%s ကို ရီပလိုင်းပြန်ထား</string>
+	<string name="notifications">နိုတီများ</string>
+	<string name="user_followed_you">က သင့်ကို ဖော်လိုးလုပ်လိုက်သည်</string>
+	<string name="user_sent_follow_request">က သင့်ကို ဖော်လိုးဝါအဖြစ်တောင်းဆိုမှုတစ်ခု ပို့လိုက်သည်</string>
+	<string name="user_favorited">က သင့်ပို့စ်ကို နှစ်သက်ခဲ့သည်</string>
+	<string name="notification_boosted">က သင့်ပို့စ်ကို ရီဘလော့လုပ်လိုက်သည်</string>
+	<string name="poll_ended">ရဲ့ စစ်တမ်းပြီးဆုံးသွားပါပြီ</string>
+	<string name="time_seconds">%d စက္ကန့်</string>
+	<string name="time_minutes">%d မိနစ်</string>
+	<string name="time_hours">%d နာရီ</string>
+	<string name="time_days">%d ရက်</string>
+	<string name="settings">ဆက်တင်များ</string>
+	<string name="publish">တင်မည်</string>
+	<string name="discard_draft">စာကြမ်းကို ဖျက်မှာလား?</string>
+	<string name="discard">ဖယ်ရှား</string>
+	<string name="cancel">မလုပ်တော့</string>
+	<plurals name="followers">
+		<item quantity="other">ဦးက ဖောလိုးထား</item>
+	</plurals>
+	<plurals name="following">
+		<item quantity="other">ဦးကို ဖောလိုးထား</item>
+	</plurals>
+	<plurals name="posts">
+		<item quantity="other">ပို့စ်</item>
+	</plurals>
+	<string name="posts">ပို့စ်များ</string>
+	<string name="posts_and_replies">ပို့စ်နှင့် ရီပလိုင်းများ</string>
+	<string name="media">ဓာတ်ပုံနှင့် ဗီဒီယိုများ</string>
+	<string name="profile_about">အကြောင်း</string>
+	<string name="button_follow">ဖောလိုး</string>
+	<string name="button_following">ဖောလိုးလုပ်ထား</string>
+	<string name="edit_profile">ပရိုဖိုင်းပြင်မည်</string>
+	<string name="mention_user">%s ကို မန်းရှင်း</string>
+	<string name="share_user">%s ကို မျှဝေ</string>
+	<string name="mute_user">%s ကို mute</string>
+	<string name="unmute_user">%s ကို unmute</string>
+	<string name="block_user">%s ကို ဘလော့မည်</string>
+	<string name="unblock_user">%s ကို ဘလော့ဖြုတ်မည်</string>
+	<string name="report_user">%s ကို တိုင်ကြားမည်</string>
+	<string name="block_domain">%s ကို ဘလော့မည်</string>
+	<string name="unblock_domain">%s ကို ဘလော့ဖြုတ်မည်</string>
+	<plurals name="x_posts">
+		<item quantity="other">ပို့စ် %,d ခု</item>
+	</plurals>
+	<string name="profile_joined">အကောင့်ဖွင့်ခဲ့သည့် ရက်စွဲ</string>
+	<string name="done">ပြီးပြီ</string>
+	<string name="loading">လုပ်ဆောင်နေသည်…</string>
+	<!-- %s is the email address -->
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is file size -->
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+</resources>

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

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Aan de slag</string>
+	<string name="get_started">Account registreren</string>
+	<string name="already_have_account">Ik heb al een account</string>
 	<string name="log_in">Inloggen</string>
 	<string name="next">Volgende</string>
+	<string name="loading_instance">Serverinformatie ophalen…</string>
 	<string name="error">Fout</string>
+	<string name="not_a_mastodon_instance">%s lijkt geen Mastodonserver te zijn.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Verificatie aan het voorbereiden…</string>
-	<string name="finishing_auth">Verificatie aan het afronden…</string>
+	<string name="finishing_auth">Verificatie afronden…</string>
 	<string name="user_boosted">%s boostte</string>
 	<string name="in_reply_to">Als reactie op %s</string>
 	<string name="notifications">Meldingen</string>
@@ -21,7 +24,7 @@
 	<string name="time_days">%dd</string>
 	<string name="share_toot_title">Delen</string>
 	<string name="settings">Instellingen</string>
-	<string name="publish">Toot!</string>
+	<string name="publish">Toot</string>
 	<string name="discard_draft">Concept verwijderen?</string>
 	<string name="discard">Verwijderen</string>
 	<string name="cancel">Annuleren</string>
@@ -164,21 +167,22 @@
 	<string name="unfollow_user">Ontvolgen</string>
 	<string name="unfollow">Ontvolgen</string>
 	<string name="mute_user_explain">Je ziet hun berichten en boosts niet op je starttijdlijn. Ze zullen niet weten dat ze worden genegeerd.</string>
-	<string name="block_user_explain">Het is niet meer mogelijk om je te volgen of om je berichten te zien, maar het is wel mogelijk om erachter te komen dat je dit account hebt geblokkeerd.</string>
+	<string name="block_user_explain">Het is niet meer mogelijk om je te volgen of om je berichten te zien, maar het is wel mogelijk om erachter te komen dat je deze account hebt geblokkeerd.</string>
 	<string name="report_personal_title">Wil je dit niet zien?</string>
 	<string name="report_personal_subtitle">Als je iets ziet dat je niet leuk vindt op Mastodon, dan kun je de persoon op meerdere manieren van je tijdlijn verwijderen.</string>
 	<string name="back">Terug</string>
 	<string name="instance_catalog_title">Mastodon bestaat uit gebruikers op verschillende servers.</string>
 	<string name="instance_catalog_subtitle">Kies een server gebaseerd op je interesses, regio, of voor algemene doeleinden. Je kunt nog steeds met iedereen in contact komen, ongeacht de server.</string>
-	<string name="search_communities">Zoek servers of voer een URL in</string>
-	<string name="instance_rules_title">Enkele basisregels</string>
-	<string name="instance_rules_subtitle">Neem een minuut de tijd om de regels te bekijken die zijn ingesteld en worden gehandhaafd door de moderatoren van %s.</string>
-	<string name="signup_title">Laten we je account op %s instellen</string>
+	<string name="search_communities">Servernaam of URL</string>
+	<string name="instance_rules_title">Serverregels</string>
+	<string name="instance_rules_subtitle">Door verder te gaan, ga je akkoord met het volgen van de regels ingesteld door de %s-moderators.</string>
+	<string name="signup_title">Account registreren</string>
 	<string name="edit_photo">bewerken</string>
-	<string name="display_name">weergavenaam</string>
-	<string name="username">gebruikersnaam</string>
-	<string name="email">e-mailadres</string>
-	<string name="password">wachtwoord</string>
+	<string name="display_name">Naam</string>
+	<string name="username">Gebruikersnaam</string>
+	<string name="email">E-mailadres</string>
+	<string name="password">Wachtwoord</string>
+	<string name="confirm_password">Wachtwoord bevestigen</string>
 	<string name="password_note">Voeg hoofdletters, speciale tekens en cijfers toe om je wachtwoord veiliger te maken.</string>
 	<string name="category_academia">Academisch</string>
 	<string name="category_activism">Activisme</string>
@@ -193,8 +197,10 @@
 	<string name="category_music">Muziek</string>
 	<string name="category_regional">Regionaal</string>
 	<string name="category_tech">Tech</string>
-	<string name="confirm_email_title">Nog één ding</string>
-	<string name="confirm_email_subtitle">Klik op de link die we naar je e-mailadres hebben gestuurd om je account te verifiëren.</string>
+	<string name="confirm_email_title">Controleer je Postvak In</string>
+	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Klik op de link die we je hebben gestuurd om %s te verifiëren. We wachten op je.</string>
+	<string name="confirm_email_didnt_get">Geen link gekregen?</string>
 	<string name="resend">Opnieuw verzenden</string>
 	<string name="open_email_app">E-mail-app openen</string>
 	<string name="resent_email">Bevestigingsmail verzonden</string>
@@ -308,7 +314,7 @@
 	<string name="button_follow_pending">In afwachting</string>
 	<string name="follows_you">Volgt jou</string>
 	<string name="manually_approves_followers">Handmatig volgers goedkeuren</string>
-	<string name="current_account">Huidig account</string>
+	<string name="current_account">Huidige account</string>
 	<string name="log_out_account">%s uitloggen</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<plurals name="x_followers">
@@ -375,8 +381,54 @@
 	<!-- %s is file size -->
 	<string name="download_update">Downloaden (%s)</string>
 	<string name="install_update">Installeren</string>
-	<string name="privacy_policy_title">Mastodon en jouw privacy</string>
-	<string name="privacy_policy_subtitle">Hoewel de Mastodon-app geen gegevens verzamelt, kan de server die je aanmeldt een ander beleid hebben. Neem even de tijd om het privacybeleid van de Mastodon-app en het privacybeleid van de server te bekijken en hiermee akkoord te gaan.</string>
+	<string name="privacy_policy_title">Jouw privacy</string>
+	<string name="privacy_policy_subtitle">Hoewel de Mastodon-app geen gegevens verzamelt, kan de server waar je je aanmeldt een ander beleid hebben.\n\nAls je het niet eens bent met het beleid voor %s, kun je teruggaan en een andere server kiezen.</string>
 	<string name="i_agree">Ik ga akkoord</string>
 	<string name="empty_list">Deze lijst is leeg</string>
+	<string name="instance_signup_closed">Deze server accepteert geen nieuwe registraties.</string>
+	<string name="text_copied">Gekopieerd naar klembord</string>
+	<string name="add_bookmark">Bladwijzer toevoegen</string>
+	<string name="remove_bookmark">Bladwijzer verwijderen</string>
+	<string name="bookmarks">Bladwijzers</string>
+	<string name="your_favorites">Jouw favorieten</string>
+	<string name="login_title">Welkom terug</string>
+	<string name="login_subtitle">Bij de server waar je je account hebt aangemaakt inloggen.</string>
+	<string name="server_url">Server-URL</string>
+	<string name="welcome_page1_title">Wat is Mastodon?</string>
+	<string name="welcome_page1_text">Stel je voor dat je een e-mailadres hebt dat eindigt op @example.com.\n\nJe kunt nog steeds e-mailen met iemand, ook als hun e-mail eindigt in @gmail.com, @icloud.com of @voorbeeld.com.</string>
+	<string name="welcome_page2_title">Mastodon is precies zo.</string>
+	<string name="welcome_page2_text">Je volledige gebruikersnaam is @gothgirl654@example.social, maar je kunt nog steeds @fallout5ever@example.online volgen, boosten en berichten sturen.</string>
+	<string name="welcome_page3_title">Hoe kies ik een server?</string>
+	<string name="welcome_page3_text">Verschillende mensen kiezen om allerlei redenen een bepaalde server. art.example is een geweldige plek voor artiesten, terwijl belgium.example misschien een goede plek is voor Belgen.\n\nHet kan niet mis gaan als je een van onze aanbevolen servers kiest. Welke je ook kiest (en ook als je zelf een server invoert in de zoekbalk): je zult geen bericht missen.</string>
+	<string name="signup_random_server_explain">Als je doorgaat zonder een selectie te maken, kiezen we een server gebaseerd op jouw taal.</string>
+	<string name="server_filter_any_language">Elke taal</string>
+	<string name="server_filter_instant_signup">Direct aanmelden</string>
+	<string name="server_filter_manual_review">Handmatige beoordeling</string>
+	<string name="server_filter_any_signup_speed">Elke registratiesnelheid</string>
+	<string name="server_filter_region_europe">Europa</string>
+	<string name="server_filter_region_north_america">Noord-Amerika</string>
+	<string name="server_filter_region_south_america">Zuid-Amerika</string>
+	<string name="server_filter_region_africa">Afrika</string>
+	<string name="server_filter_region_asia">Azië</string>
+	<string name="server_filter_region_oceania">Oceanië</string>
+	<string name="not_accepting_new_members">Laat geen nieuwe gebruikers toe</string>
+	<string name="category_special_interests">Bijzondere interesses</string>
+	<string name="signup_passwords_dont_match">Wachtwoorden komen niet overeen</string>
+	<string name="pick_server_for_me">Kies voor mij</string>
+	<string name="profile_add_row">Rij toevoegen</string>
+	<string name="profile_setup">Profiel instellen</string>
+	<string name="profile_setup_subtitle">Je kunt dit later altijd aanvullen op het tabblad Profiel.</string>
+	<string name="profile_setup_explanation">Je kunt tot vier profielvelden toevoegen voor alles wat je wilt. Locatie, links, voornaamwoorden – de mogelijkheden zijn eindeloos.</string>
+	<string name="popular_on_mastodon">Populair op Mastodon</string>
+	<string name="follow_all">Volg iedereen</string>
+	<string name="server_rules_disagree">Oneens</string>
+	<string name="privacy_policy_explanation">TL;DR: We verzamelen of verwerken niets.</string>
+	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Oneens met %s</string>
+	<string name="profile_bio">Bio</string>
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Gevolgde gebruikers…</string>
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s staat geen registraties toe van %2$s. Probeer het met een andere e-mailprovider of &lt;a&gt;kies een andere server&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Deze gebruikersnaam wordt al gebruikt.</string>
 </resources>

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

@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="get_started">Opprett konto</string>
+	<string name="already_have_account">Jeg har allerede en konto</string>
+	<string name="log_in">Logg inn</string>
+	<string name="next">Neste</string>
+	<string name="loading_instance">Henter serverinfo…</string>
+	<string name="error">Feil</string>
+	<string name="not_a_mastodon_instance">%s ser ikke ut til å være en Mastodon server.</string>
+	<string name="ok">OK</string>
+	<string name="preparing_auth">Forbereder autentisering…</string>
+	<string name="finishing_auth">Ferdigstiller autentisering…</string>
+	<string name="user_boosted">%s fremhevet</string>
+	<string name="in_reply_to">Som svar på %s</string>
+	<string name="notifications">Varslinger</string>
+	<string name="user_followed_you">følger deg</string>
+	<string name="user_sent_follow_request">har sendt deg en følgeforespørsel</string>
+	<string name="user_favorited">favoriserte ditt innlegg</string>
+	<string name="notification_boosted">fremhevet ditt innlegg</string>
+	<string name="poll_ended">avstemming avsluttet</string>
+	<string name="time_seconds">%ds</string>
+	<string name="time_minutes">%dm</string>
+	<string name="time_hours">%dt</string>
+	<string name="time_days">%dd</string>
+	<string name="share_toot_title">Del</string>
+	<string name="settings">Innstillinger</string>
+	<string name="publish">Publiser</string>
+	<string name="discard_draft">Forkaste utkast?</string>
+	<string name="discard">Forkast</string>
+	<string name="cancel">Avbryt</string>
+	<plurals name="followers">
+		<item quantity="one">følger</item>
+		<item quantity="other">følgere</item>
+	</plurals>
+	<plurals name="following">
+		<item quantity="one">følger</item>
+		<item quantity="other">følger</item>
+	</plurals>
+	<plurals name="posts">
+		<item quantity="one">innlegg</item>
+		<item quantity="other">innlegg</item>
+	</plurals>
+	<string name="posts">Innlegg</string>
+	<string name="posts_and_replies">Innlegg med svar</string>
+	<string name="media">Medier</string>
+	<string name="profile_about">Om</string>
+	<string name="button_follow">Følg</string>
+	<string name="button_following">Følgere</string>
+	<string name="edit_profile">Endre Profil</string>
+	<string name="mention_user">Nevn %s</string>
+	<string name="share_user">Del %s</string>
+	<string name="mute_user">Demp %s</string>
+	<string name="unmute_user">Opphev demping %s</string>
+	<string name="block_user">Blokker %s</string>
+	<string name="unblock_user">Opphev blokkering %s</string>
+	<string name="report_user">Rapporter %s</string>
+	<string name="block_domain">Blokker %s</string>
+	<string name="unblock_domain">Opphev blokkering %s</string>
+	<plurals name="x_posts">
+		<item quantity="one">%,d innlegg</item>
+		<item quantity="other">%,d innlegg</item>
+	</plurals>
+	<string name="profile_joined">Ble med</string>
+	<string name="done">Ferdig</string>
+	<string name="loading">Laster…</string>
+	<string name="field_label">Etikett</string>
+	<string name="field_content">Innhold</string>
+	<string name="saving">Lagrer…</string>
+	<string name="post_from_user">Innlegg fra %s</string>
+	<string name="poll_option_hint">Valg %d</string>
+	<plurals name="x_minutes">
+		<item quantity="one">%d minutt</item>
+		<item quantity="other">%d minutter</item>
+	</plurals>
+	<plurals name="x_hours">
+		<item quantity="one">%d time</item>
+		<item quantity="other">%d timer</item>
+	</plurals>
+	<plurals name="x_days">
+		<item quantity="one">%d dag</item>
+		<item quantity="other">%d dager</item>
+	</plurals>
+	<string name="compose_poll_duration">Varighet: %s</string>
+	<plurals name="x_seconds_left">
+		<item quantity="one">%d sekund igjen</item>
+		<item quantity="other">%d sekunder igjen</item>
+	</plurals>
+	<plurals name="x_minutes_left">
+		<item quantity="one">%d minutt igjen</item>
+		<item quantity="other">%d minutter igjen</item>
+	</plurals>
+	<plurals name="x_hours_left">
+		<item quantity="one">%d time igjen</item>
+		<item quantity="other">%d timer igjen</item>
+	</plurals>
+	<plurals name="x_days_left">
+		<item quantity="one">%d dag igjen</item>
+		<item quantity="other">%d dager igjen</item>
+	</plurals>
+	<plurals name="x_voters">
+		<item quantity="one">%,d stemme</item>
+		<item quantity="other">%,d stemmer</item>
+	</plurals>
+	<string name="poll_closed">Lukket</string>
+	<string name="confirm_mute_title">Demp Konto</string>
+	<string name="confirm_mute">Bekreft demping av %s</string>
+	<string name="do_mute">Demp</string>
+	<string name="confirm_unmute_title">Opphev demping av konto</string>
+	<string name="confirm_unmute">Bekreft opphev demping av %s</string>
+	<string name="do_unmute">Opphev demping</string>
+	<string name="confirm_block_title">Blokker konto</string>
+	<string name="confirm_block_domain_title">Blokker domene</string>
+	<string name="confirm_block">Bekreft blokkering %s</string>
+	<string name="do_block">Blokker</string>
+	<string name="confirm_unblock_title">Avblokker konto</string>
+	<string name="confirm_unblock_domain_title">Avblokker domene</string>
+	<string name="confirm_unblock">Bekreft oppheving av %s</string>
+	<string name="do_unblock">Avblokker</string>
+	<string name="button_muted">Dempet</string>
+	<string name="button_blocked">Blokkert</string>
+	<string name="action_vote">Stem</string>
+	<string name="tap_to_reveal">Trykk for å vise</string>
+	<string name="delete">Slett</string>
+	<string name="confirm_delete_title">Slett innlegg</string>
+	<string name="confirm_delete">Er du sikker på at du vil slette dette innlegget?</string>
+	<string name="deleting">Sletter…</string>
+	<string name="notification_channel_audio_player">Lyd avspilling</string>
+	<string name="play">Spill av</string>
+	<string name="pause">Pause</string>
+	<string name="log_out">Logg ut</string>
+	<string name="add_account">Legg til konto</string>
+	<string name="search_hint">Søk</string>
+	<string name="hashtags">Emneknagger</string>
+	<string name="news">Nyheter</string>
+	<string name="for_you">For deg</string>
+	<string name="all_notifications">Alle</string>
+	<string name="mentions">Nevner</string>
+	<plurals name="x_people_talking">
+		<item quantity="one">%d person snakker</item>
+		<item quantity="other">%d personer snakker</item>
+	</plurals>
+	<plurals name="discussed_x_times">
+		<item quantity="one">Diskutert %d gang</item>
+		<item quantity="other">Diskutert %d ganger</item>
+	</plurals>
+	<string name="report_title">Rapporter %s</string>
+	<string name="report_choose_reason">Hva er galt med dette innlegget?</string>
+	<string name="report_choose_reason_account">Hva er galt med %s?</string>
+	<string name="report_choose_reason_subtitle">Velg det som passer best</string>
+	<string name="report_reason_personal">Jeg liker det ikke</string>
+	<string name="report_reason_personal_subtitle">Det er ikke noe du har lyst til å se</string>
+	<string name="report_reason_spam">Det er spam</string>
+	<string name="report_reason_spam_subtitle">Ondsinnede lenker, falsk engasjement eller repeterende svar</string>
+	<string name="report_reason_violation">Det bryter serverregler</string>
+	<string name="report_reason_violation_subtitle">Du er klar over at det bryter spesifikke regler</string>
+	<string name="report_reason_other">Det er noe annet</string>
+	<string name="report_reason_other_subtitle">Problemet passer ikke inn i de andre kategoriene</string>
+	<string name="report_choose_rule">Hvilke regler brytes?</string>
+	<string name="report_choose_rule_subtitle">Velg alle som passer</string>
+	<string name="report_choose_posts">Er det noen innlegg som støtter opp under denne rapporten?</string>
+	<string name="report_choose_posts_subtitle">Velg alle som passer</string>
+	<string name="report_comment_title">Er det noe annet du mener vi burde vite?</string>
+	<string name="report_comment_hint">Ytterligere kommentarer</string>
+	<string name="sending_report">Sender rapport…</string>
+	<string name="report_sent_title">Takk for at du rapporterer, vi skal se på dette.</string>
+	<string name="report_sent_subtitle">Mens vi går gjennom dette, kan du iverksettet tiltak mot @%s.</string>
+	<string name="unfollow_user">Slutt å følge @%s</string>
+	<string name="unfollow">Slutt å følge</string>
+	<string name="mute_user_explain">Du vil ikke se innlegg eller fremhevinger i tidslinjen. De vil ikke vite at de er dempet.</string>
+	<string name="block_user_explain">De kan ikke lenger følge eller se dine innlegg, men de kan se om de er blokkert.</string>
+	<string name="report_personal_title">Ønsker du ikke å se dette?</string>
+	<string name="report_personal_subtitle">Når du ser noe du ikke liker på Mastodon, kan du fjerne denne personen fra opplevelsen din.</string>
+	<string name="back">Tilbake</string>
+	<string name="instance_catalog_title">Mastodon er laget av brukere på forskjellige servere.</string>
+	<string name="instance_catalog_subtitle">Velg en server basert på dine interesser, regioner eller generell. Du kan fortsatt koble til alle, uavhengig av server.</string>
+	<string name="edit_photo">rediger</string>
+	<string name="password_note">Inkluder store bokstaver, spesialtegn og tall for å øke passordstyrken.</string>
+	<string name="category_academia">Akademia</string>
+	<string name="category_activism">Aktivisme</string>
+	<string name="category_all">Alle</string>
+	<string name="category_art">Kunst</string>
+	<string name="category_food">Mat</string>
+	<string name="category_furry">Furry</string>
+	<string name="category_games">Spill</string>
+	<string name="category_general">Generelt</string>
+	<string name="category_journalism">Journalisme</string>
+	<string name="category_music">Musikk</string>
+	<string name="category_regional">Region</string>
+	<string name="category_tech">Teknologi</string>
+	<!-- %s is the email address -->
+	<string name="resend">Send på nytt</string>
+	<string name="open_email_app">Åpne e-post app</string>
+	<string name="resent_email">Bekreftelses e-post sendt</string>
+	<string name="compose_hint">Skriv eller lim inn hva du tenker på</string>
+	<string name="content_warning">Innholdsadvarsel</string>
+	<string name="add_image_description">Legg til bildebeskrivelse…</string>
+	<string name="retry_upload">Last opp på nytt</string>
+	<string name="edit_image">Rediger bilde</string>
+	<string name="save">Lagre</string>
+	<string name="add_alt_text">Legg til alternativ tekst</string>
+	<string name="alt_text_subtitle">Alternativ tekst beskriver bilder for personer med dårlig eller ingen syn. Prøv å kun inkludere nok detaljer for å forstå konteksten.</string>
+	<string name="alt_text_hint">for eksempel er det en hund som ser mistenkelig ut med snevre øyne på kameraet.</string>
+	<string name="visibility_public">Offentlig</string>
+	<string name="visibility_followers_only">Kun følgere</string>
+	<string name="visibility_private">Bare personer jeg nevner</string>
+	<string name="search_all">Alle</string>
+	<string name="search_people">Folk</string>
+	<string name="recent_searches">Nylige søk</string>
+	<string name="step_x_of_n">Trinn %1$d av %2$d</string>
+	<string name="skip">Hopp</string>
+	<string name="notification_type_follow">Nye følgere</string>
+	<string name="notification_type_favorite">Favoritter</string>
+	<string name="notification_type_reblog">Fremhevinger</string>
+	<string name="notification_type_mention">Nevnelser</string>
+	<string name="notification_type_poll">Avstemminger</string>
+	<string name="choose_account">Velg konto</string>
+	<string name="err_not_logged_in">Vennligst logg inn på Mastodon først</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Du kan ikke legge til mer enn %d media vedlegg</item>
+		<item quantity="other">Du kan ikke legge til mer enn %d medievedlegg</item>
+	</plurals>
+	<string name="media_attachment_unsupported_type">Filen %s er av en ustøttet type</string>
+	<string name="media_attachment_too_big">Filen %1$s overskrider størrelsesgrensen på %2$s MB</string>
+	<string name="settings_theme">Visuelt utseende</string>
+	<string name="theme_auto">Automatisk</string>
+	<string name="theme_light">Lyst</string>
+	<string name="theme_dark">Mørkt</string>
+	<string name="theme_true_black">Ekte svart modus</string>
+	<string name="settings_behavior">Oppførsel</string>
+	<string name="settings_gif">Spill animerte avatarer og emoji</string>
+	<string name="settings_custom_tabs">Bruk integrert nettleser</string>
+	<string name="settings_notifications">Varslinger</string>
+	<string name="notify_me_when">Varsle meg når</string>
+	<string name="notify_anyone">alle</string>
+	<string name="notify_follower">en følger</string>
+	<string name="notify_followed">noen jeg følger</string>
+	<string name="notify_none">ingen</string>
+	<string name="notify_favorites">Favorittmarker innlegget til</string>
+	<string name="notify_follow">Følger meg</string>
+	<string name="notify_reblog">Fremhevet innlegget mitt</string>
+	<string name="notify_mention">Nevner meg</string>
+	<string name="settings_boring">Kjedelige sone</string>
+	<string name="settings_account">Kontoinnstillinger</string>
+	<string name="settings_contribute">Bidra til Mastodon</string>
+	<string name="settings_tos">Bruksvilkår</string>
+	<string name="settings_privacy_policy">Personvernregler</string>
+	<string name="settings_spicy">Den krydrede sonen</string>
+	<string name="settings_clear_cache">Tøm mediemellomlager</string>
+	<string name="settings_app_version">Mastodon for Android v%1$s (%2$d)</string>
+	<string name="media_cache_cleared">Mediemellomlager er tømt</string>
+	<string name="confirm_log_out">Er du sikker på at du vil logge ut?</string>
+	<string name="sensitive_content">Sensitivt innhold</string>
+	<string name="sensitive_content_explain">Forfatteren markerte dette bildet som sensitiv. Trykk for å vise.</string>
+	<string name="media_hidden">Trykk for å vise</string>
+	<string name="avatar_description">Gå til %s sin profil</string>
+	<string name="more_options">Flere alternativer</string>
+	<string name="reveal_content">Vis innhold</string>
+	<string name="hide_content">Skjul innhold</string>
+	<string name="new_post">Nytt innlegg</string>
+	<string name="button_reply">Svar</string>
+	<string name="button_reblog">Fremhev</string>
+	<string name="button_favorite">Favoritt</string>
+	<string name="button_share">Del</string>
+	<string name="media_no_description">Media uten beskrivelse</string>
+	<string name="add_media">Legg til media</string>
+	<string name="add_poll">Legg til en avstemning</string>
+	<string name="emoji">Emoji</string>
+	<string name="post_visibility">Innlegg synlighet</string>
+	<string name="home_timeline">Hjemmetidslinje</string>
+	<string name="my_profile">Min profil</string>
+	<string name="media_viewer">Forhåndsvisning av media</string>
+	<string name="follow_user">Følg %s</string>
+	<string name="unfollowed_user">Slutt å følge %s</string>
+	<string name="followed_user">Du følger nå %s</string>
+	<string name="open_in_browser">Åpne i nettleser</string>
+	<string name="hide_boosts_from_user">Skjul fremhevinger fra %s</string>
+	<string name="show_boosts_from_user">Vis fremhevinger fra %s</string>
+	<string name="signup_reason_note">Dette vil hjelpe oss med å gjennomgå din søknad.</string>
+	<string name="clear">Tøm</string>
+	<string name="profile_header">Toppbilde</string>
+	<string name="profile_picture">Profilbilde</string>
+	<string name="reorder">Endre rekkefølge</string>
+	<string name="download">Last ned</string>
+	<string name="permission_required">Tillatelse kreves</string>
+	<string name="storage_permission_to_download">Appen trenger tilgang til lagringen for å lagre denne filen.</string>
+	<string name="open_settings">Åpne innstillinger</string>
+	<string name="error_saving_file">Feil ved lagring av fil</string>
+	<string name="file_saved">Fil lagret</string>
+	<string name="downloading">Laster ned…</string>
+	<string name="no_app_to_handle_action">Det er ingen app som kan håndtere denne handlingen</string>
+	<string name="local_timeline">Samfunn</string>
+	<string name="trending_posts_info_banner">Disse innleggene snakker folk om akkurat nå, i ditt hjørnet av Mastodon.</string>
+	<string name="trending_hashtags_info_banner">Disse emneknaggene snakker folk om akkurat nå, i ditt hjørnet av Mastodon.</string>
+	<string name="trending_links_info_banner">Disse nyhetene blir delt mest, i ditt hjørnet av Mastodon.</string>
+	<string name="local_timeline_info_banner">Dette er de siste innleggene fra de som bruker samme Mastodon-server som deg.</string>
+	<string name="dismiss">Avvis</string>
+	<string name="see_new_posts">Se nye innlegg</string>
+	<string name="load_missing_posts">Last manglende innlegg</string>
+	<string name="follow_back">Følg tilbake</string>
+	<string name="button_follow_pending">Ventende</string>
+	<string name="follows_you">Følger deg</string>
+	<string name="manually_approves_followers">Godkjenn følgere manuelt</string>
+	<string name="current_account">Konto i bruk</string>
+	<string name="log_out_account">Logg ut %s</string>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<plurals name="x_followers">
+		<item quantity="one">%d følger</item>
+		<item quantity="other">%d følgere</item>
+	</plurals>
+	<plurals name="x_following">
+		<item quantity="one">%,d følger</item>
+		<item quantity="other">%,d følgere</item>
+	</plurals>
+	<plurals name="x_favorites">
+		<item quantity="one">%,d favoritt</item>
+		<item quantity="other">%,d favoritter</item>
+	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d fremhev</item>
+		<item quantity="other">%,d fremhevinger</item>
+	</plurals>
+	<string name="timestamp_via_app">%1$s via %2$s</string>
+	<string name="time_now">nå</string>
+	<string name="post_info_reblogs">Fremhevinger</string>
+	<string name="post_info_favorites">Favoritter</string>
+	<string name="edit_history">Rediger historikk</string>
+	<string name="last_edit_at_x">Sist redigert %s</string>
+	<string name="time_just_now">akkurat nå</string>
+	<plurals name="x_seconds_ago">
+		<item quantity="one">%d sekund siden</item>
+		<item quantity="other">%d sekunder siden</item>
+	</plurals>
+	<plurals name="x_minutes_ago">
+		<item quantity="one">%d minutt siden</item>
+		<item quantity="other">%d minutter siden</item>
+	</plurals>
+	<string name="edited_timestamp">redigert %s</string>
+	<string name="edit_original_post">Opprinnelig innlegg</string>
+	<string name="edit_text_edited">Tekst redigert</string>
+	<string name="edit_spoiler_added">Innholdsadvarsel lagt til</string>
+	<string name="edit_spoiler_edited">Innholdsadvarsel redigert</string>
+	<string name="edit_spoiler_removed">Innholdsadvarsel fjernet</string>
+	<string name="edit_poll_added">Avstemning lagt til</string>
+	<string name="edit_poll_edited">Avstemning redigert</string>
+	<string name="edit_poll_removed">Avstemning fjernet</string>
+	<string name="edit_media_added">Medie lagt til</string>
+	<string name="edit_media_removed">Medie fjernet</string>
+	<string name="edit_media_reordered">Medie endret rekkefølge</string>
+	<string name="edit_marked_sensitive">Merk som følsomt</string>
+	<string name="edit_marked_not_sensitive">Marker som ikke følsom</string>
+	<string name="edit_multiple_changed">Innlegg redigert</string>
+	<string name="edit">Rediger</string>
+	<string name="discard_changes">Forkaste endringer?</string>
+	<string name="upload_failed">Opplasting feilet</string>
+	<string name="file_size_bytes">%d bytes</string>
+	<string name="file_size_kb">%.2f KB</string>
+	<string name="file_size_mb">%.2f MB</string>
+	<string name="file_size_gb">%.2f GB</string>
+	<string name="file_upload_progress">%1$s av %2$s</string>
+	<string name="file_upload_time_remaining">%s gjenstår</string>
+	<string name="upload_error_connection_lost">Enheten din har mistet tilkoblingen til Internett</string>
+	<string name="upload_processing">Behandler…</string>
+	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Mastodon for Android %s er klar til nedlasting.</string>
+	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">Mastodon for Android %s er lastet ned og klar til å installere.</string>
+	<!-- %s is file size -->
+	<string name="download_update">Last ned (%s)</string>
+	<string name="install_update">Installer</string>
+	<string name="i_agree">Jeg godtar</string>
+	<string name="empty_list">Denne listen er tom</string>
+	<string name="instance_signup_closed">Denne serveren godtar ikke nye registreringer.</string>
+	<string name="text_copied">Kopiert til utklippstavle</string>
+	<string name="add_bookmark">Bokmerke</string>
+	<string name="remove_bookmark">Fjern bokmerke</string>
+	<string name="bookmarks">Bokmerker</string>
+	<string name="your_favorites">Dine favoritter</string>
+	<string name="login_title">Velkommen tilbake</string>
+	<string name="login_subtitle">Logg inn med serveren der du opprettet kontoen din.</string>
+	<string name="server_url">Server-URL</string>
+	<string name="welcome_page1_text">Forestill deg at du sender en e-postadresse som slutter med @example.com.\n\nDu kan fortsatt sende og motta e-post fra hvem som helst, selv om e-posten deres slutter på @gmail.com eller @icloud.com eller @example.com.</string>
+	<string name="welcome_page2_title">Mastodon er slik.</string>
+	<string name="welcome_page2_text">Ditt håndtak kan være @gothgirl654@example.social, men du kan fortsatt følge, fremheve og chatte med @fallout5ever@example.online.</string>
+	<string name="welcome_page3_title">Hvordan velger jeg en server?</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+</resources>

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Per començar</string>
 	<string name="log_in">Se connectar</string>
 	<string name="next">Seguent</string>
 	<string name="error">Error</string>
@@ -42,13 +41,9 @@
 	<string name="mentions">Mencions</string>
 	<string name="back">Tornar</string>
 	<string name="edit_photo">modificar</string>
-	<string name="display_name">escais</string>
-	<string name="username">nom d’utilizaire</string>
-	<string name="email">email</string>
-	<string name="password">senhal</string>
 	<string name="category_music">Musica</string>
 	<string name="category_tech">Tecnologia</string>
-	<string name="confirm_email_title">Una darrièra causa</string>
+	<!-- %s is the email address -->
 	<string name="resend">Tornar enviar</string>
 	<string name="content_warning">Avís de contengut</string>
 	<string name="add_image_description">Apondre una descripcion d’imatge…</string>
@@ -86,4 +81,7 @@
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>

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

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Rozpocznij</string>
+	<string name="get_started">Utwórz konto</string>
+	<string name="already_have_account">Posiadam już konto</string>
 	<string name="log_in">Zaloguj się</string>
 	<string name="next">Dalej</string>
+	<string name="loading_instance">Pobieranie informacji o serwerze…</string>
 	<string name="error">Błąd</string>
+	<string name="not_a_mastodon_instance">%s wydaje się nie być instancją Mastodona.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Przygotowywanie do uwierzytelniania…</string>
 	<string name="finishing_auth">Kończenie uwierzytelniania…</string>
@@ -198,15 +201,16 @@
 	<string name="back">Wróć</string>
 	<string name="instance_catalog_title">Mastodon składa się z użytkowników na różnych serwerach.</string>
 	<string name="instance_catalog_subtitle">Wybierz serwer według Twoich zainteresowań, regionu lub ogólnotematyczny. Możesz nadal łączyć się ze wszystkimi, niezależnie od serwera.</string>
-	<string name="search_communities">Szukaj serwerów lub wprowadź adres URL</string>
-	<string name="instance_rules_title">Kilka podstawowych zasad</string>
-	<string name="instance_rules_subtitle">Poświęć chwilę, aby przejrzeć reguły ustalone i realizowane przez administratorów %s.</string>
-	<string name="signup_title">Skonfigurujmy Twoje konto na %s</string>
+	<string name="search_communities">Nazwa serwera lub jego adres URL</string>
+	<string name="instance_rules_title">Zasady serwera</string>
+	<string name="instance_rules_subtitle">Kontynuując, zgadzasz się przestrzegać następujących zasad ustalonych i wymuszonych przez %s moderatorów.</string>
+	<string name="signup_title">Utwórz konto</string>
 	<string name="edit_photo">edytuj</string>
-	<string name="display_name">wyświetlana nazwa</string>
-	<string name="username">nazwa użytkownika</string>
-	<string name="email">adres e-mail</string>
-	<string name="password">hasło</string>
+	<string name="display_name">Nazwa</string>
+	<string name="username">Nazwa użytkownika</string>
+	<string name="email">Adres e-mail</string>
+	<string name="password">Hasło</string>
+	<string name="confirm_password">Potwierdź hasło</string>
 	<string name="password_note">Użyj wielkich liter, znaków specjalnych i liczb, aby zwiększyć siłę swojego hasła.</string>
 	<string name="category_academia">Środowiska akademickie</string>
 	<string name="category_activism">Aktywizm</string>
@@ -221,8 +225,10 @@
 	<string name="category_music">Muzyka</string>
 	<string name="category_regional">Regionalne</string>
 	<string name="category_tech">Technologia</string>
-	<string name="confirm_email_title">Jeszcze jedno</string>
-	<string name="confirm_email_subtitle">Aby zweryfikować konto, naciśnij link, który wysłaliśmy na twój adres email.</string>
+	<string name="confirm_email_title">Sprawdź skrzynkę E-mail</string>
+	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Kliknij link, który Ci wysłaliśmy %s. My poczekamy tutaj.</string>
+	<string name="confirm_email_didnt_get">Nie otrzymałeś linku?</string>
 	<string name="resend">Wyślij ponownie</string>
 	<string name="open_email_app">Otwórz aplikację e-mail</string>
 	<string name="resent_email">Wysłano potwierdzający e-mail</string>
@@ -312,7 +318,7 @@
 	<string name="open_in_browser">Otwórz w przeglądarce</string>
 	<string name="hide_boosts_from_user">Ukryj podbicia od %s</string>
 	<string name="show_boosts_from_user">Pokaż podbicia od %s</string>
-	<string name="signup_reason">dlaczego chcesz dołączyć?</string>
+	<string name="signup_reason">Dlaczego chcesz dołączyć?</string>
 	<string name="signup_reason_note">To pomoże nam ocenić Twoją aplikację.</string>
 	<string name="clear">Wyczyść</string>
 	<string name="profile_header">Obraz nagłówka</string>
@@ -417,8 +423,8 @@
 	<!-- %s is file size -->
 	<string name="download_update">Pobierz (%s)</string>
 	<string name="install_update">Zainstaluj</string>
-	<string name="privacy_policy_title">Mastodon i Twoja prywatność</string>
-	<string name="privacy_policy_subtitle">Choć aplikacja Mastodona nie zbiera żadnych danych na Twój temat, serwer na którym się rejestrujesz może działać zgodnie z inną polityką. Poświęć chwilę na przejrzenie i akceptację polityki prywatności aplikacji Mastodona oraz Twojego serwera.</string>
+	<string name="privacy_policy_title">Twoja prywatność</string>
+	<string name="privacy_policy_subtitle">Chociaż aplikacja Mastodon nie zbiera żadnych danych, serwer, przez który się zarejestrujesz, może mieć inną politykę prywatności.\n\nJeśli nie zgadzasz się z zasadami dotyczącymi %s, możesz wrócić i wybrać inny serwer.</string>
 	<string name="i_agree">Wyrażam zgodę</string>
 	<string name="empty_list">Lista jest pusta</string>
 	<string name="instance_signup_closed">Ten serwer nie akceptuje nowych rejestracji.</string>
@@ -427,4 +433,44 @@
 	<string name="remove_bookmark">Usuń zakładkę</string>
 	<string name="bookmarks">Zakładki</string>
 	<string name="your_favorites">Twoje ulubione</string>
+	<string name="login_title">Witaj ponownie</string>
+	<string name="login_subtitle">Zaloguj się na serwer, na którym utworzyłeś swoje konto.</string>
+	<string name="server_url">Adres URL serwera</string>
+	<string name="welcome_page1_title">Czym jest Mastodon?</string>
+	<string name="welcome_page1_text">Wyobraź sobie, że masz adres e-mail, który kończy się @example.com.\n\nNadal możesz wysyłać i odbierać wiadomości od każdego, nawet jeśli ich e-mail kończy się na @gmail.com lub @icloud.com lub @przykład.com.</string>
+	<string name="welcome_page2_title">Mastodon jest taki.</string>
+	<string name="welcome_page2_text">Twój nick może brzmieć @gothgirl654@example.social, ale nadal możesz obserwować, reblogować i rozmawiać z @fallout5ever@example.online.</string>
+	<string name="welcome_page3_title">Jak wybrać serwer?</string>
+	<string name="welcome_page3_text">Różne osoby wybierają różne serwery z różnych powodu. art.example to świetne miejsce dla artystów, podczas gdy glasgow.przykład może być dobrym wyborem dla Szkotów.\n\nNie zrobisz źle wybierając dowolny z naszych rekomendowanych serwerów, dlatego niezależnie od tego który wybierzesz (lub jeśli wpiszesz swój własny na pasku wyszukiwania serwera), nigdy nie przegapisz niczego.</string>
+	<string name="signup_random_server_explain">My wybierzemy serwer oparty na twoim języku, jeśli kontynuujesz bez dokonywania wyboru.</string>
+	<string name="server_filter_any_language">Dowolny język</string>
+	<string name="server_filter_instant_signup">Natychmiastowa rejestracja</string>
+	<string name="server_filter_manual_review">Ręczne sprawdzenie</string>
+	<string name="server_filter_any_signup_speed">Dowolna szybkość rejestracji</string>
+	<string name="server_filter_region_europe">Europa</string>
+	<string name="server_filter_region_north_america">Ameryka Północna</string>
+	<string name="server_filter_region_south_america">Ameryka Południowa</string>
+	<string name="server_filter_region_africa">Afryka</string>
+	<string name="server_filter_region_asia">Azja</string>
+	<string name="server_filter_region_oceania">Oceania</string>
+	<string name="not_accepting_new_members">Nie przyjmuje nowych członków</string>
+	<string name="category_special_interests">Specjalne zainteresowania</string>
+	<string name="signup_passwords_dont_match">Hasła się nie zgadzają</string>
+	<string name="pick_server_for_me">Wybierz dla mnie</string>
+	<string name="profile_add_row">Dodaj wiersz</string>
+	<string name="profile_setup">Ustawienia profilu</string>
+	<string name="profile_setup_subtitle">Zawsze możesz to uzupełnić później w zakładce Profil.</string>
+	<string name="profile_setup_explanation">Możesz dodać do czterech pól profilowych dla czegokolwiek: Lokalizacja, linki, zaimki itp.</string>
+	<string name="popular_on_mastodon">Popularne na Mastodonie</string>
+	<string name="follow_all">Obserwuj każdego</string>
+	<string name="server_rules_disagree">Nie zgadzam się</string>
+	<string name="privacy_policy_explanation">TL;DR: Nie zbieramy i nie przetwarzamy żadnych danych.</string>
+	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Nie zgadzam się z %s</string>
+	<string name="profile_bio">O mnie</string>
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Obserwowani użytkownicy…</string>
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s nie zezwala na rejestracje z domeny %2$s. Spróbuj innej lub &lt;a&gt;wybierz inny serwer&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Ta nazwa użytkownika jest już zajęta.</string>
 </resources>

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

@@ -257,4 +257,5 @@
     <string name="sk_unfinished_attachments_message">Niektóre załączniki jeszcze nie zostały przesłane.</string>
     <string name="sk_settings_prefix_reply_cw_with_re">Zaczynaj CW odpowiedzi od “re:”</string>
     <string name="sk_settings_collapse_long_posts">Zwijaj bardzo długie posty</string>
+    <string name="sk_settings_hide_interaction">Ukryj przyciski interakcji</string>
 </resources>

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

@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Vamos começar</string>
+	<string name="get_started">Criar conta</string>
+	<string name="already_have_account">Já tenho uma conta</string>
 	<string name="log_in">Iniciar sessão</string>
 	<string name="next">Próximo</string>
+	<string name="loading_instance">Recuperando informações do servidor…</string>
 	<string name="error">Erro</string>
+	<string name="not_a_mastodon_instance">%s não parece ser um servidor Mastodon.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Preparando para autenticação…</string>
 	<string name="finishing_auth">Finalizando autenticação…</string>
-	<string name="user_boosted">%s reblogado</string>
+	<string name="user_boosted">%s reblogou</string>
 	<string name="in_reply_to">Em resposta à %s</string>
 	<string name="notifications">Notificações</string>
 	<string name="user_followed_you">seguiu você</string>
-	<string name="user_sent_follow_request">enviou uma solicitação para você seguir</string>
+	<string name="user_sent_follow_request">enviou uma solicitação para seguir você</string>
 	<string name="user_favorited">favoritou seu post</string>
-	<string name="notification_boosted">reblogado sua postagem</string>
+	<string name="notification_boosted">reblogou sua publicação</string>
 	<string name="poll_ended">enquete encerrada</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -38,7 +41,7 @@
 		<item quantity="other">posts</item>
 	</plurals>
 	<string name="posts">Publicações</string>
-	<string name="posts_and_replies">Posts e respostas</string>
+	<string name="posts_and_replies">Publicações e respostas</string>
 	<string name="media">Mídia</string>
 	<string name="profile_about">Sobre</string>
 	<string name="button_follow">Seguir</string>
@@ -47,7 +50,7 @@
 	<string name="mention_user">Mencionar %s</string>
 	<string name="share_user">Compartilhar %s</string>
 	<string name="mute_user">Silenciar %s</string>
-	<string name="unmute_user">Desbloquear %s</string>
+	<string name="unmute_user">Remover silenciar de %s</string>
 	<string name="block_user">Bloquear %s</string>
 	<string name="unblock_user">Desbloquear %s</string>
 	<string name="report_user">Denunciar %s</string>
@@ -102,9 +105,9 @@
 	<string name="confirm_mute_title">Silenciar Conta</string>
 	<string name="confirm_mute">Confirme para silenciar %s</string>
 	<string name="do_mute">Silenciar</string>
-	<string name="confirm_unmute_title">Silenciar conta</string>
-	<string name="confirm_unmute">Confirme para silenciar %s</string>
-	<string name="do_unmute">Reativar</string>
+	<string name="confirm_unmute_title">Tirar conta do silenciado</string>
+	<string name="confirm_unmute">Confirme para tirar %s do silenciado</string>
+	<string name="do_unmute">Remover silenciado</string>
 	<string name="confirm_block_title">Bloquear Conta</string>
 	<string name="confirm_block_domain_title">Bloquear Domínio</string>
 	<string name="confirm_block">Confirme para bloquear %s</string>
@@ -122,7 +125,7 @@
 	<string name="confirm_delete">Você tem certeza de que deseja excluir esta publicação?</string>
 	<string name="deleting">Excluindo…</string>
 	<string name="notification_channel_audio_player">Reprodução de áudio</string>
-	<string name="play">Executar</string>
+	<string name="play">Reproduzir</string>
 	<string name="pause">Pausar</string>
 	<string name="log_out">Sair</string>
 	<string name="add_account">Adicionar conta</string>
@@ -147,39 +150,40 @@
 	<string name="report_reason_personal">Eu não gostei</string>
 	<string name="report_reason_personal_subtitle">Não é algo que você quer ver</string>
 	<string name="report_reason_spam">É spam</string>
-	<string name="report_reason_spam_subtitle">Links maliciosos, envolvimento falso ou respostas repetitivas</string>
+	<string name="report_reason_spam_subtitle">Links maliciosos, engajamento falso ou respostas repetitivas</string>
 	<string name="report_reason_violation">Viola as regras do servidor</string>
-	<string name="report_reason_violation_subtitle">Você está ciente de que isso quebra regras específicas</string>
+	<string name="report_reason_violation_subtitle">Você está ciente que isso quebra regras específicas</string>
 	<string name="report_reason_other">É outra coisa</string>
 	<string name="report_reason_other_subtitle">O problema não se encaixa em outras categorias</string>
-	<string name="report_choose_rule">Que regras estão sendo violadas?</string>
-	<string name="report_choose_rule_subtitle">Selecione tudo que se aplica</string>
-	<string name="report_choose_posts">Existem postagens que respaldam esse relatório?</string>
+	<string name="report_choose_rule">Quais regras estão sendo violadas?</string>
+	<string name="report_choose_rule_subtitle">Selecione todas que se aplicam</string>
+	<string name="report_choose_posts">Existem publicações que apoiam essa denúncia?</string>
 	<string name="report_choose_posts_subtitle">Selecione tudo que se aplica</string>
-	<string name="report_comment_title">Há algo que você acredita que devemos saber?</string>
+	<string name="report_comment_title">Há algo a mais que deveríamos saber?</string>
 	<string name="report_comment_hint">Comentários adicionais</string>
 	<string name="sending_report">Enviando denúncia…</string>
-	<string name="report_sent_title">Obrigado por reportar. Vamos analisar.</string>
-	<string name="report_sent_subtitle">Enquanto revisamos isso, você pode tomar medidas contra @%s.</string>
+	<string name="report_sent_title">Obrigado por denunciar, nós vamos analisar isso.</string>
+	<string name="report_sent_subtitle">Enquanto analisamos isso, você pode tomar medidas contra @%s.</string>
 	<string name="unfollow_user">Deixar de seguir %s</string>
 	<string name="unfollow">Deixar de seguir</string>
-	<string name="mute_user_explain">Você não verá suas postagens ou reblogs em seu feed inicial. Eles não saberão que foram silenciados.</string>
-	<string name="block_user_explain">Eles não poderão mais seguir ou ver seus post, mas poderão ver se foram bloqueados.</string>
+	<string name="mute_user_explain">Você não verá as publicações ou reblogs dessa conta na sua pagina inicial. Essa pessoa não saberá que foi silenciada.</string>
+	<string name="block_user_explain">Essa conta não poderá mais te seguir ou ver suas publicações, mas ela poderá ver que foi bloqueada.</string>
 	<string name="report_personal_title">Não quer ver isto?</string>
-	<string name="report_personal_subtitle">Quando você vê algo que não gosta no Mastodon, pode remover a pessoa da sua experiência.</string>
+	<string name="report_personal_subtitle">Quando você ver algo que não gosta no Mastodon, pode remover a pessoa da sua experiência.</string>
 	<string name="back">Voltar</string>
 	<string name="instance_catalog_title">Mastodon é feito de usuários em servidores diferentes.</string>
 	<string name="instance_catalog_subtitle">Escolha um servidor com base em seus interesses, região ou um de uso geral. Você ainda pode se conectar com todos, independentemente do servidor.</string>
-	<string name="search_communities">Pesquise servidores ou digite a URL</string>
-	<string name="instance_rules_title">Algumas regras básicas</string>
-	<string name="instance_rules_subtitle">Reserve um minuto para revisar as regras definidas e aplicadas pelos %s administradores.</string>
-	<string name="signup_title">Vamos configurar você em %s</string>
+	<string name="search_communities">Nome do servidor ou URL</string>
+	<string name="instance_rules_title">Regras do Servidor</string>
+	<string name="instance_rules_subtitle">Ao continuar, você concorda em seguir as seguintes regras definidas e aplicadas pelos moderadores de %s.</string>
+	<string name="signup_title">Criar conta</string>
 	<string name="edit_photo">editar</string>
-	<string name="display_name">nome de exibição</string>
-	<string name="username">nome de usuário</string>
-	<string name="email">e-mail</string>
-	<string name="password">senha</string>
-	<string name="password_note">Inclua letras maiúsculas, caracteres especiais e números para aumentar a força da sua senha.</string>
+	<string name="display_name">Nome</string>
+	<string name="username">Nome de usuário</string>
+	<string name="email">E-mail</string>
+	<string name="password">Senha</string>
+	<string name="confirm_password">Confirmar senha</string>
+	<string name="password_note">Inclua letras maiúsculas, caracteres especiais e números para deixar sua senha mais forte e segura.</string>
 	<string name="category_academia">Acadêmico</string>
 	<string name="category_activism">Ativismo</string>
 	<string name="category_all">Todas</string>
@@ -193,12 +197,14 @@
 	<string name="category_music">Música</string>
 	<string name="category_regional">Regional</string>
 	<string name="category_tech">Tecnologia</string>
-	<string name="confirm_email_title">Mais uma coisa</string>
-	<string name="confirm_email_subtitle">Toque no link que enviamos por e-mail para verificar sua conta.</string>
+	<string name="confirm_email_title">Verifique sua caixa de entrada</string>
+	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Toque no link que te enviamos para verificar %s. Esperaremos por aqui.</string>
+	<string name="confirm_email_didnt_get">Não recebeu um link?</string>
 	<string name="resend">Reenviar</string>
 	<string name="open_email_app">Abrir aplicativo de e-mail</string>
 	<string name="resent_email">E-mail de confirmação enviado</string>
-	<string name="compose_hint">Digite ou cole o que está na sua mente</string>
+	<string name="compose_hint">Cole algo ou digite o que você está pensando</string>
 	<string name="content_warning">Aviso de conteúdo</string>
 	<string name="add_image_description">Adicionar descrição da imagem…</string>
 	<string name="retry_upload">Tentar enviar novamente</string>
@@ -206,7 +212,7 @@
 	<string name="save">Salvar</string>
 	<string name="add_alt_text">Adicionar texto alternativo</string>
 	<string name="alt_text_subtitle">O texto alternativo descreve suas fotos para pessoas com baixa ou nenhuma visão. Tente incluir apenas detalhes suficientes para entender o contexto.</string>
-	<string name="alt_text_hint">por exemplo: Um cachorro olhando desconfiado com os olhos apertados para a câmera.</string>
+	<string name="alt_text_hint">Por exemplo: Um cachorro olhando desconfiado com os olhos apertados para a câmera.</string>
 	<string name="visibility_public">Público</string>
 	<string name="visibility_followers_only">Apenas seguidores</string>
 	<string name="visibility_private">Apenas pessoas que menciono</string>
@@ -217,13 +223,13 @@
 	<string name="skip">Pular</string>
 	<string name="notification_type_follow">Novos seguidores</string>
 	<string name="notification_type_favorite">Favoritos</string>
-	<string name="notification_type_reblog">Reblogues</string>
+	<string name="notification_type_reblog">Reblogs</string>
 	<string name="notification_type_mention">Menções</string>
 	<string name="notification_type_poll">Enquetes</string>
 	<string name="choose_account">Escolher conta</string>
 	<string name="err_not_logged_in">Por favor, faça login no Mastodon primeiro</string>
 	<plurals name="cant_add_more_than_x_attachments">
-		<item quantity="one">Você não pode adicionar mais de %d anexo de mídia</item>
+		<item quantity="one">Você não pode adicionar mais de %d anexos de mídia</item>
 		<item quantity="other">Você não pode adicionar mais de %d anexos de mídia</item>
 	</plurals>
 	<string name="media_attachment_unsupported_type">Arquivo %s é de um tipo não suportado</string>
@@ -237,16 +243,16 @@
 	<string name="settings_gif">Reproduzir emojis e avatares animados</string>
 	<string name="settings_custom_tabs">Usar navegador interno</string>
 	<string name="settings_notifications">Notificações</string>
-	<string name="notify_me_when">Notificar-me quando</string>
+	<string name="notify_me_when">Me notificar quando</string>
 	<string name="notify_anyone">qualquer pessoa</string>
 	<string name="notify_follower">um seguidor</string>
 	<string name="notify_followed">pessoas que eu sigo</string>
 	<string name="notify_none">ninguém</string>
-	<string name="notify_favorites">Favoritaram minha publicação</string>
-	<string name="notify_follow">Sigam-me</string>
-	<string name="notify_reblog">Rebloga meu post</string>
-	<string name="notify_mention">Mencione-me</string>
-	<string name="settings_boring">A zona entediante</string>
+	<string name="notify_favorites">Favoritam minha publicação</string>
+	<string name="notify_follow">Me seguirem</string>
+	<string name="notify_reblog">Rebloga minha publicação</string>
+	<string name="notify_mention">Me mencionarem</string>
+	<string name="settings_boring">A zona chata</string>
 	<string name="settings_account">Configurações da conta</string>
 	<string name="settings_contribute">Contribua para o Mastodon</string>
 	<string name="settings_tos">Termos de serviço</string>
@@ -258,7 +264,7 @@
 	<string name="confirm_log_out">Você tem certeza que deseja sair?</string>
 	<string name="sensitive_content">Conteúdo sensível</string>
 	<string name="sensitive_content_explain">O autor marcou essa mídia como sensível. Toque para revelar.</string>
-	<string name="media_hidden">Tocar para exibir</string>
+	<string name="media_hidden">Toque para revelar</string>
 	<string name="avatar_description">Ir para o perfil de %s</string>
 	<string name="more_options">Mais opções</string>
 	<string name="reveal_content">Revelar conteúdo</string>
@@ -272,7 +278,7 @@
 	<string name="add_media">Adicionar mídia</string>
 	<string name="add_poll">Adicionar enquete</string>
 	<string name="emoji">Emoji</string>
-	<string name="post_visibility">Visibility do post</string>
+	<string name="post_visibility">Visibilidade da publicação</string>
 	<string name="home_timeline">Página Inicial</string>
 	<string name="my_profile">Meu perfil</string>
 	<string name="media_viewer">Visualizador de mídia</string>
@@ -282,14 +288,14 @@
 	<string name="open_in_browser">Abrir no navegador</string>
 	<string name="hide_boosts_from_user">Ocultar reblogues de %s</string>
 	<string name="show_boosts_from_user">Mostrar reblogues de %s</string>
-	<string name="signup_reason">por que você quer entrar?</string>
-	<string name="signup_reason_note">Isso vai nos ajudar a revisar sua aplicação.</string>
+	<string name="signup_reason">Por que você deseja se inscrever?</string>
+	<string name="signup_reason_note">Isso vai nos ajudar a revisar sua inscrição.</string>
 	<string name="clear">Limpar</string>
 	<string name="profile_header">Imagem do cabeçalho</string>
 	<string name="profile_picture">Foto de Perfil</string>
 	<string name="reorder">Reordenar</string>
 	<string name="download">Baixar</string>
-	<string name="permission_required">Permissão requerida</string>
+	<string name="permission_required">Permissão necessária</string>
 	<string name="storage_permission_to_download">O aplicativo precisa acessar seu armazenamento para salvar este arquivo.</string>
 	<string name="open_settings">Abrir configurações</string>
 	<string name="error_saving_file">Erro ao salvar arquivo</string>
@@ -297,13 +303,13 @@
 	<string name="downloading">Baixando…</string>
 	<string name="no_app_to_handle_action">Não há app para executar esta ação</string>
 	<string name="local_timeline">Comunidade</string>
-	<string name="trending_posts_info_banner">Esses são os posts que estão ganhando força no seu canto do Mastodon.</string>
-	<string name="trending_hashtags_info_banner">Essas são as hashtags que estão ganhando força no seu canto do Mastodon.</string>
-	<string name="trending_links_info_banner">Estas são as recentes histórias que estão sendo mais compartilhadas no seu canto do Mastodon.</string>
+	<string name="trending_posts_info_banner">Estas são as publicações que estão ganhando visibilidade no seu canto do Mastodon.</string>
+	<string name="trending_hashtags_info_banner">Estas são as hashtags que estão ganhando visibilidade no seu canto do Mastodon.</string>
+	<string name="trending_links_info_banner">Estas são as notícias mais compartilhadas no seu canto do Mastodon.</string>
 	<string name="local_timeline_info_banner">Estas são as publicações mais recentes das pessoas que usam o mesmo servidor Mastodon que você.</string>
 	<string name="dismiss">Dispensar</string>
-	<string name="see_new_posts">Veja novas postagens</string>
-	<string name="load_missing_posts">Carregar postagens perdidas</string>
+	<string name="see_new_posts">Ver novas publicações</string>
+	<string name="load_missing_posts">Carregar publicações perdidas</string>
 	<string name="follow_back">Seguir de volta</string>
 	<string name="button_follow_pending">Pendente</string>
 	<string name="follows_you">Segue você</string>
@@ -331,7 +337,7 @@
 	<string name="time_now">agora</string>
 	<string name="post_info_reblogs">Reblogues</string>
 	<string name="post_info_favorites">Favoritos</string>
-	<string name="edit_history">Editar histórico</string>
+	<string name="edit_history">Histórico de edição</string>
 	<string name="last_edit_at_x">Última edição %s</string>
 	<string name="time_just_now">agora mesmo</string>
 	<plurals name="x_seconds_ago">
@@ -343,7 +349,7 @@
 		<item quantity="other">%d minutos atrás</item>
 	</plurals>
 	<string name="edited_timestamp">editado %s</string>
-	<string name="edit_original_post">Postagem original</string>
+	<string name="edit_original_post">Publicação original</string>
 	<string name="edit_text_edited">Texto editado</string>
 	<string name="edit_spoiler_added">Aviso de conteúdo adicionado</string>
 	<string name="edit_spoiler_edited">Aviso de conteúdo editado</string>
@@ -354,12 +360,12 @@
 	<string name="edit_media_added">Mídia adicionada</string>
 	<string name="edit_media_removed">Mídia removida</string>
 	<string name="edit_media_reordered">Mídia reordenada</string>
-	<string name="edit_marked_sensitive">Marcadas como sensíveis</string>
+	<string name="edit_marked_sensitive">Marcada como sensível</string>
 	<string name="edit_marked_not_sensitive">Marcado como não sensível</string>
 	<string name="edit_multiple_changed">Publicação editada</string>
 	<string name="edit">Editar</string>
 	<string name="discard_changes">Descartar alterações?</string>
-	<string name="upload_failed">Falha no upload</string>
+	<string name="upload_failed">Falha ao enviar</string>
 	<string name="file_size_bytes">%d bytes</string>
 	<string name="file_size_kb">%.2f KB</string>
 	<string name="file_size_mb">%.2f MB</string>
@@ -375,9 +381,51 @@
 	<!-- %s is file size -->
 	<string name="download_update">Baixar (%s)</string>
 	<string name="install_update">Instalar</string>
-	<string name="privacy_policy_title">Mastodon e sua privacidade</string>
-	<string name="privacy_policy_subtitle">Embora o aplicativo Mastodon não colete nenhum dado, o servidor que você se inscrever pode ter uma política diferente. Dedique um minuto para revisar e aceitar a política de privacidade do aplicativo Mastodon e a política de privacidade do seu servidor.</string>
+	<string name="privacy_policy_title">Sua privacidade</string>
+	<string name="privacy_policy_subtitle">Embora o aplicativo Mastodon não colete nenhum dado, o servidor pelo qual você se inscreveu pode ter uma política diferente.\n\nSe você discordar da política de %s, pode voltar e escolher um servidor diferente.</string>
 	<string name="i_agree">Eu concordo</string>
 	<string name="empty_list">Essa lista está vazia</string>
 	<string name="instance_signup_closed">Este servidor não aceita novos registros.</string>
+	<string name="text_copied">Copiado para a área de transferência</string>
+	<string name="add_bookmark">Salvar</string>
+	<string name="remove_bookmark">Remover dos salvos</string>
+	<string name="bookmarks">Salvos</string>
+	<string name="your_favorites">Seus favoritos</string>
+	<string name="login_title">Bem-vindo de Volta</string>
+	<string name="login_subtitle">Faça login no servidor onde você criou sua conta.</string>
+	<string name="server_url">URL do servidor</string>
+	<string name="welcome_page1_title">O que é o Mastodon?</string>
+	<string name="welcome_page1_text">Imagine que você tem um endereço de e-mail que termina com @example.com.\n\nVocê ainda pode enviar e receber e-mails de qualquer pessoa, mesmo que o e-mail deles termine em @gmail.com ou @icloud.com ou @example.com.</string>
+	<string name="welcome_page2_title">O Mastodon é assim.</string>
+	<string name="welcome_page2_text">Seu identificador pode ser @gothgirl654@exemplo.social, mas você ainda pode seguir, reblogar, e conversar com @fallout5ever@example.online.</string>
+	<string name="welcome_page3_title">Como faço para escolher um servidor?</string>
+	<string name="welcome_page3_text">Pessoas diferentes escolhem servidores diferentes por vários motivos. O art.example é um ótimo lugar para artistas, enquanto glasgow.example pode ser uma boa escolha para escoceses.\n\nVocê não pode errar com nenhum de nossos servidores recomendados, portanto, independentemente de qual escolher (ou se inserir seu próprio na barra de pesquisa do servidor), você nunca perderá uma batida em lugar nenhum.</string>
+	<string name="signup_random_server_explain">Nós escolheremos um servidor com base no seu idioma se você continuar sem fazer uma seleção.</string>
+	<string name="server_filter_any_language">Qualquer idioma</string>
+	<string name="server_filter_manual_review">Revisão manual</string>
+	<string name="server_filter_region_europe">Europa</string>
+	<string name="server_filter_region_north_america">América do Norte</string>
+	<string name="server_filter_region_south_america">América do Sul</string>
+	<string name="server_filter_region_africa">África</string>
+	<string name="server_filter_region_asia">Ásia</string>
+	<string name="server_filter_region_oceania">Oceania</string>
+	<string name="not_accepting_new_members">Não está aceitando novos membros</string>
+	<string name="category_special_interests">Interesses especiais</string>
+	<string name="signup_passwords_dont_match">As senhas são diferentes</string>
+	<string name="pick_server_for_me">Escolher para mim</string>
+	<string name="profile_add_row">Adicionar linha</string>
+	<string name="profile_setup">Configuração do perfil</string>
+	<string name="profile_setup_subtitle">Você sempre pode concluir isso mais tarde na guia de Perfil.</string>
+	<string name="profile_setup_explanation">Você pode adicionar até quatro campos no seu perfil para o que quiser. Local, links, pronomes — o céu é o limite.</string>
+	<string name="popular_on_mastodon">Popular no Mastodon</string>
+	<string name="follow_all">Seguir todos</string>
+	<string name="server_rules_disagree">Discordo</string>
+	<string name="privacy_policy_explanation">TL;DR: Não coletamos ou processamos nada.</string>
+	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Discordo de %s</string>
+	<string name="profile_bio">Bio</string>
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s não permite inscrições de %2$s. Tente um diferente ou &lt;a&gt;escolha um servidor diferente&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Esse nome de usuário já está em uso.</string>
 </resources>

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

@@ -20,4 +20,5 @@
     <string name="mo_sending_error">Erro ao publicar</string>
     <string name="mo_poll_option_add">Adicionar nova opção de enquete</string>
     <string name="mo_filtered">Filtrado: %s</string>
+    <string name="mo_disable_reminder_to_add_alt_text">Desabilitar lembrete de adicionar textos descritivos</string>
 </resources>