+
+ );
+ }
+
renderAdminSignUp (notification, account, link) {
const { intl, unread } = this.props;
@@ -456,6 +479,8 @@ class Notification extends ImmutablePureComponent {
return this.renderPoll(notification, account);
case 'severed_relationships':
return this.renderRelationshipsSevered(notification);
+ case 'moderation_warning':
+ return this.renderModerationWarning(notification);
case 'admin.sign_up':
return this.renderAdminSignUp(notification, account, link);
case 'admin.report':
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 910d6cb06..dabefd1f4 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -297,6 +297,7 @@
"filter_modal.select_filter.subtitle": "Изберете съществуваща категория или създайте нова",
"filter_modal.select_filter.title": "Филтриране на публ.",
"filter_modal.title.status": "Филтриране на публ.",
+ "filtered_notifications_banner.mentions": "{count, plural, one {споменаване} other {споменавания}}",
"filtered_notifications_banner.pending_requests": "Известията от {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
"filtered_notifications_banner.title": "Филтрирани известия",
"firehose.all": "Всичко",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 40d9771df..6dfe06a92 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "Tot i que el teu compte no està blocat, el personal de {domain} ha pensat que és possible que vulguis revisar manualment les sol·licituds de seguiment d’aquests comptes.",
"follow_suggestions.curated_suggestion": "Tria de l'equip",
"follow_suggestions.dismiss": "No ho tornis a mostrar",
+ "follow_suggestions.featured_longer": "Triat personalment per l'equip de {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popular entre la gent que segueixes",
"follow_suggestions.hints.featured": "L'equip de {domain} ha seleccionat aquest perfil.",
"follow_suggestions.hints.friends_of_friends": "Aquest perfil és popular entre la gent que seguiu.",
"follow_suggestions.hints.most_followed": "Aquest perfil és un dels més seguits a {domain}.",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "Aquest perfil és similar a d'altres que heu seguit recentment.",
"follow_suggestions.personalized_suggestion": "Suggeriment personalitzat",
"follow_suggestions.popular_suggestion": "Suggeriment popular",
+ "follow_suggestions.popular_suggestion_longer": "Popular a {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Semblant a perfils que has seguit fa poc",
"follow_suggestions.view_all": "Mostra-ho tot",
"follow_suggestions.who_to_follow": "A qui seguir",
"followed_tags": "Etiquetes seguides",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index a7c8a049e..a23d53733 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -306,6 +306,8 @@
"follow_requests.unlocked_explanation": "Selvom din konto ikke er låst, synes {domain}-personalet, du måske bør gennemgå disse anmodninger manuelt.",
"follow_suggestions.curated_suggestion": "Personaleudvalgt",
"follow_suggestions.dismiss": "Vis ikke igen",
+ "follow_suggestions.featured_longer": "Håndplukket af {domain}-teamet",
+ "follow_suggestions.friends_of_friends_longer": "Populært blandt personer, som følges",
"follow_suggestions.hints.featured": "Denne profil er håndplukket af {domain}-teamet.",
"follow_suggestions.hints.friends_of_friends": "Denne profil er populær blandt de personer, som følges.",
"follow_suggestions.hints.most_followed": "Denne profil er en af de mest fulgte på {domain}.",
@@ -313,6 +315,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "Denne profil svarer til de profiler, som senest er blevet fulgt.",
"follow_suggestions.personalized_suggestion": "Personligt forslag",
"follow_suggestions.popular_suggestion": "Populært forslag",
+ "follow_suggestions.popular_suggestion_longer": "Populært på {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Svarende til profiler, som for nylig er fulgt",
"follow_suggestions.view_all": "Vis alle",
"follow_suggestions.who_to_follow": "Hvem, som skal følges",
"followed_tags": "Hashtag, som følges",
@@ -467,6 +471,15 @@
"notification.follow": "{name} begyndte at følge dig",
"notification.follow_request": "{name} har anmodet om at følge dig",
"notification.mention": "{name} nævnte dig",
+ "notification.moderation-warning.learn_more": "Læs mere",
+ "notification.moderation_warning": "Du er tildelt en moderationsadvarsel",
+ "notification.moderation_warning.action_delete_statuses": "Nogle af dine indlæg er blevet fjernet.",
+ "notification.moderation_warning.action_disable": "Din konto er blevet deaktiveret.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nogle af dine indlæg er blevet markeret som sensitive.",
+ "notification.moderation_warning.action_none": "Din konto er tildelt en moderationsadvarsel.",
+ "notification.moderation_warning.action_sensitive": "Dine indlæg markeres fra nu af som sensitive.",
+ "notification.moderation_warning.action_silence": "Din konto er blevet begrænset.",
+ "notification.moderation_warning.action_suspend": "Din konto er suspenderet.",
"notification.own_poll": "Din afstemning er afsluttet",
"notification.poll": "En afstemning, hvori du stemte, er slut",
"notification.reblog": "{name} boostede dit indlæg",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index a1ba25fed..59d3d0965 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "Auch wenn dein Konto öffentlich bzw. nicht geschützt ist, haben die Moderator*innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
"follow_suggestions.curated_suggestion": "Vom Server-Team empfohlen",
"follow_suggestions.dismiss": "Nicht mehr anzeigen",
+ "follow_suggestions.featured_longer": "Vom {domain}-Team ausgewählt",
+ "follow_suggestions.friends_of_friends_longer": "Beliebt bei Leuten, denen du folgst",
"follow_suggestions.hints.featured": "Dieses Profil wurde vom {domain}-Team ausgewählt.",
"follow_suggestions.hints.friends_of_friends": "Dieses Profil ist bei deinen Followern beliebt.",
"follow_suggestions.hints.most_followed": "Dieses Profil ist eines der am meisten gefolgten auf {domain}.",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "Dieses Profil ähnelt den Profilen, denen du in letzter Zeit gefolgt hast.",
"follow_suggestions.personalized_suggestion": "Persönliche Empfehlung",
"follow_suggestions.popular_suggestion": "Beliebte Empfehlung",
+ "follow_suggestions.popular_suggestion_longer": "Beliebt auf {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Ähnlich zu Profilen, denen du seit kurzem folgst",
"follow_suggestions.view_all": "Alle anzeigen",
"follow_suggestions.who_to_follow": "Empfohlene Profile",
"followed_tags": "Gefolgte Hashtags",
@@ -469,6 +473,15 @@
"notification.follow": "{name} folgt dir",
"notification.follow_request": "{name} möchte dir folgen",
"notification.mention": "{name} erwähnte dich",
+ "notification.moderation-warning.learn_more": "Mehr erfahren",
+ "notification.moderation_warning": "Du wurdest von den Moderator*innen verwarnt",
+ "notification.moderation_warning.action_delete_statuses": "Einige deiner Beiträge sind entfernt worden.",
+ "notification.moderation_warning.action_disable": "Dein Konto wurde deaktiviert.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Einige deiner Beiträge wurden mit einer Inhaltswarnung versehen.",
+ "notification.moderation_warning.action_none": "Dein Konto ist von den Moderator*innen verwarnt worden.",
+ "notification.moderation_warning.action_sensitive": "Deine zukünftigen Beiträge werden mit einer Inhaltswarnung versehen.",
+ "notification.moderation_warning.action_silence": "Dein Konto wurde eingeschränkt.",
+ "notification.moderation_warning.action_suspend": "Dein Konto wurde gesperrt.",
"notification.own_poll": "Deine Umfrage ist beendet",
"notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
"notification.reblog": "{name} teilte deinen Beitrag",
@@ -536,11 +549,11 @@
"onboarding.follows.empty": "Bedauerlicherweise können aktuell keine Ergebnisse angezeigt werden. Du kannst die Suche verwenden oder den Reiter „Entdecken“ auswählen, um neue Leute zum Folgen zu finden – oder du versuchst es später erneut.",
"onboarding.follows.lead": "Deine Startseite ist der primäre Anlaufpunkt, um Mastodon zu erleben. Je mehr Profilen du folgst, umso aktiver und interessanter wird sie. Damit du direkt loslegen kannst, gibt es hier ein paar Vorschläge:",
"onboarding.follows.title": "Personalisiere deine Startseite",
- "onboarding.profile.discoverable": "Mein Profil auffindbar machen",
+ "onboarding.profile.discoverable": "Mein Profil darf entdeckt werden",
"onboarding.profile.discoverable_hint": "Wenn du entdeckt werden möchtest, dann können deine Beiträge in Suchergebnissen und Trends erscheinen. Dein Profil kann ebenfalls anderen mit ähnlichen Interessen vorgeschlagen werden.",
"onboarding.profile.display_name": "Anzeigename",
"onboarding.profile.display_name_hint": "Dein richtiger Name oder dein Fantasiename …",
- "onboarding.profile.lead": "Du kannst das später in den Einstellungen vervollständigen, wo noch mehr Anpassungsmöglichkeiten zur Verfügung stehen.",
+ "onboarding.profile.lead": "Du kannst dein Profil später in den Einstellungen vervollständigen. Dort stehen weitere Anpassungsmöglichkeiten zur Verfügung.",
"onboarding.profile.note": "Über mich",
"onboarding.profile.note_hint": "Du kannst andere @Profile erwähnen oder #Hashtags verwenden …",
"onboarding.profile.save_and_continue": "Speichern und fortfahren",
@@ -556,16 +569,16 @@
"onboarding.start.title": "Du hast es geschafft!",
"onboarding.steps.follow_people.body": "Interessanten Profilen zu folgen ist das, was Mastodon ausmacht.",
"onboarding.steps.follow_people.title": "Personalisiere deine Startseite",
- "onboarding.steps.publish_status.body": "Begrüße die Welt mit Text, Fotos, Videos oder Umfragen {emoji}",
+ "onboarding.steps.publish_status.body": "Begrüße die Welt mit Text, Fotos, Videos oder Umfragen. {emoji}",
"onboarding.steps.publish_status.title": "Erstelle deinen ersten Beitrag",
"onboarding.steps.setup_profile.body": "Mit einem vollständigen Profil interagieren andere eher mit dir.",
"onboarding.steps.setup_profile.title": "Personalisiere dein Profil",
- "onboarding.steps.share_profile.body": "Lass deine Freund*innen wissen, wie sie dich auf Mastodon finden können",
+ "onboarding.steps.share_profile.body": "Lass deine Freund*innen wissen, wie sie dich auf Mastodon finden können.",
"onboarding.steps.share_profile.title": "Teile dein Mastodon-Profil",
"onboarding.tips.2fa": "Wusstest du schon? Du kannst die Sicherheit deines Kontos erhöhen, indem du die Zwei-Faktor-Authentisierung in deinen Kontoeinstellungen aktivierst. Dafür ist keine Telefonnummer notwendig und es funktioniert jede beliebige TOTP-App!",
"onboarding.tips.accounts_from_other_servers": "Wusstest du schon? Da Mastodon dezentralisiert ist, werden einige Profile, denen du begegnest, auf anderen Servern als deinem bereitgestellt. Und trotzdem kannst du uneingeschränkt mit ihnen interagieren! Der Servername befindet sich in der zweiten Hälfte ihres Profilnamens!",
"onboarding.tips.migration": "Wusstest du schon? Wenn du das Gefühl hast, dass {domain} in Zukunft nicht die richtige Serverwahl für dich ist, kannst du auf einen anderen Mastodon-Server umziehen, ohne deine Follower zu verlieren. Du kannst sogar deinen eigenen Server betreiben!",
- "onboarding.tips.verification": "Wusstest du schon? Du kannst dein Konto verifizieren, indem du auf deiner Website auf dein Mastodon-Profil verlinkst und den Link deiner Website zu deinem Profil hinzufügst. Keine Gebühren oder Dokumente erforderlich!",
+ "onboarding.tips.verification": "Wusstest du schon? Du kannst dein Konto verifizieren, indem du auf deiner Website auf dein Mastodon-Profil verlinkst und den Link deiner Website zu deinem Profil hinzufügst. Völlig kostenlos und ohne Dokumente einsenden zu müssen!",
"password_confirmation.exceeds_maxlength": "Passwortbestätigung überschreitet die maximal erlaubte Zeichenanzahl",
"password_confirmation.mismatching": "Passwortbestätigung stimmt nicht überein",
"picture_in_picture.restore": "Zurücksetzen",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index fd44b3952..9d127b6b0 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
"follow_suggestions.curated_suggestion": "Staff pick",
"follow_suggestions.dismiss": "Don't show again",
+ "follow_suggestions.featured_longer": "Hand-picked by the {domain} team",
+ "follow_suggestions.friends_of_friends_longer": "Popular among people you follow",
"follow_suggestions.hints.featured": "This profile has been hand-picked by the {domain} team.",
"follow_suggestions.hints.friends_of_friends": "This profile is popular among the people you follow.",
"follow_suggestions.hints.most_followed": "This profile is one of the most followed on {domain}.",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "This profile is similar to the profiles you have most recently followed.",
"follow_suggestions.personalized_suggestion": "Personalized suggestion",
"follow_suggestions.popular_suggestion": "Popular suggestion",
+ "follow_suggestions.popular_suggestion_longer": "Popular on {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Similar to profiles you recently followed",
"follow_suggestions.view_all": "View all",
"follow_suggestions.who_to_follow": "Who to follow",
"followed_tags": "Followed hashtags",
@@ -469,6 +473,15 @@
"notification.follow": "{name} followed you",
"notification.follow_request": "{name} has requested to follow you",
"notification.mention": "{name} mentioned you",
+ "notification.moderation-warning.learn_more": "Learn more",
+ "notification.moderation_warning": "Your have received a moderation warning",
+ "notification.moderation_warning.action_delete_statuses": "Some of your posts have been removed.",
+ "notification.moderation_warning.action_disable": "Your account has been disabled.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Some of your posts have been marked as sensitive.",
+ "notification.moderation_warning.action_none": "Your account has received a moderation warning.",
+ "notification.moderation_warning.action_sensitive": "Your posts will be marked as sensitive from now on.",
+ "notification.moderation_warning.action_silence": "Your account has been limited.",
+ "notification.moderation_warning.action_suspend": "Your account has been suspended.",
"notification.own_poll": "Your poll has ended",
"notification.poll": "A poll you have voted in has ended",
"notification.reblog": "{name} boosted your post",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 7e2ecf69c..9fae07487 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "Zure kontua blokeatuta ez badago ere, {domain} domeinuko arduradunek uste dute kontu hauetako jarraipen eskaerak agian eskuz begiratu nahiko dituzula.",
"follow_suggestions.curated_suggestion": "Domeinuaren iradokizuna",
"follow_suggestions.dismiss": "Ez erakutsi berriro",
+ "follow_suggestions.featured_longer": "{domain} domeinuko taldeak hautaturikoak",
+ "follow_suggestions.friends_of_friends_longer": "Jarraitzen duzun jendearen artean ezagunak direnak",
"follow_suggestions.hints.featured": "Profil hau {domain} domeinuko taldeak eskuz aukeratu du.",
"follow_suggestions.hints.friends_of_friends": "Profil hau ezaguna da jarraitzen duzun jendearen artean.",
"follow_suggestions.hints.most_followed": "Profil hau {domain} domeinuan gehien jarraitzen den profiletako bat da.",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "Profil hau duela gutxi jarraitu dituzun profil askoren antzekoa da.",
"follow_suggestions.personalized_suggestion": "Iradokizun pertsonalizatua",
"follow_suggestions.popular_suggestion": "Iradokizun ezaguna",
+ "follow_suggestions.popular_suggestion_longer": "{domain} domeinuan ezagunak direnak",
+ "follow_suggestions.similar_to_recently_followed_longer": "Berriki jarraitu dituzun profilen antzekoa",
"follow_suggestions.view_all": "Ikusi denak",
"follow_suggestions.who_to_follow": "Zein jarraitu",
"followed_tags": "Jarraitutako traolak",
@@ -469,6 +473,15 @@
"notification.follow": "{name}(e)k jarraitzen dizu",
"notification.follow_request": "{name}(e)k zu jarraitzeko eskaera egin du",
"notification.mention": "{name}(e)k aipatu zaitu",
+ "notification.moderation-warning.learn_more": "Informazio gehiago",
+ "notification.moderation_warning": "Moderazio-abisu bat jaso duzu",
+ "notification.moderation_warning.action_delete_statuses": "Argitalpen batzuk kendu dira.",
+ "notification.moderation_warning.action_disable": "Zure kontua desaktibatua izan da.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Argitalpen batzuk hunkigarri gisa ezarri dira.",
+ "notification.moderation_warning.action_none": "Kontuak moderazio-abisu bat jaso du.",
+ "notification.moderation_warning.action_sensitive": "Argitalpenak hunkigarri gisa markatuko dira hemendik aurrera.",
+ "notification.moderation_warning.action_silence": "Kontua murriztu egin da.",
+ "notification.moderation_warning.action_suspend": "Kontua itxi da.",
"notification.own_poll": "Zure inkesta amaitu da",
"notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
"notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 246bb56fc..5a5031fd1 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "Vaikkei tiliäsi ole lukittu, palvelimen {domain} ylläpito on arvioinut, että saatat olla halukas tarkistamaan nämä seuraamispyynnöt erikseen.",
"follow_suggestions.curated_suggestion": "Ehdotus ylläpidolta",
"follow_suggestions.dismiss": "Älä näytä uudelleen",
+ "follow_suggestions.featured_longer": "Käsin valinnut palvelimen {domain} tiimi",
+ "follow_suggestions.friends_of_friends_longer": "Suosittu seuraamiesi ihmisten keskuudessa",
"follow_suggestions.hints.featured": "Tämän profiilin on valinnut palvelimen {domain} tiimi.",
"follow_suggestions.hints.friends_of_friends": "Seuraamasi käyttäjät suosivat tätä profiilia.",
"follow_suggestions.hints.most_followed": "Tämä profiili on palvelimen {domain} seuratuimpia.",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "Tämä profiili on samankaltainen kuin profiilit, joita olet viimeksi seurannut.",
"follow_suggestions.personalized_suggestion": "Mukautettu ehdotus",
"follow_suggestions.popular_suggestion": "Suosittu ehdotus",
+ "follow_suggestions.popular_suggestion_longer": "Suosittu palvelimella {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Samankaltainen kuin äskettäin seuraamasi profiilit",
"follow_suggestions.view_all": "Näytä kaikki",
"follow_suggestions.who_to_follow": "Ehdotuksia seurattavaksi",
"followed_tags": "Seuratut aihetunnisteet",
@@ -469,6 +473,15 @@
"notification.follow": "{name} seurasi sinua",
"notification.follow_request": "{name} on pyytänyt lupaa saada seurata sinua",
"notification.mention": "{name} mainitsi sinut",
+ "notification.moderation-warning.learn_more": "Lue lisää",
+ "notification.moderation_warning": "Olet saanut moderointivaroituksen",
+ "notification.moderation_warning.action_delete_statuses": "Jotkin julkaisusi on poistettu.",
+ "notification.moderation_warning.action_disable": "Tilisi on poistettu käytöstä.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Jotkin julkaisusi on merkitty arkaluonteisiksi.",
+ "notification.moderation_warning.action_none": "Tilisi on saanut moderointivaroituksen.",
+ "notification.moderation_warning.action_sensitive": "Tästä lähtien julkaisusi merkitään arkaluonteisiksi.",
+ "notification.moderation_warning.action_silence": "Tiliäsi on rajoitettu.",
+ "notification.moderation_warning.action_suspend": "Tilisi on jäädytetty.",
"notification.own_poll": "Äänestyksesi on päättynyt",
"notification.poll": "Kysely, johon osallistuit, on päättynyt",
"notification.reblog": "{name} tehosti julkaisuasi",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 68faf6d81..77257413f 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "Sjálvt um konta tín ikki er læst, so hugsa {domain} starvsfólkini, at tú kanska hevur hug at kanna umbønir um at fylgja frá hesum kontum við hond.",
"follow_suggestions.curated_suggestion": "Val hjá ábyrgdarfólki",
"follow_suggestions.dismiss": "Lat vera við at vísa",
+ "follow_suggestions.featured_longer": "Vald burturúr av {domain} toyminum",
+ "follow_suggestions.friends_of_friends_longer": "Vælumtókt millum fólk, sum tú fylgir",
"follow_suggestions.hints.featured": "Hesin vangin er úrvaldur av toyminum handan {domain}.",
"follow_suggestions.hints.friends_of_friends": "Hesin vangin er vælumtóktur millum tey, tú fylgir.",
"follow_suggestions.hints.most_followed": "Hesin vangin er ein av teimum, sum er mest fylgdur á {domain}.",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "Hesin vangin líkist teimum, sum tú nýliga hevur fylgt.",
"follow_suggestions.personalized_suggestion": "Persónligt uppskot",
"follow_suggestions.popular_suggestion": "Vælumtókt uppskot",
+ "follow_suggestions.popular_suggestion_longer": "Vælumtókt á {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Líkist vangum, sum tú nýliga hevur fylgt",
"follow_suggestions.view_all": "Vís øll",
"follow_suggestions.who_to_follow": "Hvørji tú átti at fylgt",
"followed_tags": "Fylgd frámerki",
@@ -469,6 +473,15 @@
"notification.follow": "{name} fylgdi tær",
"notification.follow_request": "{name} biður um at fylgja tær",
"notification.mention": "{name} nevndi teg",
+ "notification.moderation-warning.learn_more": "Lær meira",
+ "notification.moderation_warning": "Tú hevur móttikið eina umsjónarávarðing",
+ "notification.moderation_warning.action_delete_statuses": "Onkrir av tínum postum eru strikaðir.",
+ "notification.moderation_warning.action_disable": "Konta tín er gjørd óvirkin.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nakrir av postum tínum eru merktir sum viðkvæmir.",
+ "notification.moderation_warning.action_none": "Konta tín hevur móttikið eina umsjónarávarðing.",
+ "notification.moderation_warning.action_sensitive": "Postar tínir verða merktir sum viðkvæmir frá nú av.",
+ "notification.moderation_warning.action_silence": "Konta tín er avmarkað.",
+ "notification.moderation_warning.action_suspend": "Konta tín er ógildað.",
"notification.own_poll": "Tín atkvøðugreiðsla er endað",
"notification.poll": "Ein atkvøðugreiðsla, har tú hevur atkvøtt, er endað",
"notification.reblog": "{name} lyfti tín post",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 8ab515e1a..9e79793de 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -297,6 +297,7 @@
"filter_modal.select_filter.subtitle": "Cleachd roinn-seòrsa a tha ann no cruthaich tè ùr",
"filter_modal.select_filter.title": "Criathraich am post seo",
"filter_modal.title.status": "Criathraich post",
+ "filtered_notifications_banner.mentions": "{count, plural, one {iomradh} two {iomradh} few {iomraidhean} other {iomradh}}",
"filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil brath ann o dhaoine} one {Tha brathan ann o # neach} two {Tha brathan ann o # neach} few {Tha brathan ann o # daoine} other {Tha brathan ann o # duine}} air a bheil thu eòlach ’s dòcha",
"filtered_notifications_banner.title": "Brathan criathraichte",
"firehose.all": "Na h-uile",
@@ -307,6 +308,7 @@
"follow_requests.unlocked_explanation": "Ged nach eil an cunntas agad glaiste, tha sgioba {domain} dhen bheachd gum b’ fheàirrde thu lèirmheas a dhèanamh air na h-iarrtasan leantainn o na cunntasan seo a làimh.",
"follow_suggestions.curated_suggestion": "Roghainn an sgioba",
"follow_suggestions.dismiss": "Na seall seo a-rithist",
+ "follow_suggestions.friends_of_friends_longer": "Fèill mhòr am measg nan daoine a leanas tu",
"follow_suggestions.hints.featured": "Chaidh a’ phròifil seo a thaghadh le sgioba {domain} a làimh.",
"follow_suggestions.hints.friends_of_friends": "Tha fèill mhòr air a’ phròifil seo am measg nan daoine a leanas tu.",
"follow_suggestions.hints.most_followed": "Tha a’ phròifil seo am measg an fheadhainn a leanar as trice air {domain}.",
@@ -314,6 +316,7 @@
"follow_suggestions.hints.similar_to_recently_followed": "Tha a’ phròifil seo coltach ris na pròifilean air an lean thu o chionn goirid.",
"follow_suggestions.personalized_suggestion": "Moladh pearsanaichte",
"follow_suggestions.popular_suggestion": "Moladh air a bheil fèill mhòr",
+ "follow_suggestions.popular_suggestion_longer": "Fèill mhòr air {domain}",
"follow_suggestions.view_all": "Seall na h-uile",
"follow_suggestions.who_to_follow": "Molaidhean leantainn",
"followed_tags": "Tagaichean hais ’gan leantainn",
@@ -468,6 +471,7 @@
"notification.follow": "Tha {name} ’gad leantainn a-nis",
"notification.follow_request": "Dh’iarr {name} ’gad leantainn",
"notification.mention": "Thug {name} iomradh ort",
+ "notification.moderation-warning.learn_more": "Barrachd fiosrachaidh",
"notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
"notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
"notification.reblog": "Bhrosnaich {name} am post agad",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 901bca749..49802ac48 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "Malia que a túa conta non é privada, a administración de {domain} pensou que quizabes terías que revisar de xeito manual as solicitudes de seguiminto.",
"follow_suggestions.curated_suggestion": "Suxestións do Servidor",
"follow_suggestions.dismiss": "Non mostrar máis",
+ "follow_suggestions.featured_longer": "Elección persoal do equipo de {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popular entre as persoas que sigues",
"follow_suggestions.hints.featured": "Este perfil foi escollido pola administración de {domain}.",
"follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as persoas que segues.",
"follow_suggestions.hints.most_followed": "Este perfil é un dos máis seguidos en {domain}.",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "Este perfil ten semellanzas cos perfís que ti seguiches últimamente.",
"follow_suggestions.personalized_suggestion": "Suxestión personalizada",
"follow_suggestions.popular_suggestion": "Suxestión popular",
+ "follow_suggestions.popular_suggestion_longer": "Popular en {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Perfís semellantes aos que seguiches recentemente",
"follow_suggestions.view_all": "Ver todas",
"follow_suggestions.who_to_follow": "A quen seguir",
"followed_tags": "Cancelos seguidos",
@@ -469,6 +473,15 @@
"notification.follow": "{name} comezou a seguirte",
"notification.follow_request": "{name} solicitou seguirte",
"notification.mention": "{name} mencionoute",
+ "notification.moderation-warning.learn_more": "Saber máis",
+ "notification.moderation_warning": "Recibiches unha advertencia da moderación",
+ "notification.moderation_warning.action_delete_statuses": "Algunha das túas publicacións foron eliminadas.",
+ "notification.moderation_warning.action_disable": "A túa conta foi desactivada.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algunha das túas publicacións foron marcadas como sensibles.",
+ "notification.moderation_warning.action_none": "A túa conta recibeu unha advertencia da moderación.",
+ "notification.moderation_warning.action_sensitive": "De agora en diante as túas publicacións van ser marcadas como sensibles.",
+ "notification.moderation_warning.action_silence": "A túa conta foi limitada.",
+ "notification.moderation_warning.action_suspend": "A túa conta foi suspendida.",
"notification.own_poll": "A túa enquisa rematou",
"notification.poll": "Rematou a enquisa na que votaches",
"notification.reblog": "{name} compartiu a túa publicación",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index d696186bf..0b66a27fa 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "למרות שחשבונך אינו נעול, צוות {domain} חושב שאולי כדאי לוודא את בקשות המעקב האלה ידנית.",
"follow_suggestions.curated_suggestion": "בחירת הצוות",
"follow_suggestions.dismiss": "לא להציג שוב",
+ "follow_suggestions.featured_longer": "נבחר ידנית על ידי הצוות של {domain}",
+ "follow_suggestions.friends_of_friends_longer": "פופולרי בין הנעקבים שלך",
"follow_suggestions.hints.featured": "החשבון הזה נבחר אישית על ידי צוות {domain}.",
"follow_suggestions.hints.friends_of_friends": "חשבון זה פופולרי בין הנעקבים שלך.",
"follow_suggestions.hints.most_followed": "חשבון זה הוא מבין הנעקבים ביותר בשרת {domain}.",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "חשבון זה דומה לחשבונות אחרים שאחריהם התחלת לעקוב לאחרונה.",
"follow_suggestions.personalized_suggestion": "הצעות מותאמות אישית",
"follow_suggestions.popular_suggestion": "הצעה פופולרית",
+ "follow_suggestions.popular_suggestion_longer": "פופולרי בקהילת {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "דומה למשתמשות.ים שעקבת אחריהן.ם לאחרונה",
"follow_suggestions.view_all": "צפיה בכל",
"follow_suggestions.who_to_follow": "אחרי מי לעקוב",
"followed_tags": "התגיות שהחשבון שלך עוקב אחריהן",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 16dcea642..42ce84258 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "Bár a fiókod nincs zárolva, a(z) {domain} csapata úgy gondolta, hogy talán kézzel szeretnéd ellenőrizni ezen fiókok követési kéréseit.",
"follow_suggestions.curated_suggestion": "A stáb választása",
"follow_suggestions.dismiss": "Ne jelenjen meg újra",
+ "follow_suggestions.featured_longer": "A {domain} csapata által kézzel kiválasztott",
+ "follow_suggestions.friends_of_friends_longer": "Népszerű az Ön által követett emberek körében",
"follow_suggestions.hints.featured": "Ezt a profilt a(z) {domain} csapata választotta ki.",
"follow_suggestions.hints.friends_of_friends": "Ez a profil népszerű az általad követett emberek körében.",
"follow_suggestions.hints.most_followed": "Ez a profil a leginkább követett a(z) {domain} oldalon.",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "Ez a profil hasonló azokhoz a profilokhoz, melyeket nemrég kezdtél el követni.",
"follow_suggestions.personalized_suggestion": "Személyre szabott javaslat",
"follow_suggestions.popular_suggestion": "Népszerű javaslat",
+ "follow_suggestions.popular_suggestion_longer": "Népszerű itt: {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Hasonló profilok, melyeket nemrég követett",
"follow_suggestions.view_all": "Összes megtekintése",
"follow_suggestions.who_to_follow": "Kit érdemes követni",
"followed_tags": "Követett hashtagek",
@@ -469,6 +473,15 @@
"notification.follow": "{name} követ téged",
"notification.follow_request": "{name} követni szeretne téged",
"notification.mention": "{name} megemlített",
+ "notification.moderation-warning.learn_more": "További információk",
+ "notification.moderation_warning": "Moderációs figyelmeztetést kaptál",
+ "notification.moderation_warning.action_delete_statuses": "Néhány bejegyzésedet eltávolították.",
+ "notification.moderation_warning.action_disable": "A fiókod le van tiltva.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Néhány bejegyzésedet kényesnek jelölték.",
+ "notification.moderation_warning.action_none": "A fiókod moderációs figyelmeztetést kapott.",
+ "notification.moderation_warning.action_sensitive": "A bejegyzéseid mostantól érzékenynek lesznek jelölve.",
+ "notification.moderation_warning.action_silence": "A fiókod korlátozásra került.",
+ "notification.moderation_warning.action_suspend": "A fiókod felfüggesztésre került.",
"notification.own_poll": "A szavazásod véget ért",
"notification.poll": "Egy szavazás, melyben részt vettél, véget ért",
"notification.reblog": "{name} megtolta a bejegyzésedet",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 90a48b634..33161f888 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -123,6 +123,7 @@
"column.directory": "Jelajahi profil",
"column.domain_blocks": "Domain tersembunyi",
"column.favourites": "Favorit",
+ "column.firehose": "Feed yang sedang berlangsung",
"column.follow_requests": "Permintaan mengikuti",
"column.home": "Beranda",
"column.lists": "List",
@@ -143,7 +144,9 @@
"community.column_settings.remote_only": "Hanya jarak jauh",
"compose.language.change": "Ganti bahasa",
"compose.language.search": "Telusuri bahasa...",
+ "compose.published.body": "Postingan diterbitkan.",
"compose.published.open": "Buka",
+ "compose.saved.body": "Postingan tersimpan.",
"compose_form.direct_message_warning_learn_more": "Pelajari lebih lanjut",
"compose_form.encryption_warning": "Kiriman di Mastodon tidak dienkripsi secara end-to-end. Jangan bagikan informasi sensitif melalui Mastodon.",
"compose_form.hashtag_warning": "Kiriman ini tidak akan didaftarkan di bawah tagar apapun selama tidak diatur ke publik. Hanya kiriman publik yang dapat dicari dengan tagar.",
@@ -151,11 +154,19 @@
"compose_form.lock_disclaimer.lock": "terkunci",
"compose_form.placeholder": "Apa yang ada di pikiran Anda?",
"compose_form.poll.duration": "Durasi japat",
+ "compose_form.poll.multiple": "Pilihan ganda",
+ "compose_form.poll.option_placeholder": "Opsi {number}",
+ "compose_form.poll.single": "Pilih Satu",
"compose_form.poll.switch_to_multiple": "Ubah japat menjadi pilihan ganda",
"compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal",
+ "compose_form.poll.type": "Gaya",
+ "compose_form.publish": "Postingan",
"compose_form.publish_form": "Terbitkan",
+ "compose_form.reply": "Balas",
+ "compose_form.save_changes": "Perbarui",
"compose_form.spoiler.marked": "Hapus peringatan tentang isi konten",
"compose_form.spoiler.unmarked": "Tambahkan peringatan tentang isi konten",
+ "compose_form.spoiler_placeholder": "Peringatan konten (opsional)",
"confirmation_modal.cancel": "Batal",
"confirmations.block.confirm": "Blokir",
"confirmations.cancel_follow_request.confirm": "Batalkan permintaan",
@@ -166,12 +177,15 @@
"confirmations.delete_list.message": "Apakah Anda yakin untuk menghapus daftar ini secara permanen?",
"confirmations.discard_edit_media.confirm": "Buang",
"confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan deskripsi atau pratinjau media, buang saja?",
+ "confirmations.domain_block.confirm": "Blokir server",
"confirmations.domain_block.message": "Apakah Anda benar-benar yakin untuk memblokir keseluruhan {domain}? Dalam kasus tertentu beberapa pemblokiran atau penyembunyian lebih baik.",
"confirmations.edit.confirm": "Ubah",
+ "confirmations.edit.message": "Mengubah akan menimpa pesan yang sedang anda tulis. Apakah anda yakin ingin melanjutkan?",
"confirmations.logout.confirm": "Keluar",
"confirmations.logout.message": "Apakah Anda yakin ingin keluar?",
"confirmations.mute.confirm": "Bisukan",
"confirmations.redraft.confirm": "Hapus dan susun ulang",
+ "confirmations.redraft.message": "Apakah anda yakin ingin menghapus postingan ini dan menyusun ulang postingan ini? Favorit dan peningkatan akan hilang, dan balasan ke postingan asli tidak akan terhubung ke postingan manapun.",
"confirmations.reply.confirm": "Balas",
"confirmations.reply.message": "Membalas sekarang akan menimpa pesan yang sedang Anda buat. Anda yakin ingin melanjutkan?",
"confirmations.unfollow.confirm": "Berhenti mengikuti",
@@ -180,6 +194,7 @@
"conversation.mark_as_read": "Tandai sudah dibaca",
"conversation.open": "Lihat percakapan",
"conversation.with": "Dengan {names}",
+ "copy_icon_button.copied": "Disalin ke clipboard",
"copypaste.copied": "Disalin",
"copypaste.copy_to_clipboard": "Salin ke clipboard",
"directory.federated": "Dari fediverse yang dikenal",
@@ -191,7 +206,27 @@
"dismissable_banner.community_timeline": "Ini adalah kiriman publik terkini dari orang yang akunnya berada di {domain}.",
"dismissable_banner.dismiss": "Abaikan",
"dismissable_banner.explore_links": "Cerita berita ini sekarang sedang dibicarakan oleh orang di server ini dan lainnya dalam jaringan terdesentralisasi.",
+ "dismissable_banner.explore_statuses": "Ini adalah postingan dari seluruh web sosial yang mendapatkan daya tarik saat ini. Postingan baru dengan lebih banyak peningkatan dan favorit memiliki peringkat lebih tinggi.",
"dismissable_banner.explore_tags": "Tagar ini sekarang sedang tren di antara orang di server ini dan lainnya dalam jaringan terdesentralisasi.",
+ "dismissable_banner.public_timeline": "Ini adalah postingan publik dari orang-orang di web sosial yang diikuti oleh {domain}.",
+ "domain_block_modal.block": "Blokir server",
+ "domain_block_modal.block_account_instead": "Blokir @{name} saja",
+ "domain_block_modal.they_can_interact_with_old_posts": "Orang-orang dari server ini dapat berinteraksi dengan kiriman lama anda.",
+ "domain_block_modal.they_cant_follow": "Tidak ada seorangpun dari server ini yang dapat mengikuti anda.",
+ "domain_block_modal.they_wont_know": "Mereka tidak akan tahu bahwa mereka diblokir.",
+ "domain_block_modal.title": "Blokir domain?",
+ "domain_block_modal.you_will_lose_followers": "Semua pengikut anda dari server ini akan dihapus.",
+ "domain_block_modal.you_wont_see_posts": "Anda tidak akan melihat postingan atau notifikasi dari pengguna di server ini.",
+ "domain_pill.activitypub_lets_connect": "Ini memungkinkan anda terhubung dan berinteraksi dengan orang-orang tidak hanya di Mastodon, tetapi juga di berbagai aplikasi sosial.",
+ "domain_pill.activitypub_like_language": "ActivityPub seperti bahasa yang digunakan Mastodon dengan jejaring sosial lainnya.",
+ "domain_pill.server": "Server",
+ "domain_pill.their_handle": "Nama penggunanya:",
+ "domain_pill.their_server": "Rumah digital mereka, di mana semua postingan mereka tersedia.",
+ "domain_pill.their_username": "Pengenal unik mereka di server tersebut. Itu memungkinkan dapat mencari pengguna dengan nama yang sama di server lain.",
+ "domain_pill.username": "Nama pengguna",
+ "domain_pill.whats_in_a_handle": "Apa itu nama pengguna?",
+ "domain_pill.who_they_are": "Karena nama pengguna menunjukkan siapa seseorang dan di mana server mereka berada, anda dapat berinteraksi dengan orang-orang di seluruh web sosial .",
+ "domain_pill.your_handle": "Nama pengguna anda:",
"embed.instructions": "Sematkan kiriman ini di situs web Anda dengan menyalin kode di bawah ini.",
"embed.preview": "Tampilan akan seperti ini nantinya:",
"emoji_button.activity": "Aktivitas",
@@ -260,6 +295,10 @@
"follow_request.authorize": "Izinkan",
"follow_request.reject": "Tolak",
"follow_requests.unlocked_explanation": "Meskipun akun Anda tidak dikunci, staf {domain} menyarankan Anda untuk meninjau permintaan mengikuti dari akun-akun ini secara manual.",
+ "follow_suggestions.curated_suggestion": "Pilihan staf",
+ "follow_suggestions.dismiss": "Jangan tampilkan lagi",
+ "follow_suggestions.hints.featured": "Profil ini telah dipilih sendiri oleh tim {domain}.",
+ "follow_suggestions.hints.friends_of_friends": "Profil ini populer di kalangan orang yang anda ikuti.",
"followed_tags": "Tagar yang diikuti",
"footer.about": "Tentang",
"footer.directory": "Direktori profil",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index a9b300fa4..90253743f 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -20,6 +20,7 @@
"column.bookmarks": "Ebenrụtụakā",
"column.home": "Be",
"column.lists": "Ndepụta",
+ "column.notifications": "Nziọkwà",
"column.pins": "Pinned post",
"column_header.pin": "Gbado na profaịlụ gị",
"column_subheading.settings": "Mwube",
@@ -42,17 +43,28 @@
"confirmations.reply.confirm": "Zaa",
"confirmations.unfollow.confirm": "Kwụsị iso",
"conversation.delete": "Hichapụ nkata",
+ "disabled_account_banner.account_settings": "Mwube akaụntụ",
"dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
"dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+ "domain_pill.username": "Ahaojiaru",
"embed.instructions": "Embed this status on your website by copying the code below.",
+ "emoji_button.activity": "Mmemme",
+ "emoji_button.label": "Tibanye emoji",
"emoji_button.search": "Chọọ...",
+ "emoji_button.symbols": "Ọdịmara",
"empty_column.account_timeline": "No posts found",
"empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
"empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
"errors.unexpected_crash.report_issue": "Kpesa nsogbu",
+ "explore.trending_links": "Akụkọ",
+ "firehose.all": "Ha niine",
+ "follow_request.authorize": "Nye ikike",
"footer.privacy_policy": "Iwu nzuzu",
"getting_started.heading": "Mbido",
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+ "home.column_settings.show_replies": "Gosi nzaghachị",
+ "home.hide_announcements": "Zoo ọkwa",
+ "home.show_announcements": "Gosi ọkwa",
"keyboard_shortcuts.back": "to navigate back",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "to boost",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 435f98f30..f5bf7c328 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "Jafnvel þótt aðgangurinn þinn sé ekki læstur, hafa umsjónarmenn {domain} ímyndað sér að þú gætir viljað yfirfara handvirkt fylgjendabeiðnir frá þessum notendum.",
"follow_suggestions.curated_suggestion": "Úrval starfsfólks",
"follow_suggestions.dismiss": "Ekki birta þetta aftur",
+ "follow_suggestions.featured_longer": "Handvalið af {domain}-teyminu",
+ "follow_suggestions.friends_of_friends_longer": "Vinsælt hjá fólki sem þú fylgist með",
"follow_suggestions.hints.featured": "Þetta notandasnið hefur verið handvalið af {domain}-teyminu.",
"follow_suggestions.hints.friends_of_friends": "Þetta notandasnið er vinsælt hjá fólki sem þú fylgist með.",
"follow_suggestions.hints.most_followed": "Þetta notandasnið er eitt af þeim sem mest er fylgst með á {domain}.",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "Þetta notandasnið er líkt þeim sniðum sem þú hefur valið að fylgjast með að undanförnu.",
"follow_suggestions.personalized_suggestion": "Persónuaðlöguð tillaga",
"follow_suggestions.popular_suggestion": "Vinsæl tillaga",
+ "follow_suggestions.popular_suggestion_longer": "Vinsælt á {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Svipar til notenda sem þú hefur nýlega farið að fylgjast með",
"follow_suggestions.view_all": "Skoða allt",
"follow_suggestions.who_to_follow": "Hverjum á að fylgjast með",
"followed_tags": "Myllumerki sem fylgst er með",
@@ -469,6 +473,15 @@
"notification.follow": "{name} fylgist með þér",
"notification.follow_request": "{name} hefur beðið um að fylgjast með þér",
"notification.mention": "{name} minntist á þig",
+ "notification.moderation-warning.learn_more": "Kanna nánar",
+ "notification.moderation_warning": "Þú hefur fengið aðvörun frá umsjónarmanni",
+ "notification.moderation_warning.action_delete_statuses": "Sumar færslurnar þínar hafa verið fjarlægðar.",
+ "notification.moderation_warning.action_disable": "Aðgangurinn þinn hefur verið gerður óvirkur.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Sumar færslurnar þínar hafa verið merktar sem viðkvæmt efni.",
+ "notification.moderation_warning.action_none": "Aðgangurinn þinn hefur fengið aðvörun frá umsjónarmanni.",
+ "notification.moderation_warning.action_sensitive": "Færslur þínar á verða héðan í frá merktar sem viðkvæmar.",
+ "notification.moderation_warning.action_silence": "Notandaaðgangurinn þinn hefur verið takmarkaður.",
+ "notification.moderation_warning.action_suspend": "Notandaaðgangurinn þinn hefur verið settur í frysti.",
"notification.own_poll": "Könnuninni þinni er lokið",
"notification.poll": "Könnun sem þú tókst þátt í er lokið",
"notification.reblog": "{name} endurbirti færsluna þína",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index fcfd09d75..8ab5db1b1 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "Anche se il tuo profilo non è privato, lo staff di {domain} ha pensato che potresti voler revisionare manualmente le richieste di seguirti da questi profili.",
"follow_suggestions.curated_suggestion": "Scelta personale",
"follow_suggestions.dismiss": "Non visualizzare più",
+ "follow_suggestions.featured_longer": "Selezionato personalmente dal team di {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popolare tra le persone che segui",
"follow_suggestions.hints.featured": "Questo profilo è stato selezionato personalmente dal team di {domain}.",
"follow_suggestions.hints.friends_of_friends": "Questo profilo è popolare tra le persone che segui.",
"follow_suggestions.hints.most_followed": "Questo profilo è uno dei più seguiti su {domain}.",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "Questo profilo è simile ai profili che hai seguito più recentemente.",
"follow_suggestions.personalized_suggestion": "Suggerimenti personalizzati",
"follow_suggestions.popular_suggestion": "Suggerimento frequente",
+ "follow_suggestions.popular_suggestion_longer": "Popolare su {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Simile ai profili che hai seguito di recente",
"follow_suggestions.view_all": "Vedi tutto",
"follow_suggestions.who_to_follow": "Chi seguire",
"followed_tags": "Hashtag seguiti",
@@ -469,6 +473,15 @@
"notification.follow": "{name} ha iniziato a seguirti",
"notification.follow_request": "{name} ha richiesto di seguirti",
"notification.mention": "{name} ti ha menzionato",
+ "notification.moderation-warning.learn_more": "Scopri di più",
+ "notification.moderation_warning": "Hai ricevuto un avviso di moderazione",
+ "notification.moderation_warning.action_delete_statuses": "Alcuni dei tuoi post sono stati rimossi.",
+ "notification.moderation_warning.action_disable": "Il tuo account è stato disattivato.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcuni dei tuoi post sono stati contrassegnati come sensibili.",
+ "notification.moderation_warning.action_none": "Il tuo account ha ricevuto un avviso di moderazione.",
+ "notification.moderation_warning.action_sensitive": "I tuoi post d'ora in poi saranno contrassegnati come sensibili.",
+ "notification.moderation_warning.action_silence": "Il tuo account è stato limitato.",
+ "notification.moderation_warning.action_suspend": "Il tuo account è stato sospeso.",
"notification.own_poll": "Il tuo sondaggio è terminato",
"notification.poll": "Un sondaggio in cui hai votato è terminato",
"notification.reblog": "{name} ha rebloggato il tuo post",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 30c9eb77a..f20d93753 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -298,7 +298,7 @@
"filter_modal.select_filter.title": "この投稿をフィルターする",
"filter_modal.title.status": "投稿をフィルターする",
"filtered_notifications_banner.mentions": "{count, plural, one {メンション} other {メンション}}",
- "filtered_notifications_banner.pending_requests": "{count, plural, =0 {アカウント} other {#アカウント}}からの通知がブロックされています",
+ "filtered_notifications_banner.pending_requests": "{count, plural, =0 {通知がブロックされているアカウントはありません} other {#アカウントからの通知がブロックされています}}",
"filtered_notifications_banner.title": "ブロック済みの通知",
"firehose.all": "すべて",
"firehose.local": "このサーバー",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 46d1f9783..1958e4a6a 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -308,13 +308,17 @@
"follow_requests.unlocked_explanation": "Ook al is jouw account niet besloten, de medewerkers van {domain} denken dat jij misschien de volgende volgverzoeken handmatig wil controleren.",
"follow_suggestions.curated_suggestion": "Speciaal geselecteerd",
"follow_suggestions.dismiss": "Niet meer weergeven",
- "follow_suggestions.hints.featured": "Deze gebruiker is geselecteerd door het team van {domain}.",
+ "follow_suggestions.featured_longer": "Handmatig geselecteerd door het team van {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Populair onder mensen die je volgt",
+ "follow_suggestions.hints.featured": "Deze gebruiker is handmatig geselecteerd door het team van {domain}.",
"follow_suggestions.hints.friends_of_friends": "Deze gebruiker is populair onder de mensen die jij volgt.",
"follow_suggestions.hints.most_followed": "Deze gebruiker is een van de meest gevolgde gebruikers op {domain}.",
"follow_suggestions.hints.most_interactions": "Deze gebruiker is de laatste tijd erg populair op {domain}.",
"follow_suggestions.hints.similar_to_recently_followed": "Deze gebruiker is vergelijkbaar met gebruikers die je recentelijk hebt gevolgd.",
"follow_suggestions.personalized_suggestion": "Gepersonaliseerde aanbeveling",
"follow_suggestions.popular_suggestion": "Populaire aanbeveling",
+ "follow_suggestions.popular_suggestion_longer": "Populair op {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Vergelijkbaar met accounts die je recentelijk bent gaan volgen",
"follow_suggestions.view_all": "Alles weergeven",
"follow_suggestions.who_to_follow": "Wie te volgen",
"followed_tags": "Gevolgde hashtags",
@@ -469,6 +473,15 @@
"notification.follow": "{name} volgt jou nu",
"notification.follow_request": "{name} wil jou graag volgen",
"notification.mention": "{name} vermeldde jou",
+ "notification.moderation-warning.learn_more": "Meer informatie",
+ "notification.moderation_warning": "Je hebt een moderatie-waarschuwing ontvangen",
+ "notification.moderation_warning.action_delete_statuses": "Sommige van je berichten zijn verwijderd.",
+ "notification.moderation_warning.action_disable": "Je account is uitgeschakeld.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Sommige van je berichten zijn gemarkeerd als gevoelig.",
+ "notification.moderation_warning.action_none": "Jouw account heeft een moderatie-waarschuwing ontvangen.",
+ "notification.moderation_warning.action_sensitive": "Je berichten worden vanaf nu als gevoelig gemarkeerd.",
+ "notification.moderation_warning.action_silence": "Jouw account is beperkt.",
+ "notification.moderation_warning.action_suspend": "Jouw account is opgeschort.",
"notification.own_poll": "Jouw peiling is beëindigd",
"notification.poll": "Een peiling waaraan jij hebt meegedaan is beëindigd",
"notification.reblog": "{name} boostte jouw bericht",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 2cfb0d124..14b355233 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -468,6 +468,15 @@
"notification.follow": "{name} fylgde deg",
"notification.follow_request": "{name} har bedt om å fylgja deg",
"notification.mention": "{name} nemnde deg",
+ "notification.moderation-warning.learn_more": "Lær meir",
+ "notification.moderation_warning": "Du har mottatt ei moderasjonsåtvaring",
+ "notification.moderation_warning.action_delete_statuses": "Nokre av innlegga dine har blitt fjerna.",
+ "notification.moderation_warning.action_disable": "Kontoen din har blitt deaktivert.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nokre av innlegga dine har blitt markert som sensitive.",
+ "notification.moderation_warning.action_none": "Kontoen din har mottatt ei moderasjonsåtvaring.",
+ "notification.moderation_warning.action_sensitive": "Innlegga dine vil bli markerte som sensitive frå no av.",
+ "notification.moderation_warning.action_silence": "Kontoen din har blitt avgrensa.",
+ "notification.moderation_warning.action_suspend": "Kontoen din har blitt suspendert.",
"notification.own_poll": "Rundspørjinga di er ferdig",
"notification.poll": "Ei rundspørjing du har røysta i er ferdig",
"notification.reblog": "{name} framheva innlegget ditt",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 72f1ba58f..b763f740a 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "Mimo że Twoje konto nie jest zablokowane, zespół {domain} uznał że możesz chcieć ręcznie przejrzeć prośby o możliwość obserwacji.",
"follow_suggestions.curated_suggestion": "Wybrane przez personel",
"follow_suggestions.dismiss": "Nie pokazuj ponownie",
+ "follow_suggestions.featured_longer": "Wybrane przez zespół {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popularni wśród ludzi których obserwujesz",
"follow_suggestions.hints.featured": "Ten profil został wybrany przez zespół {domain}.",
"follow_suggestions.hints.friends_of_friends": "Ten profil jest popularny w gronie użytkowników, których obserwujesz.",
"follow_suggestions.hints.most_followed": "Ten profil jest jednym z najczęściej obserwowanych na {domain}.",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "Ten profil jest podobny do profili ostatnio przez ciebie zaobserwowanych.",
"follow_suggestions.personalized_suggestion": "Sugestia spersonalizowana",
"follow_suggestions.popular_suggestion": "Sugestia popularna",
+ "follow_suggestions.popular_suggestion_longer": "Popularni na {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Podobne do ostatnio zaobserwowanych przez ciebie profilów",
"follow_suggestions.view_all": "Pokaż wszystkie",
"follow_suggestions.who_to_follow": "Kogo obserwować",
"followed_tags": "Obserwowane hasztagi",
@@ -469,6 +473,15 @@
"notification.follow": "{name} obserwuje Cię",
"notification.follow_request": "{name} chce cię zaobserwować",
"notification.mention": "Wspomniało o Tobie przez {name}",
+ "notification.moderation-warning.learn_more": "Dowiedz się więcej",
+ "notification.moderation_warning": "Otrzymałeś/-łaś ostrzeżenie moderacyjne",
+ "notification.moderation_warning.action_delete_statuses": "Niektóre twoje wpisy zostały usunięte.",
+ "notification.moderation_warning.action_disable": "Twoje konto zostało wyłączone.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Niektóre twoje wpisy zostały oznaczone jako wrażliwe.",
+ "notification.moderation_warning.action_none": "Twoje konto otrzymało ostrzeżenie moderacyjne.",
+ "notification.moderation_warning.action_sensitive": "Twoje wpisy będą od teraz oznaczane jako wrażliwe.",
+ "notification.moderation_warning.action_silence": "Twoje konto zostało ograniczone.",
+ "notification.moderation_warning.action_suspend": "Twoje konto zostało zawieszone.",
"notification.own_poll": "Twoje głosowanie zakończyło się",
"notification.poll": "Głosowanie w którym brałeś(-aś) udział zakończyło się",
"notification.reblog": "Twój post został podbity przez {name}",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 1bb73db23..6bda11058 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -297,6 +297,7 @@
"filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
"filter_modal.select_filter.title": "Filtrar esta publicação",
"filter_modal.title.status": "Filtrar uma publicação",
+ "filtered_notifications_banner.mentions": "{count, plural, one {menção} other {menções}}",
"filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {no one} one {one person} other {# people}} que você talvez conheça",
"filtered_notifications_banner.title": "Notificações filtradas",
"firehose.all": "Tudo",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 7e98cde5f..70903065d 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "Apesar de a sua não ser privada, a administração de {domain} pensa que poderá querer rever manualmente os pedidos de seguimento dessas contas.",
"follow_suggestions.curated_suggestion": "Escolha da equipe",
"follow_suggestions.dismiss": "Não mostrar novamente",
+ "follow_suggestions.featured_longer": "Escolhido a dedo pela equipa de {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Popular entre as pessoas que segue",
"follow_suggestions.hints.featured": "Este perfil foi escolhido a dedo pela equipe {domain}.",
"follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as pessoas que você segue.",
"follow_suggestions.hints.most_followed": "Este perfil é um dos mais seguidos no {domain}.",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "Este perfil é semelhante aos perfis que você seguiu mais recentemente.",
"follow_suggestions.personalized_suggestion": "Sugestão personalizada",
"follow_suggestions.popular_suggestion": "Sugestão popular",
+ "follow_suggestions.popular_suggestion_longer": "Popular em {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Semelhantes aos perfis que seguiu recentemente",
"follow_suggestions.view_all": "Ver tudo",
"follow_suggestions.who_to_follow": "Quem seguir",
"followed_tags": "Hashtags seguidas",
@@ -469,6 +473,15 @@
"notification.follow": "{name} começou a seguir-te",
"notification.follow_request": "{name} pediu para segui-lo",
"notification.mention": "{name} mencionou-te",
+ "notification.moderation-warning.learn_more": "Saber mais",
+ "notification.moderation_warning": "Recebeu um aviso de moderação",
+ "notification.moderation_warning.action_delete_statuses": "Algumas das suas publicações foram removidas.",
+ "notification.moderation_warning.action_disable": "A sua conta foi desativada.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algumas das suas publicações foram assinaladas como sensíveis.",
+ "notification.moderation_warning.action_none": "A sua conta recebeu um aviso de moderação.",
+ "notification.moderation_warning.action_sensitive": "As suas publicações serão, a partir de agora, assinaladas como sensíveis.",
+ "notification.moderation_warning.action_silence": "A sua conta foi limitada.",
+ "notification.moderation_warning.action_suspend": "A sua conta foi suspensa.",
"notification.own_poll": "A sua votação terminou",
"notification.poll": "Uma votação em que participaste chegou ao fim",
"notification.reblog": "{name} reforçou a tua publicação",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 80c203112..c2dd5297d 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -468,6 +468,11 @@
"notification.follow": "{name} följer dig",
"notification.follow_request": "{name} har begärt att följa dig",
"notification.mention": "{name} nämnde dig",
+ "notification.moderation-warning.learn_more": "Läs mer",
+ "notification.moderation_warning.action_delete_statuses": "Några av dina inlägg har tagits bort.",
+ "notification.moderation_warning.action_disable": "Ditt konto har inaktiverats.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Några av dina inlägg har markerats som känsliga.",
+ "notification.moderation_warning.action_silence": "Ditt konto har begränsats.",
"notification.own_poll": "Din röstning har avslutats",
"notification.poll": "En omröstning du röstat i har avslutats",
"notification.reblog": "{name} boostade ditt inlägg",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 83fa72338..ab6fe0bd7 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "尽管你没有锁嘟,但是 {domain} 的工作人员认为你也许会想手动审核审核这些账号的关注请求。",
"follow_suggestions.curated_suggestion": "站务人员精选",
"follow_suggestions.dismiss": "不再显示",
+ "follow_suggestions.featured_longer": "由 {domain} 管理团队精选",
+ "follow_suggestions.friends_of_friends_longer": "在你关注的人中很受欢迎",
"follow_suggestions.hints.featured": "该用户已被 {domain} 管理团队精选。",
"follow_suggestions.hints.friends_of_friends": "该用户在您关注的人中很受欢迎。",
"follow_suggestions.hints.most_followed": "该用户是 {domain} 上关注度最高的用户之一。",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "该用户与您最近关注的用户类似。",
"follow_suggestions.personalized_suggestion": "个性化建议",
"follow_suggestions.popular_suggestion": "热门建议",
+ "follow_suggestions.popular_suggestion_longer": "在 {domain} 上很受欢迎",
+ "follow_suggestions.similar_to_recently_followed_longer": "与你近期关注的用户相似",
"follow_suggestions.view_all": "查看全部",
"follow_suggestions.who_to_follow": "推荐关注",
"followed_tags": "关注的话题标签",
@@ -469,6 +473,15 @@
"notification.follow": "{name} 开始关注你",
"notification.follow_request": "{name} 向你发送了关注请求",
"notification.mention": "{name} 提及了你",
+ "notification.moderation-warning.learn_more": "了解更多",
+ "notification.moderation_warning": "你收到了一条管理警告",
+ "notification.moderation_warning.action_delete_statuses": "你的一些嘟文已被移除。",
+ "notification.moderation_warning.action_disable": "你的账号已被禁用。",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "你的一些嘟文已被标记为敏感内容。",
+ "notification.moderation_warning.action_none": "你的账号收到了管理警告。",
+ "notification.moderation_warning.action_sensitive": "今后你的嘟文都会被标记为敏感内容。",
+ "notification.moderation_warning.action_silence": "你的账号已被限制。",
+ "notification.moderation_warning.action_suspend": "你的账号已被封禁.",
"notification.own_poll": "你的投票已经结束",
"notification.poll": "你参与的一个投票已经结束",
"notification.reblog": "{name} 转发了你的嘟文",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 0b328c738..3ca9a8d11 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -297,6 +297,7 @@
"filter_modal.select_filter.subtitle": "使用既有類別,或創建一個新類別",
"filter_modal.select_filter.title": "過濾此帖文",
"filter_modal.title.status": "過濾一則帖文",
+ "filtered_notifications_banner.mentions": "{count, plural, one {則提及} other {則提及}}",
"filtered_notifications_banner.pending_requests": "來自 {count, plural, =0 {0 位} other {# 位}}你可能認識的人的通知",
"filtered_notifications_banner.title": "已過濾之通知",
"firehose.all": "全部",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 33a7070a5..f00d62c07 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -308,6 +308,8 @@
"follow_requests.unlocked_explanation": "即便您的帳號未被鎖定,{domain} 的管理員認為您可能想要自己審核這些帳號的跟隨請求。",
"follow_suggestions.curated_suggestion": "精選內容",
"follow_suggestions.dismiss": "不再顯示",
+ "follow_suggestions.featured_longer": "{domain} 團隊精選",
+ "follow_suggestions.friends_of_friends_longer": "受您跟隨之使用者愛戴的風雲人物",
"follow_suggestions.hints.featured": "這個個人檔案是 {domain} 管理團隊精心挑選。",
"follow_suggestions.hints.friends_of_friends": "這個個人檔案於您跟隨的帳號中很受歡迎。",
"follow_suggestions.hints.most_followed": "這個個人檔案是 {domain} 中最受歡迎的帳號之一。",
@@ -315,6 +317,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "這個個人檔案與您最近跟隨之帳號類似。",
"follow_suggestions.personalized_suggestion": "個人化推薦",
"follow_suggestions.popular_suggestion": "熱門推薦",
+ "follow_suggestions.popular_suggestion_longer": "{domain} 上的人氣王",
+ "follow_suggestions.similar_to_recently_followed_longer": "與您近日跟隨相近之帳號",
"follow_suggestions.view_all": "檢視全部",
"follow_suggestions.who_to_follow": "推薦跟隨帳號",
"followed_tags": "已跟隨主題標籤",
@@ -469,6 +473,15 @@
"notification.follow": "{name} 已跟隨您",
"notification.follow_request": "{name} 要求跟隨您",
"notification.mention": "{name} 已提到您",
+ "notification.moderation-warning.learn_more": "了解更多",
+ "notification.moderation_warning": "您已收到管理員警告",
+ "notification.moderation_warning.action_delete_statuses": "某些您的嘟文已被刪除。",
+ "notification.moderation_warning.action_disable": "您的帳號已被停用。",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "某些您的嘟文已被標記為敏感內容。",
+ "notification.moderation_warning.action_none": "您的帳號已收到管理員警告。",
+ "notification.moderation_warning.action_sensitive": "即日起,您的嘟文將會被標記為敏感內容。",
+ "notification.moderation_warning.action_silence": "您的帳號已被限制。",
+ "notification.moderation_warning.action_suspend": "您的帳號已被停權。",
"notification.own_poll": "您的投票已結束",
"notification.poll": "您曾投過的投票已經結束",
"notification.reblog": "{name} 已轉嘟您的嘟文",
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 7230fabca..64cddcb66 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -56,6 +56,7 @@ export const notificationToMap = notification => ImmutableMap({
status: notification.status ? notification.status.id : null,
report: notification.report ? fromJS(notification.report) : null,
event: notification.event ? fromJS(notification.event) : null,
+ moderation_warning: notification.moderation_warning ? fromJS(notification.moderation_warning) : null,
});
const normalizeNotification = (state, notification, usePendingItems) => {
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index fadd77d13..06a3b5202 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -10,6 +10,13 @@ $content-width: 840px;
width: 100%;
min-height: 100vh;
+ .icon {
+ width: 16px;
+ height: 16px;
+ vertical-align: middle;
+ margin: 0 2px;
+ }
+
.sidebar-wrapper {
min-height: 100vh;
overflow: hidden;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 87e13ee45..9cb03bedf 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2015,7 +2015,22 @@ a .account__avatar {
white-space: nowrap;
display: flex;
align-items: center;
- gap: 4px;
+ gap: 8px;
+}
+
+.account__relationship,
+.explore__suggestions__card {
+ .icon-button {
+ border: 1px solid var(--background-border-color);
+ border-radius: 4px;
+ box-sizing: content-box;
+ padding: 5px;
+
+ .icon {
+ width: 24px;
+ height: 24px;
+ }
+ }
}
.account-authorize {
@@ -2165,7 +2180,8 @@ a.account__display-name {
}
}
-.notification__relationships-severance-event {
+.notification__relationships-severance-event,
+.notification__moderation-warning {
display: flex;
gap: 16px;
color: $secondary-text-color;
@@ -2952,6 +2968,75 @@ $ui-header-logo-wordmark-width: 99px;
display: none;
}
+.explore__suggestions__card {
+ padding: 12px 16px;
+ gap: 8px;
+ display: flex;
+ flex-direction: column;
+ border-bottom: 1px solid var(--background-border-color);
+
+ &:last-child {
+ border-bottom: 0;
+ }
+
+ &__source {
+ padding-inline-start: 60px;
+ font-size: 13px;
+ line-height: 16px;
+ color: $dark-text-color;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ }
+
+ &__body {
+ display: flex;
+ gap: 12px;
+ align-items: center;
+
+ &__main {
+ flex: 1 1 auto;
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+ min-width: 0;
+
+ &__name-button {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+
+ &__name {
+ display: block;
+ color: inherit;
+ text-decoration: none;
+ flex: 1 1 auto;
+ min-width: 0;
+ }
+
+ .button {
+ min-width: 80px;
+ }
+
+ .display-name {
+ font-size: 15px;
+ line-height: 20px;
+ color: $secondary-text-color;
+
+ strong {
+ font-weight: 700;
+ }
+
+ &__account {
+ color: $darker-text-color;
+ display: block;
+ }
+ }
+ }
+ }
+ }
+}
+
@media screen and (max-width: $no-gap-breakpoint - 1px) {
.columns-area__panels__pane--compositional {
display: none;
@@ -7281,10 +7366,11 @@ a.status-card {
content: '';
position: absolute;
bottom: -1px;
- left: 0;
- width: 100%;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 40px;
height: 3px;
- border-radius: 4px;
+ border-radius: 4px 4px 0 0;
background: $highlight-text-color;
}
}
diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index bb031986d..bec7d3a45 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -156,7 +156,7 @@ class LinkDetailsExtractor
end
def title
- html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first)
+ html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first).strip
end
def description
diff --git a/app/models/account_moderation_note.rb b/app/models/account_moderation_note.rb
index ff399bab0..ad49b2422 100644
--- a/app/models/account_moderation_note.rb
+++ b/app/models/account_moderation_note.rb
@@ -13,10 +13,12 @@
#
class AccountModerationNote < ApplicationRecord
+ CONTENT_SIZE_LIMIT = 500
+
belongs_to :account
belongs_to :target_account, class_name: 'Account'
scope :latest, -> { reorder('created_at DESC') }
- validates :content, presence: true, length: { maximum: 500 }
+ validates :content, presence: true, length: { maximum: CONTENT_SIZE_LIMIT }
end
diff --git a/app/models/account_note.rb b/app/models/account_note.rb
index 9bc704d98..317e6873f 100644
--- a/app/models/account_note.rb
+++ b/app/models/account_note.rb
@@ -14,9 +14,11 @@
class AccountNote < ApplicationRecord
include RelationshipCacheable
+ COMMENT_SIZE_LIMIT = 2_000
+
belongs_to :account
belongs_to :target_account, class_name: 'Account'
validates :account_id, uniqueness: { scope: :target_account_id }
- validates :comment, length: { maximum: 2_000 }
+ validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }
end
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index 2b5560e2e..3700ce4cd 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -52,7 +52,7 @@ class Admin::AccountAction
process_reports!
end
- process_email!
+ process_notification!
process_queue!
end
@@ -158,8 +158,11 @@ class Admin::AccountAction
queue_suspension_worker! if type == 'suspend'
end
- def process_email!
- UserMailer.warning(target_account.user, warning).deliver_later! if warnable?
+ def process_notification!
+ return unless warnable?
+
+ UserMailer.warning(target_account.user, warning).deliver_later!
+ LocalNotificationWorker.perform_async(target_account.id, warning.id, 'AccountWarning', 'moderation_warning')
end
def warnable?
diff --git a/app/models/admin/status_batch_action.rb b/app/models/admin/status_batch_action.rb
index 8a8e2fa37..4a1000193 100644
--- a/app/models/admin/status_batch_action.rb
+++ b/app/models/admin/status_batch_action.rb
@@ -65,7 +65,8 @@ class Admin::StatusBatchAction
statuses.each { |status| Tombstone.find_or_create_by(uri: status.uri, account: status.account, by_moderator: true) } unless target_account.local?
end
- UserMailer.warning(target_account.user, @warning).deliver_later! if warnable?
+ process_notification!
+
RemovalWorker.push_bulk(status_ids) { |status_id| [status_id, { 'preserve' => target_account.local?, 'immediate' => !target_account.local? }] }
end
@@ -101,7 +102,7 @@ class Admin::StatusBatchAction
text: text
)
- UserMailer.warning(target_account.user, @warning).deliver_later! if warnable?
+ process_notification!
end
def handle_report!
@@ -127,6 +128,13 @@ class Admin::StatusBatchAction
!report.nil?
end
+ def process_notification!
+ return unless warnable?
+
+ UserMailer.warning(target_account.user, @warning).deliver_later!
+ LocalNotificationWorker.perform_async(target_account.id, @warning.id, 'AccountWarning', 'moderation_warning')
+ end
+
def warnable?
send_email_notification && target_account.local?
end
diff --git a/app/models/invite.rb b/app/models/invite.rb
index c0cbc5845..2fe9f22fb 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -19,12 +19,14 @@
class Invite < ApplicationRecord
include Expireable
+ COMMENT_SIZE_LIMIT = 420
+
belongs_to :user, inverse_of: :invites
has_many :users, inverse_of: :invite, dependent: nil
scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) }
- validates :comment, length: { maximum: 420 }
+ validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }
before_validation :set_code
diff --git a/app/models/notification.rb b/app/models/notification.rb
index b2376c78a..7e0e62683 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -57,6 +57,9 @@ class Notification < ApplicationRecord
severed_relationships: {
filterable: false,
}.freeze,
+ moderation_warning: {
+ filterable: false,
+ }.freeze,
'admin.sign_up': {
filterable: false,
}.freeze,
@@ -90,6 +93,7 @@ class Notification < ApplicationRecord
belongs_to :poll, inverse_of: false
belongs_to :report, inverse_of: false
belongs_to :account_relationship_severance_event, inverse_of: false
+ belongs_to :account_warning, inverse_of: false
end
validates :type, inclusion: { in: TYPES }
@@ -180,7 +184,7 @@ class Notification < ApplicationRecord
return unless new_record?
case activity_type
- when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report'
+ when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report', 'AccountWarning'
self.from_account_id = activity&.account_id
when 'Mention'
self.from_account_id = activity&.status&.account_id
diff --git a/app/models/report.rb b/app/models/report.rb
index df7e3d2ef..3df5a20e1 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -26,6 +26,8 @@ class Report < ApplicationRecord
include Paginable
include RateLimitable
+ COMMENT_SIZE_LIMIT = 1_000
+
rate_limit by: :account, family: :reports
belongs_to :account
@@ -46,7 +48,7 @@ class Report < ApplicationRecord
# A report is considered local if the reporter is local
delegate :local?, to: :account
- validates :comment, length: { maximum: 1_000 }, if: :local?
+ validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }, if: :local?
validates :rule_ids, absence: true, if: -> { (category_changed? || rule_ids_changed?) && !violation? }
validate :validate_rule_ids, if: -> { (category_changed? || rule_ids_changed?) && violation? }
diff --git a/app/models/report_note.rb b/app/models/report_note.rb
index 74b46027e..b5c40a18b 100644
--- a/app/models/report_note.rb
+++ b/app/models/report_note.rb
@@ -13,10 +13,12 @@
#
class ReportNote < ApplicationRecord
+ CONTENT_SIZE_LIMIT = 500
+
belongs_to :account
belongs_to :report, inverse_of: :notes, touch: true
scope :latest, -> { reorder(created_at: :desc) }
- validates :content, presence: true, length: { maximum: 500 }
+ validates :content, presence: true, length: { maximum: CONTENT_SIZE_LIMIT }
end
diff --git a/app/models/rule.rb b/app/models/rule.rb
index f28dc2ffe..99a36397a 100644
--- a/app/models/rule.rb
+++ b/app/models/rule.rb
@@ -15,9 +15,11 @@
class Rule < ApplicationRecord
include Discard::Model
+ TEXT_SIZE_LIMIT = 300
+
self.discard_column = :deleted_at
- validates :text, presence: true, length: { maximum: 300 }
+ validates :text, presence: true, length: { maximum: TEXT_SIZE_LIMIT }
scope :ordered, -> { kept.order(priority: :asc, id: :asc) }
end
diff --git a/app/models/user_invite_request.rb b/app/models/user_invite_request.rb
index 2b76c88b9..9dd677516 100644
--- a/app/models/user_invite_request.rb
+++ b/app/models/user_invite_request.rb
@@ -12,6 +12,8 @@
#
class UserInviteRequest < ApplicationRecord
+ TEXT_SIZE_LIMIT = 420
+
belongs_to :user, inverse_of: :invite_request
- validates :text, presence: true, length: { maximum: 420 }
+ validates :text, presence: true, length: { maximum: TEXT_SIZE_LIMIT }
end
diff --git a/app/serializers/rest/account_warning_serializer.rb b/app/serializers/rest/account_warning_serializer.rb
new file mode 100644
index 000000000..a0ef341d2
--- /dev/null
+++ b/app/serializers/rest/account_warning_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class REST::AccountWarningSerializer < ActiveModel::Serializer
+ attributes :id, :action, :text, :status_ids, :created_at
+
+ has_one :target_account, serializer: REST::AccountSerializer
+ has_one :appeal, serializer: REST::AppealSerializer
+
+ def id
+ object.id.to_s
+ end
+
+ def status_ids
+ object&.status_ids&.map(&:to_s)
+ end
+end
diff --git a/app/serializers/rest/appeal_serializer.rb b/app/serializers/rest/appeal_serializer.rb
new file mode 100644
index 000000000..a24cabc27
--- /dev/null
+++ b/app/serializers/rest/appeal_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class REST::AppealSerializer < ActiveModel::Serializer
+ attributes :text, :state
+
+ def state
+ if object.approved?
+ 'approved'
+ elsif object.rejected?
+ 'rejected'
+ else
+ 'pending'
+ end
+ end
+end
diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index 36a0adfec..417245d19 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -7,6 +7,7 @@ class REST::NotificationSerializer < ActiveModel::Serializer
belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
belongs_to :account_relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer
+ belongs_to :account_warning, key: :moderation_warning, if: :moderation_warning_event?, serializer: REST::AccountWarningSerializer
def id
object.id.to_s
@@ -23,4 +24,8 @@ class REST::NotificationSerializer < ActiveModel::Serializer
def relationship_severance_event?
object.type == :severed_relationships
end
+
+ def moderation_warning_event?
+ object.type == :moderation_warning
+ end
end
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index c83e4c017..e56562c0a 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -9,6 +9,7 @@ class NotifyService < BaseService
update
poll
status
+ moderation_warning
# TODO: this probably warrants an email notification
severed_relationships
).freeze
@@ -22,7 +23,7 @@ class NotifyService < BaseService
def dismiss?
blocked = @recipient.unavailable?
- blocked ||= from_self? && @notification.type != :poll && @notification.type != :severed_relationships
+ blocked ||= from_self? && %i(poll severed_relationships moderation_warning).exclude?(@notification.type)
return blocked if message? && from_staff?
@@ -75,6 +76,7 @@ class NotifyService < BaseService
admin.report
poll
update
+ account_warning
).freeze
def initialize(notification)
diff --git a/app/views/admin/account_warnings/_account_warning.html.haml b/app/views/admin/account_warnings/_account_warning.html.haml
index 5702e4f6d..368e69e63 100644
--- a/app/views/admin/account_warnings/_account_warning.html.haml
+++ b/app/views/admin/account_warnings/_account_warning.html.haml
@@ -2,7 +2,7 @@
.log-entry__header
.log-entry__avatar
.indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' }
- = fa_icon 'warning'
+ = material_symbol 'warning'
.log-entry__content
.log-entry__title
= t(account_warning.action,
diff --git a/app/views/admin/accounts/_remote_account.html.haml b/app/views/admin/accounts/_remote_account.html.haml
index 99996e1d4..6755af249 100644
--- a/app/views/admin/accounts/_remote_account.html.haml
+++ b/app/views/admin/accounts/_remote_account.html.haml
@@ -2,14 +2,14 @@
%th= t('admin.accounts.inbox_url')
%td
= account.inbox_url
- = fa_icon DeliveryFailureTracker.available?(account.inbox_url) ? 'check' : 'times'
+ = material_symbol DeliveryFailureTracker.available?(account.inbox_url) ? 'check' : 'close'
%td
= table_link_to 'search', domain_block.present? ? t('admin.domain_blocks.view') : t('admin.accounts.view_domain'), admin_instance_path(account.domain)
%tr
%th= t('admin.accounts.shared_inbox_url')
%td
= account.shared_inbox_url
- = fa_icon DeliveryFailureTracker.available?(account.shared_inbox_url) ? 'check' : 'times'
+ = material_symbol DeliveryFailureTracker.available?(account.shared_inbox_url) ? 'check' : 'close'
%td
- if domain_block.nil?
= table_link_to 'ban', t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: account.domain)
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 0ca457f39..01b072938 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -53,19 +53,19 @@
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- if @accounts.any?(&:user_pending?)
- = f.button safe_join([fa_icon('check'), t('admin.accounts.approve')]),
+ = f.button safe_join([material_symbol('check'), t('admin.accounts.approve')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :approve,
type: :submit
- = f.button safe_join([fa_icon('times'), t('admin.accounts.reject')]),
+ = f.button safe_join([material_symbol('close'), t('admin.accounts.reject')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :reject,
type: :submit
- = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]),
+ = f.button safe_join([material_symbol('lock'), t('admin.accounts.perform_full_suspension')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :suspend,
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index d380d807a..41fcafa29 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -20,7 +20,7 @@
%dd{ title: field.value, class: custom_field_classes(field) }
- if field.verified?
%span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) }
- = fa_icon 'check'
+ = material_symbol 'check'
= prerender_custom_emojis(account_field_value_format(field, with_rel_me: false), account.emojis)
- if account.note.present?
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml
index bea6a7cd2..e87dd4128 100644
--- a/app/views/admin/custom_emojis/index.html.haml
+++ b/app/views/admin/custom_emojis/index.html.haml
@@ -48,19 +48,19 @@
- if params[:local] == '1'
= f.button safe_join([fa_icon('save'), t('generic.save_changes')]), name: :update, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- = f.button safe_join([fa_icon('eye'), t('admin.custom_emojis.list')]), name: :list, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('visibility'), t('admin.custom_emojis.list')]), name: :list, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- = f.button safe_join([fa_icon('eye-slash'), t('admin.custom_emojis.unlist')]), name: :unlist, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('visibility_off'), t('admin.custom_emojis.unlist')]), name: :unlist, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
= f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.enable')]), name: :enable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
= f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.disable')]), name: :disable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- if can?(:destroy, :custom_emoji)
- = f.button safe_join([fa_icon('times'), t('admin.custom_emojis.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('close'), t('admin.custom_emojis.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- if can?(:copy, :custom_emoji) && params[:local] != '1'
- = f.button safe_join([fa_icon('copy'), t('admin.custom_emojis.copy')]), name: :copy, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+ = f.button safe_join([material_symbol('content_copy'), t('admin.custom_emojis.copy')]), name: :copy, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- if params[:local] == '1'
.batch-table__form.simple_form
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 8a8099278..8430dd3c4 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -57,19 +57,19 @@
.dashboard__item
= link_to admin_reports_path, class: 'dashboard__quick-access' do
%span= t('admin.dashboard.pending_reports_html', count: @pending_reports_count)
- = fa_icon 'chevron-right fw'
+ = material_symbol 'chevron_right'
= link_to admin_accounts_path(status: 'pending'), class: 'dashboard__quick-access' do
%span= t('admin.dashboard.pending_users_html', count: @pending_users_count)
- = fa_icon 'chevron-right fw'
+ = material_symbol 'chevron_right'
= link_to admin_trends_tags_path(status: 'pending_review'), class: 'dashboard__quick-access' do
%span= t('admin.dashboard.pending_tags_html', count: @pending_tags_count)
- = fa_icon 'chevron-right fw'
+ = material_symbol 'chevron_right'
= link_to admin_disputes_appeals_path(status: 'pending'), class: 'dashboard__quick-access' do
%span= t('admin.dashboard.pending_appeals_html', count: @pending_appeals_count)
- = fa_icon 'chevron-right fw'
+ = material_symbol 'chevron_right'
.dashboard__item
= react_admin_component :dimension,
dimension: 'sources',
diff --git a/app/views/admin/email_domain_blocks/index.html.haml b/app/views/admin/email_domain_blocks/index.html.haml
index 59036f899..684735c20 100644
--- a/app/views/admin/email_domain_blocks/index.html.haml
+++ b/app/views/admin/email_domain_blocks/index.html.haml
@@ -12,7 +12,7 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('times'), t('admin.email_domain_blocks.delete')]),
+ = f.button safe_join([material_symbol('close'), t('admin.email_domain_blocks.delete')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :delete,
diff --git a/app/views/admin/export_domain_blocks/_domain_block.html.haml b/app/views/admin/export_domain_blocks/_domain_block.html.haml
index cdce4fd28..79cc5595c 100644
--- a/app/views/admin/export_domain_blocks/_domain_block.html.haml
+++ b/app/views/admin/export_domain_blocks/_domain_block.html.haml
@@ -23,5 +23,5 @@
= f.object.public_comment
- if existing_relationships
·
- = fa_icon 'warning fw'
+ = material_symbol 'warning'
= t('admin.export_domain_blocks.import.existing_relationships_warning')
diff --git a/app/views/admin/export_domain_blocks/import.html.haml b/app/views/admin/export_domain_blocks/import.html.haml
index 48016a9ab..52ffc3d46 100644
--- a/app/views/admin/export_domain_blocks/import.html.haml
+++ b/app/views/admin/export_domain_blocks/import.html.haml
@@ -12,7 +12,7 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('copy'), t('admin.domain_blocks.import')]),
+ = f.button safe_join([material_symbol('content_copy'), t('admin.domain_blocks.import')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :save,
diff --git a/app/views/admin/follow_recommendations/show.html.haml b/app/views/admin/follow_recommendations/show.html.haml
index 9d23f9ba5..c8ad653a8 100644
--- a/app/views/admin/follow_recommendations/show.html.haml
+++ b/app/views/admin/follow_recommendations/show.html.haml
@@ -31,13 +31,13 @@
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- if params[:status].blank? && can?(:suppress, :follow_recommendation)
- = f.button safe_join([fa_icon('times'), t('admin.follow_recommendations.suppress')]),
+ = f.button safe_join([material_symbol('close'), t('admin.follow_recommendations.suppress')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :suppress,
type: :submit
- if params[:status] == 'suppressed' && can?(:unsuppress, :follow_recommendation)
- = f.button safe_join([fa_icon('plus'), t('admin.follow_recommendations.unsuppress')]),
+ = f.button safe_join([material_symbol('add'), t('admin.follow_recommendations.unsuppress')]),
class: 'table-action-link',
name: :unsuppress,
type: :submit
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
index 5bf4e899f..d916203d0 100644
--- a/app/views/admin/instances/show.html.haml
+++ b/app/views/admin/instances/show.html.haml
@@ -9,7 +9,7 @@
- if @instance.persisted?
%p
- = fa_icon 'info fw'
+ = material_symbol 'info'
= t('admin.instances.totals_time_period_hint_html')
.dashboard
diff --git a/app/views/admin/invites/_invite.html.haml b/app/views/admin/invites/_invite.html.haml
index e6ad9de34..f9cd6003f 100644
--- a/app/views/admin/invites/_invite.html.haml
+++ b/app/views/admin/invites/_invite.html.haml
@@ -12,7 +12,7 @@
- if invite.valid_for_use?
%td
- = fa_icon 'user fw'
+ = material_symbol 'person'
= invite.uses
= " / #{invite.max_uses}" unless invite.max_uses.nil?
%td
diff --git a/app/views/admin/ip_blocks/index.html.haml b/app/views/admin/ip_blocks/index.html.haml
index f1d2b3dc4..9eba6c68f 100644
--- a/app/views/admin/ip_blocks/index.html.haml
+++ b/app/views/admin/ip_blocks/index.html.haml
@@ -14,7 +14,7 @@
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- if can?(:destroy, :ip_block)
- = f.button safe_join([fa_icon('times'), t('admin.ip_blocks.delete')]),
+ = f.button safe_join([material_symbol('close'), t('admin.ip_blocks.delete')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :delete,
diff --git a/app/views/admin/relationships/index.html.haml b/app/views/admin/relationships/index.html.haml
index 8260430d8..c2daefb42 100644
--- a/app/views/admin/relationships/index.html.haml
+++ b/app/views/admin/relationships/index.html.haml
@@ -19,7 +19,7 @@
.back-link
= link_to admin_account_path(@account.id) do
- = fa_icon 'chevron-left fw'
+ = material_symbol 'chevron_left'
= t('admin.statuses.back_to_account')
%hr.spacer/
@@ -30,7 +30,7 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]),
+ = f.button safe_join([material_symbol('lock'), t('admin.accounts.perform_full_suspension')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :suspend,
diff --git a/app/views/admin/relays/_relay.html.haml b/app/views/admin/relays/_relay.html.haml
index f1dd2b2dd..0960124cc 100644
--- a/app/views/admin/relays/_relay.html.haml
+++ b/app/views/admin/relays/_relay.html.haml
@@ -4,7 +4,7 @@
%td
- if relay.accepted?
%span.positive-hint
- = fa_icon('check')
+ = material_symbol('check')
= t 'admin.relays.enabled'
- elsif relay.pending?
@@ -13,7 +13,7 @@
= t 'admin.relays.pending'
- else
%span.negative-hint
- = fa_icon('times')
+ = material_symbol('close')
= t 'admin.relays.disabled'
%td
diff --git a/app/views/admin/reports/_header_card.html.haml b/app/views/admin/reports/_header_card.html.haml
index e90e3f9c9..52e62b449 100644
--- a/app/views/admin/reports/_header_card.html.haml
+++ b/app/views/admin/reports/_header_card.html.haml
@@ -16,7 +16,7 @@
%strong.emojify.p-name= display_name(report.target_account, custom_emojify: true)
%span
= acct(report.target_account)
- = fa_icon('lock') if report.target_account.locked?
+ = material_symbol('lock') if report.target_account.locked?
- if report.target_account.note.present?
.account-card__bio.emojify
= prerender_custom_emojis(account_bio_format(report.target_account), report.target_account.emojis)
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
index 3775a1101..66820f0a6 100644
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@@ -37,5 +37,5 @@
= t("statuses.visibilities.#{status.visibility}")
- if status.proper.sensitive?
·
- = fa_icon('eye-slash fw')
+ = material_symbol('visibility_off')
= t('stream_entries.sensitive_content')
diff --git a/app/views/admin/reports/actions/preview.html.haml b/app/views/admin/reports/actions/preview.html.haml
index 8634bb215..7a737d4f7 100644
--- a/app/views/admin/reports/actions/preview.html.haml
+++ b/app/views/admin/reports/actions/preview.html.haml
@@ -58,7 +58,7 @@
- status.ordered_media_attachments.each do |media_attachment|
%abbr{ title: media_attachment.description }
- = fa_icon 'link'
+ = material_symbol 'link'
= media_attachment.file_file_name
.strike-card__statuses-list__item__meta
= link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', rel: 'noopener noreferrer' do
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index e37fa2590..c880021cf 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -41,7 +41,7 @@
%p
= t 'admin.reports.statuses_description_html'
—
- = link_to safe_join([fa_icon('plus'), t('admin.reports.add_to_report')]),
+ = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]),
admin_account_statuses_path(@report.target_account_id, report_id: @report.id),
class: 'table-action-link'
@@ -52,7 +52,7 @@
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- if !@statuses.empty? && @report.unresolved?
- = f.button safe_join([fa_icon('times'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
+ = f.button safe_join([material_symbol('close'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
.batch-table__body
- if @statuses.empty?
= nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/roles/_role.html.haml b/app/views/admin/roles/_role.html.haml
index d6c6b62c8..fd37644c8 100644
--- a/app/views/admin/roles/_role.html.haml
+++ b/app/views/admin/roles/_role.html.haml
@@ -2,7 +2,7 @@
- if can?(:update, role)
= link_to edit_admin_role_path(role), class: 'announcements-list__item__title' do
%span.user-role{ class: "user-role-#{role.id}" }
- = fa_icon 'users fw'
+ = material_symbol 'group'
- if role.everyone?
= t('admin.roles.everyone')
@@ -11,7 +11,7 @@
- else
%span.announcements-list__item__title
%span.user-role{ class: "user-role-#{role.id}" }
- = fa_icon 'users fw'
+ = material_symbol 'group'
- if role.everyone?
= t('admin.roles.everyone')
diff --git a/app/views/admin/settings/shared/_links.html.haml b/app/views/admin/settings/shared/_links.html.haml
index d8b697592..8b0678d4c 100644
--- a/app/views/admin/settings/shared/_links.html.haml
+++ b/app/views/admin/settings/shared/_links.html.haml
@@ -3,7 +3,7 @@
:ruby
primary.item :branding, safe_join([fa_icon('pencil fw'), t('admin.settings.branding.title')]), admin_settings_branding_path
primary.item :about, safe_join([fa_icon('file-text fw'), t('admin.settings.about.title')]), admin_settings_about_path
- primary.item :registrations, safe_join([fa_icon('users fw'), t('admin.settings.registrations.title')]), admin_settings_registrations_path
+ primary.item :registrations, safe_join([material_symbol('group'), t('admin.settings.registrations.title')]), admin_settings_registrations_path
primary.item :discovery, safe_join([fa_icon('search fw'), t('admin.settings.discovery.title')]), admin_settings_discovery_path
primary.item :content_retention, safe_join([fa_icon('history fw'), t('admin.settings.content_retention.title')]), admin_settings_content_retention_path
primary.item :appearance, safe_join([fa_icon('desktop fw'), t('admin.settings.appearance.title')]), admin_settings_appearance_path
diff --git a/app/views/admin/status_edits/_status_edit.html.haml b/app/views/admin/status_edits/_status_edit.html.haml
index 725477721..0bec0159e 100644
--- a/app/views/admin/status_edits/_status_edit.html.haml
+++ b/app/views/admin/status_edits/_status_edit.html.haml
@@ -26,5 +26,5 @@
- if status_edit.sensitive?
·
- = fa_icon('eye-slash fw')
+ = material_symbol('visibility_off')
= t('stream_entries.sensitive_content')
diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
index 33a41bd36..a41a6332d 100644
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@@ -12,11 +12,11 @@
.back-link
- if params[:report_id]
= link_to admin_report_path(params[:report_id].to_i) do
- = fa_icon 'chevron-left fw'
+ = material_symbol 'chevron_left'
= t('admin.statuses.back_to_report')
- else
= link_to admin_account_path(@account.id) do
- = fa_icon 'chevron-left fw'
+ = material_symbol 'chevron_left'
= t('admin.statuses.back_to_account')
%hr.spacer/
diff --git a/app/views/admin/tags/show.html.haml b/app/views/admin/tags/show.html.haml
index 2e4424bec..f2d87b54b 100644
--- a/app/views/admin/tags/show.html.haml
+++ b/app/views/admin/tags/show.html.haml
@@ -52,26 +52,26 @@
= link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.usable? ? 'positive' : 'negative'] do
- if @tag.usable?
%span= t('admin.trends.tags.usable')
- = fa_icon 'check fw'
+ = material_symbol 'check'
- else
%span= t('admin.trends.tags.not_usable')
- = fa_icon 'lock fw'
+ = material_symbol 'lock'
= link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.trendable? ? 'positive' : 'negative'] do
- if @tag.trendable?
%span= t('admin.trends.tags.trendable')
- = fa_icon 'check fw'
+ = material_symbol 'check'
- else
%span= t('admin.trends.tags.not_trendable')
- = fa_icon 'lock fw'
+ = material_symbol 'lock'
= link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.listable? ? 'positive' : 'negative'] do
- if @tag.listable?
%span= t('admin.trends.tags.listable')
- = fa_icon 'check fw'
+ = material_symbol 'check'
- else
%span= t('admin.trends.tags.not_listable')
- = fa_icon 'lock fw'
+ = material_symbol 'lock'
%hr.spacer/
diff --git a/app/views/admin/trends/links/index.html.haml b/app/views/admin/trends/links/index.html.haml
index 965d2b2e5..c503b2d39 100644
--- a/app/views/admin/trends/links/index.html.haml
+++ b/app/views/admin/trends/links/index.html.haml
@@ -24,7 +24,7 @@
.back-link
= link_to admin_trends_links_preview_card_providers_path do
= t('admin.trends.preview_card_providers.title')
- = fa_icon 'chevron-right fw'
+ = material_symbol 'chevron_right'
= form_for(@form, url: batch_admin_trends_links_path) do |f|
= hidden_field_tag :page, params[:page] || 1
@@ -37,22 +37,22 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow')]),
+ = f.button safe_join([material_symbol('check'), t('admin.trends.links.allow')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :approve,
type: :submit
- = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow_provider')]),
+ = f.button safe_join([material_symbol('check'), t('admin.trends.links.allow_provider')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :approve_providers,
type: :submit
- = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow')]),
+ = f.button safe_join([material_symbol('close'), t('admin.trends.links.disallow')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :reject,
type: :submit
- = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow_provider')]),
+ = f.button safe_join([material_symbol('close'), t('admin.trends.links.disallow_provider')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :reject_providers,
diff --git a/app/views/admin/trends/links/preview_card_providers/index.html.haml b/app/views/admin/trends/links/preview_card_providers/index.html.haml
index c91822fb7..706c60701 100644
--- a/app/views/admin/trends/links/preview_card_providers/index.html.haml
+++ b/app/views/admin/trends/links/preview_card_providers/index.html.haml
@@ -15,7 +15,7 @@
%li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{PreviewCardProvider.pending_review.count})"], ' '), status: 'pending_review'
.back-link
= link_to admin_trends_links_path do
- = fa_icon 'chevron-left fw'
+ = material_symbol 'chevron_left'
= t('admin.trends.links.title')
%hr.spacer/
@@ -31,12 +31,12 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]),
+ = f.button safe_join([material_symbol('check'), t('admin.trends.allow')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :approve,
type: :submit
- = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]),
+ = f.button safe_join([material_symbol('close'), t('admin.trends.disallow')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :reject,
diff --git a/app/views/admin/trends/statuses/_status.html.haml b/app/views/admin/trends/statuses/_status.html.haml
index 095f3f218..09547ff03 100644
--- a/app/views/admin/trends/statuses/_status.html.haml
+++ b/app/views/admin/trends/statuses/_status.html.haml
@@ -11,7 +11,7 @@
- status.ordered_media_attachments.each do |media_attachment|
%abbr{ title: media_attachment.description }
- = fa_icon 'link'
+ = material_symbol 'link'
= media_attachment.file_file_name
= t 'admin.trends.statuses.shared_by',
diff --git a/app/views/admin/trends/statuses/index.html.haml b/app/views/admin/trends/statuses/index.html.haml
index 0891d15fc..66151ad31 100644
--- a/app/views/admin/trends/statuses/index.html.haml
+++ b/app/views/admin/trends/statuses/index.html.haml
@@ -31,22 +31,22 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow')]),
+ = f.button safe_join([material_symbol('check'), t('admin.trends.statuses.allow')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :approve,
type: :submit
- = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow_account')]),
+ = f.button safe_join([material_symbol('check'), t('admin.trends.statuses.allow_account')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :approve_accounts,
type: :submit
- = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow')]),
+ = f.button safe_join([material_symbol('close'), t('admin.trends.statuses.disallow')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :reject,
type: :submit
- = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow_account')]),
+ = f.button safe_join([material_symbol('close'), t('admin.trends.statuses.disallow_account')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :reject_accounts,
diff --git a/app/views/admin/trends/tags/_tag.html.haml b/app/views/admin/trends/tags/_tag.html.haml
index 70c7d8dbd..8cc0d713b 100644
--- a/app/views/admin/trends/tags/_tag.html.haml
+++ b/app/views/admin/trends/tags/_tag.html.haml
@@ -5,7 +5,7 @@
.batch-table__row__content.pending-account
.pending-account__header
= link_to admin_tag_path(tag.id) do
- = fa_icon 'hashtag'
+ = material_symbol 'tag'
= tag.display_name
%br/
diff --git a/app/views/admin/trends/tags/index.html.haml b/app/views/admin/trends/tags/index.html.haml
index effde7b0e..655955f7f 100644
--- a/app/views/admin/trends/tags/index.html.haml
+++ b/app/views/admin/trends/tags/index.html.haml
@@ -25,12 +25,12 @@
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]),
+ = f.button safe_join([material_symbol('check'), t('admin.trends.allow')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :approve,
type: :submit
- = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]),
+ = f.button safe_join([material_symbol('close'), t('admin.trends.disallow')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :reject,
diff --git a/app/views/admin_mailer/new_critical_software_updates.text.erb b/app/views/admin_mailer/new_critical_software_updates.text.erb
index e4886c262..a3f031bda 100644
--- a/app/views/admin_mailer/new_critical_software_updates.text.erb
+++ b/app/views/admin_mailer/new_critical_software_updates.text.erb
@@ -1,7 +1,7 @@
<%= raw t('admin_mailer.new_critical_software_updates.body') %>
<% @software_updates.each do |update| %>
-- Mastodon #{update.version}: #{update.release_notes}
+- Mastodon <%= update.version %>: <%= update.release_notes %>
<% end %>
<%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>
diff --git a/app/views/admin_mailer/new_software_updates.text.erb b/app/views/admin_mailer/new_software_updates.text.erb
index 7612b7c59..0eccbbf9e 100644
--- a/app/views/admin_mailer/new_software_updates.text.erb
+++ b/app/views/admin_mailer/new_software_updates.text.erb
@@ -1,7 +1,7 @@
<%= raw t('admin_mailer.new_software_updates.body') %>
<% @software_updates.each do |update| %>
-- Mastodon #{update.version}: #{update.release_notes}
+- Mastodon <%= update.version %>: <%= update.release_notes %>
<% end %>
<%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>
diff --git a/config/initializers/propshaft.rb b/config/initializers/propshaft.rb
index 6cf368d5b..eff7ec90b 100644
--- a/config/initializers/propshaft.rb
+++ b/config/initializers/propshaft.rb
@@ -1,3 +1,7 @@
# frozen_string_literal: true
+# SVG icons
Rails.application.config.assets.paths << Rails.root.join('app', 'javascript', 'images')
+
+# Material Design icons
+Rails.application.config.assets.paths << Rails.root.join('app', 'javascript', 'material-icons')
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 67aad1587..923682ea1 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1046,7 +1046,7 @@ de:
apply_for_account: Konto beantragen
captcha_confirmation:
help_html: Falls du Probleme beim Lösen des CAPTCHA hast, dann kannst uns über %{email} kontaktieren und wir werden versuchen, dir zu helfen.
- hint_html: Fast geschafft! Wir müssen uns vergewissern, dass du ein Mensch bist (damit wir Spam verhindern können!). Bitte löse das CAPTCHA und klicke auf „Weiter“.
+ hint_html: Fast geschafft! Wir müssen uns vergewissern, dass du ein Mensch bist (damit wir Spam verhindern können!). Bitte löse das CAPTCHA und klicke auf „Fortfahren“.
title: Sicherheitsüberprüfung
confirmations:
awaiting_review: Deine E-Mail-Adresse wurde bestätigt und das Team von %{domain} überprüft nun deine Registrierung. Sobald es dein Konto genehmigt, wirst du eine E-Mail erhalten.
@@ -1449,7 +1449,7 @@ de:
cooldown: Nach dem Umzug wird es eine Weile dauern, bis du erneut umziehen darfst
disabled_account: Dein altes Konto ist nur noch eingeschränkt nutzbar. Du kannst jedoch deine Daten exportieren und das Konto wieder reaktivieren.
followers: Alle Follower werden vom alten zum neuen Konto übertragen
- only_redirect_html: Alternativ kannst du auch nur eine Weiterleitung zu deinem neuen Profil einrichten, ohne die Follower zu übertragen.
+ only_redirect_html: Alternativ kannst du auch nur eine Weiterleitung zu deinem neuen Konto einrichten, ohne die Follower zu übertragen.
other_data: Keine anderen Daten werden automatisch zum neuen Konto übertragen
redirect: Dein altes Konto wird einen Hinweis erhalten, dass du umgezogen bist. Außerdem wird das Profil von Suchanfragen ausgeschlossen
moderation:
@@ -1845,7 +1845,7 @@ de:
mark_statuses_as_sensitive: Deine Beiträge von %{acct} wurden mit einer Inhaltswarnung versehen
none: Warnung für %{acct}
sensitive: Deine Beiträge von %{acct} werden künftig mit einer Inhaltswarnung versehen
- silence: Dein Konto %{acct} wurde stummgeschaltet
+ silence: Dein Konto %{acct} wurde eingeschränkt
suspend: Dein Konto %{acct} wurde gesperrt
title:
delete_statuses: Beiträge entfernt
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index 73fa1fa60..032132cf5 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -25,7 +25,7 @@ de:
explanation_when_pending: Du hast dich für eine Einladung bei %{host} mit dieser E-Mail-Adresse beworben. Sobald du deine E-Mail-Adresse bestätigt hast, werden wir deine Anfrage überprüfen. Du kannst dich in dieser Zeit nicht anmelden. Wenn deine Anfrage abgelehnt wird, werden deine Daten entfernt – von dir ist keine weitere Handlung notwendig. Wenn du das nicht warst, dann kannst du diese E-Mail ignorieren.
extra_html: Bitte beachte auch die Serverregeln und unsere Datenschutzerklärung.
subject: 'Mastodon: Anleitung zum Bestätigen deines Kontos auf %{instance}'
- title: Verifiziere E-Mail-Adresse
+ title: Verifiziere deine E-Mail-Adresse
email_changed:
explanation: 'Die E-Mail-Adresse deines Kontos wird geändert zu:'
extra: Wenn du deine E-Mail-Adresse nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Administrator*innen des Servers, wenn du aus deinem Konto ausgesperrt bist.
diff --git a/config/locales/devise.eo.yml b/config/locales/devise.eo.yml
index af1769aa6..193fecc75 100644
--- a/config/locales/devise.eo.yml
+++ b/config/locales/devise.eo.yml
@@ -12,6 +12,7 @@ eo:
last_attempt: Vi ankoraŭ povas provi unufoje antaŭ ol via konto estos ŝlosita.
locked: Via konto estas ŝlosita.
not_found_in_database: Nevalida %{authentication_keys} aŭ pasvorto.
+ omniauth_user_creation_failure: Eraro okazis kreinte konton por ĉi tiu identeco.
pending: Via konto ankoraŭ estas kontrolata.
timeout: Via seanco eksvalidiĝis. Bonvolu ensaluti denove por daŭrigi.
unauthenticated: Vi devas ensaluti aŭ registriĝi antaŭ ol daŭrigi.
@@ -39,7 +40,7 @@ eo:
explanation: Retajpu la novan adreson por ŝanĝi vian retpoŝtadreson.
extra: Se ĉi tiu ŝanĝo ne estis komencita de vi, bonvolu ignori ĉi tiun retmesaĝon. La retadreso por la Mastodon-konto ne ŝanĝiĝos se vi ne aliras la supran ligilon.
subject: 'Mastodon: Konfirmi retpoŝton por %{instance}'
- title: Kontrolu retpoŝtadreson
+ title: Kontroli retpoŝtadreson
reset_password_instructions:
action: Ŝanĝi pasvorton
explanation: Vi petis novan pasvorton por via konto.
diff --git a/config/locales/doorkeeper.bg.yml b/config/locales/doorkeeper.bg.yml
index 8e026794e..7633156d7 100644
--- a/config/locales/doorkeeper.bg.yml
+++ b/config/locales/doorkeeper.bg.yml
@@ -174,6 +174,7 @@ bg:
read:filters: преглед на вашите филтри
read:follows: преглед на вашите последвания
read:lists: преглед на вашите списъци
+ read:me: четене само на основните сведения за акаунта ви
read:mutes: преглед на вашите заглушавания
read:notifications: преглед на вашите известия
read:reports: преглед на вашите докладвания
diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml
index 9706f3db7..80827a87d 100644
--- a/config/locales/doorkeeper.ca.yml
+++ b/config/locales/doorkeeper.ca.yml
@@ -174,6 +174,7 @@ ca:
read:filters: mira els teus filtres
read:follows: mira els teus seguiments
read:lists: mira les teves llistes
+ read:me: llegir només la informació bàsica del vostre compte
read:mutes: mira els teus silenciats
read:notifications: mira les teves notificacions
read:reports: mira els teus informes
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index 2c8b0d13e..ed10e14e2 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -174,6 +174,7 @@ da:
read:filters: se dine filtre
read:follows: se dine følger
read:lists: se dine lister
+ read:me: læs kun kontoens basisoplysninger
read:mutes: se dine tavsgørelser
read:notifications: se dine notifikationer
read:reports: se dine anmeldelser
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml
index 552dfeba3..80d612255 100644
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@@ -174,6 +174,7 @@ de:
read:filters: deine Filter einsehen
read:follows: sehen, wem du folgst
read:lists: deine Listen sehen
+ read:me: nur deine grundlegenden Kontoinformationen lesen
read:mutes: deine Stummschaltungen einsehen
read:notifications: deine Benachrichtigungen sehen
read:reports: deine Meldungen sehen
diff --git a/config/locales/doorkeeper.es-AR.yml b/config/locales/doorkeeper.es-AR.yml
index 532db1f30..47cfc451a 100644
--- a/config/locales/doorkeeper.es-AR.yml
+++ b/config/locales/doorkeeper.es-AR.yml
@@ -174,6 +174,7 @@ es-AR:
read:filters: ver tus filtros
read:follows: ver qué cuentas seguís
read:lists: ver tus listas
+ read:me: leer solo la información básica de tu cuenta
read:mutes: ver qué cuentas silenciaste
read:notifications: ver tus notificaciones
read:reports: ver tus denuncias
diff --git a/config/locales/doorkeeper.es-MX.yml b/config/locales/doorkeeper.es-MX.yml
index 082d656bc..e56e0df3b 100644
--- a/config/locales/doorkeeper.es-MX.yml
+++ b/config/locales/doorkeeper.es-MX.yml
@@ -174,6 +174,7 @@ es-MX:
read:filters: ver tus filtros
read:follows: ver a quién sigues
read:lists: ver tus listas
+ read:me: leer solo la información básica de tu cuenta
read:mutes: ver a quién has silenciado
read:notifications: ver tus notificaciones
read:reports: ver tus informes
diff --git a/config/locales/doorkeeper.es.yml b/config/locales/doorkeeper.es.yml
index 002f813b3..44e165a21 100644
--- a/config/locales/doorkeeper.es.yml
+++ b/config/locales/doorkeeper.es.yml
@@ -174,6 +174,7 @@ es:
read:filters: ver tus filtros
read:follows: ver a quién sigues
read:lists: ver tus listas
+ read:me: leer solo la información básica de tu cuenta
read:mutes: ver a quién has silenciado
read:notifications: ver tus notificaciones
read:reports: ver tus informes
diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml
index e7963672f..88a63f698 100644
--- a/config/locales/doorkeeper.eu.yml
+++ b/config/locales/doorkeeper.eu.yml
@@ -174,6 +174,7 @@ eu:
read:filters: ikusi zure iragazkiak
read:follows: ikusi zuk jarraitutakoak
read:lists: ikusi zure zerrendak
+ read:me: irakurri soilik zure kontuaren oinarrizko informazioa
read:mutes: ikusi zuk mutututakoak
read:notifications: ikusi zure jakinarazpenak
read:reports: ikusi zure salaketak
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index fea01d107..ae8963c76 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -174,6 +174,7 @@ fi:
read:filters: katso suodattimiasi
read:follows: katso seurattujasi
read:lists: katso listojasi
+ read:me: lue tilisi perustietoja
read:mutes: katso mykistyksiäsi
read:notifications: katso ilmoituksiasi
read:reports: katso raporttejasi
diff --git a/config/locales/doorkeeper.fo.yml b/config/locales/doorkeeper.fo.yml
index 78f8701ae..4f5cc5a64 100644
--- a/config/locales/doorkeeper.fo.yml
+++ b/config/locales/doorkeeper.fo.yml
@@ -174,6 +174,7 @@ fo:
read:filters: síggja tíni filtur
read:follows: síggja hvørji tú fylgir
read:lists: síggja tínar listar
+ read:me: les bara grundleggjandi upplýsingar av tínari kontu
read:mutes: síggja tínar doyvingar
read:notifications: síggja tínar fráboðanir
read:reports: síggja tínar meldingar
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index aa0eae284..d34c58dec 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -174,6 +174,7 @@ gl:
read:filters: ver os filtros
read:follows: ver a quen segues
read:lists: ver as tuas listaxes
+ read:me: ler só a información básica da túa conta
read:mutes: ver a quen tes acalado
read:notifications: ver as notificacións
read:reports: ver as túas denuncias
diff --git a/config/locales/doorkeeper.he.yml b/config/locales/doorkeeper.he.yml
index 9030e45e0..a6376fa4c 100644
--- a/config/locales/doorkeeper.he.yml
+++ b/config/locales/doorkeeper.he.yml
@@ -174,6 +174,7 @@ he:
read:filters: צפייה במסננים
read:follows: צפייה בנעקבים
read:lists: צפיה ברשימותיך
+ read:me: לקריאה בלבד של פרטי חשבונך הבסיסיים
read:mutes: צפיה במושתקיך
read:notifications: צפיה בהתראותיך
read:reports: צפיה בדוחותיך
diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml
index 3822e9c20..28ce283ff 100644
--- a/config/locales/doorkeeper.hu.yml
+++ b/config/locales/doorkeeper.hu.yml
@@ -174,6 +174,7 @@ hu:
read:filters: szűrök megtekintése
read:follows: követések megtekintése
read:lists: listák megtekintése
+ read:me: csak a fiókod alapvető adatainak elolvasása
read:mutes: némítások megtekintése
read:notifications: értesítések megtekintése
read:reports: bejelentések megtekintése
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index b41531a1b..fd7d7a083 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -87,6 +87,7 @@ ia:
read:filters: vider tu filtros
read:follows: vider tu sequites
read:lists: vider tu listas
+ read:me: leger solmente le information basic de tu conto
read:notifications: vider tu notificationes
read:reports: vider tu reportos
read:statuses: vider tote le messages
diff --git a/config/locales/doorkeeper.is.yml b/config/locales/doorkeeper.is.yml
index c1e2d4cfc..995d507f5 100644
--- a/config/locales/doorkeeper.is.yml
+++ b/config/locales/doorkeeper.is.yml
@@ -174,6 +174,7 @@ is:
read:filters: skoða síurnar þínar
read:follows: sjá hverjum þú fylgist með
read:lists: skoða listana þína
+ read:me: lesa einungis grunnupplýsingar aðgangsins þíns
read:mutes: skoða hverja þú þaggar
read:notifications: sjá tilkynningarnar þínar
read:reports: skoða skýrslurnar þína
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index 3fd998fc4..f39f78466 100644
--- a/config/locales/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -174,6 +174,7 @@ it:
read:filters: visualizzare i tuoi filtri
read:follows: visualizzare i tuoi seguiti
read:lists: visualizzare i tuoi elenchi
+ read:me: leggi solo le informazioni di base del tuo account
read:mutes: visualizzare i tuoi silenziamenti
read:notifications: visualizzare le tue notifiche
read:reports: visualizzare le tue segnalazioni
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
index 4721e3acd..12674cc12 100644
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@@ -174,6 +174,7 @@ ko:
read:filters: 필터 보기
read:follows: 팔로우 보기
read:lists: 리스트 보기
+ read:me: 내 계정의 기본 정보만을 읽습니다
read:mutes: 뮤트 보기
read:notifications: 알림 보기
read:reports: 신고 보기
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index b3e6e79a1..9554c0ee6 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -174,6 +174,7 @@ nl:
read:filters: jouw filters bekijken
read:follows: de accounts die jij volgt bekijken
read:lists: jouw lijsten bekijken
+ read:me: alleen de basisgegevens van jouw account lezen
read:mutes: jouw genegeerde gebruikers bekijken
read:notifications: jouw meldingen bekijken
read:reports: jouw gerapporteerde berichten bekijken
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index 0e5d1ca45..ab0380c6f 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -174,6 +174,7 @@ nn:
read:filters: sjå filtera dine
read:follows: sjå fylgjarane dine
read:lists: sjå listene dine
+ read:me: les berre kontoen din sin grunnleggjande informasjon
read:mutes: sjå kven du har målbunde
read:notifications: sjå varsla dine
read:reports: sjå rapportane dine
diff --git a/config/locales/doorkeeper.pl.yml b/config/locales/doorkeeper.pl.yml
index 226c0d403..eefca2de6 100644
--- a/config/locales/doorkeeper.pl.yml
+++ b/config/locales/doorkeeper.pl.yml
@@ -174,6 +174,7 @@ pl:
read:filters: dostęp do filtrów
read:follows: dostęp do listy obserwowanych
read:lists: dostęp do Twoich list
+ read:me: odczytaj tylko podstawowe informacje o koncie
read:mutes: dostęp do listy wyciszonych
read:notifications: możliwość odczytu powiadomień
read:reports: dostęp do Twoich zgłoszeń
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index d7e9353b5..150b4339e 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -174,6 +174,7 @@ pt-BR:
read:filters: ver seus filtros
read:follows: ver quem você segue
read:lists: ver suas listas
+ read:me: ler só as informações básicas da sua conta
read:mutes: ver seus silenciados
read:notifications: ver suas notificações
read:reports: ver suas denúncias
diff --git a/config/locales/doorkeeper.pt-PT.yml b/config/locales/doorkeeper.pt-PT.yml
index 31f6e4627..0457190cd 100644
--- a/config/locales/doorkeeper.pt-PT.yml
+++ b/config/locales/doorkeeper.pt-PT.yml
@@ -174,6 +174,7 @@ pt-PT:
read:filters: ver os seus filtros
read:follows: ver quem você segue
read:lists: ver as suas listas
+ read:me: ler apenas as informações básicas da sua conta
read:mutes: ver os utilizadores que silenciou
read:notifications: ver as suas notificações
read:reports: ver as suas denúncias
diff --git a/config/locales/doorkeeper.sl.yml b/config/locales/doorkeeper.sl.yml
index a613308b2..55e00ff96 100644
--- a/config/locales/doorkeeper.sl.yml
+++ b/config/locales/doorkeeper.sl.yml
@@ -174,6 +174,7 @@ sl:
read:filters: oglejte si svoje filtre
read:follows: oglejte si svoje sledilce
read:lists: oglejte si svoje sezname
+ read:me: preberi le osnovne podatke računa
read:mutes: oglejte si svoje utišane
read:notifications: oglejte si svoja obvestila
read:reports: oglejte si svoje prijave
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index f2c8bd34b..d336f08c5 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -174,6 +174,7 @@ sv:
read:filters: se dina filter
read:follows: se vem du följer
read:lists: se dina listor
+ read:me: läs endast den grundläggande informationen för ditt konto
read:mutes: se dina tystningar
read:notifications: se dina notiser
read:reports: se dina rapporter
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml
index 47a15e1b8..f5ebbc5fd 100644
--- a/config/locales/doorkeeper.tr.yml
+++ b/config/locales/doorkeeper.tr.yml
@@ -174,6 +174,7 @@ tr:
read:filters: süzgeçlerinizi görün
read:follows: takip ettiklerinizi görün
read:lists: listelerinizi görün
+ read:me: hesabınızın sadece temel bilgilerini okuma
read:mutes: sessize aldıklarınızı görün
read:notifications: bildirimlerinizi görün
read:reports: raporlarınızı görün
diff --git a/config/locales/doorkeeper.uk.yml b/config/locales/doorkeeper.uk.yml
index 8af404a73..ac7fbbe15 100644
--- a/config/locales/doorkeeper.uk.yml
+++ b/config/locales/doorkeeper.uk.yml
@@ -180,6 +180,7 @@ uk:
read:filters: бачити Ваші фільтри
read:follows: бачити Ваші підписки
read:lists: бачити Ваші списки
+ read:me: читайте лише основну інформацію вашого облікового запису
read:mutes: бачити ваші нехтування
read:notifications: бачити Ваші сповіщення
read:reports: бачити Ваші скарги
diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml
index 837579527..84684d24c 100644
--- a/config/locales/doorkeeper.vi.yml
+++ b/config/locales/doorkeeper.vi.yml
@@ -174,6 +174,7 @@ vi:
read:filters: xem bộ lọc
read:follows: xem những người theo dõi
read:lists: xem danh sách
+ read:me: chỉ đọc thông tin cơ bản tài khoản
read:mutes: xem những người đã ẩn
read:notifications: xem thông báo
read:reports: xem báo cáo của bạn
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 36c7fb812..73f1f9725 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -174,6 +174,7 @@ zh-CN:
read:filters: 查看你的过滤器
read:follows: 查看你的关注
read:lists: 查看你的列表
+ read:me: 只读取你账户的基本信息
read:mutes: 查看你的隐藏列表
read:notifications: 查看你的通知
read:reports: 查看你的举报
diff --git a/config/locales/doorkeeper.zh-HK.yml b/config/locales/doorkeeper.zh-HK.yml
index 79629b12f..76d13a74a 100644
--- a/config/locales/doorkeeper.zh-HK.yml
+++ b/config/locales/doorkeeper.zh-HK.yml
@@ -174,6 +174,7 @@ zh-HK:
read:filters: 檢視你的過濾條件
read:follows: 檢視你關注的人
read:lists: 檢視你的清單
+ read:me: 僅讀取帳號的基本資訊
read:mutes: 檢視被你靜音的人
read:notifications: 檢視你的通知
read:reports: 檢視你的檢舉
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index f2250b79c..86827a712 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -174,6 +174,7 @@ zh-TW:
read:filters: 檢視您的過濾條件
read:follows: 檢視您跟隨之使用者
read:lists: 檢視您的列表
+ read:me: 僅讀取您的帳號基本資訊
read:mutes: 檢視您靜音的人
read:notifications: 檢視您的通知
read:reports: 檢視您的檢舉
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index d59eadd52..749f80687 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -74,7 +74,7 @@ eo:
follows: Sekvatoj
header: Kapa bildo
inbox_url: Enira URL
- invite_request_text: 가입하려는 이유
+ invite_request_text: Kialoj por aliĝi
invited_by: Invitita de
ip: IP
joined: Aliĝis
@@ -104,7 +104,7 @@ eo:
no_role_assigned: Sen rolo
not_subscribed: Ne abonita
pending: Pritraktata recenzo
- perform_full_suspension: Suspendi
+ perform_full_suspension: Haltigi
previous_strikes: Antaǔaj admonoj
previous_strikes_description_html:
one: Ĉi tiu konto havas unu admonon.
@@ -121,7 +121,7 @@ eo:
remote_suspension_reversible_hint_html: La konto estas suspendita, kaj la datumoj estos komplete forigitaj je %{date}. Ĝis tiam, la konto povas esti malsuspendita sen flankefiko. Se vi deziras tuj forigi ĉiujn datumojn de la konto, vi povas fari tion sube.
remove_avatar: Forigi la profilbildon
remove_header: Forigi kapan bildon
- removed_avatar_msg: La rolfiguro de %{username} estas sukcese forigita
+ removed_avatar_msg: La profilbildo de %{username} estas sukcese forigita
removed_header_msg: Kapbildo de %{username} suksece forigita
resend_confirmation:
already_confirmed: Ĉi tiu uzanto jam estas konfirmita
@@ -184,7 +184,7 @@ eo:
create_domain_block: Krei Blokadon De Domajno
create_email_domain_block: Krei Blokadon De Retpoŝta Domajno
create_ip_block: Krei IP-regulon
- create_unavailable_domain: Krei nehaveblan domajnon
+ create_unavailable_domain: Krei Nehaveblan Domajnon
create_user_role: Krei Rolon
demote_user: Malpromocii Uzanton
destroy_announcement: Forigi Anoncon
@@ -193,9 +193,9 @@ eo:
destroy_domain_allow: Forigi Domajnan Permeson
destroy_domain_block: Forigi blokadon de domajno
destroy_email_domain_block: Forigi blokadon de retpoŝta domajno
- destroy_instance: Forigi domajnon
+ destroy_instance: Forigi Domajnon
destroy_ip_block: Forigi IP-regulon
- destroy_status: Forigi mesaĝon
+ destroy_status: Forigi Afiŝon
destroy_unavailable_domain: Forigi Nehaveblan Domajnon
destroy_user_role: Detrui Rolon
disable_2fa_user: Malebligi 2FA
@@ -285,7 +285,7 @@ eo:
update_custom_emoji_html: "%{name} ĝisdatigis la emoĝion %{target}"
update_domain_block_html: "%{name} ĝisdatigis domajnblokon por %{target}"
update_ip_block_html: "%{name} ŝanĝis regulon por IP %{target}"
- update_status_html: "%{name} ĝisdatigis mesaĝon de %{target}"
+ update_status_html: "%{name} ĝisdatigis afiŝon de %{target}"
update_user_role_html: "%{name} ŝanĝis la rolon %{target}"
deleted_account: forigita konto
empty: Neniu ĵurnalo trovita.
@@ -567,7 +567,7 @@ eo:
disable: Malebligi
disabled: Malebligita
enable: Ebligi
- enable_hint: Post ebligo, via servilo abonos ĉiujn publikajn mesaĝojn de tiu ripetilo, kaj komencos sendi publikajn mesaĝojn de la servilo al ĝi.
+ enable_hint: Post ebligo, via servilo abonos ĉiujn publikajn mesaĝojn de tiu ripetilo, kaj komencos sendi publikajn afiŝojn de la servilo al ĝi.
enabled: Ebligita
inbox_url: URL de la ripetilo
pending: Atendante aprobon de la ripetilo
@@ -587,7 +587,7 @@ eo:
action_log: Ĵurnalo de revizo
action_taken_by: Ago farita de
actions:
- delete_description_html: Raportitaj mesaĝoj forigotas kaj admono rekorditas.
+ delete_description_html: Raportitaj afiŝoj estos forigita kaj admono estos rekordita por helpi vin indiki estontajn afiŝojn de la sama konto kontraŭ reguloj.
mark_as_sensitive_description_html: La audovidaĵo en la raportita mesaĝo markotas kiel sentema kaj admono rekorditas.
other_description_html: Vidu pli da ebloj por regi la sintenon de la konto kaj por personigi la komunikadon kun la raportita konto.
resolve_description_html: Nenio okazotas al la raportita konto kaj la raporto fermotas.
@@ -634,7 +634,7 @@ eo:
resolved: Solvitaj
resolved_msg: Signalo sukcese solvita!
skip_to_actions: Salti al agoj
- status: Mesaĝoj
+ status: Afiŝo
statuses: Raportita enhavo
statuses_description_html: Sentema enhavo referencitas kun la raportita konto
summary:
@@ -787,6 +787,7 @@ eo:
types:
major: Ĉefa eldono
minor: Neĉefa eldono
+ version: Versio
statuses:
account: Skribanto
application: Aplikaĵo
@@ -803,12 +804,12 @@ eo:
media:
title: Aŭdovidaĵoj
metadata: Metadatumoj
- no_status_selected: Neniu mesaĝo estis ŝanĝita ĉar neniu estis elektita
+ no_status_selected: Neniu afiŝo estis ŝanĝita ĉar neniu estis elektita
open: Malfermi afiŝojn
original_status: Originala afiŝo
reblogs: Reblogaĵoj
status_changed: Afiŝo ŝanĝiĝis
- title: Mesaĝoj de la konto
+ title: Afiŝoj de la konto
trending: Popularaĵoj
visibility: Videbleco
with_media: Kun aŭdovidaĵoj
@@ -816,7 +817,7 @@ eo:
actions:
delete_statuses: "%{name} forigis afiŝojn de %{target}"
disable: "%{name} frostigis la konton de %{target}"
- mark_statuses_as_sensitive: "%{name} markis mesaĝojn de %{target} kiel sentemaj"
+ mark_statuses_as_sensitive: "%{name} markis afiŝojn de %{target} kiel tiklan"
none: "%{name} sendis averton al %{target}"
sensitive: "%{name} markis konton de %{target} kiel sentema"
silence: "%{name} limigis la konton de %{target}"
@@ -827,6 +828,8 @@ eo:
system_checks:
database_schema_check:
message_html: Estas pritraktataj datumbazaj migradoj. Bonvolu ekzekuti ilin por certigi, ke la apliko kondutas kiel atendite
+ elasticsearch_preset:
+ action: Legi dokumentaron
elasticsearch_running_check:
message_html: Ne eblas konekti Elasticsearch. Bonvolu kontroli ke ĝi funkcias, aǔ malŝaltu plentekstan serĉon
elasticsearch_version_check:
@@ -940,7 +943,7 @@ eo:
admin_mailer:
new_appeal:
actions:
- delete_statuses: por forigi iliajn mesaĝojn
+ delete_statuses: por forigi iliajn afiŝojn
disable: por frostigi ties konton
mark_statuses_as_sensitive: por marki iliajn mesaĝojn kiel sentemaj
none: averto
@@ -991,7 +994,7 @@ eo:
unsubscribe: Malabonu
view: 'Vidi:'
view_profile: Vidi profilon
- view_status: Vidi mesaĝon
+ view_status: Vidi afiŝon
applications:
created: Aplikaĵo sukcese kreita
destroyed: Aplikaĵo sukcese forigita
@@ -1131,7 +1134,7 @@ eo:
recipient: Senditas por
reject_appeal: Malakcepti apelacion
status: 'Afiŝo #%{id}'
- status_removed: Mesaĝo jam forigitas de sistemo
+ status_removed: Afiŝo jam estas forigita de sistemo
title: "%{action} de %{date}"
title_actions:
delete_statuses: Forigo de afiŝo
@@ -1199,8 +1202,8 @@ eo:
edit:
add_keyword: Aldoni ĉefvorton
keywords: Ĉefvortoj
- statuses: Individuaj mesaĝoj
- statuses_hint_html: Ĉi tiu filtrilo kongruas kelkajn mesaĝojn. Kontrolu mesaĝojn de la filtrilo.
+ statuses: Individuaj afiŝoj
+ statuses_hint_html: Ĉi tiu filtrilo kongruas kelkajn afiŝojn. Kontroli afiŝojn de la filtrilo.
title: Ŝanĝi filtrilojn
errors:
deprecated_api_multiple_keywords: Ĉi tiuj parametroj ne povas ŝanĝitis de ĉi tiu programaro. Uzu pli novan programaron.
@@ -1218,8 +1221,8 @@ eo:
one: "%{count} afiŝo"
other: "%{count} afiŝoj"
statuses_long:
- one: "%{count} mesaĝo kaŝita"
- other: "%{count} mesaĝoj kaŝita"
+ one: "%{count} afiŝo estas kaŝita"
+ other: "%{count} afiŝoj estas kaŝitaj"
title: Filtriloj
new:
save: Konservi novan filtrilon
@@ -1230,7 +1233,7 @@ eo:
remove: Forigi de filtrilo
index:
hint: Ĉi tiu filtrilo kongruas kelkaj mesaĝoj sendepende de aliaj kriterioj.
- title: Filtritaj mesaĝoj
+ title: Filtritaj afiŝoj
generic:
all: Ĉio
all_items_on_page_selected_html:
@@ -1644,16 +1647,16 @@ eo:
interaction_exceptions_explanation: Sciu ke estas neniu garantio ke mesaĝo estos forigita se ĝi iras sub la limo de diskonigoj aŭ stelumoj post atingi ĝin.
keep_direct: Konservi rektajn mesaĝojn
keep_direct_hint: Ne forigos viajn rektajn mesagôjn
- keep_media: Konservi mesaĝojn kun aŭdovidaj aldonaĵoj
+ keep_media: Konservi afiŝojn kun aŭdovidaj aldonaĵoj
keep_media_hint: Ne forigi mesaĝojn kiuj enhavas aŭdovidajn aldonaĵojn
- keep_pinned: Konservi alpinglitajn mesaĝojn
+ keep_pinned: Konservi alpinglitajn afiŝojn
keep_pinned_hint: Ne forigi viajn ajn alpinglitajn mesaĝojn
keep_polls: Konservi enketojn
keep_polls_hint: Ne forigi viajn ajn enketojn
- keep_self_bookmark: Konservi mesaĝojn kiun vi legsignis
+ keep_self_bookmark: Konservi afiŝojn kiun vi legsignis
keep_self_bookmark_hint: Ne forigi viajn siajn mesaĝojn se vi legsignis ilin
- keep_self_fav: Konservi mesaĝojn kiujn vi stelumis
- keep_self_fav_hint: Ne forigi proprajn mesaĝojn se vi stelumis ilin
+ keep_self_fav: Konservi afiŝojn kiujn vi stelumis
+ keep_self_fav_hint: Ne forigi proprajn afiŝojn se vi stelumis ilin
min_age:
'1209600': 2 semajnoj
'15778476': 6 monatoj
@@ -1664,7 +1667,7 @@ eo:
'63113904': 2 jaroj
'7889238': 3 monatoj
min_age_label: Aĝlimo
- min_favs: Konservi mesaĝojn stelumitajn almenaŭ
+ min_favs: Konservi afiŝojn stelumitajn almenaŭ
min_favs_hint: Oni ne forigas viajn afiŝojn, kiuj estas diskonigitaj almenaŭ ĉi tiun nombron da fojoj. Lasu malplena por forigi afiŝojn sendepende de iliaj nombroj da diskonigoj
min_reblogs: Konservi diskonitajn mesaĝojn almenau
min_reblogs_hint: Oni ne forigas viajn afiŝojn kiuj estas diskonigitaj almenaŭ ĉi tiun nombron da fojoj. Lasu malplena por forigi afiŝojn sendepende de iliaj nombroj da diskonigoj
@@ -1738,11 +1741,11 @@ eo:
silence: Vi ankorau povas uzi vian konton, sed nur personoj kiuj jam sekvas vin vidos viajn mesaĝojn en tiu ĉi servilo, kaj vi eble estos ekskluzive el diversaj malkovrigaj funkcioj. Tamen, aliaj ankoraŭ povas permane eksekvi vin.
suspend: Vi ne povas uzi vian konton plu, kaj via profilo kaj aliaj datumoj ne estas disponeblaj plu.
reason: 'Kialo:'
- statuses: 'Mesaĝoj ripetitaj:'
+ statuses: 'Afiŝoj citataj:'
subject:
- delete_statuses: Viaj mesaĝoj ĉe %{acct} forigitas
+ delete_statuses: Viaj afiŝoj ĉe %{acct} estas forigitaj
disable: Via konto %{acct} estas frostigita
- mark_statuses_as_sensitive: Viaj mesaĝoj ĉe %{acct} markitas kiel sentemaj
+ mark_statuses_as_sensitive: Viaj afiŝoj ĉe %{acct} estas markitaj kiel tiklemaj
none: Averto por %{acct}
sensitive: Viaj mesaĝoj ĉe %{acct} markitas kiel sentemaj malantau ol nun
silence: Oni limigis vian konton %{acct}
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index a167b5d8c..6c9929315 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -15,17 +15,27 @@ ia:
instance_actor_flash: Iste conto es un agente virtual usate pro representar le servitor mesme e non alcun usator individual. Illo es usate pro le federation e non debe esser suspendite.
last_active: ultime activitate
link_verified_on: Le proprietate de iste ligamine ha essite verificate le %{date}
+ nothing_here: Il ha nihil ci!
+ pin_errors:
+ following: Tu debe primo sequer le persona que tu vole indorsar
posts:
one: Message
other: Messages
posts_tab_heading: Messages
admin:
+ account_actions:
+ action: Exequer action
+ title: Exequer action de moderation sur %{acct}
account_moderation_notes:
create: Lassar un nota
created_msg: Nota de moderation create con successo!
+ destroyed_msg: Nota de moderation destruite con successo!
accounts:
add_email_domain_block: Blocar dominio de e-mail
+ approve: Approbar
+ approved_msg: Demanda de inscription de %{username} approbate con successo
are_you_sure: Es tu secur?
+ avatar: Avatar
by_domain: Dominio
change_email:
changed_msg: Email cambiate con successo!
@@ -34,6 +44,11 @@ ia:
new_email: Nove e-mail
submit: Cambiar e-mail
title: Cambiar e-mail pro %{username}
+ change_role:
+ changed_msg: Rolo cambiate con successo!
+ label: Cambiar rolo
+ no_role: Necun rolo
+ title: Cambiar rolo pro %{username}
confirm: Confirmar
confirmed: Confirmate
confirming: In confirmation
@@ -42,25 +57,59 @@ ia:
deleted: Delite
demote: Degradar
destroyed_msg: Le datos de %{username} ora es in cauda pro su imminente deletion
+ disable: Gelar
+ disable_sign_in_token_auth: Disactivar le authentication per token in e-mail
disable_two_factor_authentication: Disactivar 2FA
+ disabled: Gelate
display_name: Nomine visibile
domain: Dominio
edit: Modificar
email: E-mail
email_status: Stato de e-mail
+ enable: Disgelar
+ enable_sign_in_token_auth: Activar le authentication per token in e-mail
enabled: Activate
+ enabled_msg: Conto de %{username} disgelate con successo
followers: Sequitores
+ follows: Sequites
+ header: Capite
+ inbox_url: URL de cassa de entrata
+ invite_request_text: Motivos pro le inscription
+ invited_by: Invitate per
+ ip: IP
+ joined: Inscription
location:
all: Toto
+ local: Local
+ remote: Remote
title: Location
+ login_status: Stato de session
+ media_attachments: Annexos multimedial
+ memorialize: Render commemorative
+ memorialized: Conto commemorative
+ memorialized_msg: "%{username} ha essite convertite in un conto commemorative"
moderation:
active: Active
all: Toto
disabled: Disactivate
+ pending: In tractamento
+ silenced: Limitate
+ suspended: Suspendite
+ title: Moderation
moderation_notes: Notas de moderation
most_recent_activity: Activitate plus recente
most_recent_ip: IP plus recente
+ no_account_selected: Necun conto ha essite cambiate perque necun ha essite seligite
+ no_limits_imposed: Necun limite imponite
+ no_role_assigned: Necun rolo assignate
+ not_subscribed: Non subscribite
+ pending: Attende revision
+ perform_full_suspension: Suspender
+ previous_strikes: Previe admonitiones
+ promote: Promover
+ protocol: Protocollo
public: Public
+ push_subscription_expires: Subscription PuSH expira le
redownload: Actualisar profilo
resend_confirmation:
already_confirmed: Iste usator jam es confirmate
@@ -237,6 +286,9 @@ ia:
updated_at: Actualisate
view_profile: Vider profilo
roles:
+ assigned_users:
+ one: "%{count} usator"
+ other: "%{count} usatores"
everyone: Permissiones predefinite
privileges:
delete_user_data: Deler le datos de usator
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 4c22335ea..9cb9cadee 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1671,6 +1671,9 @@ pt-BR:
domain_block: Suspensão do servidor (%{target_name})
user_domain_block: Você bloqueou %{target_name}
lost_followers: Seguidores perdidos
+ lost_follows: Seguidores perdidos
+ preamble: Você poderá perder seguidores e seguidores quando bloquear um domínio ou quando os seus moderadores decidirem suspender um servidor remoto. Quando isso acontecer, você poderá baixar listas de relações desfeitas, a serem inspecionadas e possivelmente importadas para outro servidor.
+ purged: As informações sobre este servidor foram eliminadas pelos administradores do seu servidor.
type: Evento
statuses:
attached:
@@ -1765,6 +1768,7 @@ pt-BR:
contrast: Mastodon (Alto contraste)
default: Mastodon (Noturno)
mastodon-light: Mastodon (Diurno)
+ system: Automático (usar tema do sistema)
time:
formats:
default: "%H:%M em %d de %b de %Y"
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 2f04ce982..7012cdb1c 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -30,6 +30,7 @@ ia:
defaults:
autofollow: Invitar a sequer tu conto
avatar: Pictura de profilo
+ chosen_languages: Filtrar linguas
confirm_new_password: Confirmar nove contrasigno
confirm_password: Confirmar contrasigno
current_password: Contrasigno actual
@@ -39,6 +40,7 @@ ia:
new_password: Nove contrasigno
password: Contrasigno
setting_advanced_layout: Activar le interfacie web avantiate
+ setting_always_send_emails: Sempre inviar notificationes per e-mail
setting_default_language: Lingua de publication
setting_display_media_default: Predefinite
setting_display_media_hide_all: Celar toto
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 676f5e37a..c3eea9f11 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -116,6 +116,7 @@ pt-BR:
sign_up_requires_approval: Novas inscrições exigirão sua aprovação
severity: Escolha o que acontecerá com as solicitações deste IP
rule:
+ hint: Opcional. Forneça mais detalhes sobre a regra
text: Descreva uma regra ou requisito para os usuários neste servidor. Tente mantê-la curta e simples.
sessions:
otp: 'Digite o código de dois fatores gerado pelo aplicativo no seu celular ou use um dos códigos de recuperação:'
diff --git a/config/webpacker.yml b/config/webpacker.yml
index f8462e53a..e07f577c5 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -2,7 +2,7 @@
default: &default
source_path: app/javascript
- source_entry_path: packs
+ source_entry_path: entrypoints
public_root_path: public
public_output_path: packs
cache_path: tmp/cache/webpacker
diff --git a/db/migrate/20240217171534_remove_defaults_for_status_pins_timestamps.rb b/db/migrate/20240217171534_remove_defaults_for_status_pins_timestamps.rb
new file mode 100644
index 000000000..301371a02
--- /dev/null
+++ b/db/migrate/20240217171534_remove_defaults_for_status_pins_timestamps.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class RemoveDefaultsForStatusPinsTimestamps < ActiveRecord::Migration[7.1]
+ def change
+ change_column_default :status_pins, :created_at, from: -> { 'CURRENT_TIMESTAMP' }, to: nil
+ change_column_default :status_pins, :updated_at, from: -> { 'CURRENT_TIMESTAMP' }, to: nil
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6a52333a8..a875c6ffc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1030,8 +1030,8 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_22_161611) do
create_table "status_pins", force: :cascade do |t|
t.bigint "account_id", null: false
t.bigint "status_id", null: false
- t.datetime "created_at", precision: nil, default: -> { "now()" }, null: false
- t.datetime "updated_at", precision: nil, default: -> { "now()" }, null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id", "status_id"], name: "index_status_pins_on_account_id_and_status_id", unique: true
t.index ["status_id"], name: "index_status_pins_on_status_id"
end
diff --git a/spec/models/admin/account_action_spec.rb b/spec/models/admin/account_action_spec.rb
index 9bc9f8061..a9dcf352d 100644
--- a/spec/models/admin/account_action_spec.rb
+++ b/spec/models/admin/account_action_spec.rb
@@ -69,22 +69,22 @@ RSpec.describe Admin::AccountAction do
end
end
- it 'creates Admin::ActionLog' do
+ it 'sends notification, log the action, and closes other reports', :aggregate_failures do
+ other_report = Fabricate(:report, target_account: target_account)
+
+ emails = []
expect do
- subject
- end.to change(Admin::ActionLog, :count).by 1
- end
+ emails = capture_emails { subject }
+ end.to (change(Admin::ActionLog.where(action: type), :count).by 1)
+ .and(change { other_report.reload.action_taken? }.from(false).to(true))
- it 'calls process_email!' do
- allow(account_action).to receive(:process_email!)
- subject
- expect(account_action).to have_received(:process_email!)
- end
+ expect(emails).to contain_exactly(
+ have_attributes(
+ to: contain_exactly(target_account.user.email)
+ )
+ )
- it 'calls process_reports!' do
- allow(account_action).to receive(:process_reports!)
- subject
- expect(account_action).to have_received(:process_reports!)
+ expect(LocalNotificationWorker).to have_enqueued_sidekiq_job(target_account.id, anything, 'AccountWarning', 'moderation_warning')
end
end
diff --git a/tsconfig.json b/tsconfig.json
index a193ea35f..7010dda1f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,7 +20,7 @@
},
"include": [
"app/javascript/mastodon",
- "app/javascript/packs",
+ "app/javascript/entrypoints",
"app/javascript/types"
]
}