From 290b7db7e4de1ec9c0417972cacea71532010a40 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Fri, 9 Dec 2022 19:35:15 -0300
Subject: [PATCH] This is unbrokey. Merged changes from upstream.

---
 mastodon/src/main/res/values/strings.xml | 43 ++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index 1ef02d938..a78d2f9b0 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -408,4 +408,47 @@
 	<string name="login_title">Welcome Back</string>
 	<string name="login_subtitle">Log in with the server where you created your account.</string>
 	<string name="server_url">Server URL</string>
+
+
+<!--	<string name="app_name">Megalodon</string>-->
+	<string name="pinned_posts">Pinned</string>
+	<string name="delete_and_redraft">Delete and re-draft</string>
+	<string name="confirm_delete_and_redraft_title">Delete and re-draft Post</string>
+	<string name="confirm_delete_and_redraft">Are you sure you want to delete and re-draft this post?</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="image_description">Image description</string>
+	<string name="visibility_unlisted">Unlisted</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_show_interaction_counts">Show interaction counts</string>
+<!--	<string name="settings_app_version">Megalodon v%1$s (%2$d)</string>-->
+	<string name="mark_media_as_sensitive">Mark media as sensitive</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="federated_timeline">Federation</string>
+	<string name="federated_timeline_info_banner">These are the most recent posts by the people in your federation.</string>
+<!--	<string name="update_available">Megalodon %s is ready to download.</string>-->
+<!--	<string name="update_ready">Megalodon %s is downloaded and ready to install.</string>-->
+	<string name="check_for_update">Check for update</string>
+	<string name="no_update_available">No update available</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="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">Contribute to Megalodon</string>-->
+	<string name="settings_show_federated_timeline">Show federated timeline</string>
+	<string name="notification_type_status">Posts</string>
+	<string name="notify_posts">Post notifications</string>
+
 </resources>