Merge remote-tracking branch 'vanilla/master'

app/controllers/admin/domain_blocks_controller.rb

@@ -74,11 +74,11 @@ def set_domain_block
  end
 
  def update_params
- params.require(:domain_block).permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment)
+ params.require(:domain_block).permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
  end
 
  def resource_params
- params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment)
+ params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
  end
  end
 end

app/javascript/mastodon/locales/ca.json

@@ -149,7 +149,7 @@
  "emoji_button.search_results": "Resultats de la cerca",
  "emoji_button.symbols": "Símbols",
  "emoji_button.travel": "Viatges i Llocs",
- "empty_column.account_suspended": "Account suspended",
+ "empty_column.account_suspended": "Compte suspès",
  "empty_column.account_timeline": "No hi ha tuts aquí!",
  "empty_column.account_unavailable": "Perfil no disponible",
  "empty_column.blocks": "Encara no has bloquejat cap usuari.",
@@ -266,9 +266,9 @@
  "lists.edit.submit": "Canvi de títol",
  "lists.new.create": "Afegir llista",
  "lists.new.title_placeholder": "Nova llista",
- "lists.replies_policy.followed": "Any followed user",
- "lists.replies_policy.list": "Members of the list",
- "lists.replies_policy.none": "No one",
+ "lists.replies_policy.followed": "Qualsevol usuari seguit",
+ "lists.replies_policy.list": "Membres de la llista",
+ "lists.replies_policy.none": "Ningú",
  "lists.replies_policy.title": "Mostra respostes a:",
  "lists.search": "Cercar entre les persones que segueixes",
  "lists.subheading": "Les teves llistes",
@@ -334,12 +334,12 @@
  "notifications.filter.mentions": "Mencions",
  "notifications.filter.polls": "Resultats de l'enquesta",
  "notifications.filter.statuses": "Actualitzacions de gent que segueixes",
- "notifications.grant_permission": "Grant permission.",
+ "notifications.grant_permission": "Concedir permís.",
  "notifications.group": "{count} notificacions",
  "notifications.mark_as_read": "Marca cada notificació com a llegida",
  "notifications.permission_denied": "No s’ha pogut activar les notificacions d’escriptori perquè s’ha denegat el permís.",
  "notifications.permission_denied_alert": "No es poden activar les notificacions del escriptori perquè el permís del navegador ha estat denegat abans",
- "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+ "notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquè el permís requerit no ha estat concedit.",
  "notifications_permission_banner.enable": "Activar les notificacions d’escriptori",
  "notifications_permission_banner.how_to_control": "Per a rebre notificacions quan Mastodon no està obert cal activar les notificacions d’escriptori. Pots controlar amb precisió quins tipus d’interaccions generen notificacions d’escriptori després d’activar el botó {icon} de dalt.",
  "notifications_permission_banner.title": "Mai et perdis res",

app/javascript/mastodon/locales/co.json

@@ -149,7 +149,7 @@
  "emoji_button.search_results": "Risultati di a cerca",
  "emoji_button.symbols": "Simbuli",
  "emoji_button.travel": "Lochi è Viaghju",
- "empty_column.account_suspended": "Account suspended",
+ "empty_column.account_suspended": "Contu suspesu",
  "empty_column.account_timeline": "Nisun statutu quì!",
  "empty_column.account_unavailable": "Prufile micca dispunibule",
  "empty_column.blocks": "Per avà ùn avete bluccatu manc'un utilizatore.",
@@ -266,9 +266,9 @@
  "lists.edit.submit": "Cambià u titulu",
  "lists.new.create": "Aghjunghje",
  "lists.new.title_placeholder": "Titulu di a lista",
- "lists.replies_policy.followed": "Any followed user",
- "lists.replies_policy.list": "Members of the list",
- "lists.replies_policy.none": "No one",
+ "lists.replies_policy.followed": "Tutti i vostri abbunamenti",
+ "lists.replies_policy.list": "Membri di a lista",
+ "lists.replies_policy.none": "Nimu",
  "lists.replies_policy.title": "Vede e risposte à:",
  "lists.search": "Circà indè i vostr'abbunamenti",
  "lists.subheading": "E vo liste",
