Merge branch 'l10n_master'

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

@@ -461,11 +461,6 @@
 	<string name="login_title">مرحبا بك مجددًا</string>
 	<string name="login_subtitle">قم بتسجيل الدخول باستخدام الخادم حيث قمتَ بإنشاء حسابك فيه.</string>
 	<string name="server_url">رابط الخادم</string>
-	<string name="welcome_page1_title">ما هو ماستدون؟</string>
-	<string name="welcome_page1_text">تخيل أن لديك عنوان بريد إلكتروني ينتهي بـ @example.com.\n\n رغم ذلك يمكنك إرسال واستقبال رسائل البريد الإلكتروني من أي شخص، حتى إذا كان بريدهم الإلكتروني الخاص ينتهي بـ @gmail.com أو @icloud.com أو @example.com.</string>
-	<string name="welcome_page2_title">ماستدون هكذا.</string>
-	<string name="welcome_page3_title">كيف يمكنني اختيار خادم؟</string>
-	<string name="welcome_page3_text">يختار الأشخاص المختلفون خوادم مختلفة لأي عدد من الأسباب. يعد art.example مكانًا رائعًا للفنانين ، بينما قد يكون glasgow.example اختيارًا جيدًا للاسكتلنديين. \n\n لا يمكنك أن تخطئ في أي من الخوادم التي نوصي بها ، لذلك بغض النظر عن أي واحد تختاره (أو إذا قمت بإدخال الخادم الخاص بك في شريط البحث) ، فلن يفوتك أي شيء في أي مكان.</string>
 	<string name="signup_random_server_explain">سوف نختار خادماً بناءً على لغتك إذا قمت بالمتابعة دون إجراء إختيار.</string>
 	<string name="server_filter_any_language">أي لغة</string>
 	<string name="server_filter_instant_signup">تسجيل فوري</string>

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

@@ -422,11 +422,6 @@
 	<string name="login_title">З вяртаннем</string>
 	<string name="login_subtitle">Увайдзіце з дапамогай сервера, на якім вы стварылі свой уліковы запіс.</string>
 	<string name="server_url">URL-адрас сервера</string>
-	<string name="welcome_page1_title">Што такое Mastodon?</string>
-	<string name="welcome_page1_text">Уявіце, што ў вас ёсць адрас электроннай пошты, які заканчваецца на @example.com.\n\nВы па-ранейшаму можаце адпраўляць і атрымліваць электронныя лісты ад каго захочаце, нават калі іх электронная пошта заканчваецца на @gmail.com, @icloud.com або @example.com.</string>
-	<string name="welcome_page2_title">Mastodon такі.</string>
-	<string name="welcome_page3_title">Як выбраць сервер?</string>
-	<string name="welcome_page3_text">Розныя людзі выбіраюць розныя серверы па розных прычынах. art.example з\'яўляецца выдатным месцам для мастакоў, у той час як glasgow.example можа быць добрым выбарам для шатландцаў.\n\nВы не памыліцеся ні з адным з нашых рэкамендаваных сервераў, так што незалежна ад таго, які вы выбераце (або калі ўведзяце ваш уласны ў радку пошуку сервера), вы нідзе нічога не прапусціце.</string>
 	<string name="signup_random_server_explain">Мы абярэм сервер на аснове вашай мовы, калі вы працягнеце без выбару.</string>
 	<string name="server_filter_any_language">Любая мова</string>
 	<string name="server_filter_instant_signup">Імгненная рэгістрацыя</string>

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

@@ -422,11 +422,6 @@
 	<string name="login_title">Vítejte zpět</string>
 	<string name="login_subtitle">Přihlaste se pomocí serveru, kde jste vytvořili svůj účet.</string>
 	<string name="server_url">URL serveru</string>
-	<string name="welcome_page1_title">Co je Mastodon?</string>
-	<string name="welcome_page1_text">Představte si, že máte e-mailovou adresu, která končí @example.com.\n\nStále můžete od kohokoliv odesílat a přijímat e-maily, i když jejich e-mail končí na @gmail.com nebo @icloud.com nebo @example.com.</string>
-	<string name="welcome_page2_title">Takový je Mastodon.</string>
-	<string name="welcome_page3_title">Jak si vybrat server?</string>
-	<string name="welcome_page3_text">Různí lidé si vybírají různé servery z různých důvodů. Art.example je skvělým místem pro umělce, zatímco glasgow.example může být dobrou volbou pro Skoty.\n\nS žádným z našich doporučených serverů nemůžete udělat chybu, takže bez ohledu na to, který z nich si vyberete (nebo pokud zadáte svůj vlastní do vyhledávacího řádku serveru), nikde neprohloupíte.</string>
 	<string name="signup_random_server_explain">Pokud budete pokračovat bez výběru, vybereme server založený na vašem jazyce.</string>
 	<string name="server_filter_any_language">Libovolný jazyk</string>
 	<string name="server_filter_instant_signup">Okamžitá registrace</string>

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

@@ -380,11 +380,6 @@
 	<string name="login_title">Velkommen tilbage</string>
 	<string name="login_subtitle">Log ind med serveren hvor du oprettede din bruger.</string>
 	<string name="server_url">Server-URL</string>
-	<string name="welcome_page1_title">Hvad er Mastodon?</string>
-	<string name="welcome_page1_text">Det svarer til at du har en e-mailadresse, der slutter med @eksempel.dk.\n\nAlligevel kan du stadig både sende og modtage e-mails fra alle, selv om deres e-mail ender på @gmail.com eller @icloud.com eller @eksempel.dk.</string>
-	<string name="welcome_page2_title">Mastodon er ligesådan.</string>
-	<string name="welcome_page3_title">Hvordan vælger jeg en server?</string>
-	<string name="welcome_page3_text">Forskellige mennesker vælger forskellige servere af mange forskellige grunde. art.example er et godt sted for kunstnere, mens glasgow.example kan være et godt pluk for skotter.\n\nDu kan ikke gå galt i byen med en af vores anbefalingsservere, så uanset hvilken du vælger (eller hvis du indtaster din egen i serversøgelinjen), vil du aldrig gå glip af noget nogen steder.</string>
 	<string name="signup_random_server_explain">Vi vælger en server baseret på dit sprog, hvis du fortsætter uden at foretage et valg.</string>
 	<string name="server_filter_any_language">Hvilket som helst sprog</string>
 	<string name="server_filter_instant_signup">Øjeblikkelig tilmelding</string>

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

@@ -382,11 +382,6 @@
 	<string name="login_title">Willkommen zurück</string>
 	<string name="login_subtitle">Melde dich mit dem Server an, auf dem du dein Konto erstellt hast.</string>
 	<string name="server_url">Serveradresse</string>
-	<string name="welcome_page1_title">Was ist Mastodon?</string>
-	<string name="welcome_page1_text">Angenommen, du hast eine E-Mail-Adresse, die mit @example.com endet.\n\nDu kannst immer noch E-Mails von allen empfangen, auch wenn deren E-Mail-Adresse mit @gmail.com, @icloud.com oder @example.com endet.</string>
-	<string name="welcome_page2_title">Mastodon ist genau so.</string>
-	<string name="welcome_page3_title">Wie wähle ich einen Server aus?</string>
-	<string name="welcome_page3_text">Unterschiedliche Menschen wählen aus verschiedenen Gründen unterschiedliche Server. art.example ist ein toller Ort für Künstler*innen, während glasgow.example eine gute Wahl für Schott*innen sein könnte.\n\nWähle nach Möglichkeit einen kleinen Server aus, mit dessen Regeln du dich wohl fühlst und der dir vertrauenswürdig erscheint (über die Server-Suchleiste kannst du dich direkt mit dem Server deines Vertrauens verbinden).</string>
 	<string name="signup_random_server_explain">Wenn du ohne Auswahl fortfährst, wählen wir einen Server in deiner Sprache aus.</string>
 	<string name="server_filter_any_language">Alle Sprachen</string>
 	<string name="server_filter_instant_signup">Schnellregistrierung</string>

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

@@ -32,6 +32,10 @@
 		<item quantity="one">ακόλουθος</item>
 		<item quantity="other">ακόλουθοι</item>
 	</plurals>
+	<plurals name="following">
+		<item quantity="one">ακολουθεί</item>
+		<item quantity="other">ακολουθούν</item>
+	</plurals>
 	<plurals name="posts">
 		<item quantity="one">ανάρτηση</item>
 		<item quantity="other">αναρτήσεις</item>
