Fix bogus simple_form.no.yml

Fix bogus no.yml
New Crowdin translations
2025-12-13 15:58:50 +00:00 · 2025-10-10 18:49:37 +02:00 · 2025-10-10 18:49:19 +02:00 · 2025-10-10 16:47:31 +00:00 · 2025-10-10 18:45:27 +02:00 · 2025-10-10 10:29:48 +02:00
62 changed files with 714 additions and 209 deletions
--- a/.github/workflows/crowdin-download-stable.yml
+++ b/.github/workflows/crowdin-download-stable.yml
@@ -9,7 +9,7 @@ permissions:
 jobs:
  download-translations-stable:
    runs-on: ubuntu-latest
-    if: github.repository == 'mastodon/mastodon'
+    if: github.repository == 'glitch-soc/mastodon'

    steps:
      - name: Checkout
--- a/3
+++ b/3
@@ -159,6 +159,9 @@ group :test do

  # Stub web requests for specs
  gem 'webmock', '~> 3.18'
+
+  # Websocket driver for testing integration between rails/sidekiq and streaming
+  gem 'websocket-driver', '~> 0.8', require: false
 end

 group :development do
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -642,7 +642,7 @@ GEM
      activesupport (>= 3.0.0)
    raabro (1.4.0)
    racc (1.8.1)
-    rack (3.1.16)
+    rack (3.1.17)
    rack-attack (6.7.0)
      rack (>= 1.0, < 4)
    rack-cors (3.0.0)
@@ -899,7 +899,7 @@ GEM
    unicode-display_width (3.1.4)
      unicode-emoji (~> 4.0, >= 4.0.4)
    unicode-emoji (4.0.4)
-    uri (1.0.3)
+    uri (1.0.4)
    useragent (0.16.11)
    validate_url (1.0.15)
      activemodel (>= 3.0.0)
@@ -932,7 +932,7 @@ GEM
      crack (>= 0.3.2)
      hashdiff (>= 0.4.0, < 2.0.0)
    webrick (1.9.1)
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
      base64
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
@@ -1096,6 +1096,7 @@ DEPENDENCIES
  webauthn (~> 3.0)
  webmock (~> 3.18)
  webpush!
+  websocket-driver (~> 0.8)
  xorcist (~> 1.1)

 RUBY VERSION
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -9,10 +9,16 @@ module Admin

      @pending_appeals_count = Appeal.pending.async_count
      @pending_reports_count = Report.unresolved.async_count
-      @pending_tags_count    = Tag.pending_review.async_count
+      @pending_tags_count    = pending_tags.async_count
      @pending_users_count   = User.pending.async_count
      @system_checks         = Admin::SystemCheck.perform(current_user)
      @time_period           = (29.days.ago.to_date...Time.now.utc.to_date)
    end
+
+    private
+
+    def pending_tags
+      ::Trends::TagFilter.new(status: :pending_review).results
+    end
  end
 end
--- a/app/javascript/flavours/glitch/components/featured_carousel.tsx
+++ b/app/javascript/flavours/glitch/components/featured_carousel.tsx
@@ -20,7 +20,7 @@ import { useDrag } from '@use-gesture/react';
 import { expandAccountFeaturedTimeline } from '@/flavours/glitch/actions/timelines';
 import { Icon } from '@/flavours/glitch/components/icon';
 import { IconButton } from '@/flavours/glitch/components/icon_button';
-import StatusContainer from '@/flavours/glitch/containers/status_container';
+import { StatusQuoteManager } from '@/flavours/glitch/components/status_quoted';
 import { usePrevious } from '@/flavours/glitch/hooks/usePrevious';
 import { useAppDispatch, useAppSelector } from '@/flavours/glitch/store';
 import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
@@ -218,12 +218,7 @@ const FeaturedCarouselItem: React.FC<
      ref={handleRef}
      {...props}
    >
-      <StatusContainer
-        // @ts-expect-error inferred props are wrong
-        id={statusId}
-        contextType='account'
-        withCounters
-      />
+      <StatusQuoteManager id={statusId} contextType='account' withCounters />
    </animated.div>
  );
 };
--- a/app/javascript/flavours/glitch/locales/ar.json
+++ b/app/javascript/flavours/glitch/locales/ar.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "عرض الملف الشخصي كاملاً",
  "boost_modal.missing_description": "هذا المنشور يحتوي على وسائط بلا وصف",
  "column.favourited_by": "المفضلة من قبل",
-  "column.heading": "متنوعة",
  "column.reblogged_by": "المرقى من قبل",
-  "column.subheading": "خيارات متنوعة",
  "column_header.profile": "الملف الشخصي",
-  "column_subheading.lists": "القوائم",
-  "column_subheading.navigation": "التنقل",
  "community.column_settings.allow_local_only": "إظهار المنشورات المحلية فقط",
  "compose.attach.doodle": "الرسوم و التخمين",
  "compose.change_federation": "تغيير اعدادات الفيديرالية",
@@ -36,8 +32,6 @@
  "keyboard_shortcuts.secondary_toot": "لإرسال التبويق باستخدام إعدادات الخصوصية الثانوية",
  "moved_to_warning": "عُلِّم هذا الحساب بأنه انتقل إلى {moved_to_link}، لذا قد لا يقبل متابعات جديدة.",
  "navigation_bar.app_settings": "إعدادات التطبيق",
-  "navigation_bar.keyboard_shortcuts": "اختصارات لوحة المفاتيح",
-  "navigation_bar.misc": "متنوع",
  "settings.always_show_spoilers_field": "تمكين دائما حقل تحذير المحتوى",
  "settings.close": "إغلاق",
  "settings.content_warnings": "Content warnings",
--- a/app/javascript/flavours/glitch/locales/cs.json
+++ b/app/javascript/flavours/glitch/locales/cs.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Zobrazit celý profil",
  "boost_modal.missing_description": "Příspěvek obsahuje obrázky bez popisků",
  "column.favourited_by": "Oblíbeno uživatelem",
-  "column.heading": "Různé",
  "column.reblogged_by": "Boostnuto uživatelem",
-  "column.subheading": "Různé",
  "column_header.profile": "Profil",
-  "column_subheading.lists": "Seznamy",
-  "column_subheading.navigation": "Navigace",
  "community.column_settings.allow_local_only": "Zobrazit pouze místní tooty",
  "compose.attach.doodle": "Nakreslete něco",
  "compose.change_federation": "Změnit nastavení federace",
@@ -45,8 +41,6 @@
  "keyboard_shortcuts.secondary_toot": "pro odeslání příspěvku s sekundárním nastavením soukromí",
  "moved_to_warning": "Tento účet je označen jako přesunut na {moved_to_link}, a proto nemusí přijímat nové sledování.",
  "navigation_bar.app_settings": "Nastavení aplikace",
-  "navigation_bar.keyboard_shortcuts": "Klávesové zkratky",
-  "navigation_bar.misc": "Různé",
  "notifications.column_settings.filter_bar.show_bar": "Zobrazit panel filtrů",
  "settings.always_show_spoilers_field": "Vždy zobrazit pole pro varování o obsahu",
  "settings.close": "Zavřít",
--- a/app/javascript/flavours/glitch/locales/cy.json
+++ b/app/javascript/flavours/glitch/locales/cy.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Dangos proffil cyfan",
  "boost_modal.missing_description": "Mae'r tŵt yma'n cynnwys ychydig gyfryngau heb ddisgrifiad",
  "column.favourited_by": "Wedi'i hoffi gan",
-  "column.heading": "Misg",
  "column.reblogged_by": "Wedi'i bŵstio gan",
-  "column.subheading": "Opsiynnau arall",
  "column_header.profile": "Proffil",
-  "column_subheading.lists": "Rhestri",
-  "column_subheading.navigation": "Llywio",
  "community.column_settings.allow_local_only": "Dangos tŵtiau lleol yn unig",
  "compose.content-type.html": "HTML",
  "compose.content-type.markdown": "Markdown",
--- a/app/javascript/flavours/glitch/locales/da.json
+++ b/app/javascript/flavours/glitch/locales/da.json
@@ -2,7 +2,6 @@
  "home.column_settings.advanced": "Avanceret",
  "home.column_settings.show_direct": "Vis private omtaler",
  "navigation_bar.app_settings": "Appindstillinger",
-  "navigation_bar.misc": "Diverse",
  "settings.always_show_spoilers_field": "Vis altid feltet til indholdsadvarsel",
  "settings.close": "Luk",
  "settings.content_warnings": "Indholdsadvarsler",
--- a/app/javascript/flavours/glitch/locales/de.json
+++ b/app/javascript/flavours/glitch/locales/de.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Vollständiges Profil anzeigen",
  "boost_modal.missing_description": "Dieser Toot enthält Medien ohne Beschreibung",
  "column.favourited_by": "Favorisiert von",
-  "column.heading": "Sonstiges",
  "column.reblogged_by": "Geteilt von",
-  "column.subheading": "Sonstige Optionen",
  "column_header.profile": "Profil",
-  "column_subheading.lists": "Listen",
-  "column_subheading.navigation": "Navigation",
  "community.column_settings.allow_local_only": "Nur-lokale Toots anzeigen",
  "compose.attach.doodle": "Male etwas",
  "compose.change_federation": "Föderationseinstellungen ändern",
@@ -45,8 +41,6 @@
  "keyboard_shortcuts.secondary_toot": "Toot mit sekundärer Privatsphäreeinstellung absenden",
  "moved_to_warning": "Dieses Konto ist als verschoben zu {moved_to_link} markiert und akzeptiert daher keine neuen Follower.",
  "navigation_bar.app_settings": "App-Einstellungen",
-  "navigation_bar.keyboard_shortcuts": "Tastaturkürzel",
-  "navigation_bar.misc": "Sonstiges",
  "notifications.column_settings.filter_bar.show_bar": "Filterleiste anzeigen",
  "settings.always_show_spoilers_field": "Das Inhaltswarnungs-Feld immer aktivieren",
  "settings.close": "Schließen",
