bump version

remove long strings
Translated using Weblate (Swedish)
2022-12-01 16:17:51 +01:00 · 2022-12-01 16:11:23 +01:00 · 2022-12-01 15:10:42 +00:00 · 2022-12-01 15:10:42 +00:00 · 2022-12-01 15:10:41 +00:00 · 2022-12-01 15:10:41 +00:00
111 changed files with 1054 additions and 342 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Screenshots and screen recordings**
+If applicable, add screenshots (and screen recordings, if possible) to help explain your problem.
+
+**Version**
+Megalodon version: [e.g. v1.1.4+fork.#]
+
+**Additional context**
+- Does this issue also occur with the respective upstream release? (Please test using the respective `upstream-xxxxxx.apk` provided in [Releases](https://github.com/sk22/megalodon/releases)) No / Yes (`mastodon#…`)
+
+  > In this case, please consider filing an [upstream bug report](https://github.com/mastodon/mastodon-android/issues) instead. If this bug is seriously impacting your usage or you think I might want to try to fix it for Megalodon, feel free to still create this issue!
+
+**Crash log**
+If you know your way around Android development tools, please consider attaching a crash log, if possible.
--- a/.github/ISSUE_TEMPLATE/feature-ui-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-ui-request.md
@@ -0,0 +1,20 @@
+---
+name: Feature/UI request
+about: Suggest an idea for this project
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+If applicable: a clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/something-else.md
+++ b/.github/ISSUE_TEMPLATE/something-else.md
@@ -0,0 +1,10 @@
+---
+name: It's something else…
+about: Issues that can't be categorized as feature requests or bug reports
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
--- a/README.md
+++ b/README.md
@@ -2,9 +2,11 @@

 # Megalodon

+[![Translation status](https://translate.codeberg.org/widgets/megalodon/-/svg-badge.svg)](https://translate.codeberg.org/engage/megalodon/)
+
 > A fork of the [official Mastodon Android app](https://github.com/mastodon/mastodon-android) adding important features that are missing in the official app and possibly won’t ever be implemented, such as the federated timeline, unlisted posting, bookmarks and an image description viewer.

-**Warning! [The last version's integrated updater was broken](https://github.com/sk22/megalodon/issues/106) – I already published a fixed version! If you're not updating through Izzy's F-Droid repository (more sources to come, hopefully!), you'll have to download the current release manually. Sorry about that!**
+**Warning! [A previous version's integrated updater was broken](https://github.com/sk22/megalodon/issues/106) – I already published a fixed version! If you're not updating through Izzy's F-Droid repository (more sources to come, hopefully!), you'll have to download the current release manually. Sorry about that!**

 [![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=download%20apk&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fsk22%2Fmastodon-android-fork%2Freleases%2Flatest&style=for-the-badge)](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk)

@@ -49,7 +51,9 @@ To bookmark a post, press the button between the Favorite and Share buttons on t

 ## Installation

-**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Megalodon will automatically notify you about new updates inside the app.**
+**In short: Press the download button to download the APK. Open the downloaded file on your Android device to install it. Megalodon will automatically notify you about new updates inside the app.**
+
+[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=download%20apk&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fsk22%2Fmastodon-android-fork%2Freleases%2Flatest&style=for-the-badge)](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk)

 To install this app on your Android device, download the [latest release from GitHub](https://github.com/sk22/megalodon/releases/latest/download/megalodon.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/sk22/megalodon/releases) page.

@@ -78,6 +82,19 @@ This is an **unmodified version** of the official [Mastodon for Android](https:/

 Variant without the integrated updater. This is the variant to be published to F-Droid.org where an integrated updater is not necessary. -->

+---
+
+## Contribution
+
+### Translation
+
+As with the source code, the translation is sourced from the official project, which you can contribute to on the official “**Mastodon for Android**” Crowdin project: https://crowdin.com/project/mastodon-for-android
+
+There's also a handful of custom strings exclusive to this projects that would need to be translated. You can help translate **Megalodon** on Weblate: https://translate.codeberg.org/projects/megalodon/
+
+[![Translation status](https://translate.codeberg.org/widgets/megalodon/-/multi-auto.svg)](https://translate.codeberg.org/engage/megalodon/)
+
+
 ---


--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 51
-		versionName "1.1.4+fork.51"
+		versionCode 55
+		versionName "1.1.4+fork.55"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "en", "ar-rSA", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES",
 				"eu-rES", "fi-rFI", "fr-rFR", "gl-rES", "hr-rHR", "hy-rAM", "it-rIT", "iw-rIL",
@@ -32,9 +32,11 @@ android {
 		githubRelease{
 			initWith release
 		}
-		noFederatedRelease{
+		playRelease{
 			initWith release
-			versionNameSuffix '-nofederated'
+			minifyEnabled true
+			shrinkResources true
+			versionNameSuffix '-play'
 		}
 	}
 	compileOptions {
--- a/mastodon/src/main/AndroidManifest.xml
+++ b/mastodon/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
 	<application
 		android:name=".MastodonApp"
 		android:allowBackup="true"
-		android:label="@string/app_name"
+		android:label="@string/sk_app_name"
 		android:supportsRtl="true"
 		android:localeConfig="@xml/locales_config"
 		android:icon="@mipmap/ic_launcher"
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -10,6 +10,7 @@ public class GlobalUserPreferences{
 	public static boolean showReplies;
 	public static boolean showBoosts;
 	public static boolean loadNewPosts;
+	public static boolean showFederatedTimeline;
 	public static boolean showInteractionCounts;
 	public static boolean alwaysExpandContentWarnings;
 	public static boolean disableMarquee;
@@ -27,6 +28,7 @@ public class GlobalUserPreferences{
 		showReplies=prefs.getBoolean("showReplies", true);
 		showBoosts=prefs.getBoolean("showBoosts", true);
 		loadNewPosts=prefs.getBoolean("loadNewPosts", true);
+		showFederatedTimeline=prefs.getBoolean("showFederatedTimeline", !BuildConfig.BUILD_TYPE.equals("playRelease"));
 		showInteractionCounts=prefs.getBoolean("showInteractionCounts", false);
 		alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
 		disableMarquee=prefs.getBoolean("disableMarquee", false);
@@ -40,6 +42,7 @@ public class GlobalUserPreferences{
 				.putBoolean("showReplies", showReplies)
 				.putBoolean("showBoosts", showBoosts)
 				.putBoolean("loadNewPosts", loadNewPosts)
+				.putBoolean("showFederatedTimeline", showFederatedTimeline)
 				.putBoolean("trueBlackTheme", trueBlackTheme)
 				.putBoolean("showInteractionCounts", showInteractionCounts)
 				.putBoolean("alwaysExpandContentWarnings", alwaysExpandContentWarnings)
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -487,7 +487,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
 			int visibilityNameRes = switch (statusVisibility) {
 				case PUBLIC -> R.string.visibility_public;
-				case UNLISTED -> R.string.visibility_unlisted;
+				case UNLISTED -> R.string.sk_visibility_unlisted;
 				case PRIVATE -> R.string.visibility_followers_only;
 				case DIRECT -> R.string.visibility_private;
 			};
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
@@ -67,7 +67,7 @@ public class FollowRequestsListFragment extends BaseRecyclerFragment<FollowReque
 	@Override
 	public void onAttach(Activity activity) {
 		super.onAttach(activity);
-		setTitle(R.string.follow_requests);
+		setTitle(R.string.sk_follow_requests);
 	}

 	@Override
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
@@ -57,7 +57,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
-		setTitle(R.string.app_name);
+		setTitle(R.string.sk_app_name);

 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -316,7 +316,7 @@ public class HomeTimelineFragment extends StatusListFragment{

 	private void updateToolbarLogo(){
 		toolbarLogo =new TextView(getActivity());
-		toolbarLogo.setText(getString(R.string.app_name).toLowerCase(Locale.getDefault()));
+		toolbarLogo.setText(getString(R.string.sk_app_name).toLowerCase(Locale.getDefault()));
 		toolbarLogo.setTextAppearance(R.style.app_title);

 		toolbarShowNewPostsBtn=new Button(getActivity());
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
@@ -57,7 +57,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
        if(args.containsKey("profileAccount")){
            profileAccountId=args.getString("profileAccount");
            profileDisplayUsername=args.getString("profileDisplayUsername");
-            setTitle(getString(R.string.lists_with_user, profileDisplayUsername));
+            setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
 //            setHasOptionsMenu(true);
        }
    }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -249,7 +249,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				tab.setText(switch(position){
 					case 0 -> R.string.posts;
 					case 1 -> R.string.posts_and_replies;
-					case 2 -> R.string.pinned_posts;
+					case 2 -> R.string.sk_pinned_posts;
 					case 3 -> R.string.media;
 					case 4 -> R.string.profile_about;
 					default -> throw new IllegalStateException();
@@ -658,7 +658,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());
 		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 		notifyButton.setSelected(relationship.notifying);
-		if (getActivity() != null) notifyButton.setContentDescription(getString(relationship.notifying ? R.string.user_post_notifications_on : R.string.user_post_notifications_off, '@'+account.username));
+		if (getActivity() != null) notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
 	}

 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -15,7 +15,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.view.WindowManager;
-import android.view.animation.AlphaAnimation;
 import android.view.animation.LinearInterpolator;
 import android.widget.Button;
 import android.widget.ImageButton;
@@ -70,6 +69,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private NotificationPolicyItem notificationPolicyItem;
 	private String accountID;
 	private boolean needUpdateNotificationSettings;
+	private boolean needAppRestart;
 	private PushSubscription pushSubscription;

 	private ImageView themeTransitionWindowView;
@@ -95,7 +95,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new HeaderItem(R.string.settings_theme));
 		items.add(themeItem=new ThemeItem());
 		items.add(new SwitchItem(R.string.theme_true_black, R.drawable.ic_fluent_dark_theme_24_regular, GlobalUserPreferences.trueBlackTheme, this::onTrueBlackThemeChanged));
-		items.add(new SwitchItem(R.string.disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i->{
+		items.add(new SwitchItem(R.string.sk_disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i->{
 			GlobalUserPreferences.disableMarquee=i.checked;
 			GlobalUserPreferences.save();
 		}));
@@ -109,28 +109,33 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.useCustomTabs=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.settings_show_interaction_counts, R.drawable.ic_fluent_number_row_24_regular, GlobalUserPreferences.showInteractionCounts, i->{
+		items.add(new SwitchItem(R.string.sk_settings_show_interaction_counts, R.drawable.ic_fluent_number_row_24_regular, GlobalUserPreferences.showInteractionCounts, i->{
 			GlobalUserPreferences.showInteractionCounts=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.settings_always_reveal_content_warnings, R.drawable.ic_fluent_chat_warning_24_regular, GlobalUserPreferences.alwaysExpandContentWarnings, i->{
+		items.add(new SwitchItem(R.string.sk_settings_always_reveal_content_warnings, R.drawable.ic_fluent_chat_warning_24_regular, GlobalUserPreferences.alwaysExpandContentWarnings, i->{
 			GlobalUserPreferences.alwaysExpandContentWarnings=i.checked;
 			GlobalUserPreferences.save();
 		}));

 		items.add(new HeaderItem(R.string.home_timeline));
-		items.add(new SwitchItem(R.string.settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{
+		items.add(new SwitchItem(R.string.sk_settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{
 			GlobalUserPreferences.showReplies=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.settings_show_boosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, GlobalUserPreferences.showBoosts, i->{
+		items.add(new SwitchItem(R.string.sk_settings_show_boosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, GlobalUserPreferences.showBoosts, i->{
 			GlobalUserPreferences.showBoosts=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.settings_load_new_posts, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.loadNewPosts, i->{
+		items.add(new SwitchItem(R.string.sk_settings_load_new_posts, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.loadNewPosts, i->{
 			GlobalUserPreferences.loadNewPosts=i.checked;
 			GlobalUserPreferences.save();
 		}));
+		items.add(new SwitchItem(R.string.sk_settings_show_federated_timeline, R.drawable.ic_fluent_earth_24_regular, GlobalUserPreferences.showFederatedTimeline, i->{
+			GlobalUserPreferences.showFederatedTimeline=i.checked;
+			GlobalUserPreferences.save();
+			needAppRestart=true;
+		}));

 		items.add(new HeaderItem(R.string.settings_notifications));
 		items.add(notificationPolicyItem=new NotificationPolicyItem());
@@ -147,14 +152,14 @@ public class SettingsFragment extends MastodonToolbarFragment{

 		items.add(new RedHeaderItem(R.string.settings_spicy));
 		if (GithubSelfUpdater.needSelfUpdating()) {
-			checkForUpdateItem = new TextItem(R.string.check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
+			checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
 			items.add(checkForUpdateItem);
 		}
-		items.add(new TextItem(R.string.settings_contribute_fork, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sk22/megalodon")));
+		items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sk22/megalodon")));
 		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
 		items.add(new TextItem(R.string.log_out, this::confirmLogOut));

-		items.add(new FooterItem(getString(R.string.settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)));
+		items.add(new FooterItem(getString(R.string.sk_settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)));
 	}

 	@Override
@@ -202,6 +207,11 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		if(needUpdateNotificationSettings && PushSubscriptionManager.arePushNotificationsAvailable()){
 			AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().updatePushSettings(pushSubscription);
 		}
+		if(needAppRestart){
+			Intent intent = Intent.makeRestartActivityTask(MastodonApp.context.getPackageManager().getLaunchIntentForPackage(MastodonApp.context.getPackageName()).getComponent());
+			MastodonApp.context.startActivity(intent);
+			Runtime.getRuntime().exit(0);
+		}
 	}

 	@Override
@@ -377,7 +387,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}

 		if (ev.state == GithubSelfUpdater.UpdateState.NO_UPDATE) {
-			Toast.makeText(getActivity(), R.string.no_update_available, Toast.LENGTH_SHORT).show();
+			Toast.makeText(getActivity(), R.string.sk_no_update_available, Toast.LENGTH_SHORT).show();
 		}
 	}

@@ -753,10 +763,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			if (state == GithubSelfUpdater.UpdateState.CHECKING) return;
 			GithubSelfUpdater.UpdateInfo info=updater.getUpdateInfo();
 			if(state!=GithubSelfUpdater.UpdateState.DOWNLOADED){
-				text.setText(getString(R.string.update_available, info.version));
+				text.setText(getString(R.string.sk_update_available, info.version));
 				button.setText(getString(R.string.download_update, UiUtils.formatFileSize(getActivity(), info.size, false)));
 			}else{
-				text.setText(getString(R.string.update_ready, info.version));
+				text.setText(getString(R.string.sk_update_ready, info.version));
 				button.setText(R.string.install_update);
 			}
 			if(state==GithubSelfUpdater.UpdateState.DOWNLOADING){
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
@@ -286,7 +286,7 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 			menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
 			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
 			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
-			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.lists_with_user, account.getDisplayUsername()));
+			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getDisplayUsername()));
 			MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
 			if(relationship.following){
 				hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
@@ -19,6 +19,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;

 import org.joinmastodon.android.BuildConfig;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.fragments.ListTimelinesFragment;
@@ -61,7 +62,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	private String accountID;
 	private Runnable searchDebouncer=this::onSearchChangedDebounced;

-	private static final boolean noFederated = BuildConfig.BUILD_TYPE.equals("noFederatedRelease");
+	private final boolean noFederated = !GlobalUserPreferences.showFederatedTimeline;

 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -163,12 +164,12 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 				if (noFederated && position > 0) position++;
 				tab.setText(switch(position){
 					case 0 -> R.string.local_timeline;
-					case 1 -> R.string.federated_timeline;
+					case 1 -> R.string.sk_federated_timeline;
 					case 2 -> R.string.hashtags;
 					case 3 -> R.string.posts;
 					case 4 -> R.string.news;
 					case 5 -> R.string.for_you;
-					case 6 -> R.string.list_timelines;
+					case 6 -> R.string.sk_list_timelines;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/ImageDescriptionSheet.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/ImageDescriptionSheet.java
@@ -45,7 +45,7 @@ public class ImageDescriptionSheet extends BottomSheet{
 		}

 		TextView heading=new TextView(activity);
-		heading.setText(R.string.image_description);
+		heading.setText(R.string.sk_image_description);
 		heading.setAllCaps(true);
 		heading.setTypeface(null, Typeface.BOLD);
 		heading.setPadding(0, V.dp(24), 0, V.dp(8));
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
@@ -147,7 +147,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			if(id==R.id.favorite_btn)
 				return R.string.button_favorite;
 			if(id==R.id.bookmark_btn)
-				return R.string.button_bookmark;
+				return R.string.add_bookmark;
 			if(id==R.id.share_btn)
 				return R.string.button_share;
 			return 0;
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
@@ -178,7 +178,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		toolbar=uiOverlay.findViewById(R.id.toolbar);
 		toolbar.setNavigationOnClickListener(v->onStartSwipeToDismissTransition(0));
 		imageDescriptionButton = toolbar.getMenu()
-				.add(R.string.image_description)
+				.add(R.string.sk_image_description)
 				.setIcon(R.drawable.ic_fluent_image_alt_text_24_regular)
 				.setVisible(attachments.get(pager.getCurrentItem()).description != null
 						&& !attachments.get(pager.getCurrentItem()).description.isEmpty())
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
@@ -1,12 +1,29 @@
 package org.joinmastodon.android.ui.text;

+import android.graphics.Typeface;
+import android.graphics.fonts.FontFamily;
+import android.graphics.fonts.FontStyle;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.BulletSpan;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.LeadingMarginSpan;
+import android.text.style.RelativeSizeSpan;
+import android.text.style.StrikethroughSpan;
+import android.text.style.StyleSpan;
+import android.text.style.SubscriptSpan;
+import android.text.style.SuperscriptSpan;
+import android.text.style.TypefaceSpan;
+import android.text.style.UnderlineSpan;
+import android.util.TypedValue;
 import android.widget.TextView;

 import com.twitter.twittertext.Regex;

+import org.joinmastodon.android.MastodonApp;
+import org.joinmastodon.android.R;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Mention;
@@ -15,11 +32,11 @@ import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 import org.jsoup.nodes.Node;
 import org.jsoup.nodes.TextNode;
-import org.jsoup.safety.Cleaner;
 import org.jsoup.safety.Safelist;
 import org.jsoup.select.NodeVisitor;

 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -29,6 +46,8 @@ import java.util.stream.Collectors;

 import androidx.annotation.NonNull;

+import me.grishka.appkit.utils.V;
+
 public class HtmlParser{
 	private static final String TAG="HtmlParser";
 	private static final String VALID_URL_PATTERN_STRING =
@@ -67,11 +86,17 @@ public class HtmlParser{
 			public Object span;
 			public int start;
 			public Element element;
+			public boolean more;

 			public SpanInfo(Object span, int start, Element element){
+				this(span, start, element, false);
+			}
+
+			public SpanInfo(Object span, int start, Element element, boolean more){
 				this.span=span;
 				this.start=start;
 				this.element=element;
+				this.more=more;
 			}
 		}

@@ -119,24 +144,59 @@ public class HtmlParser{
 								openSpans.add(new SpanInfo(new InvisibleSpan(), ssb.length(), el));
 							}
 						}
+						case "li" -> openSpans.add(new SpanInfo(new BulletSpan(V.dp(8)), ssb.length(), el));
+						case "em", "i" -> openSpans.add(new SpanInfo(new StyleSpan(Typeface.ITALIC), ssb.length(), el));
+						case "h1", "h2", "h3", "h4", "h5", "h6" -> {
+							// increase line height above heading (multiplying the margin)
+							if (node.previousSibling()!=null) ssb.setSpan(new RelativeSizeSpan(2), ssb.length() - 1, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+							if (!node.nodeName().equals("h1")) {
+								openSpans.add(new SpanInfo(new StyleSpan(Typeface.BOLD), ssb.length(), el));
+							}
+							openSpans.add(new SpanInfo(new RelativeSizeSpan(switch(node.nodeName()) {
+								case "h1" -> 1.5f;
+								case "h2" -> 1.25f;
+								case "h3" -> 1.125f;
+								default -> 1;
+							}), ssb.length(), el, !node.nodeName().equals("h1")));
+						}
+						case "strong", "b" -> openSpans.add(new SpanInfo(new StyleSpan(Typeface.BOLD), ssb.length(), el));
+						case "u" -> openSpans.add(new SpanInfo(new UnderlineSpan(), ssb.length(), el));
+						case "s", "del" -> openSpans.add(new SpanInfo(new StrikethroughSpan(), ssb.length(), el));
+						case "sub", "sup" -> {
+							openSpans.add(new SpanInfo(node.nodeName().equals("sub") ? new SubscriptSpan() : new SuperscriptSpan(), ssb.length(), el));
+							openSpans.add(new SpanInfo(new RelativeSizeSpan(0.8f), ssb.length(), el, true));
+						}
+						case "code", "pre" -> openSpans.add(new SpanInfo(new TypefaceSpan("monospace"), ssb.length(), el));
+						case "blockquote" -> openSpans.add(new SpanInfo(new LeadingMarginSpan.Standard(V.dp(10)), ssb.length(), el));
 					}
 				}
 			}

+			final static List<String> blockElements = Arrays.asList("p", "ul", "ol", "blockquote", "h1", "h2", "h3", "h4", "h5", "h6");
+
 			@Override
 			public void tail(@NonNull Node node, int depth){
 				if(node instanceof Element el){
+					processOpenSpan(el);
 					if("span".equals(el.nodeName()) && el.hasClass("ellipsis")){
 						ssb.append("…", new DeleteWhenCopiedSpan(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-					}else if("p".equals(el.nodeName())){
-						if(node.nextSibling()!=null)
-							ssb.append("\n\n");
-					}else if(!openSpans.isEmpty()){
-						SpanInfo si=openSpans.get(openSpans.size()-1);
-						if(si.element==el){
-							ssb.setSpan(si.span, si.start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-							openSpans.remove(openSpans.size()-1);
-						}
+					}else if(blockElements.contains(el.nodeName()) && node.nextSibling()!=null){
+						ssb.append("\n"); // line end
+						ssb.append("\n", new RelativeSizeSpan(0.75f), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); // margin after block
+					}
+				}
+			}
+
+			private void processOpenSpan(Element el) {
+				if(!openSpans.isEmpty()){
+					SpanInfo si=openSpans.get(openSpans.size()-1);
+					if(si.element==el){
+						ssb.setSpan(si.span, si.start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+						openSpans.remove(openSpans.size()-1);
+						if(si.more) processOpenSpan(el);
+					}
+					if("li".equals(el.nodeName()) && el.nextSibling()!=null) {
+						ssb.append('\n');
 					}
 				}
 			}
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/DiscoverInfoBannerHelper.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/DiscoverInfoBannerHelper.java
@@ -36,7 +36,7 @@ public class DiscoverInfoBannerHelper{
 				case TRENDING_HASHTAGS -> R.string.trending_hashtags_info_banner;
 				case TRENDING_LINKS -> R.string.trending_links_info_banner;
 				case LOCAL_TIMELINE -> R.string.local_timeline_info_banner;
-				case FEDERATED_TIMELINE -> R.string.federated_timeline_info_banner;
+				case FEDERATED_TIMELINE -> R.string.sk_federated_timeline_info_banner;
 			});
 		}
 	}
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -410,7 +410,7 @@ public class UiUtils{
 	}

 	public static void confirmDeletePost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback, boolean forRedraft){
-		showConfirmationAlert(activity, forRedraft ? R.string.confirm_delete_and_redraft_title : R.string.confirm_delete_title, forRedraft ? R.string.confirm_delete_and_redraft : R.string.confirm_delete, forRedraft ? R.string.delete_and_redraft : R.string.delete, ()->{
+		showConfirmationAlert(activity, forRedraft ? R.string.sk_confirm_delete_and_redraft_title : R.string.confirm_delete_title, forRedraft ? R.string.sk_confirm_delete_and_redraft : R.string.confirm_delete, forRedraft ? R.string.sk_delete_and_redraft : R.string.delete, ()->{
 			new DeleteStatus(status.id)
 					.setCallback(new Callback<>(){
 						@Override
@@ -432,9 +432,9 @@ public class UiUtils{

 	public static void confirmPinPost(Activity activity, String accountID, Status status, boolean pinned, Consumer<Status> resultCallback){
 		showConfirmationAlert(activity,
-				pinned ? R.string.confirm_pin_post_title : R.string.confirm_unpin_post_title,
-				pinned ? R.string.confirm_pin_post : R.string.confirm_unpin_post,
-				pinned ? R.string.pin_post : R.string.unpin_post,
+				pinned ? R.string.sk_confirm_pin_post_title : R.string.sk_confirm_unpin_post_title,
+				pinned ? R.string.sk_confirm_pin_post : R.string.sk_confirm_unpin_post,
+				pinned ? R.string.sk_pin_post : R.string.sk_unpin_post,
 				()->{
 					new SetStatusPinned(status.id, pinned)
 							.setCallback(new Callback<>() {
@@ -451,7 +451,7 @@ public class UiUtils{
 									error.showToast(activity);
 								}
 							})
-							.wrapProgress(activity, pinned ? R.string.pinning : R.string.unpinning, false)
+							.wrapProgress(activity, pinned ? R.string.sk_pinning : R.string.sk_unpinning, false)
 							.exec(accountID);
 				}
 		);
@@ -507,7 +507,7 @@ public class UiUtils{
 					public void onSuccess(Relationship result) {
 						resultCallback.accept(result);
 						progressCallback.accept(false);
-						Toast.makeText(activity, activity.getString(result.notifying ? R.string.user_post_notifications_on : R.string.user_post_notifications_off, '@'+account.username), Toast.LENGTH_SHORT).show();
+						Toast.makeText(activity, activity.getString(result.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username), Toast.LENGTH_SHORT).show();
 					}

 					@Override
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -187,7 +187,7 @@
 					android:layout_weight="1"
 					android:textSize="16sp"
 					android:singleLine="true"
-					android:text="@string/mark_media_as_sensitive" />
+					android:text="@string/sk_mark_media_as_sensitive" />
 			</LinearLayout>
 		</LinearLayout>
 	</ScrollView>
--- a/mastodon/src/main/res/layout/item_discover_account.xml
+++ b/mastodon/src/main/res/layout/item_discover_account.xml
@@ -174,7 +174,7 @@
 				style="?secondaryButtonStyle"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:contentDescription="@string/reject_follow_request"
+				android:contentDescription="@string/sk_reject_follow_request"
 				android:drawableStart="@drawable/ic_fluent_dismiss_24_filled"
 				android:singleLine="true" />

@@ -204,7 +204,7 @@
 				android:id="@+id/accept_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:contentDescription="@string/accept_follow_request"
+				android:contentDescription="@string/sk_accept_follow_request"
 				android:drawableStart="@drawable/ic_fluent_checkmark_24_filled"
 				android:singleLine="true" />

--- a/mastodon/src/main/res/layout/item_settings_update.xml
+++ b/mastodon/src/main/res/layout/item_settings_update.xml
@@ -23,7 +23,7 @@
 			android:layout_marginTop="16dp"
 			android:layout_marginBottom="16dp"
 			android:textAppearance="@style/m3_body_medium"
-			tools:text="@string/update_available"/>
+			tools:text="@string/sk_update_available"/>

 		<FrameLayout
 			android:layout_width="wrap_content"
--- a/mastodon/src/main/res/menu/compose_visibility.xml
+++ b/mastodon/src/main/res/menu/compose_visibility.xml
@@ -5,7 +5,7 @@
 		android:title="@string/visibility_public"/>
 	<item android:id="@+id/vis_unlisted"
 		android:icon="@drawable/ic_fluent_people_community_24_regular"
-		android:title="@string/visibility_unlisted"/>
+		android:title="@string/sk_visibility_unlisted"/>
 	<item android:id="@+id/vis_followers"
 		android:icon="@drawable/ic_fluent_people_checkmark_24_regular"
 		android:title="@string/visibility_followers_only"/>
--- a/mastodon/src/main/res/menu/notifications.xml
+++ b/mastodon/src/main/res/menu/notifications.xml
@@ -4,5 +4,5 @@
 		android:id="@+id/follow_requests"
 		android:icon="@drawable/ic_follow_requests_24_badged"
 		android:showAsAction="always"
-		android:title="@string/follow_requests" />
+		android:title="@string/sk_follow_requests" />
 </menu>
--- a/mastodon/src/main/res/menu/post.xml
+++ b/mastodon/src/main/res/menu/post.xml
@@ -2,9 +2,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:id="@+id/edit" android:title="@string/edit"/>
 	<item android:id="@+id/delete" android:title="@string/delete"/>
-	<item android:id="@+id/delete_and_redraft" android:title="@string/delete_and_redraft"/>
-	<item android:id="@+id/pin" android:title="@string/pin_post"/>
-	<item android:id="@+id/unpin" android:title="@string/unpin_post"/>
+	<item android:id="@+id/delete_and_redraft" android:title="@string/sk_delete_and_redraft"/>
+	<item android:id="@+id/pin" android:title="@string/sk_pin_post"/>
+	<item android:id="@+id/unpin" android:title="@string/sk_unpin_post"/>
 	<item android:id="@+id/mute" android:title="@string/mute_user"/>
 	<item android:id="@+id/block" android:title="@string/block_user"/>
 	<item android:id="@+id/block_domain" android:title="@string/block_domain"/>
--- a/mastodon/src/main/res/menu/profile.xml
+++ b/mastodon/src/main/res/menu/profile.xml
@@ -6,6 +6,6 @@
 	<item android:id="@+id/report" android:title="@string/report_user"/>
 	<item android:id="@+id/block_domain" android:title="@string/block_domain"/>
 	<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user"/>
-	<item android:id="@+id/manage_user_lists" android:title="@string/lists_with_user"/>
+	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user"/>
 	<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser"/>
 </menu>
--- a/mastodon/src/main/res/values-ar-rSA/strings_sk.xml
+++ b/mastodon/src/main/res/values-ar-rSA/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-be-rBY/strings.xml
+++ b/mastodon/src/main/res/values-be-rBY/strings.xml
@@ -1,5 +1,14 @@
 <?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>
+	<string name="ok">Добра</string>
+	<string name="notifications">Апавяшчэнні</string>
+	<string name="share_toot_title">Абагуліць</string>
+	<string name="settings">Налады</string>
+	<string name="cancel">Скасаваць</string>
 	<!-- 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 -->
--- a/mastodon/src/main/res/values-be-rBY/strings_sk.xml
+++ b/mastodon/src/main/res/values-be-rBY/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-bn-rBD/strings_sk.xml
+++ b/mastodon/src/main/res/values-bn-rBD/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-bs-rBA/strings_sk.xml
+++ b/mastodon/src/main/res/values-bs-rBA/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-ca-rES/strings.xml
+++ b/mastodon/src/main/res/values-ca-rES/strings.xml
@@ -5,15 +5,15 @@
 	<string name="next">Següent</string>
 	<string name="loading_instance">Obtenint informació sobre la instància…</string>
 	<string name="error">Error</string>
-	<string name="not_a_mastodon_instance">Sembla que %s no és una instància Mastodon.</string>
+	<string name="not_a_mastodon_instance">Sembla que %s no és una instància de Mastodon.</string>
 	<string name="ok">D\'acord</string>
-	<string name="preparing_auth">Preparant a l\'autenticació…</string>
-	<string name="finishing_auth">Finalitzant autentificació…</string>
+	<string name="preparing_auth">Preparant l\'autenticació…</string>
+	<string name="finishing_auth">Finalitzant l\'autenticació…</string>
 	<string name="user_boosted">%s ha impulsat</string>
 	<string name="in_reply_to">En resposta a %s</string>
 	<string name="notifications">Notificacions</string>
 	<string name="user_followed_you">t\'ha seguit</string>
-	<string name="user_sent_follow_request">t\'ha enviat una sol·licitud de seguiment</string>
+	<string name="user_sent_follow_request">ha sol·licitat seguir-te</string>
 	<string name="user_favorited">ha afavorit la teva publicació</string>
 	<string name="notification_boosted">ha impulsat la teva publicació</string>
 	<string name="poll_ended">l\'enquesta ha finalitzat</string>
@@ -24,7 +24,7 @@
 	<string name="share_toot_title">Comparteix</string>
 	<string name="settings">Configuració</string>
 	<string name="publish">Publica</string>
-	<string name="discard_draft">Voleu descartar l\'esborrany?</string>
+	<string name="discard_draft">Vols descartar l\'esborrany?</string>
 	<string name="discard">Descarta</string>
 	<string name="cancel">Cancel·la</string>
 	<plurals name="followers">
@@ -49,14 +49,14 @@
 	<string name="mention_user">Menciona %s</string>
 	<string name="share_user">Comparteix %s</string>
 	<string name="mute_user">Silencia %s</string>
-	<string name="unmute_user">Deixar de silenciar %s</string>
+	<string name="unmute_user">Deixa de silenciar %s</string>
 	<string name="block_user">Bloca %s</string>
 	<string name="unblock_user">Desbloca %s</string>
 	<string name="report_user">Denuncia %s</string>
 	<string name="block_domain">Bloca %s</string>
 	<string name="unblock_domain">Desbloca %s</string>
 	<plurals name="x_posts">
-		<item quantity="one">%,d entrada</item>
+		<item quantity="one">%,d publicació</item>
 		<item quantity="other">%,d publicacions</item>
 	</plurals>
 	<string name="profile_joined">S\'ha unit</string>
@@ -101,12 +101,12 @@
 		<item quantity="other">%,d votants</item>
 	</plurals>
 	<string name="poll_closed">Finalitzada</string>
-	<string name="confirm_mute_title">Silenciar el compte</string>
-	<string name="confirm_mute">Confirma per silenciar %s</string>
-	<string name="do_mute">Silenciar</string>
+	<string name="confirm_mute_title">Silencia el compte</string>
+	<string name="confirm_mute">Confirma per a silenciar %s</string>
+	<string name="do_mute">Silencia</string>
 	<string name="confirm_unmute_title">Deixar de silenciar el compte</string>
 	<string name="confirm_unmute">Confirma per deixar de silenciar %s</string>
-	<string name="do_unmute">Deixar de silenciar</string>
+	<string name="do_unmute">Deixa de silenciar</string>
 	<string name="confirm_block_title">Bloca el compte</string>
 	<string name="confirm_block_domain_title">Bloca el domini</string>
 	<string name="confirm_block">Confirma per blocar %s</string>
@@ -135,12 +135,12 @@
 	<string name="all_notifications">Totes</string>
 	<string name="mentions">Mencions</string>
 	<plurals name="x_people_talking">
-		<item quantity="one">%d persona parla</item>
-		<item quantity="other">%d persones estan parlant</item>
+		<item quantity="one">%d persona està parlant-ne</item>
+		<item quantity="other">%d persones estan parlant-ne</item>
 	</plurals>
 	<plurals name="discussed_x_times">
-		<item quantity="one">S\'ha comentat %d cop</item>
-		<item quantity="other">S\'ha comentat %d cops</item>
+		<item quantity="one">S\'ha comentat %d vegada</item>
+		<item quantity="other">S\'ha comentat %d vegades</item>
 	</plurals>
 	<string name="report_title">Denuncia %s</string>
 	<string name="report_choose_reason">Quin és el problema amb aquesta publicació?</string>
@@ -160,7 +160,7 @@
 	<string name="report_choose_posts_subtitle">Selecciona tots els aplicables</string>
 	<string name="report_comment_title">Hi ha res més que hauríem de saber?</string>
 	<string name="report_comment_hint">Comentaris addicionals</string>
-	<string name="sending_report">Enviant informe…</string>
+	<string name="sending_report">S\'està enviant l\'informe…</string>
 	<string name="report_sent_title">Gràcies per informar, ho investigarem.</string>
 	<string name="report_sent_subtitle">Mentre ho revisem, pots prendre mesures contra %s.</string>
 	<string name="unfollow_user">Deixar de seguir %s</string>
@@ -176,7 +176,7 @@
 	<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="edit_photo">editar</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>
@@ -223,9 +223,9 @@
 	<string name="notification_type_mention">Mencions</string>
 	<string name="notification_type_poll">Enquestes</string>
 	<string name="choose_account">Selecciona un compte</string>
-	<string name="err_not_logged_in">Si us plau, inicia sessió primer a Mastodon</string>
+	<string name="err_not_logged_in">Primer inicia sessió a Mastodon</string>
 	<plurals name="cant_add_more_than_x_attachments">
-		<item quantity="one">No pots afegir més de %d fitxer multimèdia</item>
+		<item quantity="one">No pots afegir més d\'%d fitxer multimèdia</item>
 		<item quantity="other">No pots afegir més de %d fitxers multimèdia</item>
 	</plurals>
 	<string name="media_attachment_unsupported_type">El tipus de fitxer %s no és compatible</string>
@@ -236,8 +236,8 @@
 	<string name="theme_dark">Fosc</string>
 	<string name="theme_true_black">Mode negre pur</string>
 	<string name="settings_behavior">Comportament</string>
-	<string name="settings_gif">Reproduir emojis i avatar animats</string>
-	<string name="settings_custom_tabs">Utilitzar el navegador intern</string>
+	<string name="settings_gif">Reprodueix emojis i avatar animats</string>
+	<string name="settings_custom_tabs">Utilitza el navegador intern</string>
 	<string name="settings_notifications">Notificacions</string>
 	<string name="notify_me_when">Notifica\'m quan</string>
 	<string name="notify_anyone">qualsevol</string>
@@ -259,7 +259,7 @@
 	<string name="media_cache_cleared">S\'ha esborrat la memòria cau multimèdia</string>
 	<string name="confirm_log_out">Segur que vols tancar la sessió?</string>
 	<string name="sensitive_content">Contingut sensible</string>
-	<string name="sensitive_content_explain">L\'autor va marcar aquest mitjà com a sensible. Toca per a mostrar-lo.</string>
+	<string name="sensitive_content_explain">L\'autor ha marcat aquest mitjà com a sensible. Toca per a mostrar-lo.</string>
 	<string name="media_hidden">Toca per a mostrar</string>
 	<string name="avatar_description">Vés al perfil de: %s</string>
 	<string name="more_options">Més opcions</string>
@@ -368,7 +368,7 @@
 	<string name="file_size_gb">%.2f GB</string>
 	<string name="file_upload_progress">%1$s de %2$s</string>
 	<string name="file_upload_time_remaining">%s restants</string>
-	<string name="upload_error_connection_lost">El teu dispositiu ha perdut la connexió a internet</string>
+	<string name="upload_error_connection_lost">El dispositiu ha perdut la connexió a Internet</string>
 	<string name="upload_processing">S\'està processant…</string>
 	<!-- %s is version like 1.2.3 -->
 	<string name="update_available">Mastodon per a Android %s està preparat per a baixar-se.</string>
@@ -380,9 +380,7 @@
 	<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>
-	<!-- Missing strings -->
-	<string name="bookmarks">Marcadors</string>
-	<string name="pinned_posts">Fixat</string>
 	<string name="empty_list">Aquesta llista està buida</string>
 	<string name="instance_signup_closed">Aquest servidor no accepta nous registres.</string>
+	<string name="bookmarks">Marcadors</string>
 </resources>
--- a/mastodon/src/main/res/values-ca-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sk_pinned_posts">Fixat</string>
+</resources>
--- a/mastodon/src/main/res/values-cs-rCZ/strings.xml
+++ b/mastodon/src/main/res/values-cs-rCZ/strings.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Začít</string>
+	<string name="get_started">Začínáme</string>
 	<string name="log_in">Přihlásit se</string>
 	<string name="next">Další</string>
 	<string name="loading_instance">Získávání informací o instanci…</string>
 	<string name="error">Chyba</string>
 	<string name="not_a_mastodon_instance">Zdá se, že %s není instancí Mastodonu.</string>
 	<string name="ok">OK</string>
-	<string name="preparing_auth">Příprava na ověřování…</string>
-	<string name="finishing_auth">Dokončení ověřování…</string>
+	<string name="preparing_auth">Příprava na autentizaci…</string>
+	<string name="finishing_auth">Dokončení autentizace…</string>
 	<string name="user_boosted">Uživatel %s boostnul</string>
 	<string name="in_reply_to">V odpovědi na %s</string>
 	<string name="notifications">Upozornění</string>
-	<string name="user_followed_you">vás sleduje</string>
+	<string name="user_followed_you">vás začal(a) sledovat</string>
 	<string name="user_sent_follow_request">vám poslal(a) žádost o sledování</string>
 	<string name="user_favorited">si oblíbil(a) váš příspěvek</string>
 	<string name="notification_boosted">boostnul(a) váš příspěvek</string>
@@ -34,9 +34,9 @@
 		<item quantity="other">sledujících</item>
 	</plurals>
 	<plurals name="following">
-		<item quantity="one">sledovaní</item>
-		<item quantity="few">sledování</item>
-		<item quantity="many">sledování</item>
+		<item quantity="one">sledovaný</item>
+		<item quantity="few">sledovaní</item>
+		<item quantity="many">sledovaných</item>
 		<item quantity="other">sledovaných</item>
 	</plurals>
 	<plurals name="posts">
@@ -52,10 +52,10 @@
 	<string name="button_follow">Sledovat</string>
 	<string name="button_following">Sleduji</string>
 	<string name="edit_profile">Upravit profil</string>
-	<string name="mention_user">Zmínit @%s</string>
+	<string name="mention_user">Zmínit %s</string>
 	<string name="share_user">Sdílet %s</string>
 	<string name="mute_user">Skrýt %s</string>
-	<string name="unmute_user">Odkrýt @%s</string>
+	<string name="unmute_user">Zrušit skrytí @%s</string>
 	<string name="block_user">Blokovat %s</string>
 	<string name="unblock_user">Odblokovat %s</string>
 	<string name="report_user">Nahlásit %s</string>
@@ -67,14 +67,14 @@
 		<item quantity="many">%,d příspěvků</item>
 		<item quantity="other">%,d příspěvků</item>
 	</plurals>
-	<string name="profile_joined">Účet vytvořen</string>
+	<string name="profile_joined">Připojen/a</string>
 	<string name="done">Hotovo</string>
 	<string name="loading">Načítání…</string>
 	<string name="field_label">Označení</string>
 	<string name="field_content">Obsah</string>
 	<string name="saving">Ukládání…</string>
 	<string name="post_from_user">Příspěvek od %s</string>
-	<string name="poll_option_hint">Možnost %d</string>
+	<string name="poll_option_hint">Volba %d</string>
 	<plurals name="x_minutes">
 		<item quantity="one">%d minuta</item>
 		<item quantity="few">%d minuty</item>
@@ -108,7 +108,7 @@
 	</plurals>
 	<plurals name="x_hours_left">
 		<item quantity="one">Zbývá %d hodina</item>
-		<item quantity="few">Zbývá %d hodiny</item>
+		<item quantity="few">Zbývají %d hodiny</item>
 		<item quantity="many">Zbývá %d hodin</item>
 		<item quantity="other">Zbývá %d hodin</item>
 	</plurals>
@@ -129,20 +129,20 @@
 	<string name="confirm_mute">Potvrdit skrytí %s</string>
 	<string name="do_mute">Skrýt</string>
 	<string name="confirm_unmute_title">Zrušit skrytí účtu</string>
-	<string name="confirm_unmute">Potvrďte zrušení skrytí %s</string>
-	<string name="do_unmute">Odkrýt</string>
+	<string name="confirm_unmute">Potvrdit zrušení skrytí %s</string>
+	<string name="do_unmute">Zrušit skrytí</string>
 	<string name="confirm_block_title">Blokovat účet</string>
 	<string name="confirm_block_domain_title">Blokovat doménu</string>
-	<string name="confirm_block">Potvrďte blokování %s</string>
+	<string name="confirm_block">Potvrdit blokování %s</string>
 	<string name="do_block">Blokovat</string>
 	<string name="confirm_unblock_title">Odblokovat účet</string>
 	<string name="confirm_unblock_domain_title">Odblokovat doménu</string>
-	<string name="confirm_unblock">Potvrďte odblokování %s</string>
+	<string name="confirm_unblock">Potvrdit odblokování %s</string>
 	<string name="do_unblock">Odblokovat</string>
 	<string name="button_muted">Skrytý</string>
 	<string name="button_blocked">Blokovaný</string>
 	<string name="action_vote">Hlasovat</string>
-	<string name="tap_to_reveal">Klepnutím zobraz</string>
+	<string name="tap_to_reveal">Klepněte pro zobrazení</string>
 	<string name="delete">Smazat</string>
 	<string name="confirm_delete_title">Smazat příspěvek</string>
 	<string name="confirm_delete">Opravdu chcete smazat tento příspěvek?</string>
@@ -165,42 +165,42 @@
 		<item quantity="other">%d lidí mluví</item>
 	</plurals>
 	<plurals name="discussed_x_times">
-		<item quantity="one">Diskutováno %d krát</item>
-		<item quantity="few">Diskutováno %d krát</item>
-		<item quantity="many">Diskutováno %d krát</item>
-		<item quantity="other">Diskutováno %d krát</item>
+		<item quantity="one">Diskutováno %dkrát</item>
+		<item quantity="few">Diskutováno %dkrát</item>
+		<item quantity="many">Diskutováno %dkrát</item>
+		<item quantity="other">Diskutováno %dkrát</item>
 	</plurals>
 	<string name="report_title">Nahlásit %s</string>
 	<string name="report_choose_reason">Co je na tomto příspěvku špatně?</string>
 	<string name="report_choose_reason_account">Co je špatně na %s?</string>
 	<string name="report_choose_reason_subtitle">Vyberte nejbližší možnost</string>
-	<string name="report_reason_personal">Nelíbí se mi</string>
+	<string name="report_reason_personal">Nelíbí se mi to</string>
 	<string name="report_reason_personal_subtitle">Není to něco, co chcete vidět</string>
 	<string name="report_reason_spam">Je to spam</string>
 	<string name="report_reason_spam_subtitle">Škodlivé odkazy, falešné interakce nebo opakované odpovědi</string>
-	<string name="report_reason_violation">Porušuje pravidla serveru</string>
-	<string name="report_reason_violation_subtitle">Máte za to, že porušuje konkrétní pravidla</string>
-	<string name="report_reason_other">Jde o něco jiného</string>
+	<string name="report_reason_violation">Porušuje to pravidla serveru</string>
+	<string name="report_reason_violation_subtitle">Máte za to, že to porušuje konkrétní pravidla</string>
+	<string name="report_reason_other">It\'s something else</string>
 	<string name="report_reason_other_subtitle">Problém neodpovídá ostatním kategoriím</string>
-	<string name="report_choose_rule">Která pravidla porušuje?</string>
+	<string name="report_choose_rule">Která pravidla to porušuje?</string>
 	<string name="report_choose_rule_subtitle">Vyberte všechna relevantní</string>
 	<string name="report_choose_posts">Existují příspěvky dokládající toto hlášení?</string>
-	<string name="report_choose_posts_subtitle">Vyberte všechna relevantní</string>
+	<string name="report_choose_posts_subtitle">Vyberte všechny relevantní</string>
 	<string name="report_comment_title">Je ještě něco jiného, co bychom měli vědět?</string>
-	<string name="report_comment_hint">Dodatečné komentáře</string>
+	<string name="report_comment_hint">Další komentáře</string>
 	<string name="sending_report">Odesílání hlášení…</string>
 	<string name="report_sent_title">Děkujeme za nahlášení, podíváme se na to.</string>
-	<string name="report_sent_subtitle">Zatímco to posuzujeme, můžete podniknout kroky proti %s.</string>
+	<string name="report_sent_subtitle">Zatímco to posuzujeme, můžete podniknout akce proti %s.</string>
 	<string name="unfollow_user">Přestat sledovat %s</string>
 	<string name="unfollow">Přestat sledovat</string>
-	<string name="mute_user_explain">Neuvidíte jejich příspěvky nebo boostnutí v domovském kanálu. Nebudou vědět, že jsou skrytí.</string>
-	<string name="block_user_explain">Už nebudou moci sledovat nebo vidět vaše příspěvky, ale mohou vidět, že byli blokováni.</string>
+	<string name="mute_user_explain">Neuvidíte příspěvky nebo boosty tohoto uživatele ve svém domovském kanálu. Nebude vědět, že je skryt.</string>
+	<string name="block_user_explain">Tento uživatel vás již nebude moci sledovat ani vidět vaše příspěvky, ale může zjistit, že je blokován.</string>
 	<string name="report_personal_title">Nechcete tohle vidět?</string>
 	<string name="report_personal_subtitle">Když uvidíte něco, co se vám nelíbí na Mastodonu, můžete odstranit tuto osobu ze svého zážitku.</string>
 	<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 nebo zadat URL</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>
@@ -227,19 +227,19 @@
 	<string name="confirm_email_subtitle">Klepněte na odkaz, který jsme vám poslali e-mailem, abyste účet ověřili.</string>
 	<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 odeslán</string>
+	<string name="resent_email">Potvrzující e-mail byl odeslán</string>
 	<string name="compose_hint">Napište nebo vložte, co máte na mysli</string>
 	<string name="content_warning">Varování o obsahu</string>
 	<string name="add_image_description">Přidat popis obrázku…</string>
 	<string name="retry_upload">Opakovat nahrání</string>
 	<string name="edit_image">Upravit obrázek</string>
 	<string name="save">Uložit</string>
-	<string name="add_alt_text">Přidat alt text</string>
-	<string name="alt_text_subtitle">Alt text popisuje obrázky pro lidi se špatným nebo žádným zrakem. Pokuste se zahrnout jen tolik obsahu, kolik je potřeba pro pochopení kontextu.</string>
-	<string name="alt_text_hint">Např. podezřívavě rozhlížející se pes se zúženýma očima namířenýma na kameru.</string>
-	<string name="visibility_public">Veřejný</string>
+	<string name="add_alt_text">Přidat alternativní text</string>
+	<string name="alt_text_subtitle">Alternativní text popisuje obrázky pro lidi se špatným zrakem nebo bez zraku. Pokuste se zahrnout jen tolik obsahu, kolik je potřeba pro pochopení kontextu.</string>
+	<string name="alt_text_hint">např. Podezřívavě rozhlížející se pes se zúženýma očima namířenýma na kameru.</string>
+	<string name="visibility_public">Veřejné</string>
 	<string name="visibility_followers_only">Pouze sledující</string>
-	<string name="visibility_private">Pouze lidé, které zmíním</string>
+	<string name="visibility_private">Pouze zmínění lidé</string>
 	<string name="search_all">Vše</string>
 	<string name="search_people">Lidé</string>
 	<string name="recent_searches">Nedávná hledání</string>
@@ -247,53 +247,53 @@
 	<string name="skip">Přeskočit</string>
 	<string name="notification_type_follow">Noví sledující</string>
 	<string name="notification_type_favorite">Oblíbené</string>
-	<string name="notification_type_reblog">Boostnutí</string>
+	<string name="notification_type_reblog">Boosty</string>
 	<string name="notification_type_mention">Zmínky</string>
 	<string name="notification_type_poll">Ankety</string>
 	<string name="choose_account">Vybrat účet</string>
 	<string name="err_not_logged_in">Nejprve se přihlaste do Mastodonu</string>
 	<plurals name="cant_add_more_than_x_attachments">
-		<item quantity="one">Nelze přidat více než %d multimediálních příloh</item>
+		<item quantity="one">Nelze přidat více než %d multimediální přílohu</item>
 		<item quantity="few">Nelze přidat více než %d multimediální přílohy</item>
 		<item quantity="many">Nelze přidat více než %d multimediálních příloh</item>
 		<item quantity="other">Nelze přidat více než %d multimediálních příloh</item>
 	</plurals>
 	<string name="media_attachment_unsupported_type">Soubor %s nepatří mezi podporované typy</string>
 	<string name="media_attachment_too_big">Soubor %1$s překračuje limit velikosti %2$s MB</string>
-	<string name="settings_theme">Vizuální podoba</string>
+	<string name="settings_theme">Vizuální vzhled</string>
 	<string name="theme_auto">Automatická</string>
-	<string name="theme_light">Světlá</string>
-	<string name="theme_dark">Tmavá</string>
+	<string name="theme_light">Světlý</string>
+	<string name="theme_dark">Tmavý</string>
 	<string name="theme_true_black">Režim skutečně černé</string>
 	<string name="settings_behavior">Chování</string>
 	<string name="settings_gif">Přehrávat animované avatary a emoji</string>
-	<string name="settings_custom_tabs">Používat interní prohlížeč</string>
-	<string name="settings_notifications">Upozornění</string>
+	<string name="settings_custom_tabs">Používat prohlížeč v aplikaci</string>
+	<string name="settings_notifications">Oznámení</string>
 	<string name="notify_me_when">Upozornit mě, když</string>
 	<string name="notify_anyone">kdokoliv</string>
 	<string name="notify_follower">sledující</string>
 	<string name="notify_followed">někdo, koho sleduji</string>
 	<string name="notify_none">nikoho</string>
-	<string name="notify_favorites">Oblíbil si můj příspěvek</string>
-	<string name="notify_follow">Sleduje mě</string>
-	<string name="notify_reblog">Boostnul můj příspěvek</string>
-	<string name="notify_mention">Zmiňuje mě</string>
+	<string name="notify_favorites">Oblíbí si můj příspěvek</string>
+	<string name="notify_follow">Začne mě sledovat</string>
+	<string name="notify_reblog">Boostne můj příspěvek</string>
+	<string name="notify_mention">Zmíní mě</string>
 	<string name="settings_boring">Nudná část</string>
 	<string name="settings_account">Nastavení účtu</string>
 	<string name="settings_contribute">Přispějte do Mastodonu</string>
-	<string name="settings_tos">Podmínky používání</string>
+	<string name="settings_tos">Podmínky užití</string>
 	<string name="settings_privacy_policy">Zásady ochrany osobních údajů</string>
 	<string name="settings_spicy">Ostrá část</string>
 	<string name="settings_clear_cache">Vymazat mezipaměť médií</string>
-	<string name="settings_app_version">Mastodon pro Android v%1$s (%2$d)</string>
-	<string name="media_cache_cleared">Mezipaměť médií vymazána</string>
+	<string name="settings_app_version">Mastodon for Android v%1$s (%2$d)</string>
+	<string name="media_cache_cleared">Mezipaměť médií byla vymazána</string>
 	<string name="confirm_log_out">Opravdu se chcete odhlásit?</string>
 	<string name="sensitive_content">Citlivý obsah</string>
-	<string name="sensitive_content_explain">Autor označil toto médium za citlivé. Klepnutím zobrazíte.</string>
-	<string name="media_hidden">Klepnutím zobrazit</string>
-	<string name="avatar_description">Jít na profil %s</string>
+	<string name="sensitive_content_explain">Autor označil toto médium jako citlivé. Klepnutím ho zobrazíte.</string>
+	<string name="media_hidden">Klepněte pro zobrazení</string>
+	<string name="avatar_description">Přejít na profil uživatele %s</string>
 	<string name="more_options">Více možností</string>
-	<string name="reveal_content">Zobrazit obsah</string>
+	<string name="reveal_content">Odhalit obsah</string>
 	<string name="hide_content">Skrýt obsah</string>
 	<string name="new_post">Nový příspěvek</string>
 	<string name="button_reply">Odpovědět</string>
@@ -309,34 +309,34 @@
 	<string name="my_profile">Můj profil</string>
 	<string name="media_viewer">Prohlížeč médií</string>
 	<string name="follow_user">Sledovat %s</string>
-	<string name="unfollowed_user">Sledování %s ukončeno</string>
+	<string name="unfollowed_user">Sledování %s bylo zrušeno</string>
 	<string name="followed_user">Nyní sledujete %s</string>
 	<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 připojit?</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>
-	<string name="profile_picture">Profilová fotografie</string>
+	<string name="profile_picture">Profilový obrázek</string>
 	<string name="reorder">Změnit pořadí</string>
 	<string name="download">Stáhnout</string>
-	<string name="permission_required">Vyžadováno oprávnění</string>
+	<string name="permission_required">Je vyžadováno oprávnění</string>
 	<string name="storage_permission_to_download">Aplikace potřebuje přístup k vašemu úložišti, aby mohla uložit tento soubor.</string>
 	<string name="open_settings">Otevřít nastavení</string>
-	<string name="error_saving_file">Chyba při ukládání souboru</string>
-	<string name="file_saved">Soubor uložen</string>
+	<string name="error_saving_file">Nastala chyba při ukládání souboru</string>
+	<string name="file_saved">Soubor byl uložen</string>
 	<string name="downloading">Stahování…</string>
 	<string name="no_app_to_handle_action">Nebyly nalezeny žádné aplikace pro tuto úlohu</string>
 	<string name="local_timeline">Komunita</string>
-	<string name="trending_posts_info_banner">Toto jsou příspěvky, které získávají pozornost ve vašem koutu Mastodonu.</string>
-	<string name="trending_hashtags_info_banner">Toto jsou hashtagy, které získávají pozornost ve vašem koutu Mastodonu.</string>
-	<string name="trending_links_info_banner">Toto jsou zprávy, které jsou nejvíce sdíleny ve vašem koutu Mastodonu.</string>
+	<string name="trending_posts_info_banner">Tyto příspěvky získávají na popularitě ve vašem koutu Mastodonu.</string>
+	<string name="trending_hashtags_info_banner">Tyto hashtagy získávají na popularitě ve vašem koutu Mastodonu.</string>
+	<string name="trending_links_info_banner">Tyto zprávy jsou nejvíce sdíleny ve vašem koutu Mastodonu.</string>
 	<string name="local_timeline_info_banner">Toto jsou nejnovější příspěvky od lidí, kteří používají stejný server Mastodonu jako vy.</string>
 	<string name="dismiss">Zavřít</string>
 	<string name="see_new_posts">Zobrazit nové příspěvky</string>
 	<string name="load_missing_posts">Načíst chybějící příspěvky</string>
-	<string name="follow_back">Sledovat zpátky</string>
+	<string name="follow_back">Sledovat nazpět</string>
 	<string name="button_follow_pending">Čekající</string>
 	<string name="follows_you">Sleduje vás</string>
 	<string name="manually_approves_followers">Ručně schvaluje sledující</string>
@@ -351,34 +351,34 @@
 	</plurals>
 	<plurals name="x_following">
 		<item quantity="one">%,d sledující</item>
-		<item quantity="few">%,d sledování</item>
-		<item quantity="many">%,d sledování</item>
-		<item quantity="other">%,d sledování</item>
+		<item quantity="few">%,d sledovaní</item>
+		<item quantity="many">%,d sledovaných</item>
+		<item quantity="other">%,d sledovaných</item>
 	</plurals>
 	<plurals name="x_favorites">
-		<item quantity="one">%,d oblíbený</item>
-		<item quantity="few">%,d oblíbené</item>
-		<item quantity="many">%,d oblíbených</item>
-		<item quantity="other">%,d oblíbených</item>
+		<item quantity="one">%,d oblíbení</item>
+		<item quantity="few">%,d oblíbení</item>
+		<item quantity="many">%,d oblíbení</item>
+		<item quantity="other">%,d oblíbení</item>
 	</plurals>
 	<plurals name="x_reblogs">
 		<item quantity="one">%,d boostnul</item>
-		<item quantity="few">%,d boostnuli</item>
-		<item quantity="many">%,d boostnulo</item>
-		<item quantity="other">%,d boostnulo</item>
+		<item quantity="few">%,d boosty</item>
+		<item quantity="many">%,d boostů</item>
+		<item quantity="other">%,d boostů</item>
 	</plurals>
 	<string name="timestamp_via_app">%1$s přes %2$s</string>
 	<string name="time_now">teď</string>
-	<string name="post_info_reblogs">Reblogy</string>
-	<string name="post_info_favorites">Oblíbené</string>
-	<string name="edit_history">Historie změn</string>
+	<string name="post_info_reblogs">Boosty</string>
+	<string name="post_info_favorites">Oblíbení</string>
+	<string name="edit_history">Historie úprav</string>
 	<string name="last_edit_at_x">Poslední úprava %s</string>
 	<string name="time_just_now">právě teď</string>
 	<plurals name="x_seconds_ago">
-		<item quantity="one">Před 1 vteřinou</item>
-		<item quantity="few">Před %d vteřinami</item>
-		<item quantity="many">Před %d vteřinami</item>
-		<item quantity="other">Před %d vteřinami</item>
+		<item quantity="one">před %d sekundou</item>
+		<item quantity="few">před %d sekundami</item>
+		<item quantity="many">před %d sekundami</item>
+		<item quantity="other">před %d sekundami</item>
 	</plurals>
 	<plurals name="x_minutes_ago">
 		<item quantity="one">před %d minutou</item>
@@ -388,21 +388,21 @@
 	</plurals>
 	<string name="edited_timestamp">upraveno %s</string>
 	<string name="edit_original_post">Původní příspěvek</string>
-	<string name="edit_text_edited">Text upraven</string>
-	<string name="edit_spoiler_added">Upozornění na obsah bylo přidáno</string>
-	<string name="edit_spoiler_edited">Upozornění na obsah upraveno</string>
-	<string name="edit_spoiler_removed">Upozornění na obsah odstraněno</string>
-	<string name="edit_poll_added">Anketa přidána</string>
-	<string name="edit_poll_edited">Anketa upravena</string>
-	<string name="edit_poll_removed">Anketa odstraněna</string>
+	<string name="edit_text_edited">Text byl upraven</string>
+	<string name="edit_spoiler_added">Varování o obsahu bylo přidáno</string>
+	<string name="edit_spoiler_edited">Varování o obsahu bylo upraveno</string>
+	<string name="edit_spoiler_removed">Varování o obsahu bylo odebráno</string>
+	<string name="edit_poll_added">Anketa byla přidána</string>
+	<string name="edit_poll_edited">Anketa byla upravena</string>
+	<string name="edit_poll_removed">Anketa byla odebrána</string>
 	<string name="edit_media_added">Média přidána</string>
 	<string name="edit_media_removed">Média odstraněna</string>
-	<string name="edit_media_reordered">Média přeřazena</string>
+	<string name="edit_media_reordered">Pořadí médií bylo změněno</string>
 	<string name="edit_marked_sensitive">Označeno jako citlivé</string>
 	<string name="edit_marked_not_sensitive">Označeno, že není citlivé</string>
-	<string name="edit_multiple_changed">Příspěvek upraven</string>
+	<string name="edit_multiple_changed">Příspěvek byl upraven</string>
 	<string name="edit">Upravit</string>
-	<string name="discard_changes">Zrušit změny?</string>
+	<string name="discard_changes">Zahodit změny?</string>
 	<string name="upload_failed">Nahrávání se nezdařilo</string>
 	<string name="file_size_bytes">%d bajtů</string>
 	<string name="file_size_kb">%.2f KB</string>
@@ -413,7 +413,7 @@
 	<string name="upload_error_connection_lost">Vaše zařízení ztratilo připojení k internetu</string>
 	<string name="upload_processing">Zpracovávání…</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_available">Mastodon pro Android %s je připravený ke stažení.</string>
+	<string name="update_available">Mastodon pro Android %s je připraven ke stažení.</string>
 	<!-- %s is version like 1.2.3 -->
 	<string name="update_ready">Mastodon pro Android %s je stažený a připravený k instalaci.</string>
 	<!-- %s is file size -->
@@ -423,4 +423,10 @@
 	<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>
+	<string name="text_copied">Zkopírováno do schránky</string>
+	<string name="add_bookmark">Přidat do záložek</string>
+	<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>
 </resources>
--- a/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml
+++ b/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-de-rDE/strings.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings.xml
@@ -3,12 +3,12 @@
 	<string name="get_started">Loslegen</string>
 	<string name="log_in">Anmelden</string>
 	<string name="next">Weiter</string>
-	<string name="loading_instance">Instanzinformationen werden geladen…</string>
+	<string name="loading_instance">Instanzinformationen werden geladen …</string>
 	<string name="error">Fehler</string>
 	<string name="not_a_mastodon_instance">%s scheint keine Mastodon-Instanz zu sein.</string>
 	<string name="ok">OK</string>
-	<string name="preparing_auth">Authentifizierung wird vorbereitet…</string>
-	<string name="finishing_auth">Authentifizierung wird abgeschlossen…</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>
@@ -40,7 +40,6 @@
 		<item quantity="other">Beiträge</item>
 	</plurals>
 	<string name="posts">Beiträge</string>
-	<string name="pinned_posts">Angeheftet</string>
 	<string name="posts_and_replies">Beiträge und Antworten</string>
 	<string name="media">Medien</string>
 	<string name="profile_about">Über</string>
@@ -62,10 +61,10 @@
 	</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">Speichern…</string>
+	<string name="saving">Speichern …</string>
 	<string name="post_from_user">Beitrag von %s</string>
 	<string name="poll_option_hint">%d. Auswahl</string>
 	<plurals name="x_minutes">
@@ -121,20 +120,9 @@
 	<string name="action_vote">Abstimmen</string>
 	<string name="tap_to_reveal">Tippen zum Anzeigen</string>
 	<string name="delete">Löschen</string>
-	<string name="delete_and_redraft">Löschen und neu erstellen</string>
 	<string name="confirm_delete_title">Beitrag löschen</string>
-	<string name="confirm_delete_and_redraft_title">Beitrag löschen und neu erstellen</string>
 	<string name="confirm_delete">Bist du dir sicher, dass du diesen Beitrag löschen möchtest?</string>
-	<string name="confirm_delete_and_redraft">Bist du dir sicher, dass du diesen Beitrag löschen und neu erstellen möchtest?</string>
 	<string name="deleting">Wird gelöscht…</string>
-	<string name="pin_post">An Profil anheften</string>
-	<string name="confirm_pin_post_title">Beitrag an Profil anheften</string>
-	<string name="confirm_pin_post">Möchtest du den Beitrag an dein Profil anheften?</string>
-	<string name="pinning">Wird angeheftet…</string>
-	<string name="unpin_post">Von Profil lösen</string>
-	<string name="confirm_unpin_post_title">Angehefteten Beitrag von Profil lösen</string>
-	<string name="confirm_unpin_post">Bist du dir sicher, dass du den angehefteten Beitrag von deinem Profil lösen möchtest?</string>
-	<string name="unpinning">Wird vom Profil gelöst…</string>
 	<string name="notification_channel_audio_player">Audiowiedergabe</string>
 	<string name="play">Abspielen</string>
 	<string name="pause">Pausieren</string>
@@ -214,18 +202,14 @@
 	<string name="resent_email">Bestätigungs-E-Mail gesendet</string>
 	<string name="compose_hint">Eintippen oder einfügen, was dir am Herzen liegt</string>
 	<string name="content_warning">Inhaltwarnung</string>
-	<string name="add_image_description">Bildbeschreibung hinzufügen…</string>
+	<string name="add_image_description">Bildbeschreibung hinzufügen …</string>
 	<string name="retry_upload">Hochladen erneut versuchen</string>
-	<string name="image_description">Bildbeschreibung</string>
-	<string name="image_upload_failed">Fehler beim Hochladen des Bildes</string>
-	<string name="video_upload_failed">Fehler beim Hochladen des Videos</string>
 	<string name="edit_image">Bild bearbeiten</string>
 	<string name="save">Speichern</string>
 	<string name="add_alt_text">Bildbeschreibung hinzufügen</string>
 	<string name="alt_text_subtitle">Die Bildbeschreibung („Alt-Text“) ist eine wichtige Unterstützung für blinde und sehbehinderte Menschen. Beschränke dich bei der Formulierung auf das nötigste, interpretiere nicht und beschreibe nur, was zu sehen ist, damit der Kontext verständlich ist und alle Menschen daran teilhaben können.</string>
 	<string name="alt_text_hint">z. B. „Eine Giraffe auf einem Dreirad, während sie eine Banane isst.“</string>
 	<string name="visibility_public">Öffentlich</string>
-	<string name="visibility_unlisted">Nicht gelistet</string>
 	<string name="visibility_followers_only">Nur Follower</string>
 	<string name="visibility_private">Nur erwähnte Profile</string>
 	<string name="search_all">Alle</string>
@@ -253,11 +237,7 @@
 	<string name="theme_true_black">Echter Schwarzmodus</string>
 	<string name="settings_behavior">Verhalten</string>
 	<string name="settings_gif">Animierte GIFs, Avatare und Emojis abspielen</string>
-	<string name="settings_show_replies">Antworten anzeigen</string>
-	<string name="settings_show_boosts">Geteilte Beiträge anzeigen</string>
-	<string name="settings_load_new_posts">Automatisch neue Beiträge laden</string>
 	<string name="settings_custom_tabs">In-App-Browser verwenden</string>
-	<string name="settings_show_interaction_counts">Interaktions-Anzahlen anzeigen</string>
 	<string name="settings_notifications">Benachrichtigungen</string>
 	<string name="notify_me_when">Benachrichtige mich, wenn</string>
 	<string name="notify_anyone">irgendjemand</string>
@@ -275,7 +255,7 @@
 	<string name="settings_privacy_policy">Datenschutzbestimmungen</string>
 	<string name="settings_spicy">Gefährliches</string>
 	<string name="settings_clear_cache">Medienpuffer leeren</string>
-	<string name="settings_app_version">Megalodon v%1$s (%2$d)</string>
+	<string name="settings_app_version">Mastodon für Android v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">Medienpuffer geleert</string>
 	<string name="confirm_log_out">Bist du dir sicher, dass du dich abmelden möchtest?</string>
 	<string name="sensitive_content">Inhaltswarnung</string>
@@ -292,7 +272,6 @@
 	<string name="button_share">Teilen</string>
 	<string name="media_no_description">Medien ohne Beschreibung</string>
 	<string name="add_media">Medien hinzufügen</string>
-	<string name="mark_media_as_sensitive">Medien als NSFW markieren</string>
 	<string name="add_poll">Umfrage hinzufügen</string>
 	<string name="emoji">Emoji</string>
 	<string name="post_visibility">Sichtbarkeit des Beitrages</string>
@@ -303,10 +282,8 @@
 	<string name="unfollowed_user">%s entfolgt</string>
 	<string name="followed_user">Du folgst nun %s</string>
 	<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="user_post_notifications_on">Benachrichtigungen über Beiträge von %s aktiviert</string>
-	<string name="user_post_notifications_off">Benachrichtigungen über Beiträge von %s deaktiviert</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_note">Das erleichtert uns die Prüfung deiner Anmeldung.</string>
 	<string name="clear">Leeren</string>
@@ -319,15 +296,13 @@
 	<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="federated_timeline">Föderation</string>
 	<string name="trending_posts_info_banner">Dies sind Beiträge, die auf deinem Mastodon-Server gerade angesagt sind.</string>
 	<string name="trending_hashtags_info_banner">Diese Hashtags sind auf deinem Mastodon-Server gerade angesagt.</string>
 	<string name="trending_links_info_banner">Diese journalistischen Nachrichten werden auf deinem Mastodon-Server gerade am häufigsten geteilt.</string>
 	<string name="local_timeline_info_banner">Das sind die neuesten Beiträge von Personen, die denselben Mastodon-Server benutzen.</string>
-	<string name="federated_timeline_info_banner">Das sind die neuesten Beiträge von Personen, die in der Föderation deines Servers sind.</string>
 	<string name="dismiss">Verwerfen</string>
 	<string name="see_new_posts">Neue Beiträge anzeigen</string>
 	<string name="load_missing_posts">Weitere Beiträge laden</string>
@@ -394,28 +369,18 @@
 	<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">Megalodon %s ist zum Herunterladen bereit.</string>
+	<string name="update_available">Mastodon für Android %s ist zum Herunterladen bereit.</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_ready">Megalodon %s wurde heruntergeladen und kann jetzt installiert werden.</string>
+	<string name="update_ready">Mastodon für Android %s wurde heruntergeladen und kann jetzt installiert werden.</string>
 	<!-- %s is file size -->
 	<string name="download_update">(%s) herunterladen</string>
 	<string name="install_update">Installieren</string>
-	<string name="check_for_update">Auf Update prüfen</string>
-	<string name="no_update_available">Kein Update verfügbar</string>
-	<string name="list_timelines">Listen</string>
-	<string name="your_favorites">Deine Favoriten</string>
-	<string name="follow_requests">Folgeanfragen</string>
-	<string name="accept_follow_request">Folgeanfrage akzeptieren</string>
-	<string name="reject_follow_request">Folgeanfrage ablehnen</string>
-	<string name="lists_with_user">Listen mit %s</string>
 	<string name="privacy_policy_title">Mastodon und Ihre Privatsphäre</string>
-	<string name="privacy_policy_subtitle">Obwohl die Megalodon-App keine Daten sammelt, kann der Server, über den Sie sich anmelden, eine andere Richtlinie haben. Nehmen Sie sich eine Minute Zeit, um die Mastodon-Datenschutzrichtlinien und die Datenschutzrichtlinien Ihres Servers zu lesen und zu akzeptieren.</string>
+	<string name="privacy_policy_subtitle">Obwohl die Mastodon-App keine Daten sammelt, kann der Server, über den Sie sich anmelden, eine andere Richtlinie haben. Nehmen Sie sich eine Minute Zeit, um die Mastodon-Datenschutzrichtlinien und die Datenschutzrichtlinien Ihres Servers zu lesen und zu akzeptieren.</string>
 	<string name="i_agree">Ich stimme zu</string>
-	<string name="settings_always_reveal_content_warnings">Inhaltswarnungen immer ausklappen</string>
-	<string name="disable_marquee">Laufschrift in Titelleisten deaktivieren</string>
 	<string name="empty_list">Diese Liste ist leer</string>
 	<string name="instance_signup_closed">Dieser Server akzeptiert keine neuen Registrierungen.</string>
-	<string name="settings_contribute_fork">Zu Megalodon beitragen</string>
+	<string name="your_favorites">Deine Favoriten</string>
 </resources>
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sk_app_name">Megalodon</string>
+  <string name="sk_pinned_posts">Angeheftet</string>
+  <string name="sk_delete_and_redraft">Löschen und neu erstellen</string>
+  <string name="sk_confirm_delete_and_redraft_title">Beitrag löschen und neu erstellen</string>
+  <string name="sk_confirm_delete_and_redraft">Bist du dir sicher, dass du diesen Beitrag löschen und neu erstellen möchtest?</string>
+  <string name="sk_pin_post">An Profil anheften</string>
+	<string name="sk_confirm_pin_post_title">Beitrag an Profil anheften</string>
+	<string name="sk_confirm_pin_post">Möchtest du den Beitrag an dein Profil anheften?</string>
+	<string name="sk_pinning">Wird angeheftet…</string>
+	<string name="sk_unpin_post">Von Profil lösen</string>
+	<string name="sk_confirm_unpin_post_title">Angehefteten Beitrag von Profil lösen</string>
+	<string name="sk_confirm_unpin_post">Bist du dir sicher, dass du den angehefteten Beitrag von deinem Profil lösen möchtest?</string>
+	<string name="sk_unpinning">Wird vom Profil gelöst…</string>
+  <string name="sk_image_description">Bildbeschreibung</string>
+	<string name="sk_visibility_unlisted">Nicht gelistet</string>
+	<string name="sk_settings_show_replies">Antworten anzeigen</string>
+	<string name="sk_settings_show_boosts">Geteilte Beiträge anzeigen</string>
+	<string name="sk_settings_load_new_posts">Automatisch neue Beiträge laden</string>
+	<string name="sk_settings_show_interaction_counts">Interaktions-Anzahlen anzeigen</string>
+	<string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+	<string name="sk_mark_media_as_sensitive">Medien als sensibel markieren</string>
+	<string name="sk_user_post_notifications_on">Benachrichtigungen über Beiträge von %s aktiviert</string>
+	<string name="sk_user_post_notifications_off">Benachrichtigungen über Beiträge von %s deaktiviert</string>
+	<string name="sk_federated_timeline">Föderation</string>
+	<string name="sk_federated_timeline_info_banner">Das sind die neuesten Beiträge von Personen, die in der Föderation deines Servers sind.</string>
+	<string name="sk_update_available">Megalodon %s ist zum Herunterladen bereit.</string>
+	<string name="sk_update_ready">Megalodon %s wurde heruntergeladen und kann jetzt installiert werden.</string>
+	<string name="sk_check_for_update">Auf Update prüfen</string>
+	<string name="sk_no_update_available">Kein Update verfügbar</string>
+	<string name="sk_list_timelines">Listen</string>
+	<string name="sk_follow_requests">Folgeanfragen</string>
+	<string name="sk_accept_follow_request">Folgeanfrage akzeptieren</string>
+	<string name="sk_reject_follow_request">Folgeanfrage ablehnen</string>
+	<string name="sk_lists_with_user">Listen mit %s</string>
+	<string name="sk_settings_always_reveal_content_warnings">Inhaltswarnungen immer ausklappen</string>
+	<string name="sk_disable_marquee">Laufschrift in Titelleisten deaktivieren</string>
+	<string name="sk_settings_contribute">Zu Megalodon beitragen</string>
+	<string name="sk_settings_show_federated_timeline">Föderierte Timeline anzeigen</string>
+</resources>
--- a/mastodon/src/main/res/values-el-rGR/strings_sk.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-es-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-es-rES/strings_sk.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sk_pinned_posts">Anclado</string>
+    <string name="sk_delete_and_redraft">Eliminar y editar</string>
+    <string name="sk_confirm_delete_and_redraft_title">Eliminar y editar post</string>
+    <string name="sk_confirm_delete_and_redraft">Seguro que quiere eliminar y volver a editar este post\?</string>
+    <string name="sk_pin_post">Fijar en perfil</string>
+    <string name="sk_confirm_pin_post_title">Fijar post en perfil</string>
+    <string name="sk_confirm_pin_post">Desea fijar el post en su perfil\?</string>
+    <string name="sk_pinning">Fijando post…</string>
+    <string name="sk_unpin_post">Quitar del perfil</string>
+    <string name="sk_confirm_unpin_post_title">Quitar post del perfil</string>
+    <string name="sk_confirm_unpin_post">Está seguro que quiere quitar el post\?</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_unpinning">Quitando post…</string>
+    <string name="sk_image_description">Descripción de la imagen</string>
+    <string name="sk_visibility_unlisted">Sin listar</string>
+    <string name="sk_settings_show_replies">Mostrar respuestas</string>
+    <string name="sk_settings_show_boosts">Mostrar boosts</string>
+    <string name="sk_settings_load_new_posts">Cargar nuevos posts automáticamente</string>
+    <string name="sk_settings_show_interaction_counts">Mostrar contadores de interacciones</string>
+    <string name="sk_mark_media_as_sensitive">Marcar medio como sensible</string>
+    <string name="sk_user_post_notifications_on">Activadas las notificaciones de posts para %s</string>
+    <string name="sk_user_post_notifications_off">Desactivadas las notificaciones de posts para %s</string>
+    <string name="sk_federated_timeline">Federación</string>
+    <string name="sk_federated_timeline_info_banner">Estos son los posts más recientes de las personas de tu federación.</string>
+    <string name="sk_update_available">Megalodon %s está listo para descargar.</string>
+    <string name="sk_update_ready">Megalodon %s se ha descargado y está listo para instalarse.</string>
+    <string name="sk_check_for_update">Buscar actualizaciones</string>
+    <string name="sk_no_update_available">No hay actualizaciones disponibles</string>
+    <string name="sk_list_timelines">Listas</string>
+    <string name="sk_follow_requests">Solicitudes de seguimiento</string>
+    <string name="sk_accept_follow_request">Aceptar solicitud de seguimiento</string>
+    <string name="sk_reject_follow_request">Rechazar solicitud de seguimiento</string>
+    <string name="sk_lists_with_user">Listas con %s</string>
+    <string name="sk_settings_always_reveal_content_warnings">Mostrar siempre advertencias de contenido</string>
+    <string name="sk_disable_marquee">Desactivar desplazamiento de texto en barras del título</string>
+    <string name="sk_settings_contribute">Contribuir a Megalodon</string>
+    <string name="sk_settings_show_federated_timeline">Mostrar el timeline federado</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+</resources>
--- a/mastodon/src/main/res/values-eu-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-eu-rES/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-fi-rFI/strings_sk.xml
+++ b/mastodon/src/main/res/values-fi-rFI/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-fr-rFR/strings.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings.xml
@@ -382,4 +382,9 @@
 	<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="remove_bookmark">Retirer des favoris</string>
+	<string name="bookmarks">Favoris</string>
+	<string name="your_favorites">Vos favoris</string>
 </resources>
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sk_pinned_posts">Épinglé</string>
+    <string name="sk_confirm_delete_and_redraft_title">Supprimer et reformuler le message</string>
+    <string name="sk_confirm_delete_and_redraft">Voulez-vous vraiment supprimer et reformuler ce message \?</string>
+    <string name="sk_confirm_pin_post">Voulez-vous épingler ce message à votre profil \?</string>
+    <string name="sk_pinning">Épinglage de la publication…</string>
+    <string name="sk_unpin_post">Détacher du profil</string>
+    <string name="sk_confirm_unpin_post_title">Détacher la publication du profil</string>
+    <string name="sk_unpinning">Détachement de la publication…</string>
+    <string name="sk_image_description">Description de l\'image</string>
+    <string name="sk_visibility_unlisted">Non répertorié</string>
+    <string name="sk_settings_show_replies">Afficher les réponses</string>
+    <string name="sk_settings_show_boosts">Afficher les boosts</string>
+    <string name="sk_settings_load_new_posts">Charger automatiquement les nouvelles publications</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_mark_media_as_sensitive">Marquer le média comme sensible</string>
+    <string name="sk_user_post_notifications_on">Notifications de publication activées pour %s</string>
+    <string name="sk_user_post_notifications_off">Désactivation des notifications de publication pour %s</string>
+    <string name="sk_update_available">Megalodon %s est prêt à être téléchargé.</string>
+    <string name="sk_update_ready">Megalodon %s est téléchargé et prêt à être installé.</string>
+    <string name="sk_check_for_update">Vérifier les mises à jour</string>
+    <string name="sk_no_update_available">Pas de mise a jour disponible</string>
+    <string name="sk_list_timelines">Listes</string>
+    <string name="sk_follow_requests">Suivre les demandes</string>
+    <string name="sk_accept_follow_request">Accepter la demande de suivi</string>
+    <string name="sk_reject_follow_request">Refuser la demande de suivi</string>
+    <string name="sk_lists_with_user">Listes avec %s</string>
+    <string name="sk_settings_always_reveal_content_warnings">Toujours afficher les avertissements de contenu</string>
+    <string name="sk_disable_marquee">Désactiver le défilement du texte dans les barres de titre</string>
+    <string name="sk_settings_contribute">Contribuez à Megalodon</string>
+    <string name="sk_settings_show_federated_timeline">Afficher la timeline fédérée</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_delete_and_redraft">Supprimer et reformuler</string>
+    <string name="sk_pin_post">Épingler au profil</string>
+    <string name="sk_confirm_pin_post_title">Épingler la publication au profil</string>
+    <string name="sk_confirm_unpin_post">Êtes-vous sûr de vouloir détacher cette publication \?</string>
+    <string name="sk_settings_show_interaction_counts">Afficher le nombre d\'interactions</string>
+    <string name="sk_federated_timeline">Fédération</string>
+    <string name="sk_federated_timeline_info_banner">Ce sont les publications les plus récentes des membres de votre fédération.</string>
+</resources>
--- a/mastodon/src/main/res/values-ga-rIE/strings_sk.xml
+++ b/mastodon/src/main/res/values-ga-rIE/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-gd-rGB/strings_sk.xml
+++ b/mastodon/src/main/res/values-gd-rGB/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-gl-rES/strings.xml
+++ b/mastodon/src/main/res/values-gl-rES/strings.xml
@@ -218,7 +218,7 @@
 	<string name="step_x_of_n">Paso %1$d de %2$d</string>
 	<string name="skip">Omitir</string>
 	<string name="notification_type_follow">Novas seguidoras</string>
-	<string name="notification_type_favorite">Favoritos</string>
+	<string name="notification_type_favorite">Favoritas</string>
 	<string name="notification_type_reblog">Promocións</string>
 	<string name="notification_type_mention">Mencións</string>
 	<string name="notification_type_poll">Enquisas</string>
@@ -332,7 +332,7 @@
 	<string name="timestamp_via_app">%1$s vía %2$s</string>
 	<string name="time_now">agora</string>
 	<string name="post_info_reblogs">Promocións</string>
-	<string name="post_info_favorites">Favoritos</string>
+	<string name="post_info_favorites">Favoritas</string>
 	<string name="edit_history">Editar historial</string>
 	<string name="last_edit_at_x">Última edición %s</string>
 	<string name="time_just_now">xusto agora</string>
@@ -371,6 +371,20 @@
 	<string name="upload_error_connection_lost">O dispositivo perdeu a conexión a internet</string>
 	<string name="upload_processing">Procesando…</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Mastodon para Android %s está preparada para descargar.</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">Descargouse Mastodon para Android %s e está lista para instalar.</string>
 	<!-- %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>
+	<string name="text_copied">Copiado ao portapapeis</string>
+	<string name="add_bookmark">Marcar</string>
+	<string name="remove_bookmark">Eliminar marcador</string>
+	<string name="bookmarks">Marcadores</string>
+	<string name="your_favorites">Publicacións Favoritas</string>
 </resources>
--- a/mastodon/src/main/res/values-gl-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-gl-rES/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-hi-rIN/strings_sk.xml
+++ b/mastodon/src/main/res/values-hi-rIN/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-hr-rHR/strings_sk.xml
+++ b/mastodon/src/main/res/values-hr-rHR/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-hy-rAM/strings_sk.xml
+++ b/mastodon/src/main/res/values-hy-rAM/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sk_delete_and_redraft">Hapus dan tulis ulang</string>
+    <string name="sk_confirm_delete_and_redraft_title">Hapus dan tulis ulang kiriman</string>
+    <string name="sk_confirm_pin_post_title">Sematkan kiriman ke profil</string>
+    <string name="sk_confirm_pin_post">Sematkan kiriman ini ke profil Anda\?</string>
+    <string name="sk_pinning">Menyematkan kiriman…</string>
+    <string name="sk_unpin_post">Hapus sematan dari profil</string>
+    <string name="sk_confirm_unpin_post_title">Hapus sematan kiriman dari profil</string>
+    <string name="sk_image_description">Deskripsi gambar</string>
+    <string name="sk_settings_show_replies">Lihat balasan</string>
+    <string name="sk_settings_show_boosts">Lihat boost</string>
+    <string name="sk_settings_load_new_posts">Muat kiriman baru secara otomatis</string>
+    <string name="sk_settings_show_interaction_counts">Tampilkan jumlah interaksi</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_user_post_notifications_on">Nyalakan notifikasi kiriman untuk %s</string>
+    <string name="sk_user_post_notifications_off">Matikan notifikasi kiriman untuk %s</string>
+    <string name="sk_federated_timeline">Federasi</string>
+    <string name="sk_federated_timeline_info_banner">Kiriman terbaru dari orang-orang di federasi anda.</string>
+    <string name="sk_update_available">Megalodon %s siap untuk diunduh.</string>
+    <string name="sk_update_ready">Megalodon %s telah diunduh dan siap dipasang.</string>
+    <string name="sk_check_for_update">Periksa pembaruan</string>
+    <string name="sk_no_update_available">Tidak ada pembaruan</string>
+    <string name="sk_list_timelines">Daftar</string>
+    <string name="sk_unpinning">Menghapus sematan kiriman…</string>
+    <string name="sk_accept_follow_request">Terima permintaan pengikut</string>
+    <string name="sk_reject_follow_request">Tolak permintaan pengikut</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_confirm_delete_and_redraft">Hapus dan tulis ulang kiriman ini\?</string>
+    <string name="sk_confirm_unpin_post">Apakah Anda yakin untuk menghapus sematan kiriman ini\?</string>
+    <string name="sk_settings_contribute">Kontribusi ke Megalodon</string>
+    <string name="sk_pinned_posts">Disematkan</string>
+    <string name="sk_pin_post">Sematkan ke profil</string>
+    <string name="sk_visibility_unlisted">Tidak terdaftar</string>
+    <string name="sk_mark_media_as_sensitive">Tandai media sebagai sensitif</string>
+    <string name="sk_follow_requests">Permintaan pengikut</string>
+    <string name="sk_lists_with_user">Daftar dengan %s</string>
+    <string name="sk_settings_always_reveal_content_warnings">Selalu ungkap peringatan konten</string>
+    <string name="sk_disable_marquee">Nonaktifkan teks bergulir dalam bilah judul</string>
+    <string name="sk_settings_show_federated_timeline">Tampilkan lini masa federasi</string>
+</resources>
--- a/mastodon/src/main/res/values-is-rIS/strings.xml
+++ b/mastodon/src/main/res/values-is-rIS/strings.xml
@@ -182,6 +182,7 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="username">notandanafn</string>
 	<string name="email">tölvupóstur</string>
 	<string name="password">lykilorð</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>
 	<string name="category_all">Allt</string>
@@ -207,6 +208,8 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="edit_image">Breyta mynd</string>
 	<string name="save">Vista</string>
 	<string name="add_alt_text">Bættu við ALT-texta</string>
+	<string name="alt_text_subtitle">ALT-texti lýsir myndunum þínum fyrir sjónskert fólk. Reyndu að hafa einungis nægar upplýsingar svo hægt sé að skilja samhengi myndanna.</string>
+	<string name="alt_text_hint">t.d. hundur pírir augun á grunsamlega myndavélina.</string>
 	<string name="visibility_public">Opinbert</string>
 	<string name="visibility_followers_only">Einungis fylgjendur</string>
 	<string name="visibility_private">Einungis fólk sem ég minnist á</string>
@@ -222,6 +225,12 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="notification_type_poll">Kannanir</string>
 	<string name="choose_account">Veldu aðgang</string>
 	<string name="err_not_logged_in">Skráðu þig fyrst inn á Mastodon</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Þú getur ekki bætt við fleiri en %d myndefnisviðhengi</item>
+		<item quantity="other">Þú getur ekki bætt við fleiri en %d myndefnisviðhengjum</item>
+	</plurals>
+	<string name="media_attachment_unsupported_type">Skráin %s er af tegund sem ekki er studd</string>
+	<string name="media_attachment_too_big">Skráin %1$s fer yfir stærðartakmörkin %2$s MB</string>
 	<string name="settings_theme">Útlit</string>
 	<string name="theme_auto">Sjálfvirkt</string>
 	<string name="theme_light">Ljóst</string>
@@ -229,6 +238,7 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="theme_true_black">Sannur svartur hamur</string>
 	<string name="settings_behavior">Hegðun</string>
 	<string name="settings_gif">Spila auðkennismyndir með hreyfingu</string>
+	<string name="settings_custom_tabs">Nota innbyggðan vafra forritsins</string>
 	<string name="settings_notifications">Tilkynningar</string>
 	<string name="notify_me_when">Tilkynna mér þegar</string>
 	<string name="notify_anyone">hver sem er</string>
@@ -250,6 +260,7 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="media_cache_cleared">Skyndiminni margmiðlunarefnis hreinsað</string>
 	<string name="confirm_log_out">Ertu viss um að þú viljir skrá þig út?</string>
 	<string name="sensitive_content">Viðkvæmt efni</string>
+	<string name="sensitive_content_explain">Höfundurinn merkti þetta myndefni sem viðkvæmt. Ýttu til að birta það.</string>
 	<string name="media_hidden">Ýttu til að birta</string>
 	<string name="avatar_description">Fara á notandasnið %s</string>
 	<string name="more_options">Fleiri valkostir</string>
@@ -282,6 +293,7 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="reorder">Endurraða</string>
 	<string name="download">Sækja</string>
 	<string name="permission_required">Krafist er heimildar</string>
+	<string name="storage_permission_to_download">Forritið þarf aðgang að geymslurýminu þínu til að vista þessa skrá.</string>
 	<string name="open_settings">Opna stillingar</string>
 	<string name="error_saving_file">Villa við að vista skrána</string>
 	<string name="file_saved">Skrá vistuð</string>
@@ -291,6 +303,7 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="trending_posts_info_banner">Þetta eru færslurnar sem eru að fá aukna athygli í þínu horni á Mastodon.</string>
 	<string name="trending_hashtags_info_banner">Þetta eru myllumerkin sem eru að fá aukna athygli í þínu horni á Mastodon.</string>
 	<string name="trending_links_info_banner">Þetta eru fréttirnar sem eru að fá aukna athygli í þínu horni á Mastodon.</string>
+	<string name="local_timeline_info_banner">Þetta eru nýjustu færslurnar frá fólki sem notar sama Mastodon-netþjón og þú.</string>
 	<string name="dismiss">Afgreiða</string>
 	<string name="see_new_posts">Skoða nýjar færslur</string>
 	<string name="load_missing_posts">Hlaða inn færslum sem vantar</string>
@@ -366,7 +379,13 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<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="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>
+	<string name="text_copied">Afritað á klippispjald</string>
+	<string name="add_bookmark">Bókamerki</string>
+	<string name="remove_bookmark">Fjarlægja bókamerki</string>
+	<string name="bookmarks">Bókamerki</string>
+	<string name="your_favorites">Eftirlætin þín</string>
 </resources>
--- a/mastodon/src/main/res/values-is-rIS/strings_sk.xml
+++ b/mastodon/src/main/res/values-is-rIS/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-it-rIT/strings_sk.xml
+++ b/mastodon/src/main/res/values-it-rIT/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-iw-rIL/strings_sk.xml
+++ b/mastodon/src/main/res/values-iw-rIL/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-ja-rJP/strings.xml
+++ b/mastodon/src/main/res/values-ja-rJP/strings.xml
@@ -360,4 +360,10 @@
 	<string name="privacy_policy_subtitle">Mastodonアプリはいかなるデータも収集しませんが、サインアップするサーバーは別のポリシーを持っている場合があります。Mastodonアプリのプライバシーポリシーとサーバーのプライバシーポリシーを確認をし、同意してください。</string>
 	<string name="i_agree">同意する</string>
 	<string name="empty_list">このリストは空です。</string>
+	<string name="instance_signup_closed">このサーバーは新規登録を受け付けていません。</string>
+	<string name="text_copied">クリップボードにコピー</string>
+	<string name="add_bookmark">ブックマーク</string>
+	<string name="remove_bookmark">ブックマークから削除</string>
+	<string name="bookmarks">ブックマーク</string>
+	<string name="your_favorites">お気に入り</string>
 </resources>
--- a/mastodon/src/main/res/values-ja-rJP/strings_sk.xml
+++ b/mastodon/src/main/res/values-ja-rJP/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-kab/strings_sk.xml
+++ b/mastodon/src/main/res/values-kab/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-ko-rKR/strings.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings.xml
@@ -38,7 +38,6 @@
 	</plurals>
 	<string name="posts">게시물</string>
 	<string name="posts_and_replies">게시물과 답장</string>
-	<string name="pinned_posts">고정됨</string>
 	<string name="media">미디어</string>
 	<string name="profile_about">정보</string>
 	<string name="button_follow">팔로우</string>
@@ -109,20 +108,9 @@
 	<string name="action_vote">투표</string>
 	<string name="tap_to_reveal">눌러서 확인</string>
 	<string name="delete">삭제</string>
-	<string name="delete_and_redraft">삭제하고 다시 쓰기</string>
 	<string name="confirm_delete_title">게시물 삭제</string>
-	<string name="confirm_delete_and_redraft_title">게시물 삭제하고 다시 쓰기</string>
 	<string name="confirm_delete">정말로 이 게시물을 삭제하시겠습니까?</string>
-	<string name="confirm_delete_and_redraft">정말로 이 게시물을 삭제하고 다시 쓰시겠습니까?</string>
 	<string name="deleting">삭제 중…</string>
-	<string name="pin_post">고정</string>
-	<string name="confirm_pin_post_title">게시물 고정</string>
-	<string name="confirm_pin_post">정말로 이 게시물을 고정하시겠습니까?</string>
-	<string name="pinning">고정 중…</string>
-	<string name="unpin_post">고정 해제</string>
-	<string name="confirm_unpin_post_title">게시물 고정 해제</string>
-	<string name="confirm_unpin_post">정말로 이 게시물을 고정 해제하시겠습니까?</string>
-	<string name="unpinning">고정 해제 중…</string>
 	<string name="notification_channel_audio_player">오디오 재생</string>
 	<string name="play">재생</string>
 	<string name="pause">일시정지</string>
@@ -201,7 +189,6 @@
 	<string name="compose_hint">무슨 생각을 하고 있는지 입력하거나 붙여넣으세요</string>
 	<string name="content_warning">열람 주의</string>
 	<string name="add_image_description">이미지 설명 추가…</string>
-	<string name="image_description">이미지 설명</string>
 	<string name="retry_upload">업로드 재시도</string>
 	<string name="edit_image">이미지 편집</string>
 	<string name="save">저장</string>
@@ -209,7 +196,6 @@
 	<string name="alt_text_subtitle">대체 텍스트는 저시력자나 시각장애인들에게 당신의 사진을 설명합니다. 문맥을 파악할 수 있는 설명들만 넣도록 하세요.</string>
 	<string name="alt_text_hint">예시: 강아지가 의심스러운 가는 눈초리로 카메라를 쳐다보고 있습니다.</string>
 	<string name="visibility_public">공개</string>
-	<string name="visibility_unlisted">타임라인에 비표시</string>
 	<string name="visibility_followers_only">팔로워 전용</string>
 	<string name="visibility_private">멘션한 사람만</string>
 	<string name="search_all">모두</string>
@@ -235,12 +221,8 @@
 	<string name="theme_dark">어두움</string>
 	<string name="theme_true_black">진정한 검정 모드</string>
 	<string name="settings_behavior">동작</string>
-	<string name="settings_show_replies">답장 표시</string>
-	<string name="settings_show_boosts">리블로그 표시</string>
-	<string name="settings_load_new_posts">자동으로 새 포스트 불러오기</string>
 	<string name="settings_gif">아바타와 에모지의 애니메이션을 재생</string>
 	<string name="settings_custom_tabs">앱내 브라우저 사용</string>
-	<string name="settings_show_interaction_counts">상호 작용 수 표시</string>
 	<string name="settings_notifications">알림</string>
 	<string name="notify_me_when">알림을 보낼 조건</string>
 	<string name="notify_anyone">누구든</string>
@@ -273,11 +255,8 @@
 	<string name="button_reblog">리블로그</string>
 	<string name="button_favorite">좋아요</string>
 	<string name="button_share">공유</string>
-	<string name="button_bookmark">보관</string>
-	<string name="bookmarks">보관함</string>
 	<string name="media_no_description">설명이 없는 미디어</string>
 	<string name="add_media">미디어 추가</string>
-	<string name="mark_media_as_sensitive">미디어를 민감함으로 설정하기</string>
 	<string name="add_poll">투표 추가</string>
 	<string name="emoji">에모지</string>
 	<string name="post_visibility">게시물 공개범위</string>
@@ -290,8 +269,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="user_post_notifications_on">%s의 게시물 알림 켜기</string>
-	<string name="user_post_notifications_off">%s의 게시물 알림 끄기</string>
 	<string name="signup_reason">가입하려는 이유가 무엇인가요?</string>
 	<string name="signup_reason_note">이 정보는 우리가 심사를 하는 데에 참고할 수 있습니다.</string>
 	<string name="clear">모두 지우기</string>
@@ -306,13 +283,11 @@
 	<string name="file_saved">파일 저장됨</string>
 	<string name="downloading">다운로드중…</string>
 	<string name="no_app_to_handle_action">이 동작을 처리할 앱이 없습니다</string>
-	<string name="local_timeline">로컬</string>
-	<string name="federated_timeline">연합</string>
+	<string name="local_timeline">커뮤니티</string>
 	<string name="trending_posts_info_banner">당신이 속한 마스토돈 서버에서 관심을 끌고 있는 게시물들입니다.</string>
 	<string name="trending_hashtags_info_banner">당신이 속한 마스토돈 서버에서 관심을 끌고 있는 해시태그들입니다.</string>
 	<string name="trending_links_info_banner">당신이 속한 마스토돈 서버에서 가장 많이 공유되고 있는 소식들입니다.</string>
 	<string name="local_timeline_info_banner">당신과 같은 마스토돈 서버에 존재하는 사람들이 공유한 최신 게시물들입니다.</string>
-	<string name="federated_timeline_info_banner">당신이 속한 연합에 존재하는 사람들이 공유한 최신 게시물들입니다.</string>
 	<string name="dismiss">지우기</string>
 	<string name="see_new_posts">새 게시물 보기</string>
 	<string name="load_missing_posts">빈 게시물 불러오기</string>
@@ -381,19 +356,12 @@
 	<!-- %s is file size -->
 	<string name="download_update">다운로드 (%s)</string>
 	<string name="install_update">설치</string>
-	<string name="check_for_update">업데이트 확인</string>
-	<string name="no_update_available">사용 가능한 업데이트 없음</string>
 	<string name="privacy_policy_title">마스토돈 및 개인정보</string>
 	<string name="privacy_policy_subtitle">마스토돈 앱은 아무런 데이터도 수집하지 않지만, 가입한 서버의 정책은 다를 수도 있습니다. 잠시 시간을 들여 마스토돈 앱과 서버의 개인정보 정책을 확인한 후 동의해 주세요.</string>
 	<string name="i_agree">동의합니다</string>
-	<string name="list_timelines">리스트</string>
-	<string name="your_favorites">좋아요</string>
-	<string name="follow_requests">팔로우 요청</string>
-	<string name="accept_follow_request">팔로우 요청 허가</string>
-	<string name="reject_follow_request">팔로우 요청 거부</string>
-	<string name="lists_with_user">%s 님이 포함된 리스트</string>
-	<string name="settings_always_reveal_content_warnings">열람주의 툿을 항상 펼치기</string>
-	<string name="disable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
 	<string name="empty_list">리스트에 아무 것도 없습니다</string>
 	<string name="instance_signup_closed">이 서버는 가입이 막혀 있는 상태입니다.</string>
+	<string name="add_bookmark">보관</string>
+	<string name="bookmarks">보관함</string>
+	<string name="your_favorites">좋아요</string>
 </resources>
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="sk_pinned_posts">고정됨</string>
+	<string name="sk_delete_and_redraft">삭제하고 다시 쓰기</string>
+	<string name="sk_confirm_delete_and_redraft_title">게시물 삭제하고 다시 쓰기</string>
+	<string name="sk_confirm_delete_and_redraft">정말로 이 게시물을 삭제하고 다시 쓰시겠습니까?</string>
+	<string name="sk_pin_post">고정</string>
+	<string name="sk_confirm_pin_post_title">게시물 고정</string>
+	<string name="sk_confirm_pin_post">정말로 이 게시물을 고정하시겠습니까?</string>
+	<string name="sk_pinning">고정 중…</string>
+	<string name="sk_unpin_post">고정 해제</string>
+	<string name="sk_confirm_unpin_post_title">게시물 고정 해제</string>
+	<string name="sk_confirm_unpin_post">정말로 이 게시물을 고정 해제하시겠습니까?</string>
+	<string name="sk_unpinning">고정 해제 중…</string>
+	<string name="sk_image_description">이미지 설명</string>
+	<string name="sk_visibility_unlisted">타임라인에 비표시</string>
+  <string name="sk_settings_show_replies">답장 표시</string>
+	<string name="sk_settings_show_boosts">리블로그 표시</string>
+	<string name="sk_settings_load_new_posts">자동으로 새 포스트 불러오기</string>
+	<string name="sk_settings_show_interaction_counts">상호 작용 수 표시</string>
+	<string name="sk_mark_media_as_sensitive">미디어를 민감함으로 설정하기</string>
+	<string name="sk_user_post_notifications_on">%s의 게시물 알림 켜기</string>
+	<string name="sk_user_post_notifications_off">%s의 게시물 알림 끄기</string>
+	<string name="sk_federated_timeline">연합</string>
+	<string name="sk_federated_timeline_info_banner">당신이 속한 연합에 존재하는 사람들이 공유한 최신 게시물들입니다.</string>
+	<string name="sk_check_for_update">업데이트 확인</string>
+	<string name="sk_no_update_available">사용 가능한 업데이트 없음</string>
+	<string name="sk_list_timelines">리스트</string>
+	<string name="sk_follow_requests">팔로우 요청</string>
+	<string name="sk_accept_follow_request">팔로우 요청 허가</string>
+	<string name="sk_reject_follow_request">팔로우 요청 거부</string>
+	<string name="sk_lists_with_user">%s 님이 포함된 리스트</string>
+	<string name="sk_settings_always_reveal_content_warnings">열람주의 툿을 항상 펼치기</string>
+	<string name="sk_disable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
+</resources>
--- a/mastodon/src/main/res/values-my/strings_sk.xml
+++ b/mastodon/src/main/res/values-my/strings_sk.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_delete_and_redraft">ဖျက်ပြီး ပြန်ရေးမည်</string>
+    <string name="sk_pin_post">ပရိုဖိုင်းတွင် ပင်တွဲမည်</string>
+    <string name="sk_pinning">ပင်တွဲနေသည်…</string>
+    <string name="sk_unpin_post">ပရိုဖိုင်းတွင် ပင်မတွဲတော့ပါ</string>
+    <string name="sk_confirm_unpin_post_title">ပရိုဖိုင်းတွင် ပင်မတွဲတော့ခြင်း</string>
+    <string name="sk_unpinning">ပင်ဖြုတ်နေသည်…</string>
+    <string name="sk_image_description">ပုံတွင်ပါဝင်သော အကြောင်းအရာ</string>
+    <string name="sk_visibility_unlisted">စာရင်းမလုပ်</string>
+    <string name="sk_settings_show_boosts">Boost များကို ပြသမည်</string>
+    <string name="sk_settings_app_version">Megalodon - ဗားရှင်း %1$s (%2$d)</string>
+    <string name="sk_mark_media_as_sensitive">ပုံ/ဗီဒီယိုအား ထိရှလွယ်သည်အဖြစ် မှတ်သားသည်</string>
+    <string name="sk_user_post_notifications_off">%s အတွက် ပို့စ်နိုတီများကို ပိတ်လိုက်သည်</string>
+    <string name="sk_federated_timeline">ဖက်ဒရေးရှင်း</string>
+    <string name="sk_update_available">Megalodon %s ကို ဒေါင်းလုဒ်ဆွဲလို့ရပါပြီ။</string>
+    <string name="sk_update_ready">Megalodon %s ကို ဒေါင်းလုဒ်ဆွဲပြီးပြီမလို့ အင်စတောလုပ်နိုင်ပါပြီ။</string>
+    <string name="sk_no_update_available">မည်သည့်အပ်ဒိတ်မျှ မရှိသေးပါ</string>
+    <string name="sk_follow_requests">ဖောလိုဝါအဖြစ် တောင်းဆိုမှုများ</string>
+    <string name="sk_accept_follow_request">ဖောလိုဝါအဖြစ်တောင်းဆိုမှုကို လက်ခံမည်</string>
+    <string name="sk_reject_follow_request">ဖောလိုဝါအဖြစ်တောင်းဆိုမှုကို ငြင်းပယ်မည်</string>
+    <string name="sk_confirm_pin_post_title">ပို့စ်အား ပရိုဖိုင်းတွင် ပင်တွဲခြင်း</string>
+    <string name="sk_confirm_delete_and_redraft_title">ပို့စ်အား ဖျက်ပြီးပြန်ရေးခြင်း</string>
+    <string name="sk_confirm_delete_and_redraft">ဖျက်ပြီးပြန်ရေးမှာ သေချာပြီလား\?</string>
+    <string name="sk_confirm_pin_post">ပရိုဖိုင်းမှာ ပင်တွဲမှာ သေချာပြီလား\?</string>
+    <string name="sk_confirm_unpin_post">ပို့စ်ကို ပင်မတွဲတော့ဘူးဆိုတာ သေချာပြီလား\?</string>
+    <string name="sk_settings_show_replies">ရီပလိုင်းများကို ပြသမည်</string>
+    <string name="sk_settings_load_new_posts">ပို့စ်အသစ်များကို အလိုအလျောက်ရယူမည်</string>
+    <string name="sk_user_post_notifications_on">%s အတွက် ပို့စ်နိုတီများကို ဖွင့်လိုက်သည်</string>
+    <string name="sk_federated_timeline_info_banner">သင့်ဖက်ဒရေးရှင်းကလူတွေရဲ့ လတ်တလောပို့စ်တွေ ဖြစ်ပါတယ်။</string>
+    <string name="sk_check_for_update">အပ်ဒိတ်ရှိလားစစ်ဆေးမည်</string>
+    <string name="sk_disable_marquee">ခေါင်းစီးဘားများတွင် စာများရွေ့လျားမှု ပိတ်မည်</string>
+</resources>
--- a/mastodon/src/main/res/values-nl-rNL/strings.xml
+++ b/mastodon/src/main/res/values-nl-rNL/strings.xml
@@ -47,12 +47,12 @@
 	<string name="button_following">Volgend</string>
 	<string name="edit_profile">Profiel bewerken</string>
 	<string name="mention_user">Vermelden</string>
-	<string name="share_user">Delen</string>
+	<string name="share_user">%s delen</string>
 	<string name="mute_user">Negeren</string>
 	<string name="unmute_user">Niet langer negeren</string>
 	<string name="block_user">Blokkeren</string>
 	<string name="unblock_user">Deblokkeren</string>
-	<string name="report_user">Rapporteren</string>
+	<string name="report_user">%s rapporteren</string>
 	<string name="block_domain">Blokkeren</string>
 	<string name="unblock_domain">Deblokkeren</string>
 	<plurals name="x_posts">
@@ -142,7 +142,7 @@
 		<item quantity="one">%d keer over gediscussieerd</item>
 		<item quantity="other">%d keer over gediscussieerd</item>
 	</plurals>
-	<string name="report_title">Rapporteren</string>
+	<string name="report_title">%s rapporteren</string>
 	<string name="report_choose_reason">Wat is er mis met dit bericht?</string>
 	<string name="report_choose_reason_account">Wat is er mis met %s?</string>
 	<string name="report_choose_reason_subtitle">Kies wat het beste overeenkomt</string>
--- a/mastodon/src/main/res/values-nl-rNL/strings_sk.xml
+++ b/mastodon/src/main/res/values-nl-rNL/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-oc-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-oc-rFR/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
+++ b/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sk_delete_and_redraft">Usuń i zmodyfikuj</string>
+    <string name="sk_pin_post">Przypomnij do profilu</string>
+    <string name="sk_confirm_pin_post_title">Przypomnij post na profilu</string>
+    <string name="sk_confirm_pin_post">Czy chcesz przypiąć ten post na swoim profilu\?</string>
+    <string name="sk_pinning">Przypinanie postu…</string>
+    <string name="sk_unpin_post">Odepnij post z profilu</string>
+    <string name="sk_confirm_unpin_post_title">Odepnij post z profilu</string>
+    <string name="sk_unpinning">Odpinanie postu…</string>
+    <string name="sk_settings_show_replies">Pokaż odpowiedzi</string>
+    <string name="sk_settings_show_boosts">Pokaż podbicia</string>
+    <string name="sk_settings_load_new_posts">Automatycznie wczytuj nowe posty</string>
+    <string name="sk_settings_show_interaction_counts">Pokaż dane ilości interakcji</string>
+    <string name="sk_mark_media_as_sensitive">Oznacz jako wrażliwe</string>
+    <string name="sk_user_post_notifications_on">Włączono powiadomienia dla postu %s</string>
+    <string name="sk_user_post_notifications_off">Wyłączono powiadomienia dla postu %s</string>
+    <string name="sk_federated_timeline">Znana sieć fediverse</string>
+    <string name="sk_federated_timeline_info_banner">To są najnowsze post ze znanej sieci fediverse dla twojego serwera.</string>
+    <string name="sk_update_available">Megalodon %s jest dostępny do pobrania.</string>
+    <string name="sk_update_ready">Megalodon %s został pobrany i jest gotowy do instalacji.</string>
+    <string name="sk_check_for_update">Szukaj uaktualnień</string>
+    <string name="sk_no_update_available">Brak dostępnych uaktualnień</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_pinned_posts">Przypięte</string>
+    <string name="sk_confirm_delete_and_redraft">Jesteś pewnien, że chcesz usunąć zmodyfikowany post\?</string>
+    <string name="sk_confirm_unpin_post">Jesteś pewien, że chcesz odpiąć ten post\?</string>
+    <string name="sk_image_description">Opis obrazka</string>
+    <string name="sk_confirm_delete_and_redraft_title">Usuń i zmodyfikuj post</string>
+    <string name="sk_list_timelines">Listy</string>
+    <string name="sk_follow_requests">Prośby o obserwowanie</string>
+    <string name="sk_accept_follow_request">Zaakceptuj prośby o obserwowanie</string>
+    <string name="sk_reject_follow_request">Odrzuć prośby o obserwowanie</string>
+    <string name="sk_lists_with_user">Listy z %s</string>
+    <string name="sk_settings_always_reveal_content_warnings">Zawsze odkrywaj ostrzeżenia o zawartości</string>
+    <string name="sk_disable_marquee">Wyłącz tekst przewijany w paskach tytułowych</string>
+    <string name="sk_settings_contribute">Wspomóż Megalodon</string>
+    <string name="sk_settings_show_federated_timeline">Pokaż oś czasu znanej sieci Fediverse</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+</resources>
--- a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-pt-rPT/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rPT/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-ro-rRO/strings_sk.xml
+++ b/mastodon/src/main/res/values-ro-rRO/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-ru-rRU/strings_sk.xml
+++ b/mastodon/src/main/res/values-ru-rRU/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-si-rLK/strings_sk.xml
+++ b/mastodon/src/main/res/values-si-rLK/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-sl-rSI/strings.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings.xml
@@ -423,4 +423,10 @@
 	<string name="privacy_policy_subtitle">Čeprav program Mastodon ne zbira podatkov, ima lahko strežnik, na katerem ste prijavljeni, drugačno politiko. Vzemite si malo časa in preglejte ter potrdite pravilnik o zasebnosti programa Mastodon ter pravilnik o zasebnosti svojega strežnika.</string>
 	<string name="i_agree">Strinjam se</string>
 	<string name="empty_list">Ta seznam je prazen</string>
+	<string name="instance_signup_closed">Ta strežnik ne sprejema novih registracij.</string>
+	<string name="text_copied">Kopirano v odložišče</string>
+	<string name="add_bookmark">Dodaj med zaznamke</string>
+	<string name="remove_bookmark">Odstrani zaznamek</string>
+	<string name="bookmarks">Zaznamki</string>
+	<string name="your_favorites">Vaši priljubljeni</string>
 </resources>
--- a/mastodon/src/main/res/values-sl-rSI/strings_sk.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-sv-rSE/strings_sk.xml
+++ b/mastodon/src/main/res/values-sv-rSE/strings_sk.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sk_pinned_posts">Nåla fast</string>
+    <string name="sk_delete_and_redraft">Ta bort och skriv om</string>
+    <string name="sk_pin_post">Nåla fast på profil</string>
+    <string name="sk_pinning">Nålar fast inlägg…</string>
+    <string name="sk_unpin_post">Ta bort från profil</string>
+    <string name="sk_confirm_unpin_post_title">Ta bort inlägg från profil</string>
+    <string name="sk_unpinning">Tar bort inlägg…</string>
+    <string name="sk_image_description">Bildbeskrivning</string>
+    <string name="sk_visibility_unlisted">Olistad</string>
+    <string name="sk_settings_show_replies">Visa svar</string>
+    <string name="sk_settings_show_boosts">Visa puffar</string>
+    <string name="sk_settings_load_new_posts">Ladda automatiskt nya inlägg</string>
+    <string name="sk_settings_show_interaction_counts">Visa antal interaktioner</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_mark_media_as_sensitive">Markera media som känsligt</string>
+    <string name="sk_user_post_notifications_off">Slå av inläggsnotifieringar för %s</string>
+    <string name="sk_federated_timeline">Federation</string>
+    <string name="sk_federated_timeline_info_banner">Dessa är de senaste inläggen av folk i din federation.</string>
+    <string name="sk_update_available">Megalodon %s är redo att ladda ner.</string>
+    <string name="sk_check_for_update">Kolla efter uppdateringar</string>
+    <string name="sk_no_update_available">Inga uppdateringar tillgängliga</string>
+    <string name="sk_list_timelines">Listor</string>
+    <string name="sk_follow_requests">Följarbegäranden</string>
+    <string name="sk_accept_follow_request">Acceptera följarbegäran</string>
+    <string name="sk_reject_follow_request">Avslå följarbegäran</string>
+    <string name="sk_lists_with_user">Listor med %s</string>
+    <string name="sk_settings_always_reveal_content_warnings">Visa alltid innehållsvarningar</string>
+    <string name="sk_disable_marquee">Slå av skrollande text i titelrader</string>
+    <string name="sk_settings_contribute">Bidra till Megalodon</string>
+    <string name="sk_settings_show_federated_timeline">Visa federerad tidslinje</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_confirm_delete_and_redraft_title">Ta bort och skriv om inlägg</string>
+    <string name="sk_confirm_delete_and_redraft">Är du säker på att du vill ta bort och skriva om detta inlägg\?</string>
+    <string name="sk_confirm_pin_post_title">Nåla fast inlägg på profil</string>
+    <string name="sk_confirm_pin_post">Vill du nåla fast detta inlägg på din profil\?</string>
+    <string name="sk_confirm_unpin_post">Är du säker på att du vill ta bort detta inlägg\?</string>
+    <string name="sk_user_post_notifications_on">Slå på inläggsnotifieringar för %s</string>
+    <string name="sk_update_ready">Megalodon %s är nerladdad och redo att installeras.</string>
+</resources>
--- a/mastodon/src/main/res/values-th-rTH/strings.xml
+++ b/mastodon/src/main/res/values-th-rTH/strings.xml
@@ -360,4 +360,10 @@
 	<string name="privacy_policy_subtitle">แม้ว่าแอป Mastodon ไม่ได้เก็บรวบรวมข้อมูลใด ๆ เซิร์ฟเวอร์ที่คุณลงทะเบียนผ่านอาจมีนโยบายที่แตกต่างกัน ใช้เวลาสักครู่เพื่อตรวจทานและเห็นด้วยกับนโยบายความเป็นส่วนตัวของแอป Mastodon และนโยบายความเป็นส่วนตัวของเซิร์ฟเวอร์ของคุณ</string>
 	<string name="i_agree">ฉันเห็นด้วย</string>
 	<string name="empty_list">รายการนี้ว่างเปล่า</string>
+	<string name="instance_signup_closed">เซิร์ฟเวอร์นี้ไม่ได้เปิดรับการลงทะเบียนใหม่</string>
+	<string name="text_copied">คัดลอกไปยังคลิปบอร์ดแล้ว</string>
+	<string name="add_bookmark">เพิ่มที่คั่นหน้า</string>
+	<string name="remove_bookmark">เอาที่คั่นหน้าออก</string>
+	<string name="bookmarks">ที่คั่นหน้า</string>
+	<string name="your_favorites">รายการโปรดของคุณ</string>
 </resources>
--- a/mastodon/src/main/res/values-th-rTH/strings_sk.xml
+++ b/mastodon/src/main/res/values-th-rTH/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-tr-rTR/strings_sk.xml
+++ b/mastodon/src/main/res/values-tr-rTR/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-vi-rVN/strings.xml
+++ b/mastodon/src/main/res/values-vi-rVN/strings.xml
@@ -361,4 +361,9 @@
 	<string name="i_agree">Tôi đồng ý</string>
 	<string name="empty_list">Danh sách trống</string>
 	<string name="instance_signup_closed">Máy chủ này không chấp nhận đăng kí mới.</string>
+	<string name="text_copied">Đã sao chép vào bộ nhớ tạm</string>
+	<string name="add_bookmark">Lưu</string>
+	<string name="remove_bookmark">Bỏ lưu</string>
+	<string name="bookmarks">Tút đã lưu</string>
+	<string name="your_favorites">Lượt thích</string>
 </resources>
--- a/mastodon/src/main/res/values-vi-rVN/strings_sk.xml
+++ b/mastodon/src/main/res/values-vi-rVN/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values-zh-rCN/strings.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings.xml
@@ -38,7 +38,6 @@
 	</plurals>
 	<string name="posts">嘟文</string>
 	<string name="posts_and_replies">嘟文和回复</string>
-	<string name="pinned_posts">置顶</string>
 	<string name="media">媒体</string>
 	<string name="profile_about">关于</string>
 	<string name="button_follow">关注</string>
@@ -109,20 +108,9 @@
 	<string name="action_vote">投票</string>
 	<string name="tap_to_reveal">点击显示</string>
 	<string name="delete">删除</string>
-	<string name="delete_and_redraft">删除以重新编辑</string>
 	<string name="confirm_delete_title">删除嘟文</string>
-	<string name="confirm_delete_and_redraft_title">删除嘟文并重新编辑</string>
 	<string name="confirm_delete">确定要删除这条嘟文吗？</string>
-	<string name="confirm_delete_and_redraft">确定要删除这条嘟文并重新编辑吗？</string>
 	<string name="deleting">正在删除…</string>
-	<string name="pin_post">置顶</string>
-	<string name="confirm_pin_post_title">置顶嘟文</string>
-	<string name="confirm_pin_post">确定要在你的资料页置顶这条嘟文吗？</string>
-	<string name="pinning">正在置顶嘟文…</string>
-	<string name="unpin_post">取消置顶</string>
-	<string name="confirm_unpin_post_title">取消嘟文置顶</string>
-	<string name="confirm_unpin_post">确定不再置顶这条嘟文吗？</string>
-	<string name="unpinning">正在取消置顶…</string>
 	<string name="notification_channel_audio_player">音频播放</string>
 	<string name="play">播放</string>
 	<string name="pause">暂停</string>
@@ -200,7 +188,6 @@
 	<string name="resent_email">邮件已发送</string>
 	<string name="compose_hint">写下你的想法</string>
 	<string name="content_warning">内容警告</string>
-	<string name="image_description">图片描述</string>
 	<string name="add_image_description">添加图片描述…</string>
 	<string name="retry_upload">重新上传</string>
 	<string name="edit_image">编辑图片</string>
@@ -209,7 +196,6 @@
 	<string name="alt_text_subtitle">备注可以为视障人士描述你的图片，请尽量只包含足以理解内容的信息。</string>
 	<string name="alt_text_hint">例如，镜头前有一只狗眯着眼睛警惕地看着四周。</string>
 	<string name="visibility_public">公开</string>
-	<string name="visibility_unlisted">不公开</string>
 	<string name="visibility_followers_only">仅关注者</string>
 	<string name="visibility_private">仅提及的人</string>
 	<string name="search_all">全部</string>
@@ -269,8 +255,6 @@
 	<string name="button_reblog">转发</string>
 	<string name="button_favorite">喜欢</string>
 	<string name="button_share">分享</string>
-	<string name="button_bookmark">添加到书签</string>
-	<string name="bookmarks">书签</string>
 	<string name="media_no_description">没有描述的媒体</string>
 	<string name="add_media">添加媒体</string>
 	<string name="add_poll">发起投票</string>
@@ -300,12 +284,10 @@
 	<string name="downloading">正在下载…</string>
 	<string name="no_app_to_handle_action">未找到可处理此操作的应用</string>
 	<string name="local_timeline">本站时间轴</string>
-	<string name="federated_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="federated_timeline_info_banner">这是在你的联邦宇宙中最新发布的嘟文。</string>
 	<string name="dismiss">驳回</string>
 	<string name="see_new_posts">查看新嘟文</string>
 	<string name="load_missing_posts">加载嘟文</string>
@@ -377,4 +359,6 @@
 	<string name="privacy_policy_title">Mastodon 隐私政策</string>
 	<string name="privacy_policy_subtitle">尽管 Mastodon App 不会收集存储任何数据，但您使用的其他服务可能会有别的隐私政策，花一点时间来浏览与同意Mastodon App 隐私政策和您的服务隐私政策。</string>
 	<string name="i_agree">我同意</string>
+	<string name="add_bookmark">添加到书签</string>
+	<string name="bookmarks">书签</string>
 </resources>
--- a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sk_pinned_posts">置顶</string>
+    <string name="sk_delete_and_redraft">删除以重新编辑</string>
+    <string name="sk_confirm_delete_and_redraft_title">删除嘟文并重新编辑</string>
+    <string name="sk_confirm_delete_and_redraft">确定要删除这条嘟文并重新编辑吗？</string>
+    <string name="sk_pin_post">置顶</string>
+    <string name="sk_confirm_pin_post_title">置顶嘟文</string>
+    <string name="sk_confirm_pin_post">确定要在你的资料页置顶这条嘟文吗？</string>
+    <string name="sk_pinning">正在置顶嘟文…</string>
+    <string name="sk_unpin_post">取消置顶</string>
+    <string name="sk_confirm_unpin_post_title">取消嘟文置顶</string>
+    <string name="sk_confirm_unpin_post">确定不再置顶这条嘟文吗？</string>
+    <string name="sk_unpinning">正在取消置顶…</string>
+    <string name="sk_image_description">图片描述</string>
+    <string name="sk_visibility_unlisted">不公开</string>
+    <string name="sk_federated_timeline">联邦时间轴</string>
+    <string name="sk_federated_timeline_info_banner">这是在你的联邦宇宙中最新发布的嘟文。</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_settings_show_replies">显示回复</string>
+    <string name="sk_settings_show_boosts">显示转发</string>
+    <string name="sk_settings_load_new_posts">自动加载新嘟文</string>
+    <string name="sk_settings_show_interaction_counts">显示互动次数</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_mark_media_as_sensitive">标记为敏感媒体</string>
+    <string name="sk_user_post_notifications_on">为 %s启用嘟文通知</string>
+    <string name="sk_user_post_notifications_off">关闭%s的嘟文通知</string>
+    <string name="sk_update_available">Megalodon %s 已经可以下载了。</string>
+    <string name="sk_update_ready">Megalodon %s 已下载，准备安装。</string>
+    <string name="sk_check_for_update">检查更新</string>
+    <string name="sk_no_update_available">已经是最新版本</string>
+    <string name="sk_list_timelines">列表</string>
+    <string name="sk_accept_follow_request">接受关注请求</string>
+    <string name="sk_reject_follow_request">拒绝关注请求</string>
+    <string name="sk_lists_with_user">%s 的列表</string>
+    <string name="sk_disable_marquee">禁用标题栏的滚动文本</string>
+    <string name="sk_settings_contribute">向 Megalodon 贡献</string>
+    <string name="sk_settings_show_federated_timeline">显示联邦时间轴</string>
+    <string name="sk_follow_requests">关注请求</string>
+    <string name="sk_settings_always_reveal_content_warnings">总是显示内容警告</string>
+</resources>
--- a/mastodon/src/main/res/values-zh-rTW/strings_sk.xml
+++ b/mastodon/src/main/res/values-zh-rTW/strings_sk.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name" translatable="false">Megalodon</string>
+	<string name="app_name" translatable="false">Mastodon</string>

 	<string name="get_started">Get started</string>
 	<string name="log_in">Log in</string>
@@ -47,7 +47,6 @@
 	</plurals>
 	<string name="posts">Posts</string>
 	<string name="posts_and_replies">Posts and Replies</string>
-	<string name="pinned_posts">Pinned</string>
 	<string name="media">Media</string>
 	<string name="profile_about">About</string>
 	<string name="button_follow">Follow</string>
@@ -127,20 +126,9 @@
 	<string name="action_vote">Vote</string>
 	<string name="tap_to_reveal">Tap to reveal</string>
 	<string name="delete">Delete</string>
-	<string name="delete_and_redraft">Delete and re-draft</string>
 	<string name="confirm_delete_title">Delete Post</string>
-	<string name="confirm_delete_and_redraft_title">Delete and re-draft Post</string>
 	<string name="confirm_delete">Are you sure you want to delete this post?</string>
-	<string name="confirm_delete_and_redraft">Are you sure you want to delete and re-draft this post?</string>
 	<string name="deleting">Deleting…</string>
-	<string name="pin_post">Pin to profile</string>
-	<string name="confirm_pin_post_title">Pin post to profile</string>
-	<string name="confirm_pin_post">Do you want to pin this post to your profile?</string>
-	<string name="pinning">Pinning post…</string>
-	<string name="unpin_post">Unpin from profile</string>
-	<string name="confirm_unpin_post_title">Unpin post from profile</string>
-	<string name="confirm_unpin_post">Are you sure you want to unpin this post?</string>
-	<string name="unpinning">Unpinning post…</string>
 	<string name="notification_channel_audio_player">Audio playback</string>
 	<string name="play">Play</string>
 	<string name="pause">Pause</string>
@@ -221,7 +209,6 @@
 	<string name="compose_hint">Type or paste what\'s on your mind</string>
 	<string name="content_warning">Content warning</string>
 	<string name="add_image_description">Add image description…</string>
-	<string name="image_description">Image description</string>
 	<string name="retry_upload">Retry upload</string>
 	<string name="edit_image">Edit image</string>
 	<string name="save">Save</string>
@@ -229,7 +216,6 @@
 	<string name="alt_text_subtitle">Alt text describes your photos for people with low or no vision. Try to only include enough detail to understand the context.</string>
 	<string name="alt_text_hint">e.g. A dog looking around suspiciously with narrowed eyes at the camera.</string>
 	<string name="visibility_public">Public</string>
-	<string name="visibility_unlisted">Unlisted</string>
 	<string name="visibility_followers_only">Followers only</string>
 	<string name="visibility_private">Only people I mention</string>
 	<string name="search_all">All</string>
@@ -256,12 +242,8 @@
 	<string name="theme_dark">Dark</string>
 	<string name="theme_true_black">True black mode</string>
 	<string name="settings_behavior">Behavior</string>
-	<string name="settings_show_replies">Show replies</string>
-	<string name="settings_show_boosts">Show boosts</string>
-	<string name="settings_load_new_posts">Automatically load new posts</string>
 	<string name="settings_gif">Play animated avatars and emoji</string>
 	<string name="settings_custom_tabs">Use in-app browser</string>
-	<string name="settings_show_interaction_counts">Show interaction counts</string>
 	<string name="settings_notifications">Notifications</string>
 	<string name="notify_me_when">Notify me when</string>
 	<string name="notify_anyone">anyone</string>
@@ -279,7 +261,7 @@
 	<string name="settings_privacy_policy">Privacy policy</string>
 	<string name="settings_spicy">The spicy zone</string>
 	<string name="settings_clear_cache">Clear media cache</string>
-	<string name="settings_app_version">Megalodon v%1$s (%2$d)</string>
+	<string name="settings_app_version">Mastodon for Android v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">Media cache cleared</string>
 	<string name="confirm_log_out">Are you sure you want to sign out?</string>
 	<string name="sensitive_content">Sensitive content</string>
@@ -294,10 +276,8 @@
 	<string name="button_reblog">Reblog</string>
 	<string name="button_favorite">Favorite</string>
 	<string name="button_share">Share</string>
-	<string name="button_bookmark">Bookmark</string>
 	<string name="media_no_description">Media without description</string>
 	<string name="add_media">Add media</string>
-	<string name="mark_media_as_sensitive">Mark media as sensitive</string>
 	<string name="add_poll">Add a poll</string>
 	<string name="emoji">Emoji</string>
 	<string name="post_visibility">Post visibility</string>
@@ -310,8 +290,6 @@
 	<string name="open_in_browser">Open in browser</string>
 	<string name="hide_boosts_from_user">Hide reblogs from %s</string>
 	<string name="show_boosts_from_user">Show reblogs from %s</string>
-	<string name="user_post_notifications_on">Turned on post notifications for %s</string>
-	<string name="user_post_notifications_off">Turned off post notifications for %s</string>
 	<string name="signup_reason">why do you want to join?</string>
 	<string name="signup_reason_note">This will help us review your application.</string>
 	<string name="clear">Clear</string>
@@ -326,13 +304,11 @@
 	<string name="file_saved">File saved</string>
 	<string name="downloading">Downloading…</string>
 	<string name="no_app_to_handle_action">There\'s no app to handle this action</string>
-	<string name="local_timeline">Local</string>
-	<string name="federated_timeline">Federation</string>
+	<string name="local_timeline">Community</string>
 	<string name="trending_posts_info_banner">These are the posts gaining traction in your corner of Mastodon.</string>
 	<string name="trending_hashtags_info_banner">These are the hashtags gaining traction in your corner of Mastodon.</string>
 	<string name="trending_links_info_banner">These are the news stories being shared the most in your corner of Mastodon.</string>
 	<string name="local_timeline_info_banner">These are the most recent posts by the people who use the same Mastodon server as you.</string>
-	<string name="federated_timeline_info_banner">These are the most recent posts by the people in your federation.</string>
 	<string name="dismiss">Dismiss</string>
 	<string name="see_new_posts">See new posts</string>
 	<string name="load_missing_posts">Load missing posts</string>
@@ -402,22 +378,15 @@
 	<string name="upload_error_connection_lost">Your device lost connection to the internet</string>
 	<string name="upload_processing">Processing…</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_available">Megalodon %s is ready to download.</string>
+	<string name="update_available">Mastodon for Android %s is ready to download.</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_ready">Megalodon %s is downloaded and ready to install.</string>
+	<string name="update_ready">Mastodon for Android %s is downloaded and ready to install.</string>
 	<!-- %s is file size -->
 	<string name="download_update">Download (%s)</string>
 	<string name="install_update">Install</string>
-	<string name="check_for_update">Check for update</string>
-	<string name="no_update_available">No update available</string>
 	<string name="privacy_policy_title">Mastodon and your privacy</string>
-	<string name="privacy_policy_subtitle">Although the Megalodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server\'s privacy policy.</string>
+	<string name="privacy_policy_subtitle">Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server\'s privacy policy.</string>
 	<string name="i_agree">I Agree</string>
-	<string name="list_timelines">Lists</string>
-	<string name="follow_requests">Follow requests</string>
-	<string name="accept_follow_request">Accept follow request</string>
-	<string name="reject_follow_request">Reject follow request</string>
-	<string name="lists_with_user">Lists with %s</string>
 	<string name="empty_list">This list is empty</string>
 	<string name="instance_signup_closed">This server does not accept new registrations.</string>
 	<string name="text_copied">Copied to clipboard</string>
@@ -425,7 +394,4 @@
 	<string name="remove_bookmark">Remove bookmark</string>
 	<string name="bookmarks">Bookmarks</string>
 	<string name="your_favorites">Your Favorites</string>
-	<string name="settings_always_reveal_content_warnings">Always reveal content warnings</string>
-	<string name="disable_marquee">Disable scrolling text in title bars</string>
-	<string name="settings_contribute_fork">Contribute to Megalodon</string>
-</resources>
+</resources>
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sk_app_name">Megalodon</string>
+  <string name="sk_pinned_posts">Pinned</string>
+  <string name="sk_delete_and_redraft">Delete and re-draft</string>
+  <string name="sk_confirm_delete_and_redraft_title">Delete and re-draft Post</string>
+  <string name="sk_confirm_delete_and_redraft">Are you sure you want to delete and re-draft this post?</string>
+  <string name="sk_pin_post">Pin to profile</string>
+  <string name="sk_confirm_pin_post_title">Pin post to profile</string>
+  <string name="sk_confirm_pin_post">Do you want to pin this post to your profile?</string>
+  <string name="sk_pinning">Pinning post…</string>
+  <string name="sk_unpin_post">Unpin from profile</string>
+  <string name="sk_confirm_unpin_post_title">Unpin post from profile</string>
+  <string name="sk_confirm_unpin_post">Are you sure you want to unpin this post?</string>
+  <string name="sk_unpinning">Unpinning post…</string>
+  <string name="sk_image_description">Image description</string>
+  <string name="sk_visibility_unlisted">Unlisted</string>
+  <string name="sk_settings_show_replies">Show replies</string>
+  <string name="sk_settings_show_boosts">Show boosts</string>
+  <string name="sk_settings_load_new_posts">Automatically load new posts</string>
+  <string name="sk_settings_show_interaction_counts">Show interaction counts</string>
+  <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+  <string name="sk_mark_media_as_sensitive">Mark media as sensitive</string>
+  <string name="sk_user_post_notifications_on">Turned on post notifications for %s</string>
+  <string name="sk_user_post_notifications_off">Turned off post notifications for %s</string>
+  <string name="sk_federated_timeline">Federation</string>
+  <string name="sk_federated_timeline_info_banner">These are the most recent posts by the people in your federation.</string>
+  <string name="sk_update_available">Megalodon %s is ready to download.</string>
+  <string name="sk_update_ready">Megalodon %s is downloaded and ready to install.</string>
+  <string name="sk_check_for_update">Check for update</string>
+  <string name="sk_no_update_available">No update available</string>
+  <string name="sk_list_timelines">Lists</string>
+  <string name="sk_follow_requests">Follow requests</string>
+  <string name="sk_accept_follow_request">Accept follow request</string>
+  <string name="sk_reject_follow_request">Reject follow request</string>
+  <string name="sk_lists_with_user">Lists with %s</string>
+  <string name="sk_settings_always_reveal_content_warnings">Always reveal content warnings</string>
+  <string name="sk_disable_marquee">Disable scrolling text in title bars</string>
+  <string name="sk_settings_contribute">Contribute to Megalodon</string>
+  <string name="sk_settings_show_federated_timeline">Show federated timeline</string>
+</resources>
--- a/metadata/de-DE/changelogs/50.txt
+++ b/metadata/de-DE/changelogs/50.txt
@@ -0,0 +1,4 @@
+- Dateien für die Veröffentlichung auf F-Droid vorbereiten
+- Automatischen Updater reparieren
+- Monochrome Symbole für Launcher-Icons
+- Falsches Ungelistet-Symbol ersetzt
--- a/metadata/de-DE/changelogs/51.txt
+++ b/metadata/de-DE/changelogs/51.txt
@@ -0,0 +1,6 @@
+- Möglichkeit, beim Antworten den Originalpost (durch einen Klick auf „Als Antwort auf…“-Zeile) zu öffnen
+- Upstream-Änderungen und Fehlerbehebungen mergen
+- Unverwendeten „App Center“-Code entfernt
+- Release mit deaktivierter Föderierter Timeline für den Play Store hinzugefügt
+- Eigene Weiterleitungs-URI für einfacheres Einloggen
+- „Zu Megalodon beitragen“-Link angepasst
--- a/metadata/de-DE/short_description.txt
+++ b/metadata/de-DE/short_description.txt
@@ -1 +1 @@
-Mastodon für Android in Pink und mit zusätzlichen Features
+Mastodon für Android in Pink und mit zusätzlichen Features
--- a/metadata/de-DE/title.txt
+++ b/metadata/de-DE/title.txt
@@ -0,0 +1 @@
+Megalodon
--- a/metadata/en-US/changelogs/50.txt
+++ b/metadata/en-US/changelogs/50.txt
@@ -1,4 +1,4 @@
-* Prepare files for release on F-Droid
-* Fix automatic updater
-* Add monochromatic icons back into launcher icons
-* Replace wrong unlisted icon in extended footer
+- Prepare files for release on F-Droid
+- Fix automatic updater
+- Add monochromatic icons back into launcher icons
+- Replace wrong unlisted icon in extended footer
--- a/metadata/en-US/changelogs/51.txt
+++ b/metadata/en-US/changelogs/51.txt
@@ -1,6 +1,6 @@
-* Make it possible to open the original post while replying (by clicking the “In reply to…” line)
-* Merge upstream changes and bugfixes
-* Remove unused “App Center” code
-* Add release without Federated timeline for Play Store
-* Add custom redirect URI for easier login
-* Change contribution link
+- Make it possible to open the original post while replying (by clicking the “In reply to…” line)
+- Merge upstream changes and bugfixes
+- Remove unused “App Center” code
+- Add release without Federated timeline for Play Store
+- Add custom redirect URI for easier login
+- Change contribution link
--- a/metadata/en-US/changelogs/55.txt
+++ b/metadata/en-US/changelogs/55.txt
@@ -0,0 +1,4 @@
+- Fix broken rendering of HTML tags and enable rendering Markdown formatting
+- Initialize translation project
+- Add toggle for the Federated timeline
+- Versions 52-54 were small adjustments for a release on Google Play
--- a/metadata/fr-FR/changelogs/50.txt
+++ b/metadata/fr-FR/changelogs/50.txt
@@ -0,0 +1,4 @@
+- Préparation des fichiers pour publication sur F-Droid
+- Correction de la mise à jour automatique
+- Ajout d'icônes monochromes dans les icônes du lanceur
+- Remplacement de la mauvaise icône non répertoriée dans le pied de page étendu
--- a/metadata/fr-FR/changelogs/51.txt
+++ b/metadata/fr-FR/changelogs/51.txt
@@ -0,0 +1,6 @@
+- Rendre possible l'ouverture du message d'origine lors de la réponse (en cliquant sur la ligne « En réponse à… »)
+- Fusionner les modifications en amont et les corrections de bugs
+- Supprimer le code "App Center" inutilisé
+- Ajouter une version sans timeline fédérée pour le Play Store
+- Ajouter une URI de redirection personnalisée pour une connexion plus facile
+- Modifier le lien de contribution
--- a/metadata/fr-FR/full_description.txt
+++ b/metadata/fr-FR/full_description.txt
@@ -0,0 +1,17 @@
+Megalodon est une version modifiée de <a href="https://github.com/mastodon/mastodon-android">Mastodon officiel pour Android</a> ajoutant des fonctionnalités importantes qui manquent dans l'application officielle, telles que la timeline fédérée, la publication non répertoriée, les signets et une visionneuse de description d'image.
+
+<b>Principales fonctionnalités</b>
+
+- <b>Publication non répertoriée</b> : Publiez publiquement sans que votre message apparaisse dans les tendances, les hashtags ou les timelines publiques.
+- <b>Timeline fédérée</b> : Affichez tous les messages publics des personnes de tout le voisinage du Fediverse auxquel votre instance est connectée.
+- <b>Visionneuse de description d'image</b> : Vérifiez rapidement si une image ou une vidéo est associée à un texte alternatif.
+- <b>Épingler des publications</b> : Épinglez vos publications les plus importantes à votre profil et voyez ce que les autres ont épinglé en utilisant l'onglet "Épinglé".
+- <b>Signets</b> : Enregistrez rapidement les messages et retrouvez-les plus tard dans la liste des signets.
+- <b>Suivez des hashtags</b> : Voir les nouveaux messages avec des hashtags spécifiques directement dans votre timeline d'accueil en les suivant.
+- <b>Répondre aux demandes de suivi</b> : Acceptez ou refusez les demandes de suivi à partir de vos notifications ou de la liste dédiée aux demandes de suivi.
+- <b>Supprimer et reformuler</b> : La fonctionnalité la plus appréciée qui rend l'édition possible sans fonction d'édition réelle.
+
+<b>Fonctionnalités officielles inédites, disponibles à l'avance</b>
+
+- Modification des publications
+- Mise à jour intégrée pour les versions de GitHub
--- a/metadata/fr-FR/short_description.txt
+++ b/metadata/fr-FR/short_description.txt
@@ -0,0 +1 @@
+Mastodon pour Android mais en rose et avec plus de fonctionnalités
--- a/metadata/fr-FR/title.txt
+++ b/metadata/fr-FR/title.txt
@@ -0,0 +1 @@
+Megalodon
--- a/metadata/id/changelogs/50.txt
+++ b/metadata/id/changelogs/50.txt
@@ -0,0 +1,4 @@
+- Siapkan berkas untuk rilis di F-Droid 
+- Perbaiki pembaruan otomatis 
+- Tanbahkan ikon monokromatik kembali dalam ikon peluncur
+- Ubah ikon tidak terdaftar yang salah dalam footer yang diperluas
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sk	f0b9006c55	bump version	2022-12-01 16:17:51 +01:00
sk	4bc14ef797	remove long strings	2022-12-01 16:11:23 +01:00
Rebecca Södergren	47d2cee3f1	Translated using Weblate (Swedish) Currently translated at 100.0% (5 of 5 strings) Translation: Megalodon/metadata Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/sv/	2022-12-01 15:10:42 +00:00
Rebecca Södergren	088f53f5a9	Translated using Weblate (Swedish) Currently translated at 100.0% (39 of 39 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/sv/	2022-12-01 15:10:42 +00:00
kaea	fee660bf6c	Translated using Weblate (Polish) Currently translated at 97.4% (38 of 39 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pl/	2022-12-01 15:10:41 +00:00
Linerly	e97ecb89a9	Translated using Weblate (Indonesian) Currently translated at 100.0% (39 of 39 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/	2022-12-01 15:10:41 +00:00
sk	1ab6a4532b	remove long string	2022-12-01 16:10:15 +01:00
sk	b43ddd0d8b	Merge remote-tracking branch 'weblate/main'	2022-12-01 16:07:08 +01:00
sk	d0c4c2d594	Merge branch 'feature/more-html-tags'	2022-12-01 16:06:40 +01:00
sk	e0ae079ea0	make sub/sup text smaller	2022-12-01 16:06:29 +01:00
Linerly	dfddbd15a9	Translated using Weblate (Indonesian) Currently translated at 100.0% (5 of 5 strings) Translation: Megalodon/metadata Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/id/	2022-12-01 11:03:20 +00:00
qqherb	29242c45a1	Translated using Weblate (Chinese (Simplified)) Currently translated at 40.0% (2 of 5 strings) Translation: Megalodon/metadata Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/zh_Hans/	2022-12-01 11:03:20 +00:00
Choukajohn	7ff0e59f4d	Translated using Weblate (French) Currently translated at 100.0% (5 of 5 strings) Translation: Megalodon/metadata Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/	2022-12-01 11:03:20 +00:00
khant	2d0fe57a47	Translated using Weblate (Burmese) Currently translated at 82.0% (32 of 39 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/my/	2022-12-01 11:03:20 +00:00
kaea	ba2b87749b	Translated using Weblate (Polish) Currently translated at 66.6% (26 of 39 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pl/	2022-12-01 11:03:20 +00:00
Linerly	0806af1261	Translated using Weblate (Indonesian) Currently translated at 100.0% (39 of 39 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/	2022-12-01 11:03:20 +00:00
crse	09e92f3a18	Translated using Weblate (Indonesian) Currently translated at 100.0% (39 of 39 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/	2022-12-01 11:03:19 +00:00
Choukajohn	eb5d0bb795	Translated using Weblate (French) Currently translated at 100.0% (39 of 39 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/	2022-12-01 11:03:19 +00:00
hegondev	a8afba4067	Translated using Weblate (Spanish) Currently translated at 100.0% (39 of 39 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/	2022-12-01 11:03:19 +00:00
qqherb	7d66141c37	Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (39 of 39 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/	2022-12-01 11:03:19 +00:00
khant	b6f3ea2eec	Added translation using Weblate (Burmese)	2022-12-01 06:01:03 +00:00
sk	2570445133	create empty strings_sk files for all languages	2022-12-01 00:23:25 +01:00
sk	acbd22cf22	add weblate project closes #18	2022-12-01 00:20:12 +01:00
sk22	ef251b040a	Translated using Weblate (German) Currently translated at 100.0% (5 of 5 strings) Translation: megalodon/metadata Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/	2022-11-30 23:04:59 +00:00
sk	6c5bb69ba9	move custom strings into separate files	2022-11-30 23:16:14 +01:00
sk	7599406449	Merge branch 'feature/more-html-tags'	2022-11-30 16:15:38 +01:00
sk	670e4c8538	support headings and reduce empty line height	2022-11-30 16:15:31 +01:00
sk	30458b115c	Merge branch 'feature/more-html-tags'	2022-11-30 11:46:16 +01:00
sk	da8933ec58	Merge branch 'fix/markdown-lists' into feature/more-html-tags	2022-11-30 11:45:48 +01:00
sk	dc8ac51c83	fix inline rendering of block elements	2022-11-30 11:43:34 +01:00
sk	c4747fdc72	add support for headings	2022-11-30 11:41:10 +01:00
sk	58ba748ade	add blockquote support	2022-11-30 11:20:58 +01:00
sk	c0d51ad58a	Merge branch 'feature/more-html-tags'	2022-11-30 11:08:55 +01:00
sk	a0da73f76f	add support for html code tag	2022-11-30 11:05:00 +01:00
sk	34b8888c8f	add support for html code tag	2022-11-30 11:04:19 +01:00
sk	74ad40f67c	Merge branch 'fix/markdown-lists' into feature/more-html-tags	2022-11-30 10:55:26 +01:00
sk	a7a29db8d5	improve list rendering implementation	2022-11-30 10:51:25 +01:00
sk	86a938d31d	Merge branch 'feature/more-html-tags'	2022-11-30 00:38:08 +01:00
sk	d8d0830631	add support for more html tags closes #16	2022-11-30 00:36:42 +01:00
sk	bba3b7476a	Merge branch 'fix/markdown-lists'	2022-11-30 00:17:40 +01:00
sk	4880c642fe	render markdown lists correctly closes mastodon#152	2022-11-30 00:11:42 +01:00
sk	76ad896461	update readme	2022-11-29 23:09:19 +01:00
sk22	b49159f9e0	Update issue templates	2022-11-29 23:06:04 +01:00
sk	5f3645f716	bump version	2022-11-29 19:25:18 +01:00
sk	5af96597d5	add option to hide/show federated timeline	2022-11-29 19:24:02 +01:00
sk	c2baf4e05f	Revert "Revert "add release without federated timeline"" This reverts commit `851bf94c90`.	2022-11-29 18:29:13 +01:00
sk	9e7923bc50	bump version	2022-11-29 00:25:18 +01:00
sk	851bf94c90	Revert "add release without federated timeline" This reverts commit `5cce8ca72c`.	2022-11-29 00:24:36 +01:00
sk	ae80b7d098	minify play release	2022-11-28 20:59:13 +01:00
				`@@ -0,0 +1 @@`
				`Mastodon pour Android mais en rose et avec plus de fonctionnalités`