@@ -391,12 +395,54 @@
 	<string name="login_title">Καλώς Ήρθες Ξανά</string>
 	<string name="login_subtitle">Συνδέσου με τον διακομιστή όπου δημιούργησες τον λογαριασμό σου.</string>
 	<string name="server_url">URL διακομιστή</string>
-	<string name="welcome_page1_title">Τι είναι το Mastodon;</string>
+	<string name="signup_random_server_explain">Θα διαλέξουμε ένα διακομιστή με βάση τη γλώσσα σας αν συνεχίσεις χωρίς να κάνεις μια επιλογή.</string>
-	<string name="welcome_page1_text">Φαντάσου ότι έχεις μια διεύθυνση email που τελειώνει με @example.com.\n\nΜπορείς ακόμα να στείλεις και να λάβεις μηνύματα από οποιονδήποτε, ακόμη και αν το email τους τελειώνει σε @gmail.com ή @icloud.com ή @example.com.</string>
+	<string name="server_filter_any_language">Οποιαδήποτε Γλώσσα</string>
-	<string name="welcome_page2_title">Έτσι είναι και το Mastodon.</string>
+	<string name="server_filter_instant_signup">Άμεση Εγγραφή</string>
-	<string name="welcome_page2_text">Η λαβή σας μπορεί να είναι @gothgirl654@example.social, αλλά μπορείς ακόμα να ακολουθήσεις, ενισχύσεις και να συνομιλήσεις με τον @fallout5ever@example.online.</string>
+	<string name="server_filter_manual_review">Χειροκίνητη Αξιολόγηση</string>
-	<string name="welcome_page3_title">Πώς διαλέγω έναν διακομιστή;</string>
+	<string name="server_filter_any_signup_speed">Οποιαδήποτε Ταχύτητα Εγγραφής</string>
+	<string name="server_filter_region_europe">Ευρώπη</string>
+	<string name="server_filter_region_north_america">Βόρεια Αμερική</string>
+	<string name="server_filter_region_south_america">Νότια Αμερική</string>
+	<string name="server_filter_region_africa">Αφρική</string>
+	<string name="server_filter_region_asia">Ασία</string>
+	<string name="server_filter_region_oceania">Oceania</string>
+	<string name="not_accepting_new_members">Δεν δέχεται νέα μέλη</string>
+	<string name="category_special_interests">Ειδικά Ενδιαφέροντα</string>
+	<string name="signup_passwords_dont_match">Οι κωδικοί πρόσβασης δεν ταιριάζουν</string>
+	<string name="pick_server_for_me">Διάλεξε για μένα</string>
+	<string name="profile_add_row">Προσθήκη γραμμής</string>
+	<string name="profile_setup">Ρύθμιση προφίλ</string>
+	<string name="profile_setup_subtitle">Μπορείς πάντα να το ολοκληρώσεις αργότερα στην καρτέλα Προφίλ.</string>
+	<string name="profile_setup_explanation">Μπορείς να προσθέσεις έως και τέσσερα πεδία προφίλ για οτιδήποτε θες. Τοποθεσία, συνδέσμους, αντωνυμίες - δεν υπάρχουν όρια.</string>
+	<string name="popular_on_mastodon">Δημοφιλή στο Mastodon</string>
+	<string name="follow_all">Ακολούθησε όλους</string>
+	<string name="server_rules_disagree">Διαφωνώ</string>
+	<string name="privacy_policy_explanation">Σύνοψη: Δεν συλλέγουμε ή επεξεργαζόμαστε τίποτα.</string>
 	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Διαφωνώ με %s</string>
+	<string name="profile_bio">Βιογραφικό</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Ακολούθηση χρηστών…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">Ο %1$s δεν επιτρέπει εγγραφές από %2$s. Δοκιμάστε μια διαφορετική ή &lt;a&gt;επιλέξτε έναν διαφορετικό διακομιστή&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Αυτό το όνομα χρήστη χρησιμοποιείται.</string>
+	<string name="spoiler_show">Εμφάνιση ούτως ή άλλως</string>
+	<string name="spoiler_hide">Απόκρυψη ξανά</string>
+	<string name="poll_multiple_choice">Επίλεξε ένα ή περισσότερα</string>
+	<string name="save_changes">Αποθήκευση αλλαγών</string>
+	<string name="profile_featured">Προτεινόμενα</string>
+	<string name="profile_timeline">Ροή</string>
+	<string name="view_all">Εμφάνιση όλων</string>
+	<string name="profile_endorsed_accounts">Λογαριασμοί</string>
+	<string name="verified_link">Επαληθευμένος σύνδεσμος</string>
+	<string name="show">Εμφάνιση</string>
+	<string name="hide">Απόκρυψη</string>
+	<string name="join_default_server">Συμμετοχή %s</string>
+	<string name="pick_server">Επίλεξε το δικό μου διακομιστή</string>
+	<string name="signup_or_login">ή</string>
+	<string name="learn_more">Μάθε περισσότερα</string>
+	<string name="welcome_to_mastodon">Καλώς ήρθες στο Mastodon</string>
+	<string name="welcome_paragraph1">Το Mastodon είναι ένα αποκεντρωμένο κοινωνικό δίκτυο, που σημαίνει ότι καμία εταιρεία δεν το ελέγχει. Αποτελείται από πολλούς ανεξάρτητους διακομιστές, όλοι συνδεδεμένοι μαζί.</string>
+	<string name="what_are_servers">Τι είναι οι διακομιστές;</string>
+	<string name="welcome_paragraph2"><![CDATA[Κάθε λογαριασμός Mastodon φιλοξενείται σε ένα διακομιστή - ο καθένας με τις δικές του αξίες, κανόνες, & διαχειριστές. Ανεξάρτητα από το ποιον μπορεί να επιλέξεις, μπορείς να ακολουθήσεις και να αλληλεπιδράσεις με άτομα από οποιονδήποτε διακομιστή.]]></string>
 </resources>

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

@@ -382,11 +382,6 @@
 	<string name="login_title">Qué bueno verle de nuevo</string>
 	<string name="login_subtitle">Inicie sesión con el servidor donde creó su cuenta.</string>
 	<string name="server_url">URL del servidor</string>
-	<string name="welcome_page1_title">¿Qué es Mastodon?</string>
-	<string name="welcome_page1_text">Imagina que tienes una dirección de correo electrónico que termina con @ejemplo.com.\n\nPuedes enviar y recibir correos electrónicos de cualquier persona, incluso si su correo electrónico termina en @gmail.com o @icloud.com o @ejemplo.com.</string>
-	<string name="welcome_page2_title">Mastodon es parecido.</string>
-	<string name="welcome_page3_title">¿Cómo elijo un servidor?</string>
-	<string name="welcome_page3_text">Diferentes personas eligen diferentes servidores por diferentes motivos. Por ejemplo, art.example es un buen lugar para artistas, mientras que madrid.example puede ser una buena elección para los madrileños.\n\nNo te equivocarás con ninguno de nuestros servidores recomendados, por lo que independientemente del que escojas (o si introduces tu propio servidor en la barra de búsqueda), no te perderás ni una en ningún lugar.</string>
 	<string name="signup_random_server_explain">Seleccionaremos un servidor basado en tu idioma si continúas sin hacer una selección.</string>
 	<string name="server_filter_any_language">Cualquier idioma</string>
 	<string name="server_filter_instant_signup">Registro instantáneo</string>

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

@@ -377,11 +377,6 @@
 	<string name="login_title">Ongi etorri berriro ere</string>
 	<string name="login_subtitle">Hasi saioa kontua sortu zenuen zerbitzariarekin.</string>
 	<string name="server_url">Zerbitzariaren URLa</string>
-	<string name="welcome_page1_title">Zer da Mastodon?</string>
-	<string name="welcome_page1_text">Imajinatu zure helbide elektronikoa adibidea.eus-en amaitzen dela. \n\n Oraindik edonoren mezu elektronikoak bidali eta jaso ditzakezu, baita posta elektronikoa @gmail.com edo @icloud.com edo @adibidea.eus helbideetan amaitzen bada ere.</string>
-	<string name="welcome_page2_title">Mastodon antzekoa da.</string>
-	<string name="welcome_page3_title">Nola aukeratzen dut zerbitzari bat?</string>
-	<string name="welcome_page3_text">Hainbat pertsonak zerbitzari bat baino gehiago aukeratzen dituzte arrazoi ezberdinengatik. Adibidez, art.example leku ona da artistentzat eta mastodon.eus, berriz, euskaldunentzat. Gure gomendioetako zerbitzariekin, ez duzu hanka sartuko eta edozein dela ere zure aukera, beste zerbitzarietako kideekin harremana izan dezakezu (bilaketa-barran bilatuz).</string>
 	<string name="server_filter_any_language">Edozein hizkuntza</string>
 	<string name="server_filter_instant_signup">Berehalako erregistroa</string>
 	<string name="server_filter_region_europe">Europa</string>

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

