From a2022b25e5bf0894abcfa04d27cd08681ade2253 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 14 Dec 2022 19:23:06 -0300
Subject: [PATCH] Fixing compile problems. Merging the language picker from
 megalodon.

---
 mastodon/src/main/res/layout/fragment_compose.xml |  2 +-
 mastodon/src/main/res/layout/fragment_splash.xml  | 13 +++++++------
 mastodon/src/main/res/values/strings.xml          | 14 +++++++++++++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index c6c484327..c949f3d92 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -180,7 +180,7 @@
 						android:layout_weight="1"
 						android:textSize="16sp"
 						android:singleLine="true"
-						android:text="@string/poll_allow_multiple" />
+						android:text="@string/sk_poll_allow_multiple" />
 				</LinearLayout>
 			</LinearLayout>
 
diff --git a/mastodon/src/main/res/layout/fragment_splash.xml b/mastodon/src/main/res/layout/fragment_splash.xml
index 23e7cc657..196c303fa 100644
--- a/mastodon/src/main/res/layout/fragment_splash.xml
+++ b/mastodon/src/main/res/layout/fragment_splash.xml
@@ -103,22 +103,23 @@
 
 			<View
 				android:layout_width="8dp"
-				android:layout_height="8dp"
-				android:background="@drawable/white_circle"/>
+				android:layout_height="8dp"/>
+<!--				android:background="@drawable/white_circle"/>-->
 
 			<View
 				android:layout_width="8dp"
 				android:layout_height="8dp"
 				android:layout_marginLeft="16dp"
 				android:layout_marginRight="16dp"
-				android:alpha="0.3"
-				android:background="@drawable/white_circle"/>
+				android:alpha="0.3"/>
+<!--				android:background="@drawable/white_circle"-->
+
 
 			<View
 				android:layout_width="8dp"
 				android:layout_height="8dp"
-				android:alpha="0.3"
-				android:background="@drawable/white_circle"/>
+				android:alpha="0.3"/>
+<!--				android:background="@drawable/white_circle"-->
 
 		</LinearLayout>
 
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index 14cb6ba8e..c6f2d6685 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
 	<string name="app_name" translatable="false">Moshidon</string>
 
 	<string name="get_started">Get started</string>
+	<string name="already_have_account">I already have an account</string>
 	<string name="log_in">Log in</string>
 	<string name="next">Next</string>
 	<string name="loading_instance">Retrieving server info…</string>
@@ -408,5 +409,16 @@
 	<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="poll_allow_multiple">Allow multiple choices</string>
+	<!-- {logo} is a placeholder that is replaced with the Mastodon logo image at runtime. Please copy it into your translation as is. -->
+	<string name="welcome_page1_title">What is {logo}?</string>
+	<string name="welcome_page1_text">Imagine you have an email address that ends with @example.com.\n\nYou can still send and receive emails from anyone, even if their email ends in @gmail.com or @icloud.com or @example.com.</string>
+	<string name="welcome_page2_title">Mastodon is like that.</string>
+	<string name="welcome_page2_text">Your handle might be @gothgirl654@example.social, but you can still follow, reblog, and chat with @fallout5ever@example.online.</string>
+	<string name="welcome_page3_title">How do I pick a server?</string>
+	<string name="welcome_page3_text">Different people choose different servers for any number of reasons. art.example is a great place for artists, while glasgow.example might be a good pick for Scots.\n\nYou can’t go wrong with any of our recommend servers, so regardless of which one you pick (or if you enter your own in the server search bar), you’ll never miss a beat anywhere.</string>
+	<string name="post_language">Language: %s</string>
+	<string name="available_languages">Available languages</string>
+	<string name="language_name">%s (%s)</string>
+	<string name="clear_recent_languages">Clear recent languages</string>
+	<string name="confirm_clear_recent_languages">Are you sure you want to clear your recently used languages?</string>
 </resources>
\ No newline at end of file