--- a/app/javascript/flavours/glitch/locales/el.json
+++ b/app/javascript/flavours/glitch/locales/el.json
@@ -1,4 +1,92 @@
 {
-  "settings.content_warnings": "Content warnings",
-  "settings.preferences": "Preferences"
+  "about.fork_disclaimer": "Το Glitch-soc είναι ελεύθερο λογισμικό ανοιχτού κώδικα που είναι αντιγραφή από το Mastodon.",
+  "account.disclaimer_full": "Οι παρακάτω πληροφορίες μπορεί να αντικατοπτρίζουν το προφίλ του χρήστη ελλιπώς.",
+  "account.follows": "Ακολουθεί",
+  "account.suspended_disclaimer_full": "Αυτός ο χρήστης έχει ανασταλεί από έναν συντονιστή.",
+  "account.view_full_profile": "Προβολή πλήρους προφίλ",
+  "boost_modal.missing_description": "Αυτό το τουτ περιέχει κάποια μέσα χωρίς περιγραφή",
+  "column.favourited_by": "Αγαπήθηκε από",
+  "column.reblogged_by": "Ενισχύθηκε από",
+  "column_header.profile": "Προφίλ",
+  "community.column_settings.allow_local_only": "Εμφάνιση τοπικών τουτ",
+  "compose.attach.doodle": "Σχεδίασε κάτι",
+  "compose.change_federation": "Αλλαγή ρυθμίσεων ομοσπονδίας",
+  "compose.content-type.change": "Αλλαγή προηγμένων επιλογών μορφοποίησης",
+  "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "Μορφοποίηση των αναρτήσεων σας με χρήση HTML",
+  "compose.content-type.markdown": "Markdown",
+  "compose.content-type.markdown_meta": "Μορφοποίηση των αναρτήσεων σας με χρήση Markdown",
+  "compose.content-type.plain": "Απλό κείμενο",
+  "compose.content-type.plain_meta": "Γράψιμο χωρίς προηγμένη μορφοποίηση",
+  "compose.disable_threaded_mode": "Απενεργοποίηση λειτουργίας νημάτων",
+  "compose.enable_threaded_mode": "Ενεργοποίηση λειτουργίας νημάτων",
+  "compose_form.sensitive.hide": "{count, plural, one {Επισήμανση πολυμέσου ως ευαίσθητο} other {Επισήμανση πολυμέσων ως ευαίσθητα}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Το πολυμέσο έχει σημανθεί ως ευαίσθητο} other {Τα πολυμέσα έχουν σημανθεί ως ευαίσθητα}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Το πολυμέσο δεν έχει σημανθεί ως ευαίσθητο} other {Τα πολυμέσα δεν έχουν σημανθεί ως ευαίσθητα}}",
+  "confirmation_modal.do_not_ask_again": "Να μην ζητηθεί επιβεβαίωση ξανά",
+  "confirmations.deprecated_settings.confirm": "Χρήση προτιμήσεων του Mastodon",
+  "direct.group_by_conversations": "Ομαδοποίηση ανά συζήτηση",
+  "favourite_modal.favourite": "Αγάπησε την ανάρτηση;",
+  "federation.federated.long": "Επιτρέψτε σε αυτήν την ανάρτηση να φτάσει σε άλλους διακομιστές",
+  "federation.local_only.long": "Αποτρέψτε αυτήν την ανάρτηση να φτάσει σε άλλους διακομιστές",
+  "federation.local_only.short": "Τοπικά μόνο",
+  "firehose.column_settings.allow_local_only": "Εμφάνιση τοπικών αναρτήσεων σε \"Όλα\"",
+  "home.column_settings.advanced": "Για προχωρημένους",
+  "home.column_settings.filter_regex": "Φιλτράρισμα βάσει των κανονικών εκφράσεων",
+  "home.column_settings.show_direct": "Εμφάνιση ιδιωτικών επισημάνσεων",
+  "home.settings": "Ρυθμίσεις στήλης",
+  "keyboard_shortcuts.bookmark": "για να σελιδοποιήσει",
+  "keyboard_shortcuts.secondary_toot": "για αποστολή τουτ χρησιμοποιώντας δευτερεύουσα ρύθμιση απορρήτου",
+  "moved_to_warning": "Αυτός ο λογαριασμός έχει σημανθεί ως μετακινημένος στο {moved_to_link} και έτσι δεν μπορεί να δεχτεί νέους ακολούθους.",
+  "navigation_bar.app_settings": "Ρυθμίσεις εφαρμογής",
+  "notifications.column_settings.filter_bar.show_bar": "Εμφάνιση μπάρας φίλτρου",
+  "settings.always_show_spoilers_field": "Πάντα ενεργοποίηση του πεδίου Προειδοποίηση Περιεχομένου",
+  "settings.close": "Κλείσιμο",
+  "settings.compose_box_opts": "Πλαίσιο σύνθεσης",
+  "settings.content_warnings": "Προειδοποιήσεις περιεχομένου",
+  "settings.content_warnings.regexp": "Κανονική έκφραση (regex)",
+  "settings.content_warnings_filter": "Προειδοποιήσεις περιεχομένου να μην ξεδιπλώνονται αυτόματα:",
+  "settings.content_warnings_shared_state": "Εμφάνιση/απόκρυψη περιεχομένου όλων των αντιγράφων ταυτόχρονα",
+  "settings.content_warnings_unfold_opts": "Επιλογές αυτόματου ξεδιπλώματος",
+  "settings.deprecated_setting": "Αυτή η ρύθμιση τώρα ελέγχεται από τις {settings_page_link} του Mastodon",
+  "settings.enable_content_warnings_auto_unfold": "Αυτόματη ξεδίπλωμα προειδοποιήσεων περιεχομένου",
+  "settings.general": "Γενικά",
+  "settings.layout_opts": "Επιλογές διάταξης",
+  "settings.media": "Πολυμέσα",
+  "settings.notifications.tab_badge": "Σήμα μη αναγνωσμένων ειδοποιήσεων",
+  "settings.notifications.tab_badge.hint": "Εμφανίζει ένα σήμα για μη αναγνωσμένες ειδοποιήσεις στα εικονίδια της στήλης όταν η στήλη ειδοποιήσεων δεν είναι ανοιχτή",
+  "settings.notifications_opts": "Ρυθμίσεις ειδοποιήσεων",
+  "settings.pop_in_left": "Αριστερά",
+  "settings.pop_in_right": "Δεξιά",
+  "settings.preferences": "Προτιμήσεις χρήστη",
+  "settings.preselect_on_reply": "Προεπιλογή ονομάτων χρηστών στην απάντηση",
+  "settings.preselect_on_reply_hint": "Όταν απαντάτε σε μια συνομιλία με πολλαπλούς συμμετέχοντες, προεπιλέξτε τα ονόματα χρηστών μετά τον πρώτο",
+  "settings.rewrite_mentions": "Ξαναγράψε επισημάνσεις στις προβαλλόμενες καταστάσεις",
+  "settings.rewrite_mentions_acct": "Ξαναγράψε με όνομα χρήστη και τομέα (όταν ο λογαριασμός είναι απομακρυσμένος)",
+  "settings.rewrite_mentions_no": "Μην ξαναγράψεις επισημάνσεις",
+  "settings.rewrite_mentions_username": "Ξαναγράψε με όνομα χρήστη",
+  "settings.shared_settings_link": "προτιμήσεις χρήστη",
+  "settings.side_arm": "Δευτερεύον κουμπί τουτ:",
+  "settings.side_arm.none": "Κανένα",
+  "settings.side_arm_reply_mode": "Όταν απαντάτε σε ένα τουτ, το κουμπί δευτερεύοντος τουτ πρέπει να:",
+  "settings.side_arm_reply_mode.copy": "Αντιγράψει τη ρύθμιση απορρήτου του τουτ που απαντάται",
+  "settings.side_arm_reply_mode.keep": "Διατηρήσει το καθορισμένο απόρρητο",
+  "settings.side_arm_reply_mode.restrict": "Περιορίσει τη ρύθμιση απορρήτου σε εκείνη του τουτ που απαντάται",
+  "settings.status_icons": "Εικονίδια τουτ",
+  "settings.status_icons_language": "Ένδειξη γλώσσας",
+  "settings.status_icons_local_only": "Ένδειξη τοπικό μόνο",
+  "settings.status_icons_media": "Ενδείξεις μέσων και δημοσκοπήσεων",
+  "settings.status_icons_reply": "Ένδειξη απαντήσεων",
+  "settings.status_icons_visibility": "Ένδειξη απορρήτου τουτ",
+  "settings.tag_misleading_links": "Σήμανση παραπλανητικών συνδέσμων",
+  "settings.tag_misleading_links.hint": "Προσθήκη οπτικής ένδειξης με τον εξυπηρετητή στόχο του συνδέσμου σε κάθε σύνδεσμο που δεν αναφέρεται ρητά",
+  "status.filtered": "Φιλτραρισμένο",
+  "status.has_audio": "Διαθέτει συνημμένα αρχεία ήχου",
+  "status.has_pictures": "Διαθέτει συνημμένες εικόνες",
+  "status.has_preview_card": "Διαθέτει συνημμένη κάρτα προεπισκόπησης",
+  "status.has_video": "Διαθέτει συνημμένα βίντεο",
+  "status.hide": "Απόκρυψη ανάρτησης",
+  "status.in_reply_to": "Αυτό το τουτ είναι απάντηση",
+  "status.is_poll": "Αυτό το τουτ είναι δημοσκόπηση",
+  "status.show_filter_reason": "Εμφάνιση ούτως ή άλλως"
 }
--- a/app/javascript/flavours/glitch/locales/eo.json
+++ b/app/javascript/flavours/glitch/locales/eo.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Vidi plenan profilon",
  "boost_modal.missing_description": "Ĉi tiu afiŝo enhavas plurmedion, ke ne havas priskribon",
  "column.favourited_by": "Stelumita per",
-  "column.heading": "Diversaj aferoj",
  "column.reblogged_by": "Diskonigita de",
-  "column.subheading": "Diversaj agordoj",
  "column_header.profile": "Profilo",
-  "column_subheading.lists": "Listoj",
-  "column_subheading.navigation": "Navigado",
  "community.column_settings.allow_local_only": "Montri nur-lokajn afiŝojn",
  "compose.attach.doodle": "Skribu ion",
  "compose.change_federation": "Ŝanĝi agordojn de federacio",
@@ -45,8 +41,6 @@
  "keyboard_shortcuts.secondary_toot": "sendi afiŝon per dua agordo de privateco",
  "moved_to_warning": "Ĉi tiun konton sigelas, kiel movinta al {moved_to_link}, kaj pro ne permesos novajn sekvantojn.",
  "navigation_bar.app_settings": "Agordoj de aplikaĵo",
-  "navigation_bar.keyboard_shortcuts": "Fulmoklavoj",
-  "navigation_bar.misc": "Aliaj",
  "notifications.column_settings.filter_bar.show_bar": "Montri mezuron de filtrilo",
  "settings.always_show_spoilers_field": "Ĉiam ŝaltiĝu la arealo de Enhava Averto",
  "settings.close": "Fermi",
--- a/app/javascript/flavours/glitch/locales/es-AR.json
+++ b/app/javascript/flavours/glitch/locales/es-AR.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Ver perfil completo",
  "boost_modal.missing_description": "Esta publicación contiene medios sin descripción",
  "column.favourited_by": "Marcado como favorito por",
-  "column.heading": "Misc",
  "column.reblogged_by": "Impulsado por",
-  "column.subheading": "Opciones misceláneas",
  "column_header.profile": "Perfil",
-  "column_subheading.lists": "Listas",
-  "column_subheading.navigation": "Navegación",
  "community.column_settings.allow_local_only": "Mostrar sólo toots locales",
  "compose.attach.doodle": "Dibujá algo",
  "compose.change_federation": "Cambiar configuración de la federación",
@@ -45,8 +41,6 @@
  "keyboard_shortcuts.secondary_toot": "para enviar un toot usando lac onfiguración de privacidad secundaria",
  "moved_to_warning": "Esta cuenta está marcada como movida a {moved_to_link}, y por lo tanto no aceptará nuevos seguimientos.",
  "navigation_bar.app_settings": "Ajustes de aplicación",
-  "navigation_bar.keyboard_shortcuts": "Atajos de teclado",
-  "navigation_bar.misc": "Misc",
  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
  "settings.always_show_spoilers_field": "Siempre mostrar el campo de advertencia de contenido",
  "settings.close": "Cerrar",
--- a/app/javascript/flavours/glitch/locales/es-MX.json
+++ b/app/javascript/flavours/glitch/locales/es-MX.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Ver perfil completo",
  "boost_modal.missing_description": "Esta publicación contiene medios sin descripción",
  "column.favourited_by": "Marcado como favorito por",
-  "column.heading": "Misc",
  "column.reblogged_by": "Impulsado por",
-  "column.subheading": "Opciones misceláneas",
  "column_header.profile": "Perfil",
-  "column_subheading.lists": "Listas",
-  "column_subheading.navigation": "Navegación",
  "community.column_settings.allow_local_only": "Mostrar sólo toots locales",
  "compose.attach.doodle": "Dibujar algo",
  "compose.change_federation": "Cambiar configuración de la federación",
