Merge branch 'v2.4.2-branch' of asonix/mastodon into asonix/changes

Gemfile.lock

@@ -88,7 +88,7 @@ GEM
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.2)
-    bcrypt (3.1.11)
+    bcrypt (3.1.12)
     benchmark-ips (2.7.2)
     better_errors (2.4.0)
       coderay (>= 1.0.0)

app/javascript/mastodon/features/getting_started/index.js

@@ -95,7 +95,7 @@ export default class GettingStarted extends ImmutablePureComponent {
     navItems.push(
       <ColumnLink key={i++} icon='envelope' text={intl.formatMessage(messages.direct)} to='/timelines/direct' />,
       <ColumnLink key={i++} icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
-      <ColumnLink key={i++} icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />
+      <ColumnLink key={i++} icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />
     );
 
     height += 48*3;

app/javascript/mastodon/features/list_timeline/index.js

@@ -138,7 +138,7 @@ export default class ListTimeline extends React.PureComponent {
     return (
       <Column ref={this.setRef}>
         <ColumnHeader
-          icon='bars'
+          icon='list-ul'
           active={hasUnread}
           title={title}
           onPin={this.handlePin}

app/javascript/mastodon/features/lists/index.js

@@ -57,7 +57,7 @@ export default class Lists extends ImmutablePureComponent {
     }
 
     return (
-      <Column icon='bars' heading={intl.formatMessage(messages.heading)}>
+      <Column icon='list-ul' heading={intl.formatMessage(messages.heading)}>
         <ColumnBackButtonSlim />
 
         <NewListForm />
@@ -66,7 +66,7 @@ export default class Lists extends ImmutablePureComponent {
           <ColumnSubheading text={intl.formatMessage(messages.subheading)} />
 
           {lists.map(list =>
-            <ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='bars' text={list.get('title')} />
+            <ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} />
           )}
         </div>
       </Column>

app/javascript/mastodon/locales/ar.json

@@ -59,7 +59,7 @@
   "column_header.show_settings": "عرض الإعدادات",
   "column_header.unpin": "فك التدبيس",
   "column_subheading.settings": "الإعدادات",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "الوسائط فقط",
   "compose_form.direct_message_warning": "لن يَظهر هذا التبويق إلا للمستخدمين المذكورين.",
   "compose_form.direct_message_warning_learn_more": "إقرأ المزيد",
   "compose_form.hashtag_warning": "هذا التبويق لن يُدرَج تحت أي وسم كان بما أنه غير مُدرَج. لا يُسمح بالبحث إلّا عن التبويقات العمومية عن طريق الوسوم.",
@@ -114,13 +114,13 @@
   "empty_column.public": "لا يوجد أي شيء هنا ! قم بنشر شيء ما للعامة، أو إتبع مستخدمين آخرين في الخوادم المثيلة الأخرى لملء خيط المحادثات العام",
   "follow_request.authorize": "ترخيص",
   "follow_request.reject": "رفض",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "المُطوِّرون",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.find_friends": "البحث عن أصدقاء على تويتر",
   "getting_started.heading": "إستعدّ للبدء",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "دعوة أشخاص",
   "getting_started.open_source_notice": "ماستدون برنامج مفتوح المصدر. يمكنك المساهمة، أو الإبلاغ عن تقارير الأخطاء، على جيت هب {github}.",
-  "getting_started.security": "Security",
+  "getting_started.security": "الأمان",
   "getting_started.terms": "شروط الخدمة",
   "home.column_settings.advanced": "متقدمة",
   "home.column_settings.basic": "أساسية",

app/javascript/mastodon/locales/de.json

@@ -59,9 +59,9 @@
   "column_header.show_settings": "Einstellungen anzeigen",
   "column_header.unpin": "Lösen",
   "column_subheading.settings": "Einstellungen",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "Nur Medien",
   "compose_form.direct_message_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.direct_message_warning_learn_more": "Mehr erfahren",
   "compose_form.hashtag_warning": "Dieser Beitrag wird nicht unter einen dieser Hashtags sichtbar sein, solange er ungelistet ist. Bei einer Suche kann er nicht gefunden werden.",
   "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.",
   "compose_form.lock_disclaimer.lock": "gesperrt",
@@ -81,11 +81,11 @@
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Bist du dir sicher, dass du diese Liste permanent löschen möchtest?",
   "confirmations.domain_block.confirm": "Die ganze Domain verbergen",
-  "confirmations.domain_block.message": "Bist du dir wirklich sicher, dass du die ganze Domain {domain} verbergen willst? In den meisten Fällen reichen ein paar gezielte Blocks aus.",
+  "confirmations.domain_block.message": "Bist du dir wirklich sicher, dass du die ganze Domain {domain} verbergen willst? In den meisten Fällen reichen ein paar gezielte Blocks aus. Du wirst nicht den Inhalt von dieser Domain in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Deine Follower von dieser Domain werden entfernt.",
   "confirmations.mute.confirm": "Stummschalten",
   "confirmations.mute.message": "Bist du dir sicher, dass du {name} stummschalten möchtest?",
-  "confirmations.redraft.confirm": "Delete & redraft",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
+  "confirmations.redraft.confirm": "Löschen und neu erstellen",
+  "confirmations.redraft.message": "Bist du dir sicher, dass du diesen Status löschen und neu machen möchtest? Du wirst alle Antworten, Boosts und Favoriten darauf verlieren.",
   "confirmations.unfollow.confirm": "Entfolgen",
   "confirmations.unfollow.message": "Bist du dir sicher, dass du {name} entfolgen möchtest?",
   "embed.instructions": "Du kannst diesen Beitrag auf deiner Webseite einbetten, indem du den folgenden Code einfügst.",
@@ -114,14 +114,14 @@
   "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Instanzen, um die Zeitleiste aufzufüllen",
   "follow_request.authorize": "Erlauben",
   "follow_request.reject": "Ablehnen",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "Entwickler",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.find_friends": "Finde Freunde von Twitter",
   "getting_started.heading": "Erste Schritte",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "Leute einladen",
   "getting_started.open_source_notice": "Mastodon ist quelloffene Software. Du kannst auf GitHub unter {github} dazu beitragen oder Probleme melden.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
+  "getting_started.security": "Sicherheit",
+  "getting_started.terms": "Nutzungsbedingungen",
   "home.column_settings.advanced": "Erweitert",
   "home.column_settings.basic": "Einfach",
   "home.column_settings.filter_regex": "Mit regulären Ausdrücken filtern",
@@ -165,7 +165,7 @@
   "navigation_bar.blocks": "Blockierte Profile",
   "navigation_bar.community_timeline": "Lokale Zeitleiste",
   "navigation_bar.direct": "Direktnachrichten",
-  "navigation_bar.discover": "Discover",
+  "navigation_bar.discover": "Entdecken",
   "navigation_bar.domain_blocks": "Versteckte Domains",
   "navigation_bar.edit_profile": "Profil bearbeiten",
   "navigation_bar.favourites": "Favoriten",
@@ -179,7 +179,7 @@
   "navigation_bar.pins": "Angeheftete Beiträge",
   "navigation_bar.preferences": "Einstellungen",
   "navigation_bar.public_timeline": "Föderierte Zeitleiste",
-  "navigation_bar.security": "Security",
+  "navigation_bar.security": "Sicherheit",
   "notification.favourite": "{name} hat deinen Beitrag favorisiert",
   "notification.follow": "{name} folgt dir",
   "notification.mention": "{name} hat dich erwähnt",
@@ -195,7 +195,7 @@
   "notifications.column_settings.reblog": "Geteilte Beiträge:",
   "notifications.column_settings.show": "In der Spalte anzeigen",
   "notifications.column_settings.sound": "Ton abspielen",
-  "notifications.group": "{count} notifications",
+  "notifications.group": "{count} Benachrichtigungen",
   "onboarding.done": "Fertig",
   "onboarding.next": "Weiter",
   "onboarding.page_five.public_timelines": "Die lokale Zeitleiste zeigt alle Beiträge von Leuten, die auch auf {domain} sind. Das gesamte bekannte Netz zeigt Beiträge von allen, denen von Leuten auf {domain} gefolgt wird. Zusammen sind sie die öffentlichen Zeitleisten, ein guter Weg, um neue Leute zu finden.",
@@ -271,7 +271,7 @@
   "status.reblog": "Teilen",
   "status.reblog_private": "An das eigentliche Publikum teilen",
   "status.reblogged_by": "{name} teilte",
-  "status.redraft": "Delete & re-draft",
+  "status.redraft": "Löschen und neu erstellen",
   "status.reply": "Antworten",
   "status.replyAll": "Auf Thread antworten",
   "status.report": "@{name} melden",
@@ -295,7 +295,7 @@
   "upload_button.label": "Mediendatei hinzufügen",
   "upload_form.description": "Für Menschen mit Sehbehinderung beschreiben",
   "upload_form.focus": "Zuschneiden",
-  "upload_form.undo": "Entfernen",
+  "upload_form.undo": "Löschen",
   "upload_progress.label": "Wird hochgeladen …",
   "video.close": "Video schließen",
   "video.exit_fullscreen": "Vollbild verlassen",

app/javascript/mastodon/locales/eo.json

@@ -59,7 +59,7 @@
   "column_header.show_settings": "Montri agordojn",
   "column_header.unpin": "Depingli",
   "column_subheading.settings": "Agordado",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "Nur aŭdovidaĵoj",
   "compose_form.direct_message_warning": "Tiu mesaĝo estos sendita nur al menciitaj uzantoj.",
   "compose_form.direct_message_warning_learn_more": "Lerni pli",
   "compose_form.hashtag_warning": "Ĉi tiu mesaĝo ne estos listigita per ajna kradvorto. Nur publikaj mesaĝoj estas serĉeblaj per kradvortoj.",
@@ -81,11 +81,11 @@
   "confirmations.delete_list.confirm": "Forigi",
   "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
   "confirmations.domain_block.confirm": "Kaŝi la tutan domajnon",
-  "confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiĉas kaj preferindas.",
+  "confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiĉas kaj preferindas. Vi ne vidos enhavon de tiu domajno en publika tempolinio aŭ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.",
   "confirmations.mute.confirm": "Silentigi",
   "confirmations.mute.message": "Ĉu vi certas, ke vi volas silentigi {name}?",
-  "confirmations.redraft.confirm": "Delete & redraft",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
+  "confirmations.redraft.confirm": "Forigi kaj reskribi",
+  "confirmations.redraft.message": "Ĉu vi certas, ke vi volas forigi tiun mesaĝon kaj reskribi ĝin? Vi perdos ĉiujn respondojn, diskonigojn kaj stelumojn ligitajn al ĝi.",
   "confirmations.unfollow.confirm": "Ne plu sekvi",
   "confirmations.unfollow.message": "Ĉu vi certas, ke vi volas ĉesi sekvi {name}?",
   "embed.instructions": "Enkorpigu ĉi tiun mesaĝon en vian retejon per kopio de la suba kodo.",
@@ -114,13 +114,13 @@
   "empty_column.public": "Estas nenio ĉi tie! Publike skribu ion, aŭ mane sekvu uzantojn de aliaj nodoj por plenigi la publikan tempolinion",
   "follow_request.authorize": "Rajtigi",
   "follow_request.reject": "Rifuzi",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "Programistoj",
   "getting_started.documentation": "Dokumentado",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.find_friends": "Trovi amikojn el Twitter",
   "getting_started.heading": "Por komenci",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "Inviti homojn",
   "getting_started.open_source_notice": "Mastodon estas malfermitkoda programo. Vi povas kontribui aŭ raporti problemojn en GitHub je {github}.",
-  "getting_started.security": "Security",
+  "getting_started.security": "Sekureco",
   "getting_started.terms": "Uzkondiĉoj",
   "home.column_settings.advanced": "Precizaj agordoj",
   "home.column_settings.basic": "Bazaj agordoj",
@@ -175,7 +175,7 @@
   "navigation_bar.lists": "Listoj",
   "navigation_bar.logout": "Elsaluti",
   "navigation_bar.mutes": "Silentigitaj uzantoj",
-  "navigation_bar.personal": "Personal",
+  "navigation_bar.personal": "Persone",
   "navigation_bar.pins": "Alpinglitaj mesaĝoj",
   "navigation_bar.preferences": "Preferoj",
   "navigation_bar.public_timeline": "Fratara tempolinio",
@@ -271,7 +271,7 @@
   "status.reblog": "Diskonigi",
   "status.reblog_private": "Diskonigi al la originala atentaro",
   "status.reblogged_by": "{name} diskonigis",
-  "status.redraft": "Delete & re-draft",
+  "status.redraft": "Forigi kaj reskribi",
   "status.reply": "Respondi",
   "status.replyAll": "Respondi al la fadeno",
   "status.report": "Signali @{name}",

app/javascript/mastodon/locales/eu.json

@@ -59,7 +59,7 @@
   "column_header.show_settings": "Erakutsi ezarpenak",
   "column_header.unpin": "Desfinkatu",
   "column_subheading.settings": "Ezarpenak",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "Multimedia besterik ez",
   "compose_form.direct_message_warning": "Toot hau aipatutako erabiltzaileei besterik ez zaie bidaliko.",
   "compose_form.direct_message_warning_learn_more": "Ikasi gehiago",
   "compose_form.hashtag_warning": "Toot hau ez da traoletan agertuko zerrendatu gabekoa baita. Traoletan toot publikoak besterik ez dira agertzen.",
@@ -114,13 +114,13 @@
   "empty_column.public": "Ez dago ezer hemen! Idatzi zerbait publikoki edo jarraitu eskuz beste instantzia batzuetako erabiltzailean hau betetzeko",
   "follow_request.authorize": "Baimendu",
   "follow_request.reject": "Ukatu",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "Garatzaileak",
   "getting_started.documentation": "Dokumentazioa",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.find_friends": "Aurkitu Twitter-eko lagunak",
   "getting_started.heading": "Menua",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "Gonbidatu jendea",
   "getting_started.open_source_notice": "Mastodon software librea da. Ekarpenak egin ditzakezu edo akatsen berri eman GitHub bidez: {github}.",
-  "getting_started.security": "Security",
+  "getting_started.security": "Segurtasuna",
   "getting_started.terms": "Erabilera baldintzak",
   "home.column_settings.advanced": "Aurreratua",
   "home.column_settings.basic": "Oinarrizkoa",

app/javascript/mastodon/locales/fa.json

@@ -59,7 +59,7 @@
   "column_header.show_settings": "نمایش تنظیمات",
   "column_header.unpin": "رهاکردن",
   "column_subheading.settings": "تنظیمات",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "فقط عکس و ویدیو",
   "compose_form.direct_message_warning": "این بوق تنها به کاربرانی که از آن‌ها نام برده شده فرستاده خواهد شد.",
   "compose_form.direct_message_warning_learn_more": "بیشتر بدانید",
   "compose_form.hashtag_warning": "از آن‌جا که این بوق فهرست‌نشده است، در نتایج جستجوی هشتگ‌ها پیدا نخواهد شد. تنها بوق‌های عمومی را می‌توان با جستجوی هشتگ پیدا کرد.",
@@ -114,13 +114,13 @@
   "empty_column.public": "این‌جا هنوز چیزی نیست! خودتان چیزی بنویسید یا کاربران دیگر را پی بگیرید تا این‌جا پر شود",
   "follow_request.authorize": "اجازه دهید",
   "follow_request.reject": "اجازه ندهید",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "برای برنامه‌نویسان",
   "getting_started.documentation": "راهنما",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.find_friends": "یافتن دوستان از توییتر",
   "getting_started.heading": "آغاز کنید",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "دعوت از دوستان",
   "getting_started.open_source_notice": "ماستدون یک نرم‌افزار آزاد است. می‌توانید در ساخت آن مشارکت کنید یا مشکلاتش را در {github} گزارش دهید.",
-  "getting_started.security": "Security",
+  "getting_started.security": "امنیت",
   "getting_started.terms": "شرایط استفاده",
   "home.column_settings.advanced": "پیشرفته",
   "home.column_settings.basic": "اصلی",

app/javascript/mastodon/locales/fr.json

@@ -59,7 +59,7 @@
   "column_header.show_settings": "Afficher les paramètres",
   "column_header.unpin": "Retirer",
   "column_subheading.settings": "Paramètres",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "Média uniquement",
   "compose_form.direct_message_warning": "Ce pouet sera uniquement envoyé qu'aux personnes mentionnées. Cependant, l'administration de votre instance et des instances réceptrices pourront inspecter ce message.",
   "compose_form.direct_message_warning_learn_more": "En savoir plus",
   "compose_form.hashtag_warning": "Ce pouet ne sera pas listé dans les recherches par hashtag car sa visibilité est réglée sur \"non-listé\". Seuls les pouets avec une visibilité \"publique\" peuvent être recherchés par hashtag.",
@@ -114,13 +114,13 @@
   "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres instances pour remplir le fil public",
   "follow_request.authorize": "Accepter",
   "follow_request.reject": "Rejeter",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "Développeurs",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.find_friends": "Trouver des amis depuis Twitter",
   "getting_started.heading": "Pour commencer",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "Inviter des gens",
   "getting_started.open_source_notice": "Mastodon est un logiciel libre. Vous pouvez contribuer et envoyer vos commentaires et rapports de bogues via {github} sur GitHub.",
-  "getting_started.security": "Security",
+  "getting_started.security": "Sécurité",
   "getting_started.terms": "Conditions d’utilisation",
   "home.column_settings.advanced": "Avancé",
   "home.column_settings.basic": "Basique",

app/javascript/mastodon/locales/gl.json

@@ -81,7 +81,7 @@
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Estás seguro de que queres eliminar permanentemente esta lista?",
   "confirmations.domain_block.confirm": "Agochar un dominio completo",
-  "confirmations.domain_block.message": "Realmente está segura de que quere bloquear por completo o dominio {domain}? Normalmente é suficiente, e preferible, bloquear de xeito selectivo varios elementos.",
+  "confirmations.domain_block.message": "Realmente está segura de que quere bloquear por completo o dominio {domain}? Normalmente é suficiente, e preferible, bloquear de xeito selectivo varios elementos. Non verá contidos de ese dominio en ningunha liña temporal ou nas notificacións. As súas seguidoras en ese dominio serán eliminadas.",
   "confirmations.mute.confirm": "Acalar",
   "confirmations.mute.message": "Está segura de que quere acalar a {name}?",
   "confirmations.redraft.confirm": "Delete & redraft",

app/javascript/mastodon/locales/it.json

@@ -59,7 +59,7 @@
   "column_header.show_settings": "Mostra impostazioni",
   "column_header.unpin": "Non fissare in cima",
   "column_subheading.settings": "Impostazioni",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "Solo media",
   "compose_form.direct_message_warning": "Questo toot sarà mandato solo a tutti gli utenti menzionati.",
   "compose_form.direct_message_warning_learn_more": "Per saperne di piu'",
   "compose_form.hashtag_warning": "Questo toot non è listato, quindi non sarà trovato nelle ricerche per hashtag. Solo i toot pubblici possono essere cercati per hashtag.",
@@ -114,13 +114,13 @@
   "empty_column.public": "Qui non c'è nulla! Scrivi qualcosa pubblicamente, o aggiungi utenti da altri server per riempire questo spazio",
   "follow_request.authorize": "Autorizza",
   "follow_request.reject": "Rifiuta",
-  "getting_started.developers": "Developers",
-  "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.developers": "Sviluppatori",
+  "getting_started.documentation": "Documentazione",
+  "getting_started.find_friends": "Trova amici da Twitter",
   "getting_started.heading": "Come iniziare",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "Invita qualcuno",
   "getting_started.open_source_notice": "Mastodon è un software open source. Puoi contribuire o segnalare errori su GitHub all'indirizzo {github}.",
-  "getting_started.security": "Security",
+  "getting_started.security": "Sicurezza",
   "getting_started.terms": "Condizioni del servizio",
   "home.column_settings.advanced": "Avanzato",
   "home.column_settings.basic": "Semplice",

app/javascript/mastodon/locales/ja.json

@@ -59,7 +59,7 @@
   "column_header.show_settings": "設定を表示",
   "column_header.unpin": "ピン留めを外す",
   "column_subheading.settings": "設定",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "メディアのみ表示",
   "compose_form.direct_message_warning": "このトゥートはメンションされた人にのみ送信されます。",
   "compose_form.direct_message_warning_learn_more": "もっと詳しく",
   "compose_form.hashtag_warning": "このトゥートは未収載なのでハッシュタグの一覧に表示されません。公開トゥートだけがハッシュタグで検索できます。",
@@ -114,13 +114,13 @@
   "empty_column.public": "ここにはまだ何もありません！ 公開で何かを投稿したり、他のインスタンスのユーザーをフォローしたりしていっぱいにしましょう",
   "follow_request.authorize": "許可",
   "follow_request.reject": "拒否",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "開発",
   "getting_started.documentation": "ドキュメント",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.find_friends": "Twitterでの友達を探す",
   "getting_started.heading": "スタート",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "招待",
   "getting_started.open_source_notice": "Mastodonはオープンソースソフトウェアです。誰でもGitHub（{github}）から開発に参加したり、問題を報告したりできます。",
-  "getting_started.security": "Security",
+  "getting_started.security": "セキュリティ",
   "getting_started.terms": "プライバシーポリシー",
   "home.column_settings.advanced": "高度な設定",
   "home.column_settings.basic": "基本設定",

app/javascript/mastodon/locales/nl.json

@@ -59,7 +59,7 @@
   "column_header.show_settings": "Instellingen tonen",
   "column_header.unpin": "Losmaken",
   "column_subheading.settings": "Instellingen",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "Alleen media",
   "compose_form.direct_message_warning": "Deze toot wordt alleen naar vermelde gebruikers verstuurd. Echter, de beheerders en moderatoren van jouw en de ontvangende Mastodonserver(s) kunnen dit bericht mogelijk wel bekijken.",
   "compose_form.direct_message_warning_learn_more": "Meer leren",
   "compose_form.hashtag_warning": "Deze toot valt niet onder een hashtag te bekijken, omdat deze niet op openbare tijdlijnen wordt getoond. Alleen openbare toots kunnen via hashtags gevonden worden.",
@@ -114,13 +114,13 @@
   "empty_column.public": "Er is hier helemaal niks! Toot iets in het openbaar of volg mensen van andere servers om het te vullen",
   "follow_request.authorize": "Goedkeuren",
   "follow_request.reject": "Afkeuren",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "Ontwikkelaars",
   "getting_started.documentation": "Documentatie",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.find_friends": "Vind vrienden van Twitter",
   "getting_started.heading": "Aan de slag",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "Mensen uitnodigen",
   "getting_started.open_source_notice": "Mastodon is vrije software. Je kunt bijdragen of problemen melden op GitHub via {github}.",
-  "getting_started.security": "Security",
+  "getting_started.security": "Beveiliging",
   "getting_started.terms": "Voorwaarden",
   "home.column_settings.advanced": "Geavanceerd",
   "home.column_settings.basic": "Algemeen",

app/javascript/mastodon/locales/oc.json

@@ -59,7 +59,7 @@
   "column_header.show_settings": "Mostrar los paramètres",
   "column_header.unpin": "Despenjar",
   "column_subheading.settings": "Paramètres",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "Solament los mèdias",
   "compose_form.direct_message_warning": "Sols los mencionats poiràn veire aqueste tut.",
   "compose_form.direct_message_warning_learn_more": "Ne saber mai",
   "compose_form.hashtag_warning": "Aqueste tut serà pas ligat a cap d’etiqueta estant qu’es pas listat. Òm pas cercar que los tuts publics per etiqueta.",

app/javascript/mastodon/locales/sk.json

@@ -59,7 +59,7 @@
   "column_header.show_settings": "Ukáž nastavenia",
   "column_header.unpin": "Odopnúť",
   "column_subheading.settings": "Nastavenia",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "Iba media",
   "compose_form.direct_message_warning": "Tento príspevok bude videný výhradne iba spomenutými užívateľmi. Ber ale na vedomie že správci tvojej a všetkých iných zahrnutých instancií majú možnosť skontrolovať túto správu.",
   "compose_form.direct_message_warning_learn_more": "Zistiť viac",
   "compose_form.hashtag_warning": "Tento toot nebude zobrazený pod žiadným haštagom lebo nieje listovaný. Iba verejné tooty môžu byť nájdené podľa haštagu.",
@@ -114,13 +114,13 @@
   "empty_column.public": "Ešte tu nič nie je. Napíš niečo verejne alebo začnite sledovať používateľov z iných Mastodon serverov aby tu niečo pribudlo",
   "follow_request.authorize": "Povoľ prístup",
   "follow_request.reject": "Odmietni",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "Vývojári",
   "getting_started.documentation": "Dokumentácia",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.find_friends": "Nájdi priateľov z Twitteru",
   "getting_started.heading": "Začni tu",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "Pozvať ľudí",
   "getting_started.open_source_notice": "Mastodon má otvorený kód. Nahlásiť chyby, alebo prispieť môžeš na GitHube v {github}.",
-  "getting_started.security": "Security",
+  "getting_started.security": "Zabezpečenie",
   "getting_started.terms": "Podmienky prevozu",
   "home.column_settings.advanced": "Pokročilé",
   "home.column_settings.basic": "Základné",

app/models/concerns/attachmentable.rb

@@ -41,7 +41,9 @@ module Attachmentable
 
     extensions_for_mime_type = mime_type.empty? ? [] : mime_type.first.extensions
     original_extension       = Paperclip::Interpolations.extension(attachment, :original)
+    proper_extension         = extensions_for_mime_type.first.to_s
+    proper_extension         = 'jpeg' if proper_extension == 'jpe'
 
-    extensions_for_mime_type.include?(original_extension) ? original_extension : extensions_for_mime_type.first
+    extensions_for_mime_type.include?(original_extension) ? original_extension : proper_extension
   end
 end

app/serializers/activitypub/note_serializer.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 class ActivityPub::NoteSerializer < ActiveModel::Serializer
-  attributes :id, :type, :summary, :content,
+  attributes :id, :type, :summary,
              :in_reply_to, :published, :url,
              :attributed_to, :to, :cc, :sensitive,
              :atom_uri, :in_reply_to_atom_uri,
              :conversation
 
+  attribute :content
+  attribute :content_map, if: :language?
+
   has_many :media_attachments, key: :attachment
   has_many :virtual_tags, key: :tag
 
@@ -26,6 +29,14 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
     Formatter.instance.format(object)
   end
 
+  def content_map
+    { object.language => Formatter.instance.format(object) }
+  end
+
+  def language?
+    object.language.present?
+  end
+
   def in_reply_to
     return unless object.reply? && !object.thread.nil?
 

config/locales/ar.yml

@@ -455,6 +455,7 @@ ar:
     '422':
       content: فشل التحقق الآمن. ربما منعتَ كعكات الكوكيز ؟
       title: فشِل التحقق الآمن
+    '429': طلبات كثيرة جدا
     '500':
       content: نحن متأسفون، لقد حدث خطأ ما مِن جانبنا.
       title: هذه الصفحة خاطئة
@@ -476,6 +477,9 @@ ar:
     followers_count: عدد المتابِعين
     lock_link: قم بتجميد حسابك
     purge: تنحية من بين متابعيك
+    success:
+      one: جارية عملية حظر المتابِعين بسلاسة من نطاق آخر ...
+      other: جارية عملية حظر المتابِعين بسلاسة من %{count} نطاقات أخرى ...
     unlocked_warning_title: إنّ حسابك غير مقفل
   generic:
     changes_saved_msg: تم حفظ التعديلات بنجاح !
@@ -504,6 +508,7 @@ ar:
       '86400': يوم واحد
     expires_in_prompt: أبدا
     generate: توليد
+    invited_by: 'تمت دعوتك من طرف :'
     max_uses:
       one: إستعمال واحد
       other: "%{count} استخدامات"
@@ -589,7 +594,8 @@ ar:
     prompt: 'إنك  بصدد متابعة :'
   remote_unfollow:
     error: خطأ
-    title: ''
+    title: العنوان
+    unfollowed: غير متابَع
   sessions:
     activity: آخر نشاط
     browser: المتصفح
@@ -603,6 +609,7 @@ ar:
       generic: متصفح مجهول
       ie: إنترنت إكسبلورر
       micro_messenger: مايكرو ميسنجر
+      nokia: متصفح  Nokia S40 Ovi
       opera: أوبرا
       otter: أوتر
       phantom_js: فانتوم جي آس
@@ -647,17 +654,22 @@ ar:
     your_apps: تطبيقاتك
   statuses:
     attached:
+      description: 'مُرفَق : %{attached}'
       image:
-        one: ''
-        other: ''
+        one: "%{count} صورة"
+        other: "%{count} صور"
       video:
-        one: ''
-        other: ''
-    content_warning: ''
+        one: "%{count} فيديو"
+        other: "%{count} فيديوهات"
+    content_warning: 'تحذير عن المحتوى : %{warning}'
+    disallowed_hashtags:
+      one: 'يحتوي على وسم ممنوع : %{tags}'
+      other: 'يحتوي على وسوم ممنوعة : %{tags}'
+    language_detection: اكتشاف اللغة تلقائيا
     open_in_web: إفتح في الويب
     over_character_limit: تم تجاوز حد الـ %{max} حرف المسموح بها
     pin_errors:
-      limit: ''
+      limit: لقد بلغت الحد الأقصى للتبويقات المدبسة
       ownership: لا يمكن تدبيس تبويق نشره شخص آخر
       private: لا يمكن تثبيت تبويق لم يُنشر للعامة
       reblog: لا يمكن تثبيت ترقية
@@ -678,7 +690,9 @@ ar:
   terms:
     title: شروط الخدمة وسياسة الخصوصية على %{instance}
   themes:
+    contrast: تباين عالٍ
     default: ماستدون
+    mastodon-light: ماستدون (فاتح)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -702,15 +716,17 @@ ar:
       subject: نسخة بيانات حسابك جاهزة للتنزيل
       title: المغادرة بأرشيف الحساب
     welcome:
-      edit_profile_action: ''
-      explanation: ''
-      full_handle: ''
-      review_preferences_action: ''
-      subject: ''
+      edit_profile_action: تهيئة الملف الشخصي
+      explanation: ها هي بعض النصائح قبل بداية الإستخدام
+      final_action: اشرَع في النشر
+      full_handle: عنوانك الكامل
+      review_preferences_action: تعديل التفضيلات
+      subject: أهلًا بك على ماستدون
       tips: نصائح
       title: أهلاً بك، %{name} !
   users:
     invalid_email: عنوان البريد الإلكتروني غير صالح
     invalid_otp_token: رمز المصادقة بخطوتين غير صالح
+    otp_lost_help_html: إن فقدتَهُما ، يمكنك الإتصال بـ %{email}
     seamless_external_login: لقد قمت بتسجيل الدخول عبر خدمة خارجية، إنّ إعدادات الكلمة السرية و البريد الإلكتروني غير متوفرة.
     signed_in_as: 'تم تسجيل دخولك بصفة :'

config/locales/ca.yml

@@ -675,6 +675,7 @@ ca:
     disallowed_hashtags:
       one: 'conté una etiqueta no permesa: %{tags}'
       other: 'conté les etiquetes no permeses: %{tags}'
+    language_detection: Detecta automàticament el llenguatge
     open_in_web: Obre en la web
     over_character_limit: Límit de caràcters de %{max} superat
     pin_errors:

config/locales/de.yml

@@ -283,7 +283,7 @@ de:
         create_and_resolve: Mit Kommentar lösen
         create_and_unresolve: Mit Kommentar wieder öffnen
         delete: Löschen
-        placeholder: Beschreibe, welche Maßnahmen ergriffen wurden oder andere Neuigkeiten zu dieser Meldung…
+        placeholder: Beschreibe, welche Maßnahmen ergriffen wurden oder irgendwelche andere Neuigkeiten…
       reopen: Meldung wieder öffnen
       report: 'Meldung #%{id}'
       report_contents: Inhalt
@@ -424,7 +424,7 @@ de:
     following: 'Erfolg! Du folgst nun:'
     post_follow:
       close: Oder du schließt einfach dieses Fenster.
-      return: Zurück zum Profil dieses Wesens
+      return: Zeige Profil des Benutzers
       web: Das Web öffnen
     title: "%{acct} folgen"
   datetime:
@@ -514,6 +514,7 @@ de:
       '86400': 1 Tag
     expires_in_prompt: Nie
     generate: Generieren
+    invited_by: 'Du wurdest eingeladen von:'
     max_uses:
       one: 1 mal verwendet
       other: "%{count} mal verwendet"
@@ -550,7 +551,7 @@ de:
       subject:
         one: "1 neue Mitteilung seit deinem letzten Besuch \U0001F418"
         other: "%{count} neue Mitteilungen seit deinem letzten Besuch \U0001F418"
-      title: In deiner Abwesenheit…
+      title: In deiner Abwesenheit...
     favourite:
       body: 'Dein Beitrag wurde von %{name} favorisiert:'
       subject: "%{name} hat deinen Beitrag favorisiert"
@@ -669,6 +670,7 @@ de:
       video:
         one: "%{count} Video"
         other: "%{count} Videos"
+    boosted_from_html: Geteilt von %{acct_link}
     content_warning: 'Inhaltswarnung: %{warning}'
     disallowed_hashtags:
       one: 'Enthält den unerlaubten Hashtag: %{tags}'
@@ -699,6 +701,7 @@ de:
   themes:
     contrast: Hoher Kontrast
     default: Mastodon
+    mastodon-light: Mastodon (hell)
   time:
     formats:
       default: "%d.%m.%Y %H:%M"

config/locales/dog.yml

@@ -31,7 +31,7 @@ dog:
     source_code: Source code
     status_count_after: toots
     status_count_before: Who authored
-    user_count_after: users
+    user_count_after: dogs
     user_count_before: Home to
     what_is_mastodon: What is Mastodon?
   accounts:
@@ -121,7 +121,7 @@ dog:
       redownload: Refresh avatar
       remove_avatar: Remove avatar
       resend_confirmation:
-        already_confirmed: This user is already confirmed
+        already_confirmed: This dog is already confirmed
         send: Resend confirmation email
         success: Confirmation email successfully sent!
       reset: Reset
@@ -132,7 +132,7 @@ dog:
         admin: Administrator
         moderator: Moderator
         staff: Staff
-        user: User
+        user: Dog
       salmon_url: Salmon URL
       search: Search
       shared_inbox_url: Shared Inbox URL
@@ -153,25 +153,25 @@ dog:
     action_logs:
       actions:
         assigned_to_self_report: "%{name} assigned report %{target} to themselves"
-        change_email_user: "%{name} changed the e-mail address of user %{target}"
-        confirm_user: "%{name} confirmed e-mail address of user %{target}"
+        change_email_user: "%{name} changed the e-mail address of dog %{target}"
+        confirm_user: "%{name} confirmed e-mail address of dog %{target}"
         create_custom_emoji: "%{name} uploaded new emoji %{target}"
         create_domain_block: "%{name} blocked domain %{target}"
         create_email_domain_block: "%{name} blacklisted e-mail domain %{target}"
-        demote_user: "%{name} demoted user %{target}"
+        demote_user: "%{name} demoted dog %{target}"
         destroy_domain_block: "%{name} unblocked domain %{target}"
         destroy_email_domain_block: "%{name} whitelisted e-mail domain %{target}"
         destroy_status: "%{name} removed toot by %{target}"
-        disable_2fa_user: "%{name} disabled two factor requirement for user %{target}"
+        disable_2fa_user: "%{name} disabled two factor requirement for dog %{target}"
         disable_custom_emoji: "%{name} disabled emoji %{target}"
-        disable_user: "%{name} disabled login for user %{target}"
+        disable_user: "%{name} disabled login for dog %{target}"
         enable_custom_emoji: "%{name} enabled emoji %{target}"
-        enable_user: "%{name} enabled login for user %{target}"
+        enable_user: "%{name} enabled login for dog %{target}"
         memorialize_account: "%{name} turned %{target}'s account into a memoriam page"
-        promote_user: "%{name} promoted user %{target}"
+        promote_user: "%{name} promoted dog %{target}"
         remove_avatar_user: "%{name} removed %{target}'s avatar"
         reopen_report: "%{name} reopened report %{target}"
-        reset_password_user: "%{name} reset password of user %{target}"
+        reset_password_user: "%{name} reset password of dog %{target}"
         resolve_report: "%{name} resolved report %{target}"
         silence_account: "%{name} silenced %{target}'s account"
         suspend_account: "%{name} suspended %{target}'s account"
@@ -302,11 +302,11 @@ dog:
       view: View
     settings:
       activity_api_enabled:
-        desc_html: Counts of locally posted toots, active users, and new registrations in weekly buckets
-        title: Publish aggregate statistics about user activity
+        desc_html: Counts of locally posted toots, active dogs, and new registrations in weekly buckets
+        title: Publish aggregate statistics about dog activity
       bootstrap_timeline_accounts:
         desc_html: Separate multiple usernames by comma. Only local and unlocked accounts will work. Default when empty is all local admins.
-        title: Default follows for new users
+        title: Default follows for new dogs
       contact_information:
         email: Business e-mail
         username: Contact username
@@ -333,7 +333,7 @@ dog:
         desc_html: When toggled, it will show toots from all the known fediverse on preview. Otherwise it will only show local toots.
         title: Show known fediverse on timeline preview
       show_staff_badge:
-        desc_html: Show a staff badge on a user page
+        desc_html: Show a staff badge on a dog page
         title: Show staff badge
       site_description:
         desc_html: Introductory paragraph on the frontpage and in meta tags. You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
@@ -424,7 +424,7 @@ dog:
     following: 'Success! You are now following:'
     post_follow:
       close: Or, you can just close this window.
-      return: Return to the user's profile
+      return: Show the dog's profile
       web: Go to web
     title: Follow %{acct}
   datetime:
@@ -524,7 +524,7 @@ dog:
       expires_at: Expires
       uses: Uses
     title: Invite people
-  landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
+  landing_strip_html: "<strong>%{name}</strong> is a dog on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
   landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
   lists:
     errors:
@@ -705,7 +705,7 @@ dog:
       <ul>
         <li><em>Basic account information</em>: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.</li>
         <li><em>Posts, following and other public information</em>: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
-        <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
+        <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and dogs who are mentioned in them, and direct posts are delivered only to dogs mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
         <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
       </ul>
 
@@ -735,7 +735,7 @@ dog:
 
       <ul>
         <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
-        <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
+        <li>Retain the IP addresses associated with registered dogs no more than 12 months.</li>
       </ul>
 
       <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>

config/locales/doorkeeper.de.yml

@@ -115,5 +115,6 @@ de:
         title: OAuth-Autorisierung nötig
     scopes:
       follow: Konten folgen, blocken, entblocken und entfolgen
+      push: erhalte Push-Benachrichtigungen von deinem Account
       read: deine Daten auslesen
       write: Beiträge in deinem Namen veröffentlichen

config/locales/el.yml

@@ -444,11 +444,11 @@ el:
   deletes:
     bad_password_msg: Καλή προσπάθεια χάκερς! Λάθος συνθηματικό
     confirm_password: Γράψε το τρέχον συνθηματικό σου για να πιστοποιήσεις την ταυτότητά σου
-    description_html: Αυτό θα <strong>οριστικά και αμετάκλητα</strong> διαγράψει το περιεχόμενο του λογαριασμού σου και θα τον απενεργοποιήσει. Το όνομα χρήστη θα παραμείνει δεσμευμένο για να αποφευχθούν μελλοντικές πλαστοπροσωπίες.
+    description_html: Αυτό θα διαγράψει <strong>οριστικά και αμετάκλητα</strong> το περιεχόμενο του λογαριασμού σου και θα τον απενεργοποιήσει. Το όνομα χρήστη θα παραμείνει δεσμευμένο για να αποφευχθούν μελλοντικές πλαστοπροσωπίες.
     proceed: Διαγραφή λογαριασμού
     success_msg: Ο λογαριασμός σου διαγράφηκε με επιτυχία
     warning_html: Μόνο η διαγραφή περιεχομένου από αυτό τον συγκεκριμένο κόμβο είναι εγγυημένη. Το περιεχόμενο που έχει διαμοιραστεί ευρέως είναι πιθανό να αφήσει ίχνη. Όσοι διακομιστές είναι εκτός σύνδεσης και όσοι έχουν διακόψει τη λήψη των ενημερώσεων του κόμβου σου, δε θα ενημερώσουν τις βάσεις δεδομένων τους.
-    warning_title: Διαθεσιμότητα περιεχομένου προς διανομή
+    warning_title: Διαθεσιμότητα ήδη διανεμημένου περιεχομένου
   errors:
     '403': Δεν έχεις δικαίωμα πρόσβασης σε αυτή τη σελίδα.
     '404': Η σελίδα που ψάχνεις δεν υπάρχει.
@@ -514,6 +514,7 @@ el:
       '86400': 1 μέρα
     expires_in_prompt: Ποτέ
     generate: Δημιούργησε
+    invited_by: 'Σε προσκάλεσε ο/η:'
     max_uses:
       one: 1 χρήσης
       other: "%{count} χρήσεων"
@@ -673,6 +674,7 @@ el:
     disallowed_hashtags:
       one: 'περιέχει μη επιτρεπτή ταμπέλα: %{tags}'
       other: 'περιέχει μη επιτρεπτές ταμπέλες: %{tags}'
+    language_detection: Αυτόματη αναγνώριση γλώσσας
     open_in_web: Δες στο διαδίκτυο
     over_character_limit: υπέρβαση μέγιστου ορίου %{max} χαρακτήρων
     pin_errors:

config/locales/eu.yml

@@ -514,6 +514,7 @@ eu:
       '86400': Egun 1
     expires_in_prompt: Inoiz ez
     generate: Sortu
+    invited_by: 'Honek gonbidatu zaitu:'
     max_uses:
       one: Erabilera 1
       other: "%{count} erabilera"

config/locales/gl.yml

@@ -514,6 +514,7 @@ gl:
       '86400': 1 día
     expires_in_prompt: Nunca
     generate: Xerar
+    invited_by: 'Vostede foi convidada por:'
     max_uses:
       one: 1 uso
       other: "%{count} usos"

config/locales/it.yml

@@ -157,13 +157,17 @@ it:
         confirm_user: "%{name} ha confermato l'indirizzo email per l'utente %{target}"
         create_custom_emoji: "%{name} ha caricato un nuovo emoji %{target}"
         create_domain_block: "%{name} ha bloccato il dominio %{target}"
+        create_email_domain_block: "%{name} ha messo il dominio email %{target} nella blacklist"
         destroy_domain_block: "%{name} ha sbloccato il dominio %{target}"
+        destroy_email_domain_block: "%{name}ha messo il dominio email %{target} nella whitelist"
         destroy_status: "%{name} ha eliminato lo status di %{target}"
         disable_2fa_user: "%{name} ha disabilitato l'obbligo dei due fattori per l'utente %{target}"
         disable_custom_emoji: "%{name} ha disabilitato l'emoji %{target}"
         disable_user: "%{name} ha disabilitato il login per l'utente %{target}"
         enable_custom_emoji: "%{name} ha abilitato l'emoji %{target}"
         enable_user: "%{name} ha abilitato il login per l'utente %{target}"
+        memorialize_account: "%{name} ha trasformato l'account di %{target} in una pagina in memoriam"
+        promote_user: "%{name} ha promosso l'utente %{target}"
         remove_avatar_user: "%{name} ha eliminato l'avatar di %{target}"
         reopen_report: "%{name} ha riaperto il rapporto %{target}"
         reset_password_user: "%{name} ha reimpostato la password dell'utente %{target}"

config/locales/ja.yml

@@ -675,6 +675,7 @@ ja:
     disallowed_hashtags:
       one: '許可されていないハッシュタグが含まれています: %{tags}'
       other: '許可されていないハッシュタグが含まれています: %{tags}'
+    language_detection: 自動的に言語を検出する
     open_in_web: Webで開く
     over_character_limit: 上限は %{max}文字までです
     pin_errors:

config/locales/lion.yml

@@ -31,7 +31,7 @@ lion:
     source_code: Source code
     status_count_after: toots
     status_count_before: Who authored
-    user_count_after: users
+    user_count_after: lions
     user_count_before: Home to
     what_is_mastodon: What is Mastodon?
   accounts:
@@ -121,7 +121,7 @@ lion:
       redownload: Refresh avatar
       remove_avatar: Remove avatar
       resend_confirmation:
-        already_confirmed: This user is already confirmed
+        already_confirmed: This lion is already confirmed
         send: Resend confirmation email
         success: Confirmation email successfully sent!
       reset: Reset
@@ -132,7 +132,7 @@ lion:
         admin: Administrator
         moderator: Moderator
         staff: Staff
-        user: User
+        user: Lion
       salmon_url: Salmon URL
       search: Search
       shared_inbox_url: Shared Inbox URL
@@ -153,25 +153,25 @@ lion:
     action_logs:
       actions:
         assigned_to_self_report: "%{name} assigned report %{target} to themselves"
-        change_email_user: "%{name} changed the e-mail address of user %{target}"
-        confirm_user: "%{name} confirmed e-mail address of user %{target}"
+        change_email_user: "%{name} changed the e-mail address of lion %{target}"
+        confirm_user: "%{name} confirmed e-mail address of lion %{target}"
         create_custom_emoji: "%{name} uploaded new emoji %{target}"
         create_domain_block: "%{name} blocked domain %{target}"
         create_email_domain_block: "%{name} blacklisted e-mail domain %{target}"
-        demote_user: "%{name} demoted user %{target}"
+        demote_user: "%{name} demoted lion %{target}"
         destroy_domain_block: "%{name} unblocked domain %{target}"
         destroy_email_domain_block: "%{name} whitelisted e-mail domain %{target}"
         destroy_status: "%{name} removed toot by %{target}"
-        disable_2fa_user: "%{name} disabled two factor requirement for user %{target}"
+        disable_2fa_user: "%{name} disabled two factor requirement for lion %{target}"
         disable_custom_emoji: "%{name} disabled emoji %{target}"
-        disable_user: "%{name} disabled login for user %{target}"
+        disable_user: "%{name} disabled login for lion %{target}"
         enable_custom_emoji: "%{name} enabled emoji %{target}"
-        enable_user: "%{name} enabled login for user %{target}"
+        enable_user: "%{name} enabled login for lion %{target}"
         memorialize_account: "%{name} turned %{target}'s account into a memoriam page"
-        promote_user: "%{name} promoted user %{target}"
+        promote_user: "%{name} promoted lion %{target}"
         remove_avatar_user: "%{name} removed %{target}'s avatar"
         reopen_report: "%{name} reopened report %{target}"
-        reset_password_user: "%{name} reset password of user %{target}"
+        reset_password_user: "%{name} reset password of lion %{target}"
         resolve_report: "%{name} resolved report %{target}"
         silence_account: "%{name} silenced %{target}'s account"
         suspend_account: "%{name} suspended %{target}'s account"
@@ -302,11 +302,11 @@ lion:
       view: View
     settings:
       activity_api_enabled:
-        desc_html: Counts of locally posted toots, active users, and new registrations in weekly buckets
-        title: Publish aggregate statistics about user activity
+        desc_html: Counts of locally posted toots, active lions, and new registrations in weekly buckets
+        title: Publish aggregate statistics about lion activity
       bootstrap_timeline_accounts:
         desc_html: Separate multiple usernames by comma. Only local and unlocked accounts will work. Default when empty is all local admins.
-        title: Default follows for new users
+        title: Default follows for new lions
       contact_information:
         email: Business e-mail
         username: Contact username
@@ -333,7 +333,7 @@ lion:
         desc_html: When toggled, it will show toots from all the known fediverse on preview. Otherwise it will only show local toots.
         title: Show known fediverse on timeline preview
       show_staff_badge:
-        desc_html: Show a staff badge on a user page
+        desc_html: Show a staff badge on a lion page
         title: Show staff badge
       site_description:
         desc_html: Introductory paragraph on the frontpage and in meta tags. You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
@@ -424,7 +424,7 @@ lion:
     following: 'Success! You are now following:'
     post_follow:
       close: Or, you can just close this window.
-      return: Return to the user's profile
+      return: Show the lion's profile
       web: Go to web
     title: Follow %{acct}
   datetime:
@@ -524,7 +524,7 @@ lion:
       expires_at: Expires
       uses: Uses
     title: Invite people
-  landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
+  landing_strip_html: "<strong>%{name}</strong> is a lion on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
   landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
   lists:
     errors:
@@ -705,7 +705,7 @@ lion:
       <ul>
         <li><em>Basic account information</em>: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.</li>
         <li><em>Posts, following and other public information</em>: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
-        <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
+        <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and lions who are mentioned in them, and direct posts are delivered only to lions mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
         <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
       </ul>
 
@@ -735,7 +735,7 @@ lion:
 
       <ul>
         <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
-        <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
+        <li>Retain the IP addresses associated with registered lions no more than 12 months.</li>
       </ul>
 
       <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>

config/locales/nl.yml

@@ -675,6 +675,7 @@ nl:
     disallowed_hashtags:
       one: 'bevatte een niet toegestane hashtag: %{tags}'
       other: 'bevatte niet toegestane hashtags: %{tags}'
+    language_detection: Taal automatisch detecteren
     open_in_web: In de webapp openen
     over_character_limit: Limiet van %{max} tekens overschreden
     pin_errors:

config/locales/oc.yml

@@ -732,6 +732,7 @@ oc:
     disallowed_hashtags:
       one: 'conten una etiqueta desactivada : %{tags}'
       other: 'conten las etiquetas desactivadas : %{tags}'
+    language_detection: Detectar automaticament la lenga
     open_in_web: Dobrir sul web
     over_character_limit: limit de %{max} caractèrs passat
     pin_errors:

config/locales/pl.yml

@@ -517,6 +517,7 @@ pl:
       '86400': dobie
     expires_in_prompt: Nigdy
     generate: Wygeneruj
+    invited_by: 'Zostałeś zaproszony przez:'
     max_uses:
       few: "%{count} użycia"
       many: "%{count} użyć"
@@ -687,6 +688,7 @@ pl:
     disallowed_hashtags:
       one: 'zawiera niedozwolony hashtag: %{tags}'
       other: 'zawiera niedozwolone hashtagi: %{tags}'
+    language_detection: Automatycznie wykrywaj język
     open_in_web: Otwórz w przeglądarce
     over_character_limit: limit %{max} znaków przekroczony
     pin_errors:

config/locales/simple_form.ar.yml

@@ -12,10 +12,12 @@ ar:
           other: <span class="name-counter">%{count}</span> حرف باق
         fields: يُمكنك عرض 4 عناصر على شكل جدول في ملفك الشخصي
         header: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير 2MB. سيتم تصغيره إلى 700x335px
+        locale: لغة واجهة المستخدم و الرسائل الإلكترونية و الإشعارات
         locked: يتطلب منك الموافقة يدويا على طلبات المتابعة
         note:
           one: <span class="note-counter">1</span> حرف باق
           other: <span class="note-counter">%{count}</span> حرف باق
+        setting_default_language: يمكن الكشف التلقائي للّغة اللتي استخدمتها في تحرير تبويقاتك ، غيرَ أنّ العملية ليست دائما دقيقة
         setting_hide_network: الحسابات التي تُتابعها و التي تُتابِعك على حد سواء لن تُعرَض على صفحتك الشخصية
         setting_noindex: ذلك يؤثر على حالة ملفك الشخصي و صفحاتك
         setting_theme: ذلك يؤثر على الشكل الذي سيبدو عليه ماستدون عندما تقوم بالدخول مِن أي جهاز.
@@ -23,6 +25,8 @@ ar:
         data: ملف CSV تم تصديره مِن مثيل خادوم ماستدون آخر
       sessions:
         otp: 'قم بإدخال رمز المصادقة بخطوتين الذي قام بتوليده تطبيق جهازك أو إستخدم أحد رموز النفاذ الإحتياطية :'
+      user:
+        chosen_languages: لن تظهر على الخيوط العمومية إلّا التبويقات المنشورة في اللغات المختارة
     labels:
       account:
         fields:
@@ -32,6 +36,7 @@ ar:
         autofollow: إرسال دعوة لمتابعة حسابك
         avatar: الصورة الرمزية
         bot: إنّ هذا الحساب روبوت آلي
+        chosen_languages: تصفية اللغات
         confirm_new_password: تأكيد كلمة السر الجديدة
         confirm_password: تأكيد كلمة السر
         current_password: كلمة السر الحالية
@@ -41,7 +46,7 @@ ar:
         expires_in: تنتهي مدة صلاحيته بعد
         fields: واصفات بيانات الملف الشخصي
         header: الرأسية
-        locale: اللغة
+        locale: لغة الواجهة
         locked: تجميد الحساب
         max_uses: عدد مرات استخدام الرابط
         new_password: كلمة السر الجديدة
@@ -50,6 +55,7 @@ ar:
         password: كلمة السر
         setting_auto_play_gif: تشغيل تلقائي لِوَسائط جيف المتحركة
         setting_boost_modal: إظهار مربع حوار للتأكيد قبل ترقية أي تبويق
+        setting_default_language: لغة النشر
         setting_default_privacy: خصوصية المنشور
         setting_default_sensitive: إعتبر الوسائط دائما كمحتوى حساس
         setting_delete_modal: إظهار مربع حوار للتأكيد قبل حذف أي تبويق

config/locales/simple_form.ca.yml

@@ -12,10 +12,12 @@ ca:
           other: <span class="name-counter">%{count}</span> càracters restans
         fields: Pots tenir fins a 4 elements que es mostren com a taula al teu perfil
         header: PNG, GIF o JPG. Màxim 2MB. S'escalarà a 700x335px
+        locale: El llenguatge de l’interfície d’usuari, els correus i les notificacions push
         locked: Requereix que aprovis manualment els seguidors
         note:
           one: <span class="note-counter">1</span> càracter restant
           other: <span class="note-counter">%{count}</span> caràcters restants
+        setting_default_language: La llengua dels teus toots pot ser detectada automàticament però no sempre acuradament
         setting_hide_network: Qui tu segueixes i els que et segueixen a tu no es mostraran en el teu perfil
         setting_noindex: Afecta el teu perfil públic i les pàgines d'estat
         setting_theme: Afecta l'aspecte de Mastodon quan es visita des de qualsevol dispositiu.
@@ -23,6 +25,8 @@ ca:
         data: Fitxer CSV exportat des de una altra instància de Mastodon
       sessions:
         otp: 'Introdueix el codi de dos factors generat per el teu telèfon o utilitza un dels teus codis de recuperació:'
+      user:
+        chosen_languages: Quan estigui marcat, només es mostraran els toots de les llengües seleccionades en les línies de temps públiques
     labels:
       account:
         fields:
@@ -32,6 +36,7 @@ ca:
         autofollow: Convida a seguir el teu compte
         avatar: Avatar
         bot: Aquest compte és un bot
+        chosen_languages: Filtrar llengües
         confirm_new_password: Confirma la contrasenya nova
         confirm_password: Confirma la contrasenya
         current_password: Contrasenya actual
@@ -41,7 +46,7 @@ ca:
         expires_in: Expira després
         fields: Metadades del perfil
         header: Capçalera
-        locale: Llengua
+        locale: Llengua de la interfície
         locked: Fes aquest compte privat
         max_uses: Nombre màxim d'usos
         new_password: Contrasenya nova
@@ -50,6 +55,7 @@ ca:
         password: Contrasenya
         setting_auto_play_gif: Reproducció automàtica de GIFs animats
         setting_boost_modal: Mostra la finestra de confirmació abans d'un retoot
+        setting_default_language: Llengua de les publicacions
         setting_default_privacy: Privacitat de les publicacions
         setting_default_sensitive: Marca sempre els elements multimèdia com a sensibles
         setting_delete_modal: Mostra la finestra de confirmació abans de suprimir un toot

config/locales/simple_form.de.yml

@@ -3,6 +3,7 @@ de:
   simple_form:
     hints:
       defaults:
+        autofollow: Leute die sich über deine Einladung registrieren werden dir automatisch folgen
         avatar: PNG, GIF oder JPG. Maximal 2 MB. Wird auf 400×400 px herunterskaliert
         bot: Dieser Account führt hauptsächlich automatische Aktionen aus und wird möglicherweise nicht überwacht
         digest: Wenn du lange Zeit inaktiv bist, wird dir eine Zusammenfassung von Erwähnungen in deiner Abwesenheit zugeschickt
@@ -15,7 +16,7 @@ de:
         note:
           one: <span class="note-counter">1</span> Zeichen verbleibt
           other: <span class="note-counter">%{count}</span> Zeichen verbleiben
-        setting_hide_network: Wem du folgst und wer dir folgt, wird in deinem Profil nicht angezeigt
+        setting_hide_network: Wem du folgst und wer dir folgt wird in deinem Profil nicht angezeigt
         setting_noindex: Betrifft dein öffentliches Profil und deine Beiträge
         setting_theme: Wirkt sich darauf aus, wie Mastodon aussieht, egal auf welchem Gerät du eingeloggt bist.
       imports:
@@ -28,6 +29,7 @@ de:
           name: Bezeichnung
           value: Inhalt
       defaults:
+        autofollow: Einladen, um deinen Account zu folgen
         avatar: Profilbild
         bot: Dies ist ein bot Benutzer
         confirm_new_password: Neues Passwort bestätigen
@@ -52,6 +54,7 @@ de:
         setting_default_sensitive: Medien immer als heikel markieren
         setting_delete_modal: Bestätigungsdialog anzeigen, bevor ein Beitrag gelöscht wird
         setting_display_sensitive_media: Medien, die als heikel markiert sind, immer anzeigen
+        setting_hide_network: Verstecke dein Netzwerk
         setting_noindex: Suchmaschinen-Indexierung verhindern
         setting_reduce_motion: Bewegung in Animationen verringern
         setting_system_font_ui: Standardschriftart des Systems verwenden

config/locales/simple_form.eo.yml

@@ -3,6 +3,7 @@ eo:
   simple_form:
     hints:
       defaults:
+        autofollow: Homoj, kiuj registriĝos per la invito aŭtomate sekvos vin
         avatar: Formato PNG, GIF aŭ JPG. Ĝis 2MB. Estos malgrandigita al 400x400px
         bot: Tiu konto ĉefe faras aŭtomatajn agojn, kaj povas esti ne kontrolata
         digest: Sendita nur post longa tempo de neaktiveco, kaj nur se vi ricevis personan mesaĝon en via foresto
@@ -28,6 +29,7 @@ eo:
           name: Etikedo
           value: Enhavo
       defaults:
+        autofollow: Inviti al sekvi vian konton
         avatar: Profilbildo
         bot: Tio estas robota konto
         confirm_new_password: Konfirmi novan pasvorton

config/locales/simple_form.eu.yml

@@ -3,6 +3,7 @@ eu:
   simple_form:
     hints:
       defaults:
+        autofollow: Gonbidapena erabiliz izena ematen dutenek automatikoki jarraituko zaituzte
         avatar: PNG, GIF edo JPG. Gehienez 2MB. 400x400px neurrira eskalatuko da
         bot: Kontu honek nagusiki automatizatutako ekintzak burutzen ditu eta agian ez du inork monitorizatzen
         digest: Soilik jarduerarik gabeko epe luze bat eta gero, eta soilik ez zeudela mezu pertsonalen bat jaso baduzu
@@ -28,6 +29,7 @@ eu:
           name: Etiketa
           value: Edukia
       defaults:
+        autofollow: Gonbidatu zure kontua jarraitzera
         avatar: Abatarra
         bot: Hau bot kontu bat da
         confirm_new_password: Berretsi pasahitz berria

config/locales/simple_form.fr.yml

@@ -3,6 +3,7 @@ fr:
   simple_form:
     hints:
       defaults:
+        autofollow: Les personnes qui s'inscrivent grâce à l'invitation vous suivront automatiquement
         avatar: Au format PNG, GIF ou JPG. 2 Mo maximum. Sera réduit à 400x400px
         bot: Ce compte exécute principalement des actions automatisées et pourrait ne pas être surveillé
         digest: Uniquement envoyé après une longue période d’inactivité et uniquement si vous avez reçu des messages personnels pendant votre absence
@@ -28,6 +29,7 @@ fr:
           name: Étiquette
           value: Contenu
       defaults:
+        autofollow: Invitation à suivre votre compte
         avatar: Image de profil
         bot: Ceci est un robot
         confirm_new_password: Confirmation du nouveau mot de passe

config/locales/simple_form.gl.yml

@@ -3,6 +3,7 @@ gl:
   simple_form:
     hints:
       defaults:
+        autofollow: As persoas que se conectaron a través de un convite seguirana automáticamente a vostede
         avatar: PNG, GIF ou JPG.  Máximo 2MB. Será reducida a 400x400px
         bot: Esta conta realiza principalmente accións automatizadas e podería non estar monitorizada
         digest: Enviar só tras un longo período de inactividade e só si recibeu algunha mensaxe personal na súa ausencia
@@ -28,6 +29,7 @@ gl:
           name: Etiqueta
           value: Contido
       defaults:
+        autofollow: Convide a seguir a súa conta
         avatar: Avatar
         bot: Esta conta é de un bot
         confirm_new_password: Confirme o novo contrasinal

config/locales/simple_form.it.yml

@@ -3,6 +3,7 @@ it:
   simple_form:
     hints:
       defaults:
+        autofollow: Le persone che si iscrivono attraverso l'invito ti seguiranno automaticamente
         avatar: PNG, GIF o JPG. Al massimo 2MB. Verranno scalate a 400x400px
         bot: Questo account esegue principalmente operazioni automatiche e potrebbe non essere tenuto sotto controllo da una persona
         digest: Inviata solo dopo un lungo periodo di inattività e solo se hai ricevuto qualche messaggio personale in tua assenza
@@ -28,6 +29,7 @@ it:
           name: Etichetta
           value: Contenuto
       defaults:
+        autofollow: Invita a seguire il tuo account
         avatar: Avatar
         bot: Questo account è un bot
         confirm_new_password: Conferma nuova password

config/locales/simple_form.ja.yml

@@ -10,8 +10,10 @@ ja:
         display_name: あと<span class="name-counter">%{count}</span>文字入力できます。
         fields: プロフィールに表として4つまでの項目を表示することができます
         header: 2MBまでのPNG、GIF、JPGが利用可能です。 700x335pxまで縮小されます
+        locale: ユーザーインターフェース、メールやプッシュ通知の言語
         locked: フォロワーを手動で承認する必要があります
         note: あと<span class="note-counter">%{count}</span>文字入力できます。
+        setting_default_language: トゥートの言語は自動的に検出されますが、必ずしも正確とは限りません
         setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします
         setting_noindex: 公開プロフィールおよび各投稿ページに影響します
         setting_theme: ログインしている全てのデバイスで適用されるデザインです。
@@ -19,6 +21,8 @@ ja:
         data: 他の Mastodon インスタンスからエクスポートしたCSVファイルを選択して下さい
       sessions:
         otp: '携帯電話のアプリで生成された二段階認証コードを入力するか、リカバリーコードを使用してください:'
+      user:
+        chosen_languages: 選択すると、選択した言語のトゥートのみが公開タイムラインに表示されるようになります
     labels:
       account:
         fields:
@@ -28,6 +32,7 @@ ja:
         autofollow: あなたのアカウントに招待する
         avatar: アイコン
         bot: これは BOT アカウントです
+        chosen_languages: 除外する言語
         confirm_new_password: 新しいパスワード（確認用）
         confirm_password: パスワード（確認用）
         current_password: 現在のパスワード
@@ -46,6 +51,7 @@ ja:
         password: パスワード
         setting_auto_play_gif: アニメーションGIFを自動再生する
         setting_boost_modal: ブーストする前に確認ダイアログを表示する
+        setting_default_language: 投稿する言語
         setting_default_privacy: 投稿の公開範囲
         setting_default_sensitive: メディアを常に閲覧注意としてマークする
         setting_delete_modal: トゥートを削除する前に確認ダイアログを表示する

config/locales/simple_form.ko.yml

@@ -12,10 +12,12 @@ ko:
           other: <span class="name-counter">%{count}</span> 글자 남음
         fields: 당신의 프로파일에 최대 4개까지 표 형식으로 나타낼 수 있습니다
         header: PNG, GIF 혹은 JPG. 최대 2MB. 700x335px로 다운스케일 됨
+        locale: 유저 인터페이스, 이메일, 푸시 알림 언어
         locked: 수동으로 팔로워를 승인하고, 기본 툿 프라이버시 설정을 팔로워 전용으로 변경
         note:
           one: <span class="note-counter">1</span> 글자 남음
           other: <span class="note-counter">%{count}</span> 글자 남음
+        setting_default_language: 작성한 툿의 언어는 자동으로 인식할 수 있지만, 언제나 정확한 건 아닙니다
         setting_hide_network: 나를 팔로우 하는 사람들과 내가 팔로우 하는 사람들이 내 프로필에 표시되지 않게 합니다
         setting_noindex: 공개 프로필 및 각 툿페이지에 영향을 미칩니다
         setting_theme: 로그인중인 모든 디바이스에 적용되는 디자인입니다.
@@ -23,6 +25,8 @@ ko:
         data: 다른 마스토돈 인스턴스에서 추출된 CSV 파일
       sessions:
         otp: '휴대전화에서 생성 된 2단계 인증 코드를 입력하거나, 복구 코드 중 하나를 사용하세요:'
+      user:
+        chosen_languages: 체크하면, 선택 된 언어들만 공개 타임라인에 보여집니다
     labels:
       account:
         fields:
@@ -32,6 +36,7 @@ ko:
         autofollow: 초대를 통한 팔로우
         avatar: 아바타
         bot: 이것은 봇 계정입니다
+        chosen_languages: 언어 필터링
         confirm_new_password: 새로운 비밀번호 다시 입력
         confirm_password: 현재 비밀번호 다시 입력
         current_password: 현재 비밀번호 입력
@@ -41,7 +46,7 @@ ko:
         expires_in: 만료시각
         fields: 프로필 메타데이터
         header: 헤더
-        locale: 언어
+        locale: 인터페이스 언어
         locked: 계정 잠금
         max_uses: 사용 횟수 제한
         new_password: 새로운 비밀번호 입력
@@ -50,6 +55,7 @@ ko:
         password: 비밀번호
         setting_auto_play_gif: 애니메이션 GIF를 자동 재생
         setting_boost_modal: 부스트 전 확인 창을 표시
+        setting_default_language: 게시물 언어
         setting_default_privacy: 툿 프라이버시
         setting_default_sensitive: 미디어를 언제나 민감한 컨텐츠로 설정
         setting_delete_modal: 툿 삭제 전 확인 창을 표시

config/locales/simple_form.nl.yml

@@ -12,10 +12,12 @@ nl:
           other: <span class="name-counter">%{count}</span> tekens over
         fields: Je kan maximaal 4 items als een tabel op je profiel weergeven
         header: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 700x335px
+        locale: De taal van de gebruikersomgeving, e-mails en pushmeldingen
         locked: Vereist dat je handmatig volgers moet accepteren
         note:
           one: <span class="note-counter">1</span> teken over
           other: <span class="note-counter">%{count}</span> tekens over
+        setting_default_language: De taal van jouw toots kan automatisch worden gedetecteerd, maar het is niet altijd accuraat
         setting_hide_network: Wie jij volgt en wie jou volgen wordt niet op jouw profiel getoond
         setting_noindex: Heeft invloed op jouw openbare profiel en toots
         setting_theme: Heeft invloed op hoe de webapp van Mastodon eruitziet (op elk apparaat waarmee je inlogt).
@@ -23,6 +25,8 @@ nl:
         data: CSV-bestand dat op een andere Mastodonserver werd geëxporteerd
       sessions:
         otp: Voer de tweestaps-aanmeldcode vanaf jouw mobiele telefoon in of gebruik een van jouw herstelcodes.
+      user:
+        chosen_languages: Alleen toots in de aangevinkte talen worden op de openbare tijdlijnen getoond
     labels:
       account:
         fields:
@@ -32,6 +36,7 @@ nl:
         autofollow: Uitnodigen om jouw account te volgen
         avatar: Avatar
         bot: Dit is een bot-account
+        chosen_languages: Talen filteren
         confirm_new_password: Nieuw wachtwoord bevestigen
         confirm_password: Wachtwoord bevestigen
         current_password: Huidig wachtwoord
@@ -41,7 +46,7 @@ nl:
         expires_in: Vervalt na
         fields: Metadata profiel
         header: Omslagfoto
-        locale: Taal
+        locale: Taal van de gebruikersomgeving
         locked: Maak account besloten
         max_uses: Max. aantal keer te gebruiken
         new_password: Nieuwe wachtwoord
@@ -50,6 +55,7 @@ nl:
         password: Wachtwoord
         setting_auto_play_gif: Speel geanimeerde GIF's automatisch af
         setting_boost_modal: Vraag voor het boosten van een toot een bevestiging
+        setting_default_language: Taal van jouw toots
         setting_default_privacy: Zichtbaarheid toots
         setting_default_sensitive: Media altijd als gevoelig markeren
         setting_delete_modal: Vraag voor het verwijderen van een toot een bevestiging

config/locales/simple_form.oc.yml

@@ -12,10 +12,12 @@ oc:
           other: Demòran encara <span class="name-counter">%{count}</span> caractèrs
         fields: Podètz far veire cap a 4 elements sus vòstre perfil
         header: PNG, GIF o JPG. Maximum 2 Mo. Serà retalhada en 700x335px
+        locale: La lenga de l’interfàcia d’utilizacion, los messatges e las notificacions
         locked: Demanda qu’acceptetz manualament lo mond que vos sègon e botarà la visibilitat de vòstras publicacions coma accessiblas a vòstres seguidors solament
         note:
           one: Demòra encara <span class="name-counter">1</span> caractèr
           other: Demòran encara <span class="name-counter">%{count}</span> caractèrs
+        setting_default_language: La lenga de vòstres tuts pòt èsser detectada automaticament, mas de còps es pas corrèctament determinada
         setting_hide_network: Vòstre perfil mostrarà pas los que vos sègon e lo monde que seguètz
         setting_noindex: Aquò es destinat a vòstre perfil public e vòstra pagina d’estatuts
         setting_theme: Aquò càmbia lo tèma grafic de Mastodon quand sètz connectat qual que siasque lo periferic.
@@ -23,6 +25,8 @@ oc:
         data: Fichièr CSV exportat d’una autra instància Mastodon
       sessions:
         otp: 'Picatz lo còdi d’autentificacion en dos temps (Two factor code) de vòstra aplicacion mobil o utilizatz un de vòstres còdis de recuperacion :'
+      user:
+        chosen_languages: Quand seleccionadas, solament los tuts dins las lengas triadas seràn mostrats dins vòstre flux d’actualitat
     labels:
       account:
         fields:
@@ -32,6 +36,7 @@ oc:
         autofollow: Convidar a sègre vòstre compte
         avatar: Avatar
         bot: Aquò es lo compte a un robòt
+        chosen_languages: Filtrar las lengas
         confirm_new_password: Confirmacion del nòu senhal
         confirm_password: Confirmatz lo nòu senhal
         current_password: Senhal actual
@@ -41,7 +46,7 @@ oc:
         expires_in: Expira aprèp
         fields: Metadonada del perfil
         header: Bandièra
-        locale: Lenga
+        locale: Lenga de l’interfàcia
         locked: Far venir lo compte privat
         max_uses: Limit d’utilizacions
         new_password: Nòu senhal
@@ -50,6 +55,7 @@ oc:
         password: Senhal
         setting_auto_play_gif: Lectura automatica dels GIFS animats
         setting_boost_modal: Afichar una fenèstra de confirmacion abans de partejar un estatut
+        setting_default_language: Lenga de publicacion
         setting_default_privacy: Confidencialitat de las publicacions
         setting_default_sensitive: Totjorn marcar los mèdias coma sensibles
         setting_delete_modal: Afichar una fenèstra de confirmacion abans de suprimir un estatut

config/locales/simple_form.pl.yml

@@ -3,8 +3,9 @@ pl:
   simple_form:
     hints:
       defaults:
+        autofollow: Osoby, które zarejestrują się z Twojego zaproszenia automatycznie zaczną Cię śledzić
         avatar: PNG, GIF lub JPG. Maksymalnie 2MB. Zostanie zmniejszony do 400x400px
-        bot: Informuje użytkowników, że konto nie jest prowadzone przez człowieka
+        bot: To konto wykonuje głównie zautomatyzowane działania i może nie być monitorowane
         digest: Wysyłane tylko po długiej nieaktywności, jeżeli w tym czasie otrzymaleś jakąś wiadomość bezpośrednią
         display_name:
           few: Pozostały <span class="name-counter">%{count}</span> znaki.
@@ -13,12 +14,14 @@ pl:
           other: Pozostało <span class="name-counter">%{count}</span> znaków
         fields: Możesz ustawić maksymalnie 4 niestandardowe pola wyświetlane jako tabela na Twoim profilu
         header: PNG, GIF lub JPG. Maksymalnie 2MB. Zostanie zmniejszony do 700x335px
+        locale: Język interfejsu, wiadomości e-mail i powiadomieniach push
         locked: Musisz akceptować prośby o śledzenie
         note:
           few: Pozostały <span class="name-counter">%{count}</span> znaki.
           many: Pozostało <span class="name-counter">%{count}</span> znaków
           one: Pozostał <span class="name-counter">1</span> znak
           other: Pozostało <span class="name-counter">%{count}</span> znaków
+        setting_default_language: Język Twoich wpisów może być wykrywany automatycznie, ale nie zawsze jest to dokładne
         setting_hide_network: Informacje o tym, kto Cię śledzi i kogo śledzisz nie będą widoczne
         setting_noindex: Wpływa na widoczność strony profilu i Twoich wpisów
         setting_theme: Zmienia wygląd Mastodona po zalogowaniu z dowolnego urządzenia.
@@ -26,14 +29,18 @@ pl:
         data: Plik CSV wyeksportowany z innej instancji Mastodona
       sessions:
         otp: 'Wprowadź kod weryfikacji dwuetapowej z telefonu lub wykorzystaj jeden z kodów zapasowych:'
+      user:
+        chosen_languages: Jeżeli zaznaczone, tylko wpisy w wybranych językach będą wyświetlane na publicznych osiach czasu
     labels:
       account:
         fields:
           name: Nazwa
           value: Zawartość
       defaults:
+        autofollow: Zapraszaj do śledzenia swojego konta
         avatar: Awatar
         bot: To konto jest prowadzone przez bota
+        chosen_languages: Filtrowanie języków
         confirm_new_password: Potwierdź nowe hasło
         confirm_password: Potwierdź hasło
         current_password: Obecne hasło
@@ -43,7 +50,7 @@ pl:
         expires_in: Wygaśnie po
         fields: Metadane profilu
         header: Nagłówek
-        locale: Język
+        locale: Język interfejsu
         locked: Ustaw konto jako prywatne
         max_uses: Maksymalna liczba użyć
         new_password: Nowe hasło
@@ -52,6 +59,7 @@ pl:
         password: Hasło
         setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy
         setting_boost_modal: Pytaj o potwierdzenie przed podbiciem
+        setting_default_language: Język wpisów
         setting_default_privacy: Widoczność wpisów
         setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
         setting_delete_modal: Pytaj o potwierdzenie przed usunięciem wpisu

config/locales/simple_form.sk.yml

@@ -13,6 +13,7 @@ sk:
           other: Ostáva ti <span class="name-counter">%{count}</span> znakov
         fields: Môžeš mať 4 položky na svojom profile zobrazené vo forme tabuľky
         header: PNG, GIF alebo JPG. Maximálne 2MB. Bude zmenšený na 700x335px
+        locale: Jazyk užívateľského rozhrania, emailových a nástenkových oboznámení
         locked: Vyžaduje manuálne schvalovať sledujúcich
         note:
           few: Ostávajú ti <span class="note-counter">%{count}</span> znaky
@@ -34,6 +35,7 @@ sk:
         autofollow: Pozvi k následovaniu tvojho profilu
         avatar: Avatar
         bot: Toto je automatizovaný bot účet
+        chosen_languages: Filtruj jazyky
         confirm_new_password: Znovu tvoje nové heslo, pre potvrdenie
         confirm_password: Potvrď heslo
         current_password: Súčasné heslo
@@ -43,7 +45,7 @@ sk:
         expires_in: Expirovať po
         fields: Metadáta profilu
         header: Obrázok v hlavičke
-        locale: Jazyk
+        locale: Jazyk rozhrania
         locked: Zamknúť účet
         max_uses: Maximálne možno použiť
         new_password: Nové heslo

config/locales/sk.yml

@@ -662,6 +662,7 @@ sk:
     disallowed_hashtags:
       one: 'obsahuje nepovolený haštag: %{tags}'
       other: 'obsahuje nepovolené haštagy: %{tags}'
+    language_detection: Zisti jazyk automaticky
     open_in_web: Otvor v okne prehliadača
     over_character_limit: limit počtu %{max} znakov bol presiahnutý
     pin_errors:

lib/mastodon/version.rb

@@ -21,7 +21,7 @@ module Mastodon
     end
 
     def flags
-      'rc1'
+      ''
     end
 
     def to_a

spec/controllers/shares_controller_spec.rb

@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+describe SharesController do
+  render_views
+
+  let(:user) { Fabricate(:user) }
+  before { sign_in user }
+
+  describe 'GTE #show' do
+    subject(:initial_state_json) { JSON.parse(assigns(:initial_state_json), symbolize_names: true) }
+    subject(:body_classes) { assigns(:body_classes) }
+
+    before { get :show, params: { title: 'test title', text: 'test text', url: 'url1 url2' } }
+
+    it 'assigns json' do
+      expect(response).to have_http_status :ok
+      expect(initial_state_json[:compose][:text]).to eq 'test title test text url1 url2'
+      expect(initial_state_json[:meta][:me]).to eq user.account.id.to_s
+      expect(body_classes).to eq 'modal-layout compose-standalone'
+    end
+  end
+end