@@ -366,10 +366,6 @@
 	<string name="login_title">Maligayang pagbalik,</string>
 	<string name="login_subtitle">Mag-Log in gamit ang server kung saan mo nilikha ang iyong account.</string>
 	<string name="server_url">Ang URL ng server</string>
-	<string name="welcome_page1_text">Isipin na mayroon kang isang email address na nagtatapos sa @example. com. \n \nMaaari ka pa ring magpadala at tumanggap ng mga email mula sa sinuman, kahit na ang kanilang email ay nagtatapos sa @gmail.com o @icloud.com o @example.com.</string>
-	<string name="welcome_page2_title">Mastodon ay tulad na.</string>
-	<string name="welcome_page3_title">Paano ako pumili ng server?</string>
-	<string name="welcome_page3_text">Ang iba \'t ibang mga tao ay pumili ng iba\' t ibang mga server para sa anumang bilang ng mga kadahilanan. sining.ang halimbawa ay isang magandang lugar para sa mga artista, habang ang glasgow.halimbawa ay maaaring maging isang mahusay na pick para sa Scots.\n \nhindi ka maaaring magkamali sa alinman sa aming mga inirekumendang server, kaya anuman ang pipiliin mo (o kung ipinasok mo ang iyong sarili sa search bar ng server), hindi ka makaligtaan ng isang matalo kahit saan.</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->

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

@@ -381,11 +381,6 @@
 	<string name="login_title">Content de vous revoir</string>
 	<string name="login_subtitle">Connectez-vous avec le serveur sur lequel vous avez créé votre compte.</string>
 	<string name="server_url">URL du serveur</string>
-	<string name="welcome_page1_title">Qu’est-ce que Mastodon ?</string>
-	<string name="welcome_page1_text">Imaginez que vous ayez une adresse e-mail qui se termine par @example.com.\n\nVous pouvez toujours envoyer et recevoir des e-mails de n\'importe qui, même si leur e-mail se termine par @gmail.com ou @icloud.com ou @example.com.</string>
-	<string name="welcome_page2_title">Mastodon est comme ça.</string>
-	<string name="welcome_page3_title">Comment choisir un serveur?</string>
-	<string name="welcome_page3_text">Différentes personnes choisissent différents serveurs pour un certain nombre de raisons. art.example est un lieu idéal pour les artistes, tandis que glasgow.example pourrait être un bon choix pour les Écossais.\n\nVous ne pouvez pas vous tromper avec l\'un de nos serveurs recommandés et ainsi, quel que soit celui que vous choisissez (ou si vous entrez le vôtre dans la barre de recherche du serveur), vous ne manquerez jamais une info quelque part.</string>
 	<string name="signup_random_server_explain">Nous choisirons un serveur basé sur votre langue si vous continuez sans faire de sélection.</string>
 	<string name="server_filter_any_language">N\'importe quelle langue</string>
 	<string name="server_filter_instant_signup">Inscription instantanée</string>

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

@@ -382,11 +382,6 @@
 	<string name="login_title">Benvida outra vez</string>
 	<string name="login_subtitle">Accede co servidor onde creaches a conta.</string>
 	<string name="server_url">URL do servidor</string>
-	<string name="welcome_page1_title">Qué é Mastodon?</string>
-	<string name="welcome_page1_text">Imaxina que tes un enderezo de email que remata con @exemplo.com.\n\nPodes recibir e enviar mensaxes con calquera persoa, incluso se o seu email remata en @gmail.com ou @icloud.com ou @exemplo.com.</string>
-	<string name="welcome_page2_title">Mastodon é o mesmo.</string>
-	<string name="welcome_page3_title">Como elexir un servidor?</string>
-	<string name="welcome_page3_text">Pode haber moitas razóns para elexir un servidor. art.exemplo é un bo lugar para artistas, mentras glasgow.exemplo podería ser axeitado para persoas escocesas.\n\nNon terás problemas con calquera dos servidores recomendados, así que independentemente do que elixas (ou se escribes o teu propio na caixa de busca) non botarás nada en falta.</string>
 	<string name="signup_random_server_explain">Elixiremos un servidor no teu idioma se segues sen seleccionar nada.</string>
 	<string name="server_filter_any_language">Calquer idioma</string>
 	<string name="server_filter_instant_signup">Rexistro Instantáneo</string>

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

@@ -381,11 +381,6 @@
 	<string name="login_title">Üdv újra</string>
 	<string name="login_subtitle">Azon a kiszolgálón jelentkezz be, ahol a fiókodat létrehoztad.</string>
 	<string name="server_url">Kiszolgáló URL</string>
-	<string name="welcome_page1_title">Mi a Mastodon?</string>
-	<string name="welcome_page1_text">Képzeld el, hogy az emailcímed @example.com-ra végződik.\n\nEttől még küldhtesz és fogadhatsz emailt bárkitől, akkor is, ha a címük @gmail.com-ra, @icloud.com-ra vagy @example.com-ra végződik.</string>
-	<string name="welcome_page2_title">Ilyen a Mastodon.</string>
-	<string name="welcome_page3_title">Hogyan választok kiszolgálót?</string>
-	<string name="welcome_page3_text">Az emberek különböző okok miatt választanak más és más kiszolgálót. Az art.example egy jó hely lehet a művészek számára, miközben a glasgow.example a skótoknak lehet megfelelő.\n\nAz általunk javasolt kiszolgálókkal nem lehet probléma, de teljesen mindegy, hogy melyiket választod (vagy ha saját kiszolgálót használsz a keresőmezőben), nem maradsz le semmiről egy kiszolgálón sem.</string>
 	<string name="signup_random_server_explain">Választunk egy kiszolgálót a saját nyelvedhez, ha választás nélkül folytatod.</string>
 	<string name="server_filter_any_language">Bármely Nyelv</string>
 	<string name="server_filter_instant_signup">Azonnali Regisztráció</string>

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

@@ -15,6 +15,7 @@
 	<string name="user_followed_you">mengikuti Anda</string>
 	<string name="user_sent_follow_request">mengirim Anda permintaan pengikut</string>
 	<string name="user_favorited">memfavorit kiriman Anda</string>
+	<string name="notification_boosted">mem-boost kiriman Anda</string>
 	<string name="poll_ended">pemungutan suara berakhir</string>
 	<string name="time_seconds">%dd</string>
 	<string name="time_minutes">%dm</string>
@@ -362,11 +363,6 @@
 	<string name="login_title">Selamat Datang Kembali</string>
 	<string name="login_subtitle">Masuk dengan server di mana Anda buat akun Anda.</string>
 	<string name="server_url">URL Server</string>
-	<string name="welcome_page1_title">Apa itu Mastodon?</string>
-	<string name="welcome_page1_text">Bayangkan Anda memikiki alamat surel yang berakhiran @contoh.com.\n\nAnda masih bisa mengirim dan menerima surel dari siapa pun, bahkan jika alamat surel mereka berakhiran @gmail.com atau @icloud.com atau @contoh.com.</string>
-	<string name="welcome_page2_title">Mastodon seperti itu.</string>
-	<string name="welcome_page3_title">Bagaimana saya memilih server?</string>
-	<string name="welcome_page3_text">Kebanyakan orang memilih server berbeda karena berbagai alasan. seni.contoh adalah tempat yang cocok bagi artis, sedangkan glasgow.example mungkin pilihan yang baik untuk para Scots.\n\nAnda tidak bisa salah dengan server yang kami rekomendasikan, jadi server apa yang Anda pilih (atau jika Anda memasukkan Anda sendiri di bilah pencarian server), Anda tidak akan melewatkan apa pun di mana pun.</string>
 	<string name="signup_random_server_explain">Kami akan memilih sebuah server berdasarkan bahasa Anda jika Anda melanjutkan tanpa memilih.</string>
 	<string name="server_filter_any_language">Bahasa Apa Pun</string>
 	<string name="server_filter_instant_signup">Pendaftaran Instan</string>