@@ -41,8 +37,6 @@
  "keyboard_shortcuts.secondary_toot": "para enviar un toot usando lac onfiguración de privacidad secundaria",
  "moved_to_warning": "Esta cuenta está marcada como movida a {moved_to_link}, y por lo tanto no aceptará nuevos seguimientos.",
  "navigation_bar.app_settings": "Ajustes de aplicación",
-  "navigation_bar.keyboard_shortcuts": "Atajos de teclado",
-  "navigation_bar.misc": "Misc",
  "settings.always_show_spoilers_field": "Siempre mostrar el campo de advertencia de contenido",
  "settings.close": "Cerrar",
  "settings.compose_box_opts": "Cuadro de redacción",
--- a/app/javascript/flavours/glitch/locales/es.json
+++ b/app/javascript/flavours/glitch/locales/es.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Ver perfil completo",
  "boost_modal.missing_description": "Esta publicación contiene medios sin descripción",
  "column.favourited_by": "Marcado como favorito por",
-  "column.heading": "Misc",
  "column.reblogged_by": "Impulsado por",
-  "column.subheading": "Opciones misceláneas",
  "column_header.profile": "Perfil",
-  "column_subheading.lists": "Listas",
-  "column_subheading.navigation": "Navegación",
  "community.column_settings.allow_local_only": "Mostrar toots solo-locales",
  "compose.attach.doodle": "Dibujar algo",
  "compose.change_federation": "Cambiar configuración de la federación",
@@ -41,8 +37,6 @@
  "keyboard_shortcuts.secondary_toot": "para enviar un toot usando lac onfiguración de privacidad secundaria",
  "moved_to_warning": "Esta cuenta está marcada como movida a {moved_to_link}, y por lo tanto no aceptará nuevos seguimientos.",
  "navigation_bar.app_settings": "Ajustes de la aplicación",
-  "navigation_bar.keyboard_shortcuts": "Atajos de teclado",
-  "navigation_bar.misc": "Misc",
  "settings.always_show_spoilers_field": "Siempre mostrar el campo de advertencia de contenido",
  "settings.close": "Cerrar",
  "settings.compose_box_opts": "Cuadro de redacción",
--- a/app/javascript/flavours/glitch/locales/fa.json
+++ b/app/javascript/flavours/glitch/locales/fa.json
@@ -8,7 +8,6 @@
  "compose.content-type.plain": "متن ساده",
  "home.column_settings.advanced": "پیشرفته",
  "navigation_bar.app_settings": "تنظیمات کاره",
-  "navigation_bar.keyboard_shortcuts": "میان‌برهای صفحه‌کلید",
  "settings.close": "بستن",
  "settings.content_warnings": "هشدارهای محتوا",
  "settings.media": "رسانه",
--- a/app/javascript/flavours/glitch/locales/fr-CA.json
+++ b/app/javascript/flavours/glitch/locales/fr-CA.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Voir le profil complet",
  "boost_modal.missing_description": "Ce post contient des médias sans description",
  "column.favourited_by": "Ajouté en favori par",
-  "column.heading": "Divers",
  "column.reblogged_by": "Partagé par",
-  "column.subheading": "Autres options",
  "column_header.profile": "Profil",
-  "column_subheading.lists": "Listes",
-  "column_subheading.navigation": "Navigation",
  "community.column_settings.allow_local_only": "Afficher seulement les posts locaux",
  "compose.attach.doodle": "Dessinez quelque chose",
  "compose.change_federation": "Changer les paramètres de fédération",
@@ -24,6 +20,9 @@
  "compose.content-type.plain_meta": "Écrire sans formatage avancé",
  "compose.disable_threaded_mode": "Désactiver le mode thread",
  "compose.enable_threaded_mode": "Activer le mode thread",
+  "compose_form.sensitive.hide": "{count, plural, one {Marquer le média comme sensible} other {Marquer les médias comme sensibles}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Le média n’est pas marqué comme sensible} other {Les médias ne sont pas marqué comme sensible}}",
  "confirmation_modal.do_not_ask_again": "Ne plus demander confirmation",
  "confirmations.deprecated_settings.confirm": "Utiliser les préférences de Mastodon",
  "confirmations.deprecated_settings.message": "Certaines {app_settings} de glitch-soc que vous utilisez ont été remplacées par les {preferences} de Mastodon et seront remplacées :",
@@ -42,8 +41,7 @@
  "keyboard_shortcuts.secondary_toot": "Envoyer le post en utilisant les paramètres secondaires de confidentialité",
  "moved_to_warning": "Ce compte a déménagé vers {moved_to_link} et ne peut donc plus accepter de nouveaux abonné·e·s.",
  "navigation_bar.app_settings": "Paramètres de l'application",
-  "navigation_bar.keyboard_shortcuts": "Raccourcis clavier",
-  "navigation_bar.misc": "Autres",
+  "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
  "settings.always_show_spoilers_field": "Toujours activer le champ de rédaction de l'avertissement de contenu",
  "settings.close": "Fermer",
  "settings.compose_box_opts": "Zone de rédaction",
@@ -57,6 +55,8 @@
  "settings.content_warnings_unfold_opts": "Options de dépliement automatique",
  "settings.deprecated_setting": "Cette option est maintenant définie par les {settings_page_link} de Mastodon",
  "settings.enable_content_warnings_auto_unfold": "Déplier automatiquement les avertissements de contenu",
+  "settings.fullwidth_view": "Étirer les colonnes sur toute la largeur (mode bureau uniquement)",
+  "settings.fullwidth_view_hint": "Étire les colonnes pour remplir tout l'espace disponible.",
  "settings.general": "Général",
  "settings.hicolor_privacy_icons": "Indicateurs de confidentialité en couleurs",
  "settings.hicolor_privacy_icons.hint": "Affiche les indicateurs de confidentialité dans des couleurs facilement distinguables",
@@ -105,11 +105,14 @@
  "settings.tag_misleading_links.hint": "Ajouter une indication visuelle avec l'hôte cible du lien à chaque lien ne le mentionnant pas explicitement",
  "settings.wide_view": "Vue élargie (mode ordinateur uniquement)",
  "settings.wide_view_hint": "Étire les colonnes pour mieux remplir l'espace disponible.",
+  "status.filtered": "Filtré",
  "status.has_audio": "Contient des fichiers audio attachés",
  "status.has_pictures": "Contient des images attachées",
  "status.has_preview_card": "Contient une carte de prévisualisation attachée",
  "status.has_video": "Contient des vidéos attachées",
+  "status.hide": "Masquer la publication",
  "status.in_reply_to": "Ce post est une réponse",
  "status.is_poll": "Ce post est un sondage",
-  "status.local_only": "Visible uniquement depuis votre instance"
+  "status.local_only": "Visible uniquement depuis votre instance",
+  "status.show_filter_reason": "Afficher quand même"
 }
--- a/app/javascript/flavours/glitch/locales/fr.json
+++ b/app/javascript/flavours/glitch/locales/fr.json
@@ -2,16 +2,12 @@
  "about.fork_disclaimer": "Glitch-soc est un logiciel gratuit et open source, fork de Mastodon.",
  "account.disclaimer_full": "Les informations ci-dessous peuvent être incomplètes.",
  "account.follows": "Abonnements",
-  "account.suspended_disclaimer_full": "Cet utilisateur a été suspendu par un modérateur.",
+  "account.suspended_disclaimer_full": "Ce compte a été suspendu par un modérateur.",
  "account.view_full_profile": "Voir le profil complet",
  "boost_modal.missing_description": "Ce post contient des médias sans description",
  "column.favourited_by": "Ajouté en favori par",
-  "column.heading": "Divers",
  "column.reblogged_by": "Partagé par",
-  "column.subheading": "Autres options",
  "column_header.profile": "Profil",
-  "column_subheading.lists": "Listes",
-  "column_subheading.navigation": "Navigation",
  "community.column_settings.allow_local_only": "Afficher seulement les posts locaux",
  "compose.attach.doodle": "Dessinez quelque chose",
  "compose.change_federation": "Changer les paramètres de fédération",
@@ -20,10 +16,13 @@
  "compose.content-type.html_meta": "Formatez vos messages en HTML",
  "compose.content-type.markdown": "Markdown",
  "compose.content-type.markdown_meta": "Formatez vos messages en Markdown",
-  "compose.content-type.plain": "Text brut",
+  "compose.content-type.plain": "Texte brut",
  "compose.content-type.plain_meta": "Écrire sans formatage avancé",
  "compose.disable_threaded_mode": "Désactiver le mode thread",
  "compose.enable_threaded_mode": "Activer le mode thread",
+  "compose_form.sensitive.hide": "{count, plural, one {Marquer le média comme sensible} other {Marquer les médias comme sensibles}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Le média n’est pas marqué comme sensible} other {Les médias ne sont pas marqué comme sensible}}",
  "confirmation_modal.do_not_ask_again": "Ne plus demander confirmation",
  "confirmations.deprecated_settings.confirm": "Utiliser les préférences de Mastodon",
  "confirmations.deprecated_settings.message": "Certaines {app_settings} de glitch-soc que vous utilisez ont été remplacées par les {preferences} de Mastodon et seront remplacées :",
@@ -42,8 +41,7 @@
  "keyboard_shortcuts.secondary_toot": "Envoyer le post en utilisant les paramètres secondaires de confidentialité",
  "moved_to_warning": "Ce compte a déménagé vers {moved_to_link} et ne peut donc plus accepter de nouveaux abonné·e·s.",
  "navigation_bar.app_settings": "Paramètres de l'application",
-  "navigation_bar.keyboard_shortcuts": "Raccourcis clavier",
-  "navigation_bar.misc": "Autres",
+  "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
  "settings.always_show_spoilers_field": "Toujours activer le champ de rédaction de l'avertissement de contenu",
  "settings.close": "Fermer",
  "settings.compose_box_opts": "Zone de rédaction",
@@ -57,6 +55,8 @@
  "settings.content_warnings_unfold_opts": "Options de dépliement automatique",
  "settings.deprecated_setting": "Cette option est maintenant définie par les {settings_page_link} de Mastodon",
  "settings.enable_content_warnings_auto_unfold": "Déplier automatiquement les avertissements de contenu",
+  "settings.fullwidth_view": "Étirer les colonnes sur toute la largeur (mode bureau uniquement)",
+  "settings.fullwidth_view_hint": "Étire les colonnes pour remplir tout l'espace disponible.",
  "settings.general": "Général",
  "settings.hicolor_privacy_icons": "Indicateurs de confidentialité en couleurs",
  "settings.hicolor_privacy_icons.hint": "Affiche les indicateurs de confidentialité dans des couleurs facilement distinguables",
@@ -76,7 +76,7 @@
  "settings.pop_in_player": "Activer le lecteur pop-in",
  "settings.pop_in_position": "Position du lecteur pop-in :",
  "settings.pop_in_right": "Droite",
-  "settings.preferences": "Preferences",
+  "settings.preferences": "Préferences",
  "settings.prepend_cw_re": "Préfixer les avertissements avec \"re: \" lors d'une réponse",
  "settings.preselect_on_reply": "Présélectionner les noms d’utilisateur·rices lors de la réponse",
  "settings.preselect_on_reply_hint": "Présélectionner les noms d'utilisateurs après le premier lors d'une réponse à une conversation à plusieurs participants",
@@ -105,11 +105,14 @@
  "settings.tag_misleading_links.hint": "Ajouter une indication visuelle avec l'hôte cible du lien à chaque lien ne le mentionnant pas explicitement",
  "settings.wide_view": "Vue élargie (mode ordinateur uniquement)",
  "settings.wide_view_hint": "Étire les colonnes pour mieux remplir l'espace disponible.",