@@ -334,12 +334,12 @@
  "notifications.filter.mentions": "Minzione",
  "notifications.filter.polls": "Risultati di u scandagliu",
  "notifications.filter.statuses": "Messe à ghjornu di e persone chì siguitate",
- "notifications.grant_permission": "Grant permission.",
+ "notifications.grant_permission": "Auturizà.",
  "notifications.group": "{count} nutificazione",
  "notifications.mark_as_read": "Marcà tutte e nutificazione cum'è lette",
- "notifications.permission_denied": "Ùn si po micca attivà e nutificazione desktop perchè a dumanda d'auturizazione hè stata ricusata",
+ "notifications.permission_denied": "Ùn si po micca attivà e nutificazione desktop perchè l'auturizazione hè stata ricusata",
  "notifications.permission_denied_alert": "Ùn pudete micca attivà e nutificazione nant'à l'urdinatore, perchè avete digià ricusatu a dumanda d'auturizazione di u navigatore",
- "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+ "notifications.permission_required": "Ùn si po micca attivà e nutificazione desktop perchè a l'auturizazione richiesta ùn hè micca stata data.",
  "notifications_permission_banner.enable": "Attivà e nutificazione nant'à l'urdinatore",
  "notifications_permission_banner.how_to_control": "Per riceve nutificazione quandu Mastodon ùn hè micca aperta, attivate e nutificazione nant'à l'urdinatore. Pudete decide quali tippi d'interazione anu da mandà ste nutificazione cù u buttone {icon} quì sopra quandu saranu attivate.",
  "notifications_permission_banner.title": "Ùn mancate mai nunda",

app/javascript/mastodon/locales/el.json

@@ -149,7 +149,7 @@
  "emoji_button.search_results": "Αποτελέσματα αναζήτησης",
  "emoji_button.symbols": "Σύμβολα",
  "emoji_button.travel": "Ταξίδια & Τοποθεσίες",
- "empty_column.account_suspended": "Account suspended",
+ "empty_column.account_suspended": "Λογαριασμός σε αναστολή",
  "empty_column.account_timeline": "Δεν έχει τουτ εδώ!",
  "empty_column.account_unavailable": "Μη διαθέσιμο προφίλ",
  "empty_column.blocks": "Δεν έχεις αποκλείσει κανέναν χρήστη ακόμα.",
@@ -266,9 +266,9 @@
  "lists.edit.submit": "Αλλαγή τίτλου",
  "lists.new.create": "Προσθήκη λίστας",
  "lists.new.title_placeholder": "Τίτλος νέας λίστα",
- "lists.replies_policy.followed": "Any followed user",
- "lists.replies_policy.list": "Members of the list",
- "lists.replies_policy.none": "No one",
+ "lists.replies_policy.followed": "Οποιοσδήποτε χρήστης που ακολουθείς",
+ "lists.replies_policy.list": "Μέλη της λίστας",
+ "lists.replies_policy.none": "Κανένας",
  "lists.replies_policy.title": "Εμφάνιση απαντήσεων σε:",
  "lists.search": "Αναζήτησε μεταξύ των ανθρώπων που ακουλουθείς",
  "lists.subheading": "Οι λίστες σου",
@@ -334,12 +334,12 @@
  "notifications.filter.mentions": "Αναφορές",
  "notifications.filter.polls": "Αποτελέσματα ψηφοφορίας",
  "notifications.filter.statuses": "Ενημερώσεις από όσους ακολουθείς",
- "notifications.grant_permission": "Grant permission.",
+ "notifications.grant_permission": "Χορήγηση άδειας.",
  "notifications.group": "{count} ειδοποιήσεις",
  "notifications.mark_as_read": "Σημείωσε όλες τις ειδοποιήσεις ως αναγνωσμένες",
  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