@@ -398,4 +394,14 @@
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="signup_email_domain_blocked">%1$s tidak memperbolehkan pendaftaran dari %2$s. Coba yang lain atau &lt;a&gt;pilih server lain&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Nama pengguna ini sudah diambil.</string>
+	<string name="save_changes">Simpan perubahan</string>
+	<string name="profile_timeline">Linimasa</string>
+	<string name="view_all">Lihat semua</string>
+	<string name="profile_endorsed_accounts">Akun</string>
+	<string name="verified_link">Pranala terverifikasi</string>
+	<string name="show">Tampilkan</string>
+	<string name="hide">Sembunyikan</string>
+	<string name="join_default_server">Gabung %s</string>
+	<string name="learn_more">Pelajari lebih lanjut</string>
+	<string name="welcome_to_mastodon">Selamat datang di Mastodon</string>
 </resources>

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

@@ -382,11 +382,6 @@
 	<string name="login_title">Velkomin aftur</string>
 	<string name="login_subtitle">Skráðu þig inn á netþjóninn þar sem þú útbjóst notandaaðganginn þinn.</string>
 	<string name="server_url">Vefslóð netþjóns</string>
-	<string name="welcome_page1_title">Hvað er Mastodon?</string>
-	<string name="welcome_page1_text">Ímyndaðu þér að þú sért með tölvupóstfang sem endar á @lén.is.\n\nÞú getur alltaf tekið við og sent tölvupóst til allra, jafnvel þótt tölvupóstfangið þeirra endi á @gmail.com, @icloud.com eða @lén.is.</string>
-	<string name="welcome_page2_title">Mastodon er eins og þetta.</string>
-	<string name="welcome_page3_title">Hvernig vel ég netþjón?</string>
-	<string name="welcome_page3_text">Mismunandi fólk velur sér mismunandi netþjóna af ýmsum ólíkum ástæðum. Netþjónninn art.example er frábær staður fyrir listafólk, á meðan glasgow.example gæti verið góður kostur fyrir suma skota.\n\nÞú getur eiginlega ekki lent á röngum stað á neinum að þeim netþjónum sem við mælum með, þannig að hvern þeirra sem þú velur (eða ef þú setur inn þinn eigin netþjón í leitarreitinn), þá ættirðu ekki að missa af neinu neinsstaðar.</string>
 	<string name="signup_random_server_explain">Við munum velja netþjón út frá tungumálinu þínu, ef þú heldur áfram án þess að velja neitt.</string>
 	<string name="server_filter_any_language">Hvaða tungumál sem er</string>
 	<string name="server_filter_instant_signup">Nýskráning á stundinni</string>

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

@@ -270,6 +270,7 @@
 	<string name="hide_content">Nascondi il contenuto</string>
 	<string name="new_post">Nuovo post</string>
 	<string name="button_reply">Rispondi</string>
+	<string name="button_reblog">Condividi</string>
 	<string name="button_favorite">Preferito</string>
 	<string name="button_share">Condividi</string>
 	<string name="media_no_description">Media senza descrizione</string>
@@ -285,6 +286,8 @@
 	<string name="followed_user">Hai cominciato a seguire %s</string>
 	<string name="following_user_requested">Richiesto di seguire %s</string>
 	<string name="open_in_browser">Apri nel browser</string>
+	<string name="hide_boosts_from_user">Nascondi condivisioni da %s</string>
+	<string name="show_boosts_from_user">Mostra condivisioni da %s</string>
 	<string name="signup_reason">Perché vuoi unirti?</string>
 	<string name="signup_reason_note">Questo ci aiuterà ad esaminare la tua richiesta.</string>
 	<string name="clear">Cancella</string>
@@ -326,8 +329,13 @@
 		<item quantity="one">%,d preferito</item>
 		<item quantity="other">%,d preferiti</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d condivisione</item>
+		<item quantity="other">%,d condivisioni</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s tramite %2$s</string>
 	<string name="time_now">ora</string>
+	<string name="post_info_reblogs">Condivisioni</string>
 	<string name="post_info_favorites">Preferiti</string>
 	<string name="edit_history">Cronologia delle modifiche</string>
 	<string name="last_edit_at_x">Ultima modifica: %s</string>
@@ -386,11 +394,6 @@
 	<string name="login_title">Bentornato/a</string>
 	<string name="login_subtitle">Accedi con il server in cui hai creato il tuo account.</string>
 	<string name="server_url">URL del server</string>
-	<string name="welcome_page1_title">Che cos\'è Mastodon?</string>
-	<string name="welcome_page1_text">Immaginate di avere un indirizzo email che termina con @example.com.\n\nPotete ancora inviare e ricevere email da chiunque, anche se la loro email termina in @gmail.com o @icloud.com o @example.com.</string>
-	<string name="welcome_page2_title">Mastodon è così.</string>
-	<string name="welcome_page3_title">Come scegliere un server?</string>
-	<string name="welcome_page3_text">Diverse persone scelgono server diversi per vari motivi. art.example è un server ottimo per gli artisti, mentre glasgow.example è una buona scelta per i Scozzesi. \n\nNon si può sbagliare con nessuno dei nostri server consigliati, e qualsiasi server scegli (o se cerchi un altro che conosci tu usando la barra di ricerca dei server) non perderai mai un colpo.</string>
 	<string name="signup_random_server_explain">Sceglieremo un server in base alla tua lingua se continui senza effettuare una selezione.</string>
 	<string name="server_filter_any_language">Qualsiasi lingua</string>
 	<string name="server_filter_instant_signup">Iscrizione immediata</string>
@@ -422,10 +425,18 @@
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="signup_email_domain_blocked">%1$s non consente iscrizioni da %2$s. Provane uno diverso o &lt;a&gt;scegli un altro server&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Questo nome utente è già in uso.</string>
+	<string name="spoiler_show">Mostra comunque</string>
+	<string name="spoiler_hide">Ri-nascondere</string>
+	<string name="poll_multiple_choice">Scegli una o più risposte</string>
+	<string name="save_changes">Salva le modifiche</string>
+	<string name="profile_featured">In primo piano</string>
+	<string name="profile_timeline">Timeline</string>
+	<string name="view_all">Vedi tutto</string>
 	<string name="profile_endorsed_accounts">Account</string>
 	<string name="verified_link">Collegamento verificato</string>
 	<string name="show">Mostra</string>
 	<string name="hide">Nascondi</string>
+	<string name="join_default_server">Unisciti a %s</string>
 	<string name="pick_server">Scegli il mio server</string>
 	<string name="signup_or_login">o</string>
 	<string name="learn_more">Scopri di più</string>

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

@@ -361,11 +361,6 @@
 	<string name="login_title">アカウントでログイン</string>
 	<string name="login_subtitle">アカウントのあるサーバーのURLを入力してください。</string>
 	<string name="server_url">サーバーのURL</string>
-	<string name="welcome_page1_title">Mastodonとは</string>
-	<string name="welcome_page1_text">Mastodonのしくみは電子メールとよく似ています。\n\n電子メールは ○○@example.com のようなメールアドレスを持っていれば、 □□@gmail.com や △△@icloud.com はもちろん、同じプロバイダの ◇◇@example.com など、どんな相手にもメールを送れます。</string>
-	<string name="welcome_page2_title">サーバーからサーバーへ</string>
-	<string name="welcome_page3_title">サーバーをさがしてみよう</string>
-	<string name="welcome_page3_text">サーバーの選びかたは十人十色です。アーティスト同士が集まるサーバーもあれば、とある鉄道の沿線住民が集うサーバーもあります。\n\nアカウント作成に進むと、検索バーとおすすめのサーバーが表示されます。参加したいサーバーが決まっていない場合は、おすすめから選んでみましょう。どのサーバーを選んでも、どこの誰とでもつながれます。</string>
 	<string name="signup_random_server_explain">利用中の言語に基づいてサーバーを自動選択することもできます。</string>
 	<string name="server_filter_any_language">すべての言語</string>
 	<string name="server_filter_instant_signup">開放</string>

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

@@ -312,7 +312,6 @@
 	<string name="add_bookmark">Creḍ</string>
 	<string name="your_favorites">Imenyifen-ik·im</string>
 	<string name="login_title">Ansuf yess·ek·em</string>
-	<string name="welcome_page1_title">D acu-t Maṣṭudun?</string>
 	<string name="server_filter_any_language">Yal tutlayt</string>
 	<string name="server_filter_region_europe">Turuft</string>
 	<string name="server_filter_region_africa">Tafriqt</string>

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