+  "status.filtered": "Filtré",
  "status.has_audio": "Contient des fichiers audio attachés",
  "status.has_pictures": "Contient des images attachées",
  "status.has_preview_card": "Contient une carte de prévisualisation attachée",
  "status.has_video": "Contient des vidéos attachées",
+  "status.hide": "Masquer la publication",
  "status.in_reply_to": "Ce post est une réponse",
  "status.is_poll": "Ce post est un sondage",
-  "status.local_only": "Visible uniquement depuis votre instance"
+  "status.local_only": "Visible uniquement depuis votre instance",
+  "status.show_filter_reason": "Afficher quand même"
 }
--- a/app/javascript/flavours/glitch/locales/gl.json
+++ b/app/javascript/flavours/glitch/locales/gl.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Ver perfil completo",
  "boost_modal.missing_description": "Esta publicación contén multimedia sen descrición",
  "column.favourited_by": "Favorecida por",
-  "column.heading": "Varios",
  "column.reblogged_by": "Promovida por",
-  "column.subheading": "Opcións diversas",
  "column_header.profile": "Perfil",
-  "column_subheading.lists": "Listas",
-  "column_subheading.navigation": "Navegación",
  "community.column_settings.allow_local_only": "Ver só mensaxes de ámbito local",
  "compose.attach.doodle": "Debuxa algo",
  "compose.change_federation": "Cambiar axustes de federación",
@@ -45,8 +41,6 @@
  "keyboard_shortcuts.secondary_toot": "para enviar publicación usando axuste secundario de privacidade",
  "moved_to_warning": "Esta conta moveuse a {moved_to_link}, e non acepta novos seguimentos.",
  "navigation_bar.app_settings": "Axustes da app",
-  "navigation_bar.keyboard_shortcuts": "Atallos de teclado",
-  "navigation_bar.misc": "Varios",
  "notifications.column_settings.filter_bar.show_bar": "Amosar barra de filtros",
  "settings.always_show_spoilers_field": "Activar sempre o campo de Aviso sobre o contido CW",
  "settings.close": "Pechar",
--- a/app/javascript/flavours/glitch/locales/id.json
+++ b/app/javascript/flavours/glitch/locales/id.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Tampilkan profil lengkap",
  "boost_modal.missing_description": "Toot ini berisi beberapa media tanpa deskripsi",
  "column.favourited_by": "Disukai oleh",
-  "column.heading": "Lainnya",
  "column.reblogged_by": "Dibagikan oleh",
-  "column.subheading": "Opsi lain-lain",
  "column_header.profile": "Profil",
-  "column_subheading.lists": "Daftar",
-  "column_subheading.navigation": "Penelusuran",
  "community.column_settings.allow_local_only": "Tampilkan toot lokal saja",
  "compose.change_federation": "Ubah pengaturan federasi",
  "compose.content-type.change": "Ubah opsi pemformatan lanjutan",
@@ -38,8 +34,6 @@
  "keyboard_shortcuts.secondary_toot": "untuk mengirim toot menggunakan pengaturan privasi sekunder",
  "moved_to_warning": "Akun ini ditandai sebagai dipindahkan ke {moved_to_link}, dan karenanya tidak menerima pengikut baru.",
  "navigation_bar.app_settings": "Pengaturan aplikasi",
-  "navigation_bar.keyboard_shortcuts": "Pintasan keyboard",
-  "navigation_bar.misc": "Lainnya",
  "settings.always_show_spoilers_field": "Selalu aktifkan bidang Peringatan Konten",
  "settings.close": "Tutup",
  "settings.compose_box_opts": "Kotak tulis",
@@ -49,6 +43,7 @@
  "settings.content_warnings.regexp": "Ekspresi reguler",
  "settings.content_warnings_filter": "Peringatan konten yang tidak akan dibuka secara otomatis:",
  "settings.content_warnings_shared_state": "Tampilkan/sembunyikan konten semua salinan sekaligus",
+  "settings.pop_in_right": "Kanan",
  "settings.preferences": "Preferences",
  "settings.status_icons_reply": "Indikator balasan",
  "settings.status_icons_visibility": "Indikator privasi toot",
--- a/app/javascript/flavours/glitch/locales/ja.json
+++ b/app/javascript/flavours/glitch/locales/ja.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "正確な情報を見る",
  "boost_modal.missing_description": "このトゥートには少なくとも1つの画像に説明が付与されていません",
  "column.favourited_by": "お気に入りしたユーザー",
-  "column.heading": "その他",
  "column.reblogged_by": "ブーストしたユーザー",
-  "column.subheading": "その他のオプション",
  "column_header.profile": "プロフィール",
-  "column_subheading.lists": "リスト",
-  "column_subheading.navigation": "ナビゲーション",
  "community.column_settings.allow_local_only": "ローカル限定投稿を表示する",
  "compose.content-type.html": "HTML",
  "compose.content-type.html_meta": "投稿に HTML を使用する",
@@ -33,8 +29,6 @@
  "keyboard_shortcuts.secondary_toot": "セカンダリートゥートの公開範囲でトゥートする",
  "moved_to_warning": "このアカウント{moved_to_link}に引っ越したため、新しいフォロワーを受け入れていません。",
  "navigation_bar.app_settings": "アプリ設定",
-  "navigation_bar.keyboard_shortcuts": "キーボードショートカット",
-  "navigation_bar.misc": "その他",
  "settings.always_show_spoilers_field": "常にコンテンツワーニング設定を表示する(指定がない場合は通常投稿)",
  "settings.close": "閉じる",
  "settings.compose_box_opts": "コンポーズボックス設定",