- "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+ "notifications.permission_required": "Οι ειδοποιήσεις δεν είναι διαθέσιμες επειδή δεν έχει δοθεί η απαιτούμενη άδεια.",
  "notifications_permission_banner.enable": "Ενεργοποίηση ειδοποιήσεων επιφάνειας εργασίας",
  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
  "notifications_permission_banner.title": "Μη χάσετε τίποτα",

app/javascript/mastodon/locales/es-AR.json

@@ -149,7 +149,7 @@
  "emoji_button.search_results": "Resultados de búsqueda",
  "emoji_button.symbols": "Símbolos",
  "emoji_button.travel": "Viajes y lugares",
- "empty_column.account_suspended": "Account suspended",
+ "empty_column.account_suspended": "Cuenta suspendida",
  "empty_column.account_timeline": "¡No hay toots acá!",
  "empty_column.account_unavailable": "Perfil no disponible",
  "empty_column.blocks": "Todavía no bloqueaste a ningún usuario.",
@@ -266,9 +266,9 @@
  "lists.edit.submit": "Cambiar título",
  "lists.new.create": "Agregar lista",
  "lists.new.title_placeholder": "Nuevo título de lista",
- "lists.replies_policy.followed": "Any followed user",
- "lists.replies_policy.list": "Members of the list",
- "lists.replies_policy.none": "No one",
+ "lists.replies_policy.followed": "Cualquier cuenta seguida",
+ "lists.replies_policy.list": "Miembros de la lista",
+ "lists.replies_policy.none": "Nadie",
  "lists.replies_policy.title": "Mostrar respuestas a:",
  "lists.search": "Buscar entre la gente que seguís",
  "lists.subheading": "Tus listas",
@@ -334,12 +334,12 @@
  "notifications.filter.mentions": "Menciones",
  "notifications.filter.polls": "Resultados de encuesta",
  "notifications.filter.statuses": "Actualizaciones de cuentas que seguís",
- "notifications.grant_permission": "Grant permission.",
+ "notifications.grant_permission": "Conceder permiso.",
  "notifications.group": "{count} notificaciones",
  "notifications.mark_as_read": "Marcar cada notificación como leída",
  "notifications.permission_denied": "Las notificaciones de escritorio no están disponibles, debido a una solicitud de permiso del navegador web previamente denegada",
  "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado antes",
- "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+ "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se concedió el permiso requerido.",
  "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
  "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no está abierto, habilitá las notificaciones de escritorio. Podés controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba, una vez que estén habilitadas.",
  "notifications_permission_banner.title": "No te pierdas nada",

app/javascript/mastodon/locales/es.json

@@ -149,7 +149,7 @@
  "emoji_button.search_results": "Resultados de búsqueda",
  "emoji_button.symbols": "Símbolos",
  "emoji_button.travel": "Viajes y lugares",
- "empty_column.account_suspended": "Account suspended",
+ "empty_column.account_suspended": "Cuenta suspendida",
  "empty_column.account_timeline": "¡No hay toots aquí!",
  "empty_column.account_unavailable": "Perfil no disponible",
  "empty_column.blocks": "Aún no has bloqueado a ningún usuario.",
@@ -266,9 +266,9 @@
  "lists.edit.submit": "Cambiar título",
  "lists.new.create": "Añadir lista",
  "lists.new.title_placeholder": "Título de la nueva lista",
- "lists.replies_policy.followed": "Any followed user",
- "lists.replies_policy.list": "Members of the list",
- "lists.replies_policy.none": "No one",
+ "lists.replies_policy.followed": "Cualquier usuario seguido",
+ "lists.replies_policy.list": "Miembros de la lista",
+ "lists.replies_policy.none": "Nadie",
  "lists.replies_policy.title": "Mostrar respuestas a:",
  "lists.search": "Buscar entre la gente a la que sigues",
  "lists.subheading": "Tus listas",
@@ -334,12 +334,12 @@
  "notifications.filter.mentions": "Menciones",
  "notifications.filter.polls": "Resultados de la votación",
  "notifications.filter.statuses": "Actualizaciones de gente a la que sigues",