@@ -361,11 +361,6 @@
 	<string name="login_title">돌아오신 것을 환영합니다</string>
 	<string name="login_subtitle">계정을 생성한 서버에 로그인하세요.</string>
 	<string name="server_url">서버 URL</string>
-	<string name="welcome_page1_title">마스토돈이란?</string>
-	<string name="welcome_page1_text">당신이 @example.com으로 끝나는 이메일 주소를 갖고 있다고 상상해보세요.\n\n당신은 이메일이 @gmail.com이나 @icloud.com 또는 @example.com으로 끝나는 모두에게 이메일을 보내거나 받을 수 있습니다.</string>
-	<string name="welcome_page2_title">마스토돈도 그렇답니다.</string>
-	<string name="welcome_page3_title">서버는 어떻게 선택하나요?</string>
-	<string name="welcome_page3_text">다른 사람들은 여러가지 이유로 서로 다른 서버들을 선택합니다. art.example은 예술가들에게 훌륭한 곳인 반면, glasgow.example은 스코틀랜드인들에게 좋은 선택이 될 수 있습니다.\n\n저희가 추천하는 서버를 선택하면 잘못될 일이 없으므로, 당신은 어떠한 서버를 선택하더라도(또는 서버 검색란에 직접 입력하더라도) 어디서나 소식을 놓치지 않을 것입니다.</string>
 	<string name="signup_random_server_explain">아무 것도 고르지 않은 경우, 당신의 언어에 따라 서버를 골라드립니다.</string>
 	<string name="server_filter_any_language">모든 언어</string>
 	<string name="server_filter_instant_signup">즉시 가입</string>

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

@@ -382,11 +382,6 @@
 	<string name="login_title">Welkom terug</string>
 	<string name="login_subtitle">Bij de server waar je je account hebt aangemaakt inloggen.</string>
 	<string name="server_url">Server-URL</string>
-	<string name="welcome_page1_title">Wat is Mastodon?</string>
-	<string name="welcome_page1_text">Stel je voor dat je een e-mailadres hebt dat eindigt op @example.com.\n\nJe kunt nog steeds e-mailen met iemand, ook als hun e-mail eindigt in @gmail.com, @icloud.com of @voorbeeld.com.</string>
-	<string name="welcome_page2_title">Mastodon is precies zo.</string>
-	<string name="welcome_page3_title">Hoe kies ik een server?</string>
-	<string name="welcome_page3_text">Verschillende mensen kiezen om allerlei redenen een bepaalde server. art.example is een geweldige plek voor artiesten, terwijl belgium.example misschien een goede plek is voor Belgen.\n\nHet kan niet mis gaan als je een van onze aanbevolen servers kiest. Welke je ook kiest (en ook als je zelf een server invoert in de zoekbalk): je zult geen bericht missen.</string>
 	<string name="signup_random_server_explain">Als je doorgaat zonder een selectie te maken, kiezen we een server gebaseerd op jouw taal.</string>
 	<string name="server_filter_any_language">Elke taal</string>
 	<string name="server_filter_instant_signup">Direct aanmelden</string>

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

@@ -365,9 +365,6 @@
 	<string name="login_title">Velkommen tilbake</string>
 	<string name="login_subtitle">Logg inn med serveren der du opprettet kontoen din.</string>
 	<string name="server_url">Server-URL</string>
-	<string name="welcome_page1_text">Forestill deg at du sender en e-postadresse som slutter med @example.com.\n\nDu kan fortsatt sende og motta e-post fra hvem som helst, selv om e-posten deres slutter på @gmail.com eller @icloud.com eller @example.com.</string>
-	<string name="welcome_page2_title">Mastodon er slik.</string>
-	<string name="welcome_page3_title">Hvordan velger jeg en server?</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->

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

@@ -421,11 +421,6 @@
 	<string name="login_title">Witaj ponownie</string>
 	<string name="login_subtitle">Zaloguj się na serwer, na którym utworzyłeś swoje konto.</string>
 	<string name="server_url">Adres URL serwera</string>
-	<string name="welcome_page1_title">Czym jest Mastodon?</string>
-	<string name="welcome_page1_text">Wyobraź sobie, że masz adres e-mail, który kończy się @example.com.\n\nNadal możesz wysyłać i odbierać wiadomości od każdego, nawet jeśli ich e-mail kończy się na @gmail.com lub @icloud.com lub @przykład.com.</string>
-	<string name="welcome_page2_title">Mastodon jest taki.</string>
-	<string name="welcome_page3_title">Jak wybrać serwer?</string>
-	<string name="welcome_page3_text">Różne osoby wybierają różne serwery z różnych powodu. art.example to świetne miejsce dla artystów, podczas gdy glasgow.przykład może być dobrym wyborem dla Szkotów.\n\nNie zrobisz źle wybierając dowolny z naszych rekomendowanych serwerów, dlatego niezależnie od tego który wybierzesz (lub jeśli wpiszesz swój własny na pasku wyszukiwania serwera), nigdy nie przegapisz niczego.</string>
 	<string name="signup_random_server_explain">My wybierzemy serwer oparty na twoim języku, jeśli kontynuujesz bez dokonywania wyboru.</string>
 	<string name="server_filter_any_language">Dowolny język</string>
 	<string name="server_filter_instant_signup">Natychmiastowa rejestracja</string>

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

@@ -381,11 +381,6 @@
 	<string name="login_title">Bem-vindo de Volta</string>
 	<string name="login_subtitle">Faça login no servidor onde você criou sua conta.</string>
 	<string name="server_url">URL do servidor</string>
-	<string name="welcome_page1_title">O que é o Mastodon?</string>
-	<string name="welcome_page1_text">Imagine que você tem um endereço de e-mail que termina com @example.com.\n\nVocê ainda pode enviar e receber e-mails de qualquer pessoa, mesmo que o e-mail deles termine em @gmail.com ou @icloud.com ou @example.com.</string>
-	<string name="welcome_page2_title">O Mastodon é assim.</string>
-	<string name="welcome_page3_title">Como faço para escolher um servidor?</string>
-	<string name="welcome_page3_text">Pessoas diferentes escolhem servidores diferentes por vários motivos. O art.example é um ótimo lugar para artistas, enquanto glasgow.example pode ser uma boa escolha para escoceses.\n\nVocê não pode errar com nenhum de nossos servidores recomendados, portanto, independentemente de qual escolher (ou se inserir seu próprio na barra de pesquisa do servidor), você nunca perderá uma batida em lugar nenhum.</string>
 	<string name="signup_random_server_explain">Nós escolheremos um servidor com base no seu idioma se você continuar sem fazer uma seleção.</string>
 	<string name="server_filter_any_language">Qualquer idioma</string>
 	<string name="server_filter_instant_signup">Cadastro Rápido</string>

mastodon/src/main/res/values-ru-rRU/strings.xml

@@ -415,11 +415,6 @@
 	<string name="login_title">С возвращением</string>
 	<string name="login_subtitle">Войдите на сервер, на котором вы создали свою учётную запись.</string>
 	<string name="server_url">URL-адрес сервера</string>
-	<string name="welcome_page1_title">Что такое Mastodon?</string>
-	<string name="welcome_page1_text">Представьте, что у вас есть адрес электронной почты, который заканчивается на @example.com.\n\nВы можете отправлять и получать письма от всех, даже если их адрес заканчивается на @gmail.com или @icloud.com или @example.com.</string>
-	<string name="welcome_page2_title">Mastodon работает так же.</string>
-	<string name="welcome_page3_title">Как выбрать сервер?</string>
-	<string name="welcome_page3_text">Разные люди выбирают разные серверы по разным причинам. art.example — отличное место для художников, а glasgow.example может быть хорошим выбором для шотландцев.\n\nВы не ошибётесь с любым из рекомендованных серверов, поэтому независимо от того, какой из них вы выберете (или если вы введёте свой собственный в строке поиска сервера), вы никогда и нигде не пропустите ни одной детали.</string>
 	<string name="signup_random_server_explain">Мы выберем сервер на основе вашего языка, если вы продолжите, не сделав выбор.</string>
 	<string name="server_filter_any_language">Любой язык</string>
 	<string name="server_filter_instant_signup">Мгновенная регистрация</string>

mastodon/src/main/res/values-sl-rSI/strings.xml