--- a/app/javascript/flavours/glitch/locales/kab.json
+++ b/app/javascript/flavours/glitch/locales/kab.json
@@ -1,6 +1,5 @@
 {
  "compose.attach.doodle": "Ssuneɣ-d kra",
-  "navigation_bar.keyboard_shortcuts": "Inezgumen n unasiw",
  "settings.close": "Mdel",
  "settings.content_warnings": "Content warnings",
  "settings.preferences": "Preferences"
--- a/app/javascript/flavours/glitch/locales/ko.json
+++ b/app/javascript/flavours/glitch/locales/ko.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "전체 프로필 보기",
  "boost_modal.missing_description": "이 게시물은 설명이 없는 미디어를 포함하고 있습니다",
  "column.favourited_by": "즐겨찾기 한 사람",
-  "column.heading": "기타",
  "column.reblogged_by": "부스트 한 사람",
-  "column.subheading": "다양한 옵션",
  "column_header.profile": "프로필",
-  "column_subheading.lists": "리스트",
-  "column_subheading.navigation": "탐색",
  "community.column_settings.allow_local_only": "로컬 전용 글 보기",
  "compose.attach.doodle": "뭔가 그려보세요",
  "compose.change_federation": "연합 설정 변경",
@@ -45,8 +41,6 @@
  "keyboard_shortcuts.secondary_toot": "보조 프라이버시 설정으로 글 보내기",
  "moved_to_warning": "이 계정은 {moved_to_link}로 이동한 것으로 표시되었고, 새 팔로우를 받지 않는 것 같습니다.",
  "navigation_bar.app_settings": "앱 설정",
-  "navigation_bar.keyboard_shortcuts": "키보드 단축기",
-  "navigation_bar.misc": "다양한 옵션들",
  "notifications.column_settings.filter_bar.show_bar": "필터 막대 표시",
  "settings.always_show_spoilers_field": "열람주의 항목을 언제나 활성화",
  "settings.close": "닫기",
--- a/app/javascript/flavours/glitch/locales/lt.json
+++ b/app/javascript/flavours/glitch/locales/lt.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Peržiūrėti visą profilį",
  "boost_modal.missing_description": "Šis įrašas turi šiek tiek medijų be aprašų.",
  "column.favourited_by": "Pamėgo",
-  "column.heading": "Įvairūs",
  "column.reblogged_by": "Pasidalino",
-  "column.subheading": "Įvairios parinktys",
  "column_header.profile": "Profilis",
-  "column_subheading.lists": "Sąrašai",
-  "column_subheading.navigation": "Naršymas",
  "community.column_settings.allow_local_only": "Rodyti tik vietinius įrašus",
  "compose.attach.doodle": "Nupiešti kažką",
  "compose.change_federation": "Keisti federacijos nustatymus",
@@ -45,8 +41,6 @@
  "keyboard_shortcuts.secondary_toot": "siųsti įrašą naudojant antrinį privatumo nustatymą",
  "moved_to_warning": "Ši paskyra pažymėta kaip perkelta į {moved_to_link}, todėl negali priimti naujų sekimų.",
  "navigation_bar.app_settings": "Programėlės nustatymai",
-  "navigation_bar.keyboard_shortcuts": "Spartieji klavišai",
-  "navigation_bar.misc": "Įvairūs",
  "notifications.column_settings.filter_bar.show_bar": "Rodyti filtro juostą",
  "settings.always_show_spoilers_field": "Visada įjungti turinio įspėjimo lauką",
  "settings.close": "Užverti",
--- a/app/javascript/flavours/glitch/locales/nl.json
+++ b/app/javascript/flavours/glitch/locales/nl.json
@@ -3,12 +3,8 @@
  "account.view_full_profile": "Volledig profiel weergeven",
  "boost_modal.missing_description": "Deze toot bevat media zonder beschrijving",
  "column.favourited_by": "Favoriet door",
-  "column.heading": "Overige",
  "column.reblogged_by": "Geboost door",
-  "column.subheading": "Diverse opties",
  "column_header.profile": "Profiel",
-  "column_subheading.lists": "Lijsten",
-  "column_subheading.navigation": "Navigatie",
  "community.column_settings.allow_local_only": "Toon alleen lokale toots",
  "compose.content-type.html": "HTML",
  "compose.content-type.markdown": "Markdown",
--- a/app/javascript/flavours/glitch/locales/pl.json
+++ b/app/javascript/flavours/glitch/locales/pl.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Pokaż pełny profil",
  "boost_modal.missing_description": "Ten wpis zawiera multimedialne załączniki bez opisu",
  "column.favourited_by": "Polubiony przez",
-  "column.heading": "Różne",
  "column.reblogged_by": "Podbity przez",
-  "column.subheading": "Różne opcje",
  "column_header.profile": "Profil",
-  "column_subheading.lists": "Listy",
-  "column_subheading.navigation": "Nawigacja",
  "community.column_settings.allow_local_only": "Pokazuj wyłącznie wpisy lokalne",
  "compose.content-type.html": "HTML",
  "compose.content-type.markdown": "Markdown",
@@ -28,8 +24,6 @@
  "keyboard_shortcuts.secondary_toot": "aby opublikować wpis używając dodatkowych ustawień prywatności",
  "moved_to_warning": "To konto oznaczone jest jako przeniesione do {moved_to_link} i może z tego powodu nie akceptować nowych obserwujących.",
  "navigation_bar.app_settings": "Ustawienia aplikacji",
-  "navigation_bar.keyboard_shortcuts": "Skróty klawiszowe",
-  "navigation_bar.misc": "Różne",
  "settings.always_show_spoilers_field": "Zawsze pokazuj pole ostrzeżenia o zawartości",
  "settings.close": "Zamknij",
  "settings.compose_box_opts": "Pole edycji",
--- a/app/javascript/flavours/glitch/locales/pt-BR.json
+++ b/app/javascript/flavours/glitch/locales/pt-BR.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Ver o perfil completo",
  "boost_modal.missing_description": "Este toot contém algumas mídias sem descrição",
  "column.favourited_by": "Favoritado por",
-  "column.heading": "Diversos",
  "column.reblogged_by": "Inpulsionado por",
-  "column.subheading": "Opções diversas",
  "column_header.profile": "Perfil",
-  "column_subheading.lists": "Listas",
-  "column_subheading.navigation": "Navegação",
  "community.column_settings.allow_local_only": "Mostrar os toots apenas locais",
  "compose.content-type.html": "HTML",
  "compose.content-type.markdown": "Markdown",
@@ -28,8 +24,6 @@
  "keyboard_shortcuts.secondary_toot": "para enviar toot usando a configuração de privacidade secundária",
  "moved_to_warning": "Esta conta foi como movida para {moved_to_link} e, portanto, pode não aceitar novos seguidores.",
  "navigation_bar.app_settings": "Configurações do aplicativo",
-  "navigation_bar.keyboard_shortcuts": "Atalhos de teclado",
-  "navigation_bar.misc": "Diversos",
  "settings.always_show_spoilers_field": "Sempre ativar o campo Aviso de Conteúdo",
  "settings.close": "Fechar",
  "settings.compose_box_opts": "Caixa de composição",
--- a/app/javascript/flavours/glitch/locales/pt-PT.json
+++ b/app/javascript/flavours/glitch/locales/pt-PT.json
@@ -6,7 +6,6 @@
  "account.view_full_profile": "Ver o perfil completo",
  "boost_modal.missing_description": "Este post contém alguns media sem descrição",
  "column.favourited_by": "Adicionado aos favoritos de",
-  "column.heading": "Diversos",
  "moved_to_warning": "Esta conta mudou-se para {moved_to_link} e, portanto, pode não aceitar novos seguidores.",
  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
  "settings.always_show_spoilers_field": "Mostrar sempre o campo Aviso de Conteúdo",
--- a/app/javascript/flavours/glitch/locales/ru.json
+++ b/app/javascript/flavours/glitch/locales/ru.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Открыть полный профиль",
  "boost_modal.missing_description": "Этот пост содержит медиафайлы без описания",
  "column.favourited_by": "Добавили в избранное",
-  "column.heading": "Прочее",
  "column.reblogged_by": "Продвинули",
-  "column.subheading": "Прочие разделы",
  "column_header.profile": "Профиль",
-  "column_subheading.lists": "Списки",
-  "column_subheading.navigation": "Навигация",
  "community.column_settings.allow_local_only": "Показывать нефедерируемые посты",
  "compose.attach.doodle": "Нарисовать что-нибудь",
  "compose.change_federation": "Изменить настройки федерации",
@@ -39,8 +35,6 @@
  "keyboard_shortcuts.bookmark": "добавить закладку",
  "moved_to_warning": "Этот аккаунт переехал на {moved_to_link}, и скорее всего не принимает новых подписчиков.",
  "navigation_bar.app_settings": "Настройки приложения",
-  "navigation_bar.keyboard_shortcuts": "Сочетания клавиш",
-  "navigation_bar.misc": "Прочее",
  "notifications.column_settings.filter_bar.show_bar": "Показать панель фильтров",
  "settings.always_show_spoilers_field": "Всегда ставить предупреждение о содержании",
  "settings.close": "Закрыть",
--- a/app/javascript/flavours/glitch/locales/sco.json
+++ b/app/javascript/flavours/glitch/locales/sco.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "View full profile",
  "boost_modal.missing_description": "This post contains some media withoot description",
  "column.favourited_by": "Favouritit by",
-  "column.heading": "Misc",
  "column.reblogged_by": "Boosted by",
-  "column.subheading": "Miscellaneous options",
  "column_header.profile": "Profile",
-  "column_subheading.lists": "Lists",
-  "column_subheading.navigation": "Navigation",
  "community.column_settings.allow_local_only": "Show local-only posts",
  "compose.attach.doodle": "Draw something",
  "compose.change_federation": "Change federation settins",
@@ -45,8 +41,6 @@
  "keyboard_shortcuts.secondary_toot": "tae send post using secondary privacy settin",
  "moved_to_warning": "This account is marked as moved tae {moved_to_link}, an' may not accept new follows.",
  "navigation_bar.app_settings": "App settins",
-  "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
-  "navigation_bar.misc": "Misc",
  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
  "settings.always_show_spoilers_field": "Always enable the Content Warning field",
  "settings.close": "Close",
--- a/app/javascript/flavours/glitch/locales/sv.json
+++ b/app/javascript/flavours/glitch/locales/sv.json
@@ -4,12 +4,8 @@
  "account.view_full_profile": "Visa full profil",
  "boost_modal.missing_description": "Denna toot innehåller viss media utan beskrivning",
  "column.favourited_by": "Favoritmarkerad av",
-  "column.heading": "Övrigt",
  "column.reblogged_by": "Boostad av",
-  "column.subheading": "Övriga val",
  "column_header.profile": "Profil",
-  "column_subheading.lists": "Listor",
-  "column_subheading.navigation": "Navigering",
  "community.column_settings.allow_local_only": "Visa endast lokala toots",
  "compose.content-type.html": "HTML",
  "compose.content-type.markdown": "Markdown",
--- a/app/javascript/flavours/glitch/locales/th.json
+++ b/app/javascript/flavours/glitch/locales/th.json
@@ -1,8 +1,5 @@
 {
-  "about.fork_disclaimer": ".",
-  "account.disclaimer_full": ".",
-  "account.follows": "",
-  "community.column_settings.allow_local_only": "",
+  "account.follows": "ติดตาม",
  "settings.content_warnings": "Content warnings",
  "settings.preferences": "Preferences"
 }
--- a/app/javascript/flavours/glitch/locales/tr.json
+++ b/app/javascript/flavours/glitch/locales/tr.json
@@ -5,12 +5,8 @@
  "account.view_full_profile": "Tam görünüm",
  "boost_modal.missing_description": "Bu gönderi açıklaması olmayan medya içerir",
  "column.favourited_by": "Tarafından favorilere eklendi",
-  "column.heading": "Diğer",
  "column.reblogged_by": "Tarafından yükseltildi",
-  "column.subheading": "Diğer seçenekler",
  "column_header.profile": "Profil",
-  "column_subheading.lists": "Listeler",
-  "column_subheading.navigation": "Gezinme",
  "community.column_settings.allow_local_only": "Sadece yerel gönderileri göster",
  "compose.content-type.html": "HTML",
  "compose.content-type.markdown": "Markdown modu",
--- a/app/javascript/flavours/glitch/locales/uk.json
+++ b/app/javascript/flavours/glitch/locales/uk.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "Переглянути повний профіль",
  "boost_modal.missing_description": "Цей дмух містить деякі медіа без опису",
  "column.favourited_by": "Уподобані",
-  "column.heading": "Різне",
  "column.reblogged_by": "Поширено",
-  "column.subheading": "Інші параметри",
  "column_header.profile": "Профіль",
-  "column_subheading.lists": "Списки",
-  "column_subheading.navigation": "Навігація",
  "community.column_settings.allow_local_only": "Показувати тільки локальні дмухи",
  "compose.content-type.html": "HTML",
  "compose.content-type.markdown": "Markdown",
@@ -29,8 +25,6 @@
  "keyboard_shortcuts.secondary_toot": "надсилати повідомлення з використанням вторинних налаштувань конфіденційності",
  "moved_to_warning": "Цей обліковий запис позначено як переміщений до {moved_to_link} і тому не може прийняти нових підписок.",
  "navigation_bar.app_settings": "Налаштування програми",
-  "navigation_bar.keyboard_shortcuts": "Комбінації клавіш",
-  "navigation_bar.misc": "Різне",
  "settings.always_show_spoilers_field": "Завжди вмикати попередження про вміст",
  "settings.close": "Закрити",
  "settings.compose_box_opts": "Compose box",
--- a/app/javascript/flavours/glitch/locales/zh-CN.json
+++ b/app/javascript/flavours/glitch/locales/zh-CN.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "查看完整资料",
  "boost_modal.missing_description": "这条嘟文未包含媒体描述",
  "column.favourited_by": "点赞",
-  "column.heading": "杂项",
  "column.reblogged_by": "转嘟",
-  "column.subheading": "其他选项",
  "column_header.profile": "资料卡",
-  "column_subheading.lists": "列表",
-  "column_subheading.navigation": "导航",
  "community.column_settings.allow_local_only": "只显示仅本站可见的嘟文",
  "compose.attach.doodle": "涂鸦",
  "compose.change_federation": "更改联动设置",
@@ -45,8 +41,6 @@
  "keyboard_shortcuts.secondary_toot": "使用另一隐私设置发送嘟文",
  "moved_to_warning": "此账户已被标记为移至 {moved_to_link}，并且似乎没有收到新粉丝。",
  "navigation_bar.app_settings": "应用设置",
-  "navigation_bar.keyboard_shortcuts": "键盘快捷键",
-  "navigation_bar.misc": "杂项",
  "notifications.column_settings.filter_bar.show_bar": "显示筛选栏",
  "settings.always_show_spoilers_field": "始终显示内容警告框",
  "settings.close": "关闭",
--- a/app/javascript/flavours/glitch/locales/zh-TW.json
+++ b/app/javascript/flavours/glitch/locales/zh-TW.json
@@ -6,12 +6,8 @@
  "account.view_full_profile": "查看完整個人資料",
  "boost_modal.missing_description": "此貼文包含未加說明的媒體檔案",
  "column.favourited_by": "誰按了最愛",
-  "column.heading": "雜項",
  "column.reblogged_by": "被誰轉貼",
-  "column.subheading": "其他選項",
  "column_header.profile": "個人檔案",
-  "column_subheading.lists": "列表",
-  "column_subheading.navigation": "導覽",
  "community.column_settings.allow_local_only": "顯示僅限本地的貼文",
  "compose.attach.doodle": "塗鴉",
  "compose.change_federation": "變更聯邦設定",
@@ -24,6 +20,9 @@
  "compose.content-type.plain_meta": "不使用進階格式撰寫",
  "compose.disable_threaded_mode": "停用貼文串模式",
  "compose.enable_threaded_mode": "啟用貼文串模式",
+  "compose_form.sensitive.hide": "{count, plural, other {將媒體標記為敏感內容}}",
+  "compose_form.sensitive.marked": "{count, plural, other {媒體已被標記為敏感內容}}",
+  "compose_form.sensitive.unmarked": "{count, plural, other {媒體未被標記為敏感內容}}",
  "confirmation_modal.do_not_ask_again": "不要再顯示確認訊息",
  "confirmations.deprecated_settings.confirm": "使用 Mastodon 偏好",
  "confirmations.deprecated_settings.message": "您正在使用的某些特定於 glitch-soc 設備的 {app_settings} 已被 Mastodon {preferences} 所取代，並將被覆蓋：",
@@ -42,8 +41,6 @@
  "keyboard_shortcuts.secondary_toot": "使用次要隱私設定來發布貼文",
  "moved_to_warning": "此帳戶已標記為移至 {moved_to_link}，因此可能不接受新的追隨者。",
  "navigation_bar.app_settings": "應用程式設定",
-  "navigation_bar.keyboard_shortcuts": "鍵盤快速鍵",
-  "navigation_bar.misc": "雜項",
  "notifications.column_settings.filter_bar.show_bar": "顯示過濾器",
  "settings.always_show_spoilers_field": "永遠啟用內容警告欄位",
  "settings.close": "關閉",
@@ -58,6 +55,8 @@
  "settings.content_warnings_unfold_opts": "自動展開選項",
  "settings.deprecated_setting": "此設定現在已由 Mastodon 的 {settings_page_link} 控制。",
  "settings.enable_content_warnings_auto_unfold": "自動展開內容警告",
+  "settings.fullwidth_view": "將欄位延展至全寬（僅限桌面模式）",
+  "settings.fullwidth_view_hint": "將欄位延展以填滿所有可用空間。",
  "settings.general": "一般設定",
  "settings.hicolor_privacy_icons": "隱私圖示使用對比色",
  "settings.hicolor_privacy_icons.hint": "用明亮且易於區分的顏色顯示隱私圖示",
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -589,11 +589,14 @@ code {
  }

  .stacked-actions {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
    margin-top: 30px;
    margin-bottom: 15px;
  }

-  button:not(.button, .link-button, .help-button) {
+  .btn {
    display: block;
    width: 100%;
    border: 0;
@@ -610,8 +613,6 @@ code {
    cursor: pointer;
    font-weight: 500;
    outline: 0;
-    margin-bottom: 10px;
-    margin-inline-end: 10px;

    &:last-child {
      margin-inline-end: 0;
--- a/app/javascript/mastodon/components/featured_carousel.tsx
+++ b/app/javascript/mastodon/components/featured_carousel.tsx
@@ -20,7 +20,7 @@ import { useDrag } from '@use-gesture/react';
 import { expandAccountFeaturedTimeline } from '@/mastodon/actions/timelines';
 import { Icon } from '@/mastodon/components/icon';
 import { IconButton } from '@/mastodon/components/icon_button';
-import StatusContainer from '@/mastodon/containers/status_container';
+import { StatusQuoteManager } from '@/mastodon/components/status_quoted';
 import { usePrevious } from '@/mastodon/hooks/usePrevious';
 import { useAppDispatch, useAppSelector } from '@/mastodon/store';
 import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
@@ -218,12 +218,7 @@ const FeaturedCarouselItem: React.FC<
      ref={handleRef}
      {...props}
    >
-      <StatusContainer
-        // @ts-expect-error inferred props are wrong
-        id={statusId}
-        contextType='account'
-        withCounters
-      />
+      <StatusQuoteManager id={statusId} contextType='account' withCounters />
    </animated.div>
  );
 };
--- a/app/javascript/styles/entrypoints/mailer.scss
+++ b/app/javascript/styles/entrypoints/mailer.scss
@@ -88,6 +88,14 @@ table + p {
  padding: 24px;
 }

+.email-inner-nested-card-td {
+  border-radius: 12px;
+  padding: 18px;
+  overflow: hidden;
+  background-color: #fff;
+  border: 1px solid #dfdee3;
+}
+
 // Account
 .email-account-banner-table {
  background-color: #f3f2f5;
@@ -559,12 +567,29 @@ table + p {
  }
 }

+.email-quote-header-img {
+  width: 34px;
+
+  img {
+    width: 34px;
+    height: 34px;
+    border-radius: 8px;
+    overflow: hidden;
+  }
+}
+
 .email-status-header-text {
  padding-left: 16px;
  padding-right: 16px;
  vertical-align: middle;
 }

+.email-quote-header-text {
+  padding-left: 14px;
+  padding-right: 14px;
+  vertical-align: middle;
+}
+
 .email-status-header-name {
  font-size: 16px;
  font-weight: 600;
@@ -578,6 +603,19 @@ table + p {
  color: #746a89;
 }

+.email-quote-header-name {
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 18px;
+  color: #17063b;
+}
+
+.email-quote-header-handle {
+  font-size: 13px;
+  line-height: 18px;
+  color: #746a89;
+}
+
 .email-status-content {
  padding-top: 24px;
 }
@@ -589,6 +627,10 @@ table + p {
 }

 .email-status-prose {
+  .quote-inline {
+    display: none;
+  }
+
  p {
    font-size: 14px;
    line-height: 20px;
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -217,11 +217,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity

  def process_quote
    @quote_uri = @status_parser.quote_uri
-    return if @quote_uri.blank?
+    return unless @status_parser.quote?

    approval_uri = @status_parser.quote_approval_uri
-    approval_uri = nil if unsupported_uri_scheme?(approval_uri)
-    @quote = Quote.new(account: @account, approval_uri: approval_uri, legacy: @status_parser.legacy_quote?)
+    approval_uri = nil if unsupported_uri_scheme?(approval_uri) || TagManager.instance.local_url?(approval_uri)
+    @quote = Quote.new(account: @account, approval_uri: approval_uri, legacy: @status_parser.legacy_quote?, state: @status_parser.deleted_quote? ? :deleted : :pending)
  end

  def process_hashtag(tag)
--- a/app/lib/activitypub/parser/status_parser.rb
+++ b/app/lib/activitypub/parser/status_parser.rb
@@ -119,6 +119,14 @@ class ActivityPub::Parser::StatusParser
    flags
  end

+  def quote?
+    %w(quote _misskey_quote quoteUrl quoteUri).any? { |key| @object[key].present? }
+  end
+
+  def deleted_quote?
+    @object['quote'].is_a?(Hash) && @object['quote']['type'] == 'Tombstone'
+  end
+
  def quote_uri
    %w(quote _misskey_quote quoteUrl quoteUri).filter_map do |key|
      value_or_id(as_array(@object[key]).first)
@@ -143,7 +151,7 @@ class ActivityPub::Parser::StatusParser
  def quote_subpolicy(subpolicy)
    flags = 0

-    allowed_actors = as_array(subpolicy)
+    allowed_actors = as_array(subpolicy).dup
    allowed_actors.uniq!

    flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] if allowed_actors.delete('as:Public') || allowed_actors.delete('Public') || allowed_actors.delete('https://www.w3.org/ns/activitystreams#Public')
--- a/app/lib/permalink_redirector.rb
+++ b/app/lib/permalink_redirector.rb
@@ -26,7 +26,7 @@ class PermalinkRedirector
  end

  def redirect_path
-    return ActivityPub::TagManager.instance.url_for(object) if object.present?
+    return ActivityPub::TagManager.instance.url_for(object) || ActivityPub::TagManager.instance.uri_for(object) if object.present?

    @path.delete_prefix('/deck') if @path.start_with?('/deck')
  end
--- a/app/models/quote.rb
+++ b/app/models/quote.rb
@@ -21,7 +21,7 @@ class Quote < ApplicationRecord
  REFRESH_DEADLINE = 6.hours

  enum :state,
-       { pending: 0, accepted: 1, rejected: 2, revoked: 3 },
+       { pending: 0, accepted: 1, rejected: 2, revoked: 3, deleted: 4 },
       validate: true

  belongs_to :status
--- a/app/services/activitypub/process_status_update_service.rb
+++ b/app/services/activitypub/process_status_update_service.rb
@@ -74,6 +74,8 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
      update_quote_approval!
      update_counts!
    end
+
+    broadcast_updates! if @status.quote&.state_previously_changed?
  end

  def update_interaction_policies!
@@ -298,15 +300,17 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
  def update_quote!
    quote_uri = @status_parser.quote_uri

-    if quote_uri.present?
+    if @status_parser.quote?
      approval_uri = @status_parser.quote_approval_uri
      approval_uri = nil if unsupported_uri_scheme?(approval_uri)

      if @status.quote.present?
+        state = @status_parser.deleted_quote? ? :deleted : :pending
+
        # If the quoted post has changed, discard the old object and create a new one
        if @status.quote.quoted_status.present? && ActivityPub::TagManager.instance.uri_for(@status.quote.quoted_status) != quote_uri
          @status.quote.destroy
-          quote = Quote.create(status: @status, approval_uri: approval_uri, legacy: @status_parser.legacy_quote?)
+          quote = Quote.create(status: @status, approval_uri: approval_uri, legacy: @status_parser.legacy_quote?, state: state)
          @quote_changed = true
        else
          quote = @status.quote
--- a/app/views/notification_mailer/_nested_quote.html.haml
+++ b/app/views/notification_mailer/_nested_quote.html.haml
@@ -0,0 +1,17 @@
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-quote-header-img
+      = image_tag full_asset_url(status.account.avatar.url), alt: '', width: 34, height: 34
+    %td.email-quote-header-text
+      %h2.email-quote-header-name
+        = display_name(status.account)
+      %p.email-quote-header-handle
+        @#{status.account.pretty_acct}
+
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-status-content
+      = render 'status_content', status: status
+
+      %p.email-status-footer
+        = link_to l(status.created_at.in_time_zone(time_zone.presence), format: :with_time_zone), web_url("@#{status.account.pretty_acct}/#{status.id}")
--- a/app/views/notification_mailer/_status.html.haml
+++ b/app/views/notification_mailer/_status.html.haml
@@ -11,21 +11,12 @@
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
  %tr
    %td.email-status-content
-      .auto-dir
-        - if status.spoiler_text?
-          %p.email-status-spoiler
-            = status.spoiler_text
-
-        .email-status-prose
-          = status_content_format(status)
-
-        - if status.ordered_media_attachments.size.positive?
-          %p.email-status-media
-            - status.ordered_media_attachments.each do |a|
-              - if status.local?
-                = link_to full_asset_url(a.file.url(:original)), full_asset_url(a.file.url(:original))
-              - else
-                = link_to a.remote_url, a.remote_url
+      = render 'status_content', status: status

+      - if status.local? && status.quote
+        %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+          %tr
+            %td.email-inner-nested-card-td
+              = render 'nested_quote', status: status.quote.quoted_status, time_zone: time_zone
      %p.email-status-footer
        = link_to l(status.created_at.in_time_zone(time_zone.presence), format: :with_time_zone), web_url("@#{status.account.pretty_acct}/#{status.id}")
--- a/app/views/notification_mailer/_status.text.erb
+++ b/app/views/notification_mailer/_status.text.erb
@@ -4,5 +4,9 @@
 >
 <% end %>
 > <%= raw word_wrap(extract_status_plain_text(status), break_sequence: "\n> ") %>
+<% if status.local? && status.quote %>
+>
+>> <%= raw word_wrap(extract_status_plain_text(status.quote.quoted_status), break_sequence: "\n>> ") %>
+<% end %>

 <%= raw t('application_mailer.view')%> <%= web_url("@#{status.account.pretty_acct}/#{status.id}") %>
--- a/app/views/notification_mailer/_status_content.html.haml
+++ b/app/views/notification_mailer/_status_content.html.haml
@@ -0,0 +1,15 @@
+.auto-dir
+  - if status.spoiler_text?
+    %p.email-status-spoiler
+      = status.spoiler_text
+
+  .email-status-prose
+    = status_content_format(status)
+
+  - if status.ordered_media_attachments.size.positive?
+    %p.email-status-media
+      - status.ordered_media_attachments.each do |a|
+        - if status.local?
+          = link_to full_asset_url(a.file.url(:original)), full_asset_url(a.file.url(:original))
+        - else
+          = link_to a.remote_url, a.remote_url
--- a/app/workers/activitypub/refetch_and_verify_quote_worker.rb
+++ b/app/workers/activitypub/refetch_and_verify_quote_worker.rb
@@ -10,6 +10,7 @@ class ActivityPub::RefetchAndVerifyQuoteWorker
  def perform(quote_id, quoted_uri, options = {})
    quote = Quote.find(quote_id)
    ActivityPub::VerifyQuoteService.new.call(quote, fetchable_quoted_uri: quoted_uri, request_id: options[:request_id])
+    ::DistributionWorker.perform_async(quote.status_id, { 'update' => true }) if quote.state_previously_changed?
  rescue ActiveRecord::RecordNotFound
    # Do nothing
    true
--- a/config/locales-glitch/el.yml
+++ b/config/locales-glitch/el.yml
@@ -1 +1,32 @@
+---
 el:
+  admin:
+    custom_emojis:
+      batch_copy_error: 'Παρουσιάστηκε σφάλμα κατά την αντιγραφή ορισμένων από τα επιλεγμένα emoji: %{message}'
+      batch_error: 'Παρουσιάστηκε σφάλμα: %{message}'
+    settings:
+      captcha_enabled:
+        title: Να απαιτείται από νέους χρήστες να λύσουν ένα CAPTCHA για να επιβεβαιώσουν τον λογαριασμό τους
+      hide_followers_count:
+        desc_html: Να μην εμφανίζεται ο αριθμός ακολούθων στα προφίλ χρηστών
+        title: Απόκρυψη αριθμού ακολούθων
+      other:
+        title: Άλλες
+      outgoing_spoilers:
+        title: Προειδοποίηση περιεχομένου για εξερχόμενα τουτς
+      show_reblogs_in_public_timelines:
+        desc_html: Εμφάνιση δημόσιων ενισχύσεων των δημόσιων τουτς σε τοπικές και δημόσιες ροές.
+        title: Εμφάνιση ενισχύσεων σε δημόσιες ροές
+      show_replies_in_public_timelines:
+        desc_html: Εκτός από τις δημόσιες αυτοαπαντήσεις (νήματα), εμφανίζονται δημόσιες απαντήσεις σε τοπικές και δημόσιες ροές.
+        title: Εμφάνιση απαντήσεων σε δημόσιες ροές
+  appearance:
+    localization:
+      glitch_guide_link: https://crowdin.com/project/glitch-soc
+      glitch_guide_link_text: Και ομοίως για το glitch-soc!
+  auth:
+    captcha_confirmation:
+      hint_html: Απλώς ένα βήμα ακόμη! Για να επιβεβαιώσεις τον λογαριασμό σου, αυτός ο διακομιστής απαιτεί να λύσεις ένα CAPTCHA. Μπορείς να <a href="/about/more">επικοινωνήσεις με τον διαχειριστή του διακομιστή</a> αν έχεις ερωτήσεις ή χρειάζεσαι βοήθεια με την επιβεβαίωση του λογαριασμού σου.
+      title: Επαλήθευση χρήστη
+  generic:
+    use_this: Χρησιμοποιήστε αυτό
--- a/config/locales-glitch/fr.yml
+++ b/config/locales-glitch/fr.yml
@@ -6,7 +6,7 @@ fr:
      batch_error: 'Une erreur est survenue : %{message}'
    settings:
      captcha_enabled:
-        desc_html: Ceci se base sur des scripts externes venant de hCaptcha, ce qui peut engendrer des soucis de sécurité et de confidentialité. De plus, <strong>cela peut rendre l'inscription beaucoup moins accessible pour certaines personnes (comme les personnes handicapées)</strong>. Pour ces raisons, veuillez préférer des mesures alternatives telles que l'inscription sur acceptation ou invitation. <br>Les utilisateurs qui ont été invités via une invitation à usage limité n'auront pas à résoudre un CAPTCHA
+        desc_html: Ceci se base sur des scripts externes venant de hCaptcha, ce qui peut engendrer des soucis de sécurité et de confidentialité. De plus, <strong>cela peut rendre l'inscription beaucoup moins accessible pour certaines personnes (comme les personnes handicapées)</strong>. Pour ces raisons, veuillez préférer des mesures alternatives telles que l'inscription sur acceptation ou invitation. <br>Les utilisateurs qui ont été invités via une invitation à usage limité n'auront pas à résoudre un CAPTCHA.
        title: Obliger les nouveaux utilisateurs à résoudre un CAPTCHA pour vérifier leur compte
      flavour_and_skin:
        title: Apparence et thèmes
--- a/config/locales-glitch/simple_form.el.yml
+++ b/config/locales-glitch/simple_form.el.yml
@@ -1 +1,15 @@
+---
 el:
+  simple_form:
+    glitch_only: glitch-soc
+    hints:
+      defaults:
+        setting_default_language: Η γλώσσα των τουτ σας μπορεί να εντοπιστεί αυτόματα, αλλά δεν είναι πάντα ακριβής
+        setting_show_followers_count: Εμφάνιση του αριθμού ακολούθων σας στο προφίλ σας. Αν αποκρύψετε τον αριθμό των ακολούθων σας, θα είναι κρυμμένος ακόμη και από εσάς, και μερικές εφαρμογές μπορεί να εμφανίσουν έναν αρνητικό αριθμό ακολούθων.
+    labels:
+      defaults:
+        setting_default_content_type: Προεπιλεγμένη μορφή για τουτς
+        setting_default_content_type_html: HTML
+        setting_default_content_type_markdown: Markdown
+        setting_default_content_type_plain: Απλό κείμενο
+        setting_show_followers_count: Δείξε τον αριθμό των ακολούθων σου
--- a/config/locales-glitch/simple_form.fr-CA.yml
+++ b/config/locales-glitch/simple_form.fr-CA.yml
@@ -17,7 +17,7 @@ fr-CA:
        setting_default_content_type_markdown: Markdown
        setting_default_content_type_plain: Texte brut
        setting_favourite_modal: Afficher une fenêtre de confirmation avant de mettre en favori un post (s'applique uniquement au mode Glitch)
-        setting_show_followers_count: Cacher votre nombre d'abonné·e·s
+        setting_show_followers_count: Montrer votre nombre d'abonné·e·s
        setting_skin: Thème
        setting_system_emoji_font: Utiliser la police par défaut du système pour les émojis (s'applique uniquement au mode Glitch)
      notification_emails:
--- a/config/locales-glitch/simple_form.fr.yml
+++ b/config/locales-glitch/simple_form.fr.yml
@@ -17,7 +17,7 @@ fr:
        setting_default_content_type_markdown: Markdown
        setting_default_content_type_plain: Texte brut
        setting_favourite_modal: Demander confirmation avant de mettre un post en favori (s'applique uniquement au mode Glitch)
-        setting_show_followers_count: Cacher votre nombre d'abonné·e·s
+        setting_show_followers_count: Montrer votre nombre d'abonné·e·s
        setting_skin: Thème
        setting_system_emoji_font: Utiliser la police par défaut du système pour les émojis (s'applique uniquement au mode Glitch)
      notification_emails:
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -988,6 +988,30 @@ RSpec.describe ActivityPub::Activity::Create do
        end
      end

+      context 'with an unverifiable quote of a dead post' do
+        let(:quoted_status) { Fabricate(:status) }
+
+        let(:object_json) do
+          build_object(
+            type: 'Note',
+            content: 'woah what she said is amazing',
+            quote: { type: 'Tombstone' }
+          )
+        end
+
+        it 'creates a status with an unverified quote' do
+          expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
+          status = sender.statuses.first
+          expect(status).to_not be_nil
+          expect(status.quote).to_not be_nil
+          expect(status.quote).to have_attributes(
+            state: 'deleted',
+            approval_uri: nil
+          )
+        end
+      end
+
      context 'with an unverifiable unknown post' do
        let(:unknown_post_uri) { 'https://unavailable.example.com/unavailable-post' }

--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -30,7 +30,8 @@ end

 # This needs to be defined before Rails is initialized
 STREAMING_PORT = ENV.fetch('TEST_STREAMING_PORT', '4020')
-ENV['STREAMING_API_BASE_URL'] = "http://localhost:#{STREAMING_PORT}"
+STREAMING_HOST = ENV.fetch('TEST_STREAMING_HOST', 'localhost')
+ENV['STREAMING_API_BASE_URL'] = "http://#{STREAMING_HOST}:#{STREAMING_PORT}"

 require_relative '../config/environment'

--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -976,6 +976,44 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
    end
  end

+  context 'when the status swaps a verified quote with an ID-less Tombstone through an explicit update' do
+    let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
+    let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+    let(:second_quoted_status) { Fabricate(:status, account: quoted_account) }
+    let!(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, approval_uri: approval_uri, state: :accepted) }
+    let(:approval_uri) { 'https://quoted.example.com/approvals/1' }
+
+    let(:payload) do
+      {
+        '@context': [
+          'https://www.w3.org/ns/activitystreams',
+          {
+            '@id': 'https://w3id.org/fep/044f#quote',
+            '@type': '@id',
+          },
+          {
+            '@id': 'https://w3id.org/fep/044f#quoteAuthorization',
+            '@type': '@id',
+          },
+        ],
+        id: 'foo',
+        type: 'Note',
+        summary: 'Show more',
+        content: 'Hello universe',
+        updated: '2021-09-08T22:39:25Z',
+        quote: { type: 'Tombstone' },
+      }
+    end
+
+    it 'updates the URI and unverifies the quote' do
+      expect { subject.call(status, json, json) }
+        .to change { status.quote.quoted_status }.from(quoted_status).to(nil)
+        .and change { status.quote.state }.from('accepted').to('deleted')
+
+      expect { quote.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+  end
+
  context 'when the status swaps a verified quote with another verifiable quote through an explicit update' do
    let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
    let(:second_quoted_account) { Fabricate(:account, domain: 'second-quoted.example.com') }
--- a/spec/support/streaming_client.rb
+++ b/spec/support/streaming_client.rb
@@ -0,0 +1,205 @@
+# frozen_string_literal: true
+
+require 'websocket/driver'
+
+class StreamingClient
+  module AUTHENTICATION
+    SUBPROTOCOL = 1
+    AUTHORIZATION_HEADER = 2
+    QUERY_PARAMETER = 3
+  end
+
+  class Connection
+    attr_reader :url, :messages, :last_error
+    attr_accessor :logger, :protocols
+
+    def initialize(url)
+      @uri = URI.parse(url)
+      @query_params = @uri.query.present? ? URI.decode_www_form(@uri.query).to_h : {}
+      @protocols = nil
+      @headers = {}
+
+      @dead = false
+
+      @events_queue = Thread::Queue.new
+      @messages = []
+      @last_error = nil
+    end
+
+    def set_header(key, value)
+      @headers[key] = value
+    end
+
+    def set_query_param(key, value)
+      @query_params[key] = value
+    end
+
+    def driver
+      return @driver if defined?(@driver)
+
+      @uri.query = URI.encode_www_form(@query_params)
+      @url = @uri.to_s
+      @tcp = TCPSocket.new(@uri.host, @uri.port)
+
+      @driver = WebSocket::Driver.client(self, {
+        protocols: @protocols,
+      })
+
+      @headers.each_pair do |key, value|
+        @driver.set_header(key, value)
+      end
+
+      at_exit do
+        @driver.close
+      end
+
+      @driver.on(:open) do
+        @events_queue.enq({ event: :opened })
+      end
+
+      @driver.on(:message) do |event|
+        @events_queue.enq({ event: :message, payload: event.data })
+        @messages << event.data
+      end
+
+      @driver.on(:error) do |event|
+        logger&.debug(event.message)
+        @events_queue.enq({ event: :error, payload: event })
+        @last_error = event
+      end
+
+      @driver.on(:close) do |event|
+        @events_queue.enq({ event: :closing, payload: event })
+        finalize(event)
+      end
+
+      @thread = Thread.new do
+        @driver.parse(@tcp.read(1)) until @dead || @tcp.closed?
+      rescue Errno::ECONNRESET
+        # Create a synthetic close event:
+        close_event = WebSocket::Driver::CloseEvent.new(
+          WebSocket::Driver::Hybi::ERRORS[:unexpected_condition],
+          'Connection reset'
+        )
+
+        finalize(close_event)
+      end
+
+      @driver
+    end
+
+    def wait_for_event(expected_event, timeout: 10)
+      Timeout.timeout(timeout) do
+        loop do
+          event = dequeue_event
+
+          return nil if event.nil? && @events_queue.closed?
+          return event[:payload] unless event.nil? || event[:event] != expected_event
+        end
+      end
+    end
+
+    def write(data)
+      @tcp.write(data)
+    rescue Errno::EPIPE => e
+      logger&.debug("EPIPE: #{e}")
+    end
+
+    def finalize(event)
+      @dead = true
+      @events_queue.enq({ event: :closed, payload: event })
+      @events_queue.close
+      @thread.kill
+    end
+
+    def dequeue_event
+      event = @events_queue.pop
+      logger&.debug(event) unless event.nil?
+      event
+    end
+  end
+
+  def initialize
+    @logger = Logger.new($stdout)
+    @logger.level = 'info'
+
+    @connection = Connection.new("ws://#{STREAMING_HOST}:#{STREAMING_PORT}/api/v1/streaming")
+    @connection.logger = @logger
+  end
+
+  def debug!
+    @logger.debug!
+  end
+
+  def authenticate(access_token, authentication_method = StreamingClient::AUTHENTICATION::SUBPROTOCOL)
+    raise 'Invalid access_token passed to StreamingClient, expected a string' unless access_token.is_a?(String)
+
+    case authentication_method
+    when AUTHENTICATION::QUERY_PARAMETER
+      @connection.set_query_param('access_token', access_token)
+    when AUTHENTICATION::SUBPROTOCOL
+      @connection.protocols = access_token
+    when AUTHENTICATION::AUTHORIZATION_HEADER
+      @connection.set_header('Authorization', "Bearer #{access_token}")
+    else
+      raise 'Invalid authentication method'
+    end
+  end
+
+  def connect
+    @connection.driver.start
+    @connection.wait_for_event(:opened)
+  end
+
+  def subscribe(channel, **params)
+    send(Oj.dump({ type: 'subscribe', stream: channel }.merge(params)))
+  end
+
+  def wait_for(event = nil)
+    @connection.wait_for_event(event)
+  end
+
+  def wait_for_message
+    message = @connection.wait_for_event(:message)
+    event = Oj.load(message)
+    event['payload'] = Oj.load(event['payload']) if event['payload']
+
+    event.deep_symbolize_keys
+  end
+
+  delegate :status, :state, to: :'@connection.driver'
+  delegate :messages, to: :@connection
+
+  def open?
+    state == :open
+  end
+
+  def closing?
+    state == :closing
+  end
+
+  def closed?
+    state == :closed
+  end
+
+  def send(message)
+    @connection.driver.text(message) if open?
+  end
+
+  def close
+    return if closed?
+
+    @connection.driver.close unless closing?
+    @connection.wait_for_event(:closed)
+  end
+end
+
+module StreamingClientHelper
+  def streaming_client
+    @streaming_client ||= StreamingClient.new
+  end
+end
+
+RSpec.configure do |config|
+  config.include StreamingClientHelper, :streaming
+end
--- a/spec/support/streaming_server_manager.rb
+++ b/spec/support/streaming_server_manager.rb
@@ -12,6 +12,11 @@ class StreamingServerManager

    queue = Queue.new

+    if ENV['DEBUG_STREAMING_SERVER'].present?
+      logger = Logger.new($stdout)
+      logger.level = 'debug'
+    end
+
    @queue = queue

    @running_thread = Thread.new do
@@ -31,7 +36,7 @@ class StreamingServerManager
        # Spawn a thread to listen on streaming server output
        output_thread = Thread.new do
          stdout_err.each_line do |line|
-            Rails.logger.info "Streaming server: #{line}"
+            logger&.info "Streaming server: #{line}"

            if status == :starting && line.match('Streaming API now listening on')
              status = :started
@@ -115,12 +120,12 @@ RSpec.configure do |config|
    self.use_transactional_tests = true
  end

-  private
-
  def streaming_server_manager
    @streaming_server_manager ||= StreamingServerManager.new
  end

+  private
+
  def streaming_examples_present?
    RSpec.world.filtered_examples.values.flatten.any? { |example| example.metadata[:streaming] == true }
  end
--- a/spec/system/admin/dashboard_spec.rb
+++ b/spec/system/admin/dashboard_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe 'Admin Dashboard' do
    before do
      stub_system_checks
      Fabricate :software_update
+      Fabricate :tag, requested_review_at: 5.minutes.ago
      sign_in(user)
    end

@@ -18,6 +19,7 @@ RSpec.describe 'Admin Dashboard' do
      expect(page)
        .to have_title(I18n.t('admin.dashboard.title'))
        .and have_content(I18n.t('admin.system_checks.software_version_patch_check.message_html'))
+        .and have_content('0 pending hashtags')
    end

    private
--- a/spec/system/streaming/channel_subscriptions_spec.rb
+++ b/spec/system/streaming/channel_subscriptions_spec.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'debug'
+
+RSpec.describe 'Channel Subscriptions', :inline_jobs, :streaming do
+  let(:application) { Fabricate(:application, confidential: false) }
+  let(:scopes) { nil }
+  let(:access_token) { Fabricate(:accessible_access_token, resource_owner_id: user_account.user.id, application: application, scopes: scopes) }
+
+  let(:user_account) { Fabricate(:account, username: 'alice', domain: nil) }
+  let(:bob_account) { Fabricate(:account, username: 'bob') }
+
+  after do
+    streaming_client.close
+  end
+
+  context 'when the access token has read scope' do
+    let(:scopes) { 'read' }
+
+    it 'can subscribing to the public:local channel' do
+      streaming_client.authenticate(access_token.token)
+
+      streaming_client.connect
+      streaming_client.subscribe('public:local')
+
+      # We need to publish a status as there is no positive acknowledgement of
+      # subscriptions:
+      status = PostStatusService.new.call(bob_account, text: 'Hello @alice')
+
+      # And then we want to receive that status:
+      message = streaming_client.wait_for_message
+
+      expect(message).to include(
+        stream: be_an(Array).and(contain_exactly('public:local')),
+        event: 'update',
+        payload: include(
+          id: status.id.to_s
+        )
+      )
+    end
+  end
+
+  context 'when the access token cannot read notifications' do
+    let(:scopes) { 'read:statuses' }
+
+    it 'cannot subscribing to the user:notifications channel' do
+      streaming_client.authenticate(access_token.token)
+
+      streaming_client.connect
+      streaming_client.subscribe('user:notification')
+
+      # We should receive an error back immediately:
+      message = streaming_client.wait_for_message
+
+      expect(message).to include(
+        error: 'Access token does not have the required scopes',
+        status: 401
+      )
+    end
+  end
+end
--- a/spec/system/streaming/streaming_spec.rb
+++ b/spec/system/streaming/streaming_spec.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+RSpec.describe 'Streaming', :inline_jobs, :streaming do
+  let(:authentication_method) { StreamingClient::AUTHENTICATION::SUBPROTOCOL }
+  let(:user) { Fabricate(:user) }
+  let(:scopes) { '' }
+  let(:application) { Fabricate(:application, confidential: false) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: application, scopes: scopes) }
+  let(:access_token) { token.token }
+
+  before do
+    streaming_client.authenticate(access_token, authentication_method)
+  end
+
+  after do
+    streaming_client.close
+  end
+
+  context 'when authenticating via subprotocol' do
+    it 'is able to connect' do
+      streaming_client.connect
+
+      expect(streaming_client.status).to eq(101)
+      expect(streaming_client.open?).to be(true)
+    end
+  end
+
+  context 'when authenticating via authorization header' do
+    let(:authentication_method) { StreamingClient::AUTHENTICATION::AUTHORIZATION_HEADER }
+
+    it 'is able to connect successfully' do
+      streaming_client.connect
+
+      expect(streaming_client.status).to eq(101)
+      expect(streaming_client.open?).to be(true)
+    end
+  end
+
+  context 'when authenticating via query parameter' do
+    let(:authentication_method) { StreamingClient::AUTHENTICATION::QUERY_PARAMETER }
+
+    it 'is able to connect successfully' do
+      streaming_client.connect
+
+      expect(streaming_client.status).to eq(101)
+      expect(streaming_client.open?).to be(true)
+    end
+  end
+
+  context 'with a revoked access token' do
+    before do
+      token.revoke
+    end
+
+    it 'receives an 401 unauthorized error' do
+      streaming_client.connect
+
+      expect(streaming_client.status).to eq(401)
+      expect(streaming_client.open?).to be(false)
+    end
+  end
+
+  context 'when revoking an access token after connection' do
+    it 'disconnects the client' do
+      streaming_client.connect
+
+      expect(streaming_client.status).to eq(101)
+      expect(streaming_client.open?).to be(true)
+
+      token.revoke
+
+      expect(streaming_client.wait_for(:closed).code).to be(1000)
+      expect(streaming_client.open?).to be(false)
+    end
+  end
+end
Author	SHA1	Message	Date
Claire	8007fce623	Fix bogus simple_form.no.yml	2025-10-10 18:49:37 +02:00
Claire	07c030861c	Fix bogus no.yml	2025-10-10 18:49:19 +02:00
GitHub Actions	e6d9bd1ae9	New Crowdin translations	2025-10-10 16:47:31 +00:00
Claire	81955c10b1	Fix crowdin download script for glitch-soc stable branches	2025-10-10 18:45:27 +02:00
Claire	958d4df6cf	Merge pull request #3222 from ClearlyClaire/glitch-soc/merge-4.4 Merge upstream changes up to `c858fc77ef` to stable-4.4	2025-10-10 10:29:48 +02:00
Claire	21d4abf7cc	Merge commit 'd7d6407d4196ab6783485b20a3d9e2fbfc00ef01' into glitch-soc/merge-4.4	2025-10-09 18:15:33 +02:00
Claire	d7d6407d41	Explicitly record Tombstone quotes as deleted This adds a `deleted` state to the internal representation, but this does not change the API, which already included such a state.	2025-10-09 17:37:23 +02:00
Claire	a186bad399	Fix `"quote": { "type": "Tombstone" }` being ignored	2025-10-09 17:37:23 +02:00
Claire	67575e59e6	Fix quote post state sometimes not being updated through streaming server (#36408 )	2025-10-09 17:37:23 +02:00
Matt Jankowski	d9113976c8	Use tag filter for pending tag count on admin dashboard (#36404 )	2025-10-09 17:37:23 +02:00
Claire	3386f225e4	Merge pull request #3218 from ClearlyClaire/glitch-soc/merge-4.4 Merge upstream changes up to `670316499f` into stable-4.4	2025-10-09 14:08:25 +02:00
diondiondion	97bc82c710	[Glitch] Allow quotes to be displayed in the featured carousel Port `0d7af7e1fe` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2025-10-08 20:24:22 +02:00
Claire	0e7cb713d1	Merge commit '670316499fb4439a28d93aca2f40617dfb9bb2b0' into glitch-soc/merge-4.4	2025-10-08 18:00:57 +02:00
Claire	670316499f	Update dependency `uri`	2025-10-08 16:26:13 +02:00
Claire	3c725240fd	Update dependency `rack`	2025-10-08 16:26:13 +02:00
Claire	d8ddf95485	Fix JSON payload being potentially mutated when processing interaction policies (#36392 )	2025-10-08 16:26:13 +02:00
Emelia Smith	4c12c2ed60	Add integration tests for mastodon-streaming (#36025 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: David Roetzel <david@roetzel.de>	2025-10-08 16:26:13 +02:00
diondiondion	636ecd1d03	Display quotes in email notifications (#36379 )	2025-10-08 16:26:13 +02:00
Claire	cb0065cfe9	Fix redirect to external object when URL is missing or malformed (#36347 )	2025-10-08 16:26:13 +02:00
diondiondion	6ae1b4fae9	Allow quotes to be displayed in the featured carousel (#36335 )	2025-10-08 16:26:13 +02:00
Eugen Rochko	fd7adcc9d4	[Glitch] Fix wrong styles on rules and buttons in the sign-up form Port `2df86d6413` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2025-10-06 20:12:00 +02:00