- "notifications.grant_permission": "Grant permission.",
+ "notifications.grant_permission": "Conceder permiso.",
  "notifications.group": "{count} notificaciones",
  "notifications.mark_as_read": "Marcar todas las notificaciones como leídas",
  "notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
  "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
- "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+ "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
  "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
  "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
  "notifications_permission_banner.title": "Nunca te pierdas nada",

app/javascript/mastodon/locales/fa.json

@@ -81,7 +81,7 @@
  "column_header.show_settings": "نمایش تنظیمات",
  "column_header.unpin": "رهاکردن",
  "column_subheading.settings": "ساماندهی",
- "community.column_settings.local_only": "تنها بومی",
+ "community.column_settings.local_only": "فقط محلّی",
  "community.column_settings.media_only": "فقط رسانه",
  "community.column_settings.remote_only": "تنها دوردست",
  "compose_form.direct_message_warning": "این بوق تنها به کاربرانی که از آن‌ها نام برده شده فرستاده خواهد شد.",
@@ -149,7 +149,7 @@
  "emoji_button.search_results": "نتایج جستجو",
  "emoji_button.symbols": "نمادها",
  "emoji_button.travel": "سفر و مکان",
- "empty_column.account_suspended": "Account suspended",
+ "empty_column.account_suspended": "حساب معلق شد",
  "empty_column.account_timeline": "هیچ بوقی این‌جا نیست!",
  "empty_column.account_unavailable": "نمایهٔ موجود نیست",
  "empty_column.blocks": "هنوز کسی را مسدود نکرده‌اید.",
@@ -266,9 +266,9 @@
  "lists.edit.submit": "تغییر عنوان",
  "lists.new.create": "افزودن فهرست",
  "lists.new.title_placeholder": "عنوان فهرست تازه",
- "lists.replies_policy.followed": "Any followed user",
- "lists.replies_policy.list": "Members of the list",
- "lists.replies_policy.none": "No one",
+ "lists.replies_policy.followed": "هر کاربر پیگرفته",
+ "lists.replies_policy.list": "اعضای فهرست",
+ "lists.replies_policy.none": "هیچ کدام",
  "lists.replies_policy.title": "نمایش پاسخ‌ها به:",
  "lists.search": "بین کسانی که پی می‌گیرید بگردید",
  "lists.subheading": "فهرست‌های شما",
@@ -334,12 +334,12 @@
  "notifications.filter.mentions": "نام‌بردن‌ها",
  "notifications.filter.polls": "نتایج نظرسنجی",
  "notifications.filter.statuses": "به‌روز رسانی‌ها از کسانی که پی‌گیرشانید",
- "notifications.grant_permission": "Grant permission.",
+ "notifications.grant_permission": "اعطای مجوز.",
  "notifications.group": "{count} اعلان",
  "notifications.mark_as_read": "نشانه‌گذاری همهٔ آگاهی‌ها به عنوان خوانده‌شده",
  "notifications.permission_denied": "آگاهی‌های میزکار به دلیل رد کردن درخواست اجازهٔ پیشین مرورگر، در دسترس نیستند",
  "notifications.permission_denied_alert": "از آن‌جا که پیش از این اجازهٔ مرورگر رد شده است، آگاهی‌های میزکار نمی‌توانند به کار بیفتند",
- "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+ "notifications.permission_required": "اعلان‌های میزکار در دسترس نیستند زیرا نیازمند مجوزی هستند که اعطا نشده است.",
  "notifications_permission_banner.enable": "به کار انداختن آگاهی‌های میزکار",
  "notifications_permission_banner.how_to_control": "اگر می‌خواهید حتی زمانی که ماستودون باز نیست اعلان‌ها نمایش یابند، اعلان‌های میزکار را فعال کنید. به محض فعال شدن از طریق دکمه {icon} بالا می‌توانید به دقت کنترل کنید که چه نوع از تعامل‌ها باعث صادر شدن اعلان‌ها شوند.",
  "notifications_permission_banner.title": "هرگز چیزی را از دست ندهید",