@@ -10,11 +10,13 @@
 	<string name="ok">V redu</string>
 	<string name="preparing_auth">Pripravljanje na preverjanje pristnosti …</string>
 	<string name="finishing_auth">Zaključevanje preverjanja pristnosti ...</string>
+	<string name="user_boosted">%s je izpostavil/a</string>
 	<string name="in_reply_to">Kot odgovor %s</string>
 	<string name="notifications">Obvestila</string>
 	<string name="user_followed_you">vam sledi</string>
 	<string name="user_sent_follow_request">vam je poslal_a zahtevo za sledenje</string>
 	<string name="user_favorited">je vzljubil_a vašo objavo</string>
+	<string name="notification_boosted">je izpostavil/a vašo objavo</string>
 	<string name="poll_ended">anketa je zaključena</string>
 	<string name="time_seconds">%d s</string>
 	<string name="time_minutes">%d m</string>
@@ -192,6 +194,7 @@
 	<string name="report_sent_subtitle">Medtem, ko to pregledujemo, lahko proti %s ukrepate.</string>
 	<string name="unfollow_user">Prenehaj slediti %s</string>
 	<string name="unfollow">Prenehaj slediti</string>
+	<string name="mute_user_explain">Njihovih objav ali poobjav ne boste videli v svojem domačem viru. Ne bodo vedeli, da so utišani.</string>
 	<string name="block_user_explain">Nič več ne bodo mogli slediti ali videti vaše objave, lahko pa vidijo, če so blokirani.</string>
 	<string name="report_personal_title">Ali ne želite tega videti?</string>
 	<string name="report_personal_subtitle">Če vidite nekaj, česar na Masodonu ne želite, lahko odstranite osebo iz svoje izkušnje.</string>
@@ -248,6 +251,7 @@
 	<string name="skip">Preskoči</string>
 	<string name="notification_type_follow">Novi sledilci</string>
 	<string name="notification_type_favorite">Priljubljeni</string>
+	<string name="notification_type_reblog">Izpostavitve</string>
 	<string name="notification_type_mention">Omembe</string>
 	<string name="notification_type_poll">Ankete</string>
 	<string name="choose_account">Izberite račun</string>
@@ -276,6 +280,7 @@
 	<string name="notify_none">nihče</string>
 	<string name="notify_favorites">mojo objavo da med priljubljene</string>
 	<string name="notify_follow">me sledi</string>
+	<string name="notify_reblog">Izpostavi mojo objavo </string>
 	<string name="notify_mention">me omeni</string>
 	<string name="settings_boring">Cona dolgočasja</string>
 	<string name="settings_account">Nastavitve računa</string>
@@ -296,6 +301,7 @@
 	<string name="hide_content">Skrij vsebino</string>
 	<string name="new_post">Nova objava</string>
 	<string name="button_reply">Odgovori</string>
+	<string name="button_reblog">Izpostavi</string>
 	<string name="button_favorite">Priljubljen_a</string>
 	<string name="button_share">Deli</string>
 	<string name="media_no_description">Medij brez opisa</string>
@@ -311,6 +317,8 @@
 	<string name="followed_user">Zdaj sledite %s</string>
 	<string name="following_user_requested">Zaprošeni ste, da sledite %s</string>
 	<string name="open_in_browser">Odpri v brskalniku</string>
+	<string name="hide_boosts_from_user">Skrij izpostavitve od %s</string>
+	<string name="show_boosts_from_user">Pokaži izpostavitve osebe %s</string>
 	<string name="signup_reason">Zakaj se želite pridružiti?</string>
 	<string name="signup_reason_note">To nam bo pomagalo pregledati vašo prijavo.</string>
 	<string name="clear">Počisti</string>
@@ -360,6 +368,7 @@
 	</plurals>
 	<string name="timestamp_via_app">%1$s prek %2$s</string>
 	<string name="time_now">zdaj</string>
+	<string name="post_info_reblogs">Izpostavitve</string>
 	<string name="post_info_favorites">Priljubljeni</string>
 	<string name="edit_history">Uredi zgodovino</string>
 	<string name="last_edit_at_x">Zadnjič urejano %s</string>
@@ -422,11 +431,6 @@
 	<string name="login_title">Dobrodošli nazaj</string>
 	<string name="login_subtitle">Prijavite se na strežniku, na katerem ste ustvarili svoj račun.</string>
 	<string name="server_url">URL strežnika</string>
-	<string name="welcome_page1_title">Kaj je Mastodon?</string>
-	<string name="welcome_page1_text">Predstavljajte si, da imate e-poštni naslov, ki se konča s @primer.com.\n\nŠe vedno lahko pošiljate in prejemate e-sporočilo od vsakogar, tudi če se njihov e-naslov konča @gmail.com, @icloud.com ali @primer.com.</string>
-	<string name="welcome_page2_title">Mastodon je takšen.</string>
-	<string name="welcome_page3_title">Kako izberem strežnik?</string>
-	<string name="welcome_page3_text">Različni ljudje izbirajo različne strežnike iz najrazličnejših razlogov. art.example je krasno mesto za uemtnike, medtem ko je glasgow.example dobra izbira za Škode.\n\nNič ne morete storiti narobe s katerim koli od naših priporočenih strežnikov, tako da je povsem nepomembno, katerega ste izbrali (ali če vnesete lastnega v iskalno vrstico strežnikov) - nikoli ne boste zamudili niti najmanjših vsebin.</string>
 	<string name="signup_random_server_explain">Izbrali bomo strežnik na osnovi vašega jezika, če nadaljujete brez izbire.</string>
 	<string name="server_filter_any_language">Katerikoli jezik</string>
 	<string name="server_filter_instant_signup">Takojšnja prijava</string>
@@ -458,4 +462,23 @@
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="signup_email_domain_blocked">%1$s ne dovoljuje prijav s/z %2$s. Poskusite drugega ali &lt;a&gt;izberite drug strežnik&lt;/a&gt;.</string>
 	<string name="signup_username_taken">To ime je že zasedeno.</string>
+	<string name="spoiler_show">Vseeno pokaži</string>
+	<string name="spoiler_hide">Ponovno skrij</string>
+	<string name="poll_multiple_choice">Izberi eno ali več izbir</string>
+	<string name="save_changes">Shrani spremembe</string>
+	<string name="profile_featured">Predstavljeni</string>
+	<string name="profile_timeline">Časovnica</string>
+	<string name="view_all">Prikaži vse</string>
+	<string name="profile_endorsed_accounts">Računi</string>
+	<string name="verified_link">Preverjena povezava</string>
+	<string name="show">Pokaži</string>
+	<string name="hide">Skrij</string>
+	<string name="join_default_server">Pridruži se %s</string>
+	<string name="pick_server">Izberi moj lasten strežnik</string>
+	<string name="signup_or_login">ali</string>
+	<string name="learn_more">Več o tem</string>
+	<string name="welcome_to_mastodon">Dobrodošli na Mastodon</string>
+	<string name="welcome_paragraph1">Mastodon je decentralizirano družbeno omrežje, kar pomeni, da ga ne upravlja nobeno posamezno podjetje. Sestavljajo ga številni neodvisni strežniki, ki so medsebojno povezani.</string>
+	<string name="what_are_servers">Kaj so strežniki?</string>
+	<string name="welcome_paragraph2"><![CDATA[Vsak račun Mastodon gostuje na strežniku — vsak strežnik ima svoje vrednote, pravila in skbrnike. Vseeno je, katerega izberete - sledite in komunicirate lahko z osebbami na poljubnem strežniku.]]></string>
 </resources>

mastodon/src/main/res/values-sv-rSE/strings.xml

@@ -381,11 +381,6 @@
 	<string name="login_title">Välkommen tillbaka</string>
 	<string name="login_subtitle">Logga in på den server där du skapade ditt konto.</string>
 	<string name="server_url">Server-URL</string>
-	<string name="welcome_page1_title">Vad är Mastodon?</string>
-	<string name="welcome_page1_text">Tänk dig att du har en epostadress som slutar med @example.com.\n\nDu kan skicka och ta emot epost från vem som helst, även om deras epostadress slutar med @gmail.com, @icloud.com eller @example.com.</string>
-	<string name="welcome_page2_title">Mastodon fungerar så.</string>
-	<string name="welcome_page3_title">Hur väljer jag en server?</string>
-	<string name="welcome_page3_text">Olika personer väljer olika servrar av olika anledningar. art.example är en bra plats för konstnärer medan glasgow.exempel kan vara ett bra val för skottar.\n\nMed någon av våra rekommenderar servrar kan du inte hamna fel så oavsett vilken du väljer, eller om du skriver in din egen i serverns sökfältet, kommer du aldrig missa något.</string>
 	<string name="signup_random_server_explain">Vi kommer att välja en server baserat på ditt språk om du fortsätter utan att göra ett val.</string>
 	<string name="server_filter_any_language">Vilket språk som helst</string>
 	<string name="server_filter_instant_signup">Omedelbar registrering</string>

mastodon/src/main/res/values-th-rTH/strings.xml

@@ -374,12 +374,6 @@
 	<string name="login_title">ยินดีต้อนรับกลับมา</string>
 	<string name="login_subtitle">เข้าสู่ระบบด้วยเซิร์ฟเวอร์ที่ซึ่งคุณได้สร้างบัญชีของคุณ</string>
 	<string name="server_url">URL ของเซิร์ฟเวอร์</string>
-	<string name="welcome_page1_title">Mastodon คืออะไร?</string>
-	<string name="welcome_page1_text">จินตนาการว่าคุณมีที่อยู่อีเมลที่ลงท้ายด้วย @example.com\n\nคุณยังคงสามารถส่งและรับอีเมลจากใครก็ตาม แม้ว่าอีเมลของเขาจะลงท้ายด้วย @gmail.com หรือ @icloud.com หรือ @example.com ก็ตาม</string>
-	<string name="welcome_page2_title">Mastodon เป็นเช่นนั้น</string>
-	<string name="welcome_page2_text">นามของคุณอาจเป็น @gothgirl654@example.social แต่คุณยังคงสามารถติดตาม ดัน และแชทกับ @fallout5ever@example.online</string>
-	<string name="welcome_page3_title">ฉันจะเลือกเซิร์ฟเวอร์อย่างไร?</string>
-	<string name="welcome_page3_text">ต่างคนต่างเลือกเซิร์ฟเวอร์ด้วยเหตุผลต่าง ๆ art.example เป็นสถานที่ที่ยอดเยี่ยมสำหรับศิลปิน ขณะที่ glasgow.example อาจเป็นตัวเลือกที่ดีสำหรับชาวสกอต\n\nรับรองว่าคุณต้องชอบเซิร์ฟเวอร์ที่แนะนำของเราใดก็ตาม ดังนั้นไม่ว่าเซิร์ฟเวอร์ใดที่คุณเลือก (หรือหากคุณป้อนของคุณเองในแถบค้นหาเซิร์ฟเวอร์) คุณจะไม่พลาดความเคลื่อนไหวที่ใดก็ตาม</string>
 	<string name="signup_random_server_explain">เราจะเลือกเซิร์ฟเวอร์ตามภาษาของคุณหากคุณดำเนินการต่อโดยไม่ได้ทำการเลือก</string>
 	<string name="server_filter_any_language">ภาษาใด ๆ</string>
 	<string name="server_filter_instant_signup">การลงทะเบียนทันที</string>
@@ -429,5 +423,5 @@
 	<string name="welcome_to_mastodon">ยินดีต้อนรับสู่ Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon เป็นเครือข่ายสังคมแบบกระจายศูนย์ หมายความว่าไม่มีบริษัทใดควบคุมเครือข่ายสังคม เครือข่ายสังคมประกอบด้วยเซิร์ฟเวอร์ที่ทำงานอย่างอิสระจำนวนมาก ทั้งหมดเชื่อมต่อเข้าด้วยกัน</string>
 	<string name="what_are_servers">เซิร์ฟเวอร์คืออะไร?</string>
-	<string name="welcome_paragraph2"><![CDATA[ทุกบัญชี Mastodon ได้รับการโฮสต์ในเซิร์ฟเวอร์ — แต่ละแห่งมีค่า กฎ และผู้ดูแลของเซิร์ฟเวอร์เอง ไม่ว่าคุณจะเลือกเซิร์ฟเวอร์ใด คุณสามารถติดตามและโต้ตอบกับผู้คนในเซิร์ฟเวอร์ใด ๆ]]></string>
+	<string name="welcome_paragraph2"><![CDATA[ทุกบัญชี Mastodon ได้รับการโฮสต์ในเซิร์ฟเวอร์ — แต่ละแห่งมีค่า, กฎ และผู้ดูแลของเซิร์ฟเวอร์เอง ไม่ว่าคุณจะเลือกเซิร์ฟเวอร์ใด คุณสามารถติดตามและโต้ตอบกับผู้คนในเซิร์ฟเวอร์ใด ๆ]]></string>
 </resources>

mastodon/src/main/res/values-tr-rTR/strings.xml

@@ -381,11 +381,6 @@
 	<string name="login_title">Hoşgeldin</string>
 	<string name="login_subtitle">Hesabınızı oluşturduğunuz sunucu ile giriş yapın.</string>
 	<string name="server_url">Sunucu URL\'si</string>
-	<string name="welcome_page1_title">Mastodon nedir?</string>
-	<string name="welcome_page1_text">\@örnek.com ile biten bir e-posta adresiniz olduğunu düşünün. \n\n Kişilerin e-posta adresi @gmail.com, @icloud.com ya da @örnek.com ile bitse de herkese e-posta gönderebilir veya herkesten e-posta alabilirsiniz.</string>
-	<string name="welcome_page2_title">Mastodon da böyledir.</string>
-	<string name="welcome_page3_title">Bir sunucuyu nasıl seçerim?</string>
-	<string name="welcome_page3_text">İnsanlar farklı sebeplerle farklı sunucular seçer. sanat.ornek sanatçılar için, istanbul.ornek İstanbullular için güzel bir seçenek olabilir. \n\n Bizim önerdiğimiz bir sunucuyu seçerek (ya da kendi sunucunuzu arama alanına yazabilirsiniz) yanlış bir şey yapmış olmazsınız, hangisini seçtiğiniz fark etmeksizin hiçbir olayı kaçırmayacaksınız.</string>
 	<string name="signup_random_server_explain">Herhangi bir seçim yapmadan devam ederseniz dilinize göre bir sunucu seçeceğiz.</string>
 	<string name="server_filter_any_language">Herhangi Bir Dil</string>
 	<string name="server_filter_instant_signup">Koşulsuz Kayıt</string>

mastodon/src/main/res/values-uk-rUA/strings.xml

@@ -422,11 +422,6 @@
 	<string name="login_title">З поверненням</string>
 	<string name="login_subtitle">Увійдіть за допомогою сервера, де ви створили свій обліковий запис.</string>
 	<string name="server_url">URL-адреса сервера</string>
-	<string name="welcome_page1_title">Що таке Mastodon?</string>
-	<string name="welcome_page1_text">Уявіть, що у вас є електронної пошта, яка закінчується на @example.com.\n\nВи можете все ще надсилати та отримувати листи від будь-кого, навіть якщо їх електронна пошта закінчується на @gmail.com або @icloud.com або @example.com.</string>
-	<string name="welcome_page2_title">Mastodon такий.</string>
-	<string name="welcome_page3_title">Як обрати сервер?</string>
-	<string name="welcome_page3_text">Різні люди обирають різні сервери з будь-якої кількості причин. art.example - це чудове місце для художників, в той час як glasgow.example може бути гарним вибором для шотландці.\n\nВи не можете піти не так з жодними з наших рекомендованих серверів, так чи інакше, незалежно від того, який вибір ви обираєте (або введете власний в панель пошуку сервера), ви ніколи ніде не помилитися в жодному місці.</string>
 	<string name="signup_random_server_explain">Ми підберемо сервер основі вашої мовою, якщо ви продовжите без вибору.</string>
 	<string name="server_filter_any_language">Будь-яка мова</string>
 	<string name="server_filter_instant_signup">Миттєва Реєстрація</string>

mastodon/src/main/res/values-vi-rVN/strings.xml

@@ -362,11 +362,6 @@
 	<string name="login_title">Chào mừng quay trở lại!</string>
 	<string name="login_subtitle">Đăng nhập với máy chủ nơi bạn tạo tài khoản.</string>
 	<string name="server_url">URL Máy chủ</string>
-	<string name="welcome_page1_title">Mastodon là gì?</string>
-	<string name="welcome_page1_text">Hãy tưởng tượng bạn có một địa chỉ email tên miền @example.com.\n\nBạn vẫn có thể gửi và nhận email từ bất kỳ ai, ngay cả khi email của họ là @gmail.com hoặc @icloud.com hoặc @example.com.</string>
-	<string name="welcome_page2_title">Mastodon tương tự vậy.</string>
-	<string name="welcome_page3_title">Làm thế nào để chọn một máy chủ?</string>
-	<string name="welcome_page3_text">Mọi người chọn các máy chủ khác nhau vì nhiều lý do. art.example là một nơi tuyệt vời cho các nghệ sĩ, trong khi glasgow.example có thể là một lựa chọn tốt cho người Scotland.\n\nBạn có thể chọn bất kỳ máy chủ đề xuất nào của chúng tôi, vì vậy, bất kể bạn chọn máy chủ nào (hoặc tự chọn trong thanh tìm kiếm của máy chủ), bạn sẽ không bao giờ bỏ lỡ một nhịp nào ở bất cứ đâu.</string>
 	<string name="signup_random_server_explain">Chúng tôi sẽ chọn một máy chủ dựa trên ngôn ngữ của bạn nếu bạn tiếp tục mà không lựa chọn.</string>
 	<string name="server_filter_any_language">Mọi ngôn ngữ</string>
 	<string name="server_filter_instant_signup">Đăng ký nhanh</string>

mastodon/src/main/res/values-zh-rCN/strings.xml

@@ -346,7 +346,6 @@
 	<string name="login_title">欢迎回来</string>
 	<string name="login_subtitle">登陆到你创建账户的服务器。</string>
 	<string name="server_url">服务器地址</string>
-	<string name="welcome_page3_title">如何选择服务器？</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->

mastodon/src/main/res/values-zh-rTW/strings.xml

@@ -10,11 +10,13 @@
 	<string name="ok">確定</string>
 	<string name="preparing_auth">正在準備認證……</string>
 	<string name="finishing_auth">正在結束認證……</string>
+	<string name="user_boosted">%s 已轉嘟</string>
 	<string name="in_reply_to">回覆給 %s</string>
 	<string name="notifications">通知</string>
 	<string name="user_followed_you">已跟隨您</string>
 	<string name="user_sent_follow_request">傳送跟隨請求給您</string>
 	<string name="user_favorited">已將您的嘟文加入最愛</string>
+	<string name="notification_boosted">已轉嘟您的嘟文</string>
 	<string name="poll_ended">投票已結束</string>
 	<string name="time_seconds">%d 秒</string>
 	<string name="time_minutes">%d 分</string>
@@ -150,6 +152,7 @@
 	<string name="report_sent_subtitle">當我們正在審核時，您可以對 %s 採取以下措施。</string>
 	<string name="unfollow_user">取消跟隨 %s</string>
 	<string name="unfollow">取消跟隨</string>
+	<string name="mute_user_explain">您不會在您的首頁時間軸中再見到他們的嘟文或轉嘟。他們不會知道他們已被靜音。</string>
 	<string name="block_user_explain">他們將無法跟隨您或是看到您的嘟文。他們能看到他們是否已被封鎖。</string>
 	<string name="report_personal_title">不想再看到這個？</string>
 	<string name="report_personal_subtitle">當您看到某些不喜歡的內容時，您可以將該帳號從您的體驗中移除。</string>
@@ -206,6 +209,7 @@
 	<string name="skip">跳過</string>
 	<string name="notification_type_follow">新的跟隨者</string>
 	<string name="notification_type_favorite">最愛</string>
+	<string name="notification_type_reblog">轉嘟</string>
 	<string name="notification_type_mention">提及</string>
 	<string name="notification_type_poll">投票</string>
 	<string name="choose_account">選擇帳號</string>
@@ -231,6 +235,7 @@
 	<string name="notify_none">沒有人</string>
 	<string name="notify_favorites">將我的嘟文加到最愛</string>
 	<string name="notify_follow">跟隨我</string>
+	<string name="notify_reblog">已轉嘟我的嘟文</string>
 	<string name="notify_mention">提及我</string>
 	<string name="settings_boring">無聊的區域</string>
 	<string name="settings_account">帳號設定</string>
@@ -251,6 +256,7 @@
 	<string name="hide_content">隱藏內容</string>
 	<string name="new_post">新嘟文</string>
 	<string name="button_reply">回覆</string>
+	<string name="button_reblog">轉嘟</string>
 	<string name="button_favorite">最愛</string>
 	<string name="button_share">分享</string>
 	<string name="media_no_description">沒有描述的媒體</string>
@@ -266,6 +272,8 @@
 	<string name="followed_user">您現在開始跟隨 %s</string>
 	<string name="following_user_requested">要求跟隨 %s</string>
 	<string name="open_in_browser">在瀏覽器中開啟</string>
+	<string name="hide_boosts_from_user">隱藏來自 %s 的轉嘟</string>
+	<string name="show_boosts_from_user">顯示來自 %s 的轉嘟</string>
 	<string name="signup_reason">為什麼想要加入呢？</string>
 	<string name="signup_reason_note">這會協助我們審核您的申請。</string>
 	<string name="clear">清除</string>
@@ -304,8 +312,12 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d 個最愛</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="other">%,d 轉嘟</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s 透過 %2$s</string>
 	<string name="time_now">剛剛</string>
+	<string name="post_info_reblogs">轉嘟</string>
 	<string name="post_info_favorites">最愛</string>
 	<string name="edit_history">編輯記錄</string>
 	<string name="last_edit_at_x">上次編輯於 %s</string>
@@ -362,11 +374,6 @@
 	<string name="login_title">歡迎回來</string>
 	<string name="login_subtitle">以您建立帳號之伺服器登入。</string>
 	<string name="server_url">伺服器 URL</string>
-	<string name="welcome_page1_title">什麼是 Mastodon？</string>
-	<string name="welcome_page1_text">想像您擁有以 @example.com 結尾的 email 信箱地址。\n\n您仍可發送及接收來自任何人的電子郵件，無論他們的信箱是來自 @gmail.com 或 @icloud.com 或 @example.com。</string>
-	<string name="welcome_page2_title">Mastodon 就像這樣。</string>
-	<string name="welcome_page3_title">如何挑選伺服器？</string>
-	<string name="welcome_page3_text">不同人基於各式各樣的原因挑選不同的伺服器。art.example 也許對藝術家來說是個好地方，glasgow.example 也許對於蘇格蘭人來說是個好選擇。\n\n任何我們推薦的伺服器都是不錯的選擇（或著您也能從搜尋欄中輸入您自己的伺服器），您不會錯過任何來自聯邦宇宙角落的嘟嘟聲。</string>
 	<string name="signup_random_server_explain">如果您不選擇而繼續的話，我們將透過您的語言設定替您選擇一台伺服器。</string>
 	<string name="server_filter_any_language">任何語言</string>
 	<string name="server_filter_instant_signup">立即註冊</string>
@@ -398,4 +405,23 @@
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="signup_email_domain_blocked">%1$s 不允許 %2$s 之信箱註冊。請重新試試另一個電子郵件服務商，或 &lt;a&gt; 挑選另一個伺服器 &lt;/a&gt;。</string>
 	<string name="signup_username_taken">這個帳號已經被註冊過囉。</string>
+	<string name="spoiler_show">仍要顯示</string>
+	<string name="spoiler_hide">重新隱藏</string>
+	<string name="poll_multiple_choice">請選擇一個或多個</string>
+	<string name="save_changes">儲存變更</string>
+	<string name="profile_featured">推薦主題標籤</string>
+	<string name="profile_timeline">時間軸</string>
+	<string name="view_all">檢視全部</string>
+	<string name="profile_endorsed_accounts">帳號</string>
+	<string name="verified_link">已驗證連結</string>
+	<string name="show">顯示</string>
+	<string name="hide">隱藏</string>
+	<string name="join_default_server">加入 %s</string>
+	<string name="pick_server">選擇我的伺服器</string>
+	<string name="signup_or_login">或</string>
+	<string name="learn_more">了解更多</string>
+	<string name="welcome_to_mastodon">歡迎來到 Mastodon</string>
+	<string name="welcome_paragraph1">Mastodon 是去中心化的社交網路，意思是沒有單一公司掌控它。它由許多獨立運行而互相連接的伺服器組成。</string>
+	<string name="what_are_servers">伺服器是什麼？</string>
+	<string name="welcome_paragraph2"><![CDATA[所有的 Mastodon 帳號皆託管於一個伺服器上 — 其擁有各自之價值觀、規則、與管理者。無論您選擇何者，您皆能跟隨並與其他任何伺服器上的人們互動。]]></string>
 </resources>