Merge 3d1eb5e294 into 6d62581da1

.github/workflows/bundler-audit.yml

@@ -36,4 +36,4 @@ jobs:
           bundler-cache: true
 
       - name: Run bundler-audit
-        run: bundle exec bundler-audit check --update
+        run: bin/bundler-audit check --update

.github/workflows/check-i18n.yml

@@ -35,18 +35,18 @@ jobs:
           git diff --exit-code
 
       - name: Check locale file normalization
-        run: bundle exec i18n-tasks check-normalized
+        run: bin/i18n-tasks check-normalized
 
       - name: Check for unused strings
-        run: bundle exec i18n-tasks unused
+        run: bin/i18n-tasks unused
 
       - name: Check for missing strings in English YML
         run: |
-          bundle exec i18n-tasks add-missing -l en
+          bin/i18n-tasks add-missing -l en
           git diff --exit-code
 
       - name: Check for wrong string interpolations
-        run: bundle exec i18n-tasks check-consistent-interpolations
+        run: bin/i18n-tasks check-consistent-interpolations
 
       - name: Check that all required locale files exist
-        run: bundle exec rake repo:check_locales_files
+        run: bin/rake repo:check_locales_files

.github/workflows/crowdin-download-stable.yml

@@ -46,7 +46,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
 
       - name: Run i18n normalize task
-        run: bundle exec i18n-tasks normalize
+        run: bin/i18n-tasks normalize
 
       # Create or update the pull request
       - name: Create Pull Request

.github/workflows/crowdin-download.yml

@@ -48,7 +48,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
 
       - name: Run i18n normalize task
-        run: bundle exec i18n-tasks normalize
+        run: bin/i18n-tasks normalize
 
       # Create or update the pull request
       - name: Create Pull Request

.github/workflows/lint-haml.yml

@@ -43,4 +43,4 @@ jobs:
       - name: Run haml-lint
         run: |
           echo "::add-matcher::.github/workflows/haml-lint-problem-matcher.json"
-          bundle exec haml-lint --reporter github
+          bin/haml-lint --reporter github

Gemfile.lock

@@ -1031,7 +1031,7 @@ DEPENDENCIES
   xorcist (~> 1.1)
 
 RUBY VERSION
-   ruby 3.3.5p100
+   ruby 3.3.6p108
 
 BUNDLED WITH
-   2.5.22
+   2.5.23

app/lib/feed_manager.rb

@@ -58,6 +58,7 @@ class FeedManager
   # @param [Boolean] update
   # @return [Boolean]
   def push_to_home(account, status, update: false)
+    return false unless account.user&.signed_in_recently?
     return false unless add_to_feed(:home, account.id, status, aggregate_reblogs: account.user&.aggregates_reblogs?)
 
     trim(:home, account.id)
@@ -83,7 +84,9 @@ class FeedManager
   # @param [Boolean] update
   # @return [Boolean]
   def push_to_list(list, status, update: false)
-    return false if filter_from_list?(status, list) || !add_to_feed(:list, list.id, status, aggregate_reblogs: list.account.user&.aggregates_reblogs?)
+    return false if filter_from_list?(status, list)
+    return false unless list.account.user&.signed_in_recently?
+    return false unless add_to_feed(:list, list.id, status, aggregate_reblogs: list.account.user&.aggregates_reblogs?)
 
     trim(:list, list.id)
     PushUpdateWorker.perform_async(list.account_id, status.id, "timeline:list:#{list.id}", { 'update' => update }) if push_update_required?("timeline:list:#{list.id}")

app/models/user.rb

@@ -165,6 +165,10 @@ class User < ApplicationRecord
     end
   end
 
+  def signed_in_recently?
+    current_sign_in_at.present? && current_sign_in_at >= ACTIVE_DURATION.ago
+  end
+
   def confirmed?
     confirmed_at.present?
   end

bin/bundler-audit

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundler-audit' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("bundler-audit", "bundler-audit")

bin/haml-lint

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'haml-lint' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("haml_lint", "haml-lint")

bin/i18n-tasks

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'i18n-tasks' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("i18n-tasks", "i18n-tasks")

bin/rspec

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -7,9 +8,18 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
 
 require "rubygems"
 require "bundler/setup"

config/locales/an.yml

@@ -1376,7 +1376,6 @@ an:
     edit_profile: Editar perfil
     featured_tags: Hashtags destacaus
     import: Importar
-    import_and_export: Importar y exportar
     migrate: Migración de cuenta
     preferences: Preferencias
     profile: Perfil

config/locales/ar.yml

@@ -1706,7 +1706,6 @@ ar:
     edit_profile: تعديل الصفحة التعريفية
     featured_tags: الوسوم الشائعة
     import: استيراد
-    import_and_export: استيراد وتصدير
     migrate: تهجير الحساب
     notifications: إشعارات البريد الإلكتروني
     preferences: التفضيلات

config/locales/ast.yml

@@ -778,7 +778,6 @@ ast:
     edit_profile: Edición del perfil
     featured_tags: Etiquetes destacaes
     import: Importación
-    import_and_export: Importación y esportación
     migrate: Migración de la cuenta
     notifications: Avisos per corréu electrónicu
     preferences: Preferencies

config/locales/be.yml

@@ -1709,7 +1709,6 @@ be:
     edit_profile: Рэдагаваць профіль
     featured_tags: Выбраныя хэштэгі
     import: Імпарт
-    import_and_export: Імпарт і экспарт
     migrate: Перамяшчэнне ўліковага запісу
     notifications: Апавяшчэнні па эл. пошце
     preferences: Налады

config/locales/bg.yml

@@ -1638,7 +1638,6 @@ bg:
     edit_profile: Редактирай профила си
     featured_tags: Актуални хаштагове
     import: Импортиране
-    import_and_export: Импортиране и експортиране
     migrate: Миграция на акаунта
     notifications: Известия по е-поща
     preferences: Предпочитания

config/locales/br.yml

@@ -505,7 +505,6 @@ br:
     edit_profile: Kemmañ ar profil
     featured_tags: Hashtagoù pennañ
     import: Enporzhiañ
-    import_and_export: Enporzhiañ hag ezporzhiañ
     preferences: Gwellvezioù
     profile: Profil
   statuses:

config/locales/ca.yml

@@ -1701,7 +1701,6 @@ ca:
     export: Exporta
     featured_tags: Etiquetes destacades
     import: Importació
-    import_and_export: Importació i exportació
     migrate: Migració del compte
     notifications: Notificacions per correu electrònic
     preferences: Preferències

config/locales/ckb.yml

@@ -908,7 +908,6 @@ ckb:
     edit_profile: دەستکاری پرۆفایل
     featured_tags: هاشتاگی تایبەت
     import: هاوردن
-    import_and_export: هاوردەکردن و ناردن
     migrate: گواستنەوەی هەژمارە
     preferences: پەسەندەکان
     profile: پرۆفایل

config/locales/co.yml

@@ -892,7 +892,6 @@ co:
     edit_profile: Mudificà u prufile
     featured_tags: Hashtag in vista
     import: Impurtazione
-    import_and_export: Impurtazione è spurtazione
     migrate: Migrazione di u contu
     preferences: Priferenze
     profile: Prufile

config/locales/cs.yml

@@ -1653,7 +1653,6 @@ cs:
     edit_profile: Upravit profil
     featured_tags: Zvýrazněné hashtagy
     import: Import
-    import_and_export: Import a export
     migrate: Přesun účtu
     preferences: Předvolby
     profile: Profil

config/locales/cy.yml

@@ -1884,7 +1884,6 @@ cy:
     export: Allforio
     featured_tags: Prif hashnodau
     import: Mewnforio
-    import_and_export: Mewnforio ac allforio
     migrate: Mudo cyfrif
     notifications: Hysbysiadau e-bost
     preferences: Dewisiadau

config/locales/da.yml

@@ -1739,7 +1739,6 @@ da:
     export: Eksport
     featured_tags: Udvalgte hashtags
     import: Import
-    import_and_export: Import og eksport
     migrate: Kontomigrering
     notifications: E-mailnotifikationer
     preferences: Præferencer

config/locales/de.yml

@@ -1739,7 +1739,6 @@ de:
     export: Exportieren
     featured_tags: Vorgestellte Hashtags
     import: Importieren
-    import_and_export: Importieren und exportieren
     migrate: Kontoumzug
     notifications: E-Mail-Benachrichtigungen
     preferences: Einstellungen

config/locales/el.yml

@@ -1619,7 +1619,6 @@ el:
     export: Εξαγωγή
     featured_tags: Παρεχόμενες ετικέτες
     import: Εισαγωγή
-    import_and_export: Εισαγωγή και εξαγωγή
     migrate: Μετακόμιση λογαριασμού
     notifications: Ειδοποιήσεις μέσω email
     preferences: Προτιμήσεις

config/locales/en-GB.yml

@@ -1720,7 +1720,6 @@ en-GB:
     export: Export
     featured_tags: Featured hashtags
     import: Import
-    import_and_export: Import and export
     migrate: Account migration
     notifications: Email notifications
     preferences: Preferences

config/locales/en.yml

@@ -1738,9 +1738,9 @@ en:
     development: Development
     edit_profile: Edit profile
     export: Export
+    export_and_import: Export and import
     featured_tags: Featured hashtags
     import: Import
-    import_and_export: Import and export
     migrate: Account migration
     notifications: Email notifications
     preferences: Preferences

config/locales/eo.yml

@@ -1642,7 +1642,6 @@ eo:
     export: Eksporti
     featured_tags: Elstarigitaj kradvortoj
     import: Enporti
-    import_and_export: Importi kaj eksporti
     migrate: Konta migrado
     notifications: Retpoŝtaj sciigoj
     preferences: Preferoj

config/locales/es-AR.yml

@@ -1739,7 +1739,6 @@ es-AR:
     export: Exportar
     featured_tags: Etiquetas destacadas
     import: Importar
-    import_and_export: Importación y exportación
     migrate: Migración de la cuenta
     notifications: Notificaciones por correo electrónico
     preferences: Configuración

config/locales/es-MX.yml

@@ -1739,7 +1739,6 @@ es-MX:
     export: Exportar
     featured_tags: Hashtags destacados
     import: Importar
-    import_and_export: Importar y exportar
     migrate: Migración de cuenta
     notifications: Notificaciones por correo electrónico
     preferences: Preferencias

config/locales/es.yml

@@ -1739,7 +1739,6 @@ es:
     export: Exportar
     featured_tags: Etiquetas destacadas
     import: Importar
-    import_and_export: Importar y exportar
     migrate: Migración de cuenta
     notifications: Notificaciones por correo electrónico
     preferences: Preferencias

config/locales/et.yml

@@ -1724,7 +1724,6 @@ et:
     export: Eksport
     featured_tags: Esile toodud sildid
     import: Impordi
-    import_and_export: Import / eksport
     migrate: Konto kolimine
     notifications: E-postiteated
     preferences: Eelistused

config/locales/eu.yml

@@ -1579,7 +1579,6 @@ eu:
     edit_profile: Editatu profila
     featured_tags: Nabarmendutako traolak
     import: Inportazioa
-    import_and_export: Inportatu eta esportatu
     migrate: Kontuaren migrazioa
     preferences: Hobespenak
     profile: Profila

config/locales/fa.yml

@@ -1526,7 +1526,6 @@ fa:
     export: برون‌ریزی
     featured_tags: برچسب‌های برگزیده
     import: درون‌ریزی
-    import_and_export: درون‌ریزی و برون‌بری
     migrate: انتقال حساب
     notifications: آگاهی‌های رایانامه‌ای
     preferences: ترجیحات

config/locales/fi.yml

@@ -1739,7 +1739,6 @@ fi:
     export: Vie
     featured_tags: Suositellut aihetunnisteet
     import: Tuo tietoja
-    import_and_export: Tuonti ja vienti
     migrate: Tilin muutto toisaalle
     notifications: Sähköposti-ilmoitukset
     preferences: Asetukset

config/locales/fo.yml

@@ -1739,7 +1739,6 @@ fo:
     export: Flyt út
     featured_tags: Varpaði frámerki
     import: Innflyt
-    import_and_export: Innflyt og útflyt
     migrate: Flyting av kontu
     notifications: Teldupostfráboðanir
     preferences: Stillingar

config/locales/fr-CA.yml

@@ -1724,7 +1724,6 @@ fr-CA:
     export: Exportation
     featured_tags: Hashtags mis en avant
     import: Import de données
-    import_and_export: Import et export
     migrate: Migration de compte
     notifications: Notifications par courriel
     preferences: Préférences

config/locales/fr.yml

@@ -1724,7 +1724,6 @@ fr:
     export: Exportation
     featured_tags: Hashtags mis en avant
     import: Import de données
-    import_and_export: Import et export
     migrate: Migration de compte
     notifications: Notifications par courriel
     preferences: Préférences

config/locales/fy.yml

@@ -1724,7 +1724,6 @@ fy:
     export: Eksportearje
     featured_tags: Utljochte hashtags
     import: Ymportearje
-    import_and_export: Ymportearje en eksportearje
     migrate: Accountmigraasje
     notifications: E-mailmeldingen
     preferences: Ynstellingen

config/locales/ga.yml

@@ -1853,7 +1853,6 @@ ga:
     export: Easpórtáil
     featured_tags: Haischlib faoi thrácht
     import: Iompórtáil
-    import_and_export: Iompórtáil agus easpórtáil
     migrate: Imirce cuntais
     notifications: Fógraí ríomhphoist
     preferences: Sainroghanna pearsanta

config/locales/gd.yml

@@ -1815,7 +1815,6 @@ gd:
     export: Às-phortadh
     featured_tags: Tagaichean hais brosnaichte
     import: Ion-phortadh
-    import_and_export: Ion-phortadh ⁊ às-phortadh
     migrate: Imrich cunntais
     notifications: Brathan puist-d
     preferences: Roghainnean

config/locales/gl.yml

@@ -1739,7 +1739,6 @@ gl:
     export: Exportar
     featured_tags: Cancelos destacados
     import: Importar
-    import_and_export: Importar e exportar
     migrate: Migrar conta
     notifications: Notificacións por correo
     preferences: Preferencias

config/locales/he.yml

@@ -1815,7 +1815,6 @@ he:
     export: ייצוא
     featured_tags: תגיות נבחרות
     import: יבוא
-    import_and_export: יבוא ויצוא
     migrate: הגירת חשבון
     notifications: התראות בדואל
     preferences: העדפות

config/locales/hr.yml

@@ -207,7 +207,6 @@ hr:
     edit_profile: Uredi profil
     featured_tags: Istaknuti hashtagovi
     import: Uvezi
-    import_and_export: Uvezi i izvezi
     preferences: Postavke
     profile: Profil
     statuses_cleanup: Automatsko brisanje postova

config/locales/hu.yml

@@ -1732,7 +1732,6 @@ hu:
     export: Exportálás
     featured_tags: Kiemelt hashtagek
     import: Importálás
-    import_and_export: Import és export
     migrate: Fiók átirányítása
     notifications: E-mail-értesítések
     preferences: Beállítások

config/locales/hy.yml

@@ -758,7 +758,6 @@ hy:
     edit_profile: Խմբագրել պրոֆիլը
     featured_tags: Ընտրուած հէշթեգեր
     import: Ներմուծել
-    import_and_export: Ներմուծել և արտահանել
     migrate: Հաշուի տեղափոխում
     preferences: Կարգավորումներ
     profile: Հաշիւ

config/locales/ia.yml

@@ -1739,7 +1739,6 @@ ia:
     export: Exportar
     featured_tags: Hashtags in evidentia
     import: Importar
-    import_and_export: Importar e exportar
     migrate: Migration de conto
     notifications: Notificationes per e-mail
     preferences: Preferentias

config/locales/id.yml

@@ -1348,7 +1348,6 @@ id:
     edit_profile: Ubah profil
     featured_tags: Tagar unggulan
     import: Impor
-    import_and_export: Impor dan ekspor
     migrate: Pemindahan akun
     preferences: Pilihan
     profile: Profil

config/locales/ie.yml

@@ -1577,7 +1577,6 @@ ie:
     edit_profile: Modificar profil
     featured_tags: Recomandat hashtags
     import: Importar
-    import_and_export: Importation e exportation
     migrate: Migration de conto
     preferences: Preferenties
     profile: Public profil

config/locales/io.yml

@@ -1542,7 +1542,6 @@ io:
     edit_profile: Redaktar la profilo
     featured_tags: Estelata hashtagi
     import: Importacar
-    import_and_export: Importaco e exportaco
     migrate: Kontomigro
     preferences: Preferi
     profile: Profilo

config/locales/is.yml

@@ -1743,7 +1743,6 @@ is:
     export: Flytja út
     featured_tags: Myllumerki með aukið vægi
     import: Flytja inn
-    import_and_export: Inn- og útflutningur
     migrate: Yfirfærsla notandaaðgangs
     notifications: Tilkynningar í tölvupósti
     preferences: Kjörstillingar

config/locales/it.yml

@@ -1741,7 +1741,6 @@ it:
     export: Esporta
     featured_tags: Hashtag in evidenza
     import: Importa
-    import_and_export: Importa ed esporta
     migrate: Migrazione dell'account
     notifications: Notifiche e-mail
     preferences: Preferenze

config/locales/ja.yml

@@ -1701,7 +1701,6 @@ ja:
     export: エクスポート
     featured_tags: 注目のハッシュタグ
     import: データのインポート
-    import_and_export: インポート・エクスポート
     migrate: アカウントの引っ越し
     notifications: メール通知
     preferences: ユーザー設定

config/locales/kab.yml

@@ -785,7 +785,6 @@ kab:
     development: Taneflit
     edit_profile: Ẓreg amaɣnu
     import: Kter
-    import_and_export: Taktert d usifeḍ
     migrate: Tunigin n umiḍan
     notifications: Alɣuten s imayl
     preferences: Imenyafen

config/locales/kk.yml

@@ -624,7 +624,6 @@ kk:
     edit_profile: Профиль өңдеу
     featured_tags: Таңдаулы хэштегтер
     import: Импорт
-    import_and_export: Импорт/экспорт
     migrate: Аккаунт көшіру
     preferences: Баптаулар
     profile: Профиль

config/locales/ko.yml

@@ -1703,7 +1703,6 @@ ko:
     export: 내보내기
     featured_tags: 추천 해시태그
     import: 데이터 가져오기
-    import_and_export: 가져오기 & 내보내기
     migrate: 계정 이동
     notifications: 이메일 알림
     preferences: 환경설정

config/locales/ku.yml

@@ -1370,7 +1370,6 @@ ku:
     edit_profile: Profîlê serrast bike
     featured_tags: Hashtagên bijarte
     import: Têxistin
-    import_and_export: Têxistin û derxistin
     migrate: Barkirina ajimêrê
     preferences: Hilbijarte
     profile: Profîl

config/locales/lad.yml

@@ -1661,7 +1661,6 @@ lad:
     export: Eksporto
     featured_tags: Etiketas avaliadas
     import: Importo
-    import_and_export: Importo i eksporto
     migrate: Migrasyon de kuento
     notifications: Avizos por posta elektronika
     preferences: Preferensyas

config/locales/lt.yml

@@ -1112,7 +1112,6 @@ lt:
     export: Eksportuoti
     featured_tags: Rodomi saitažodžiai
     import: Importuoti
-    import_and_export: Importas ir eksportas
     migrate: Paskyros migracija
     notifications: El. laiško pranešimai
     preferences: Nuostatos

config/locales/lv.yml

@@ -1673,7 +1673,6 @@ lv:
     export: Izgūt
     featured_tags: Piedāvātie tēmturi
     import: Imports
-    import_and_export: Imports un eksports
     migrate: Konta migrācija
     notifications: E-pasta paziņojumi
     preferences: Iestatījumi

config/locales/ms.yml

@@ -1516,7 +1516,6 @@ ms:
     edit_profile: Sunting profil
     featured_tags: Tanda pagar terpilih
     import: Import
-    import_and_export: Import dan eksport
     migrate: Penghijrahan akaun
     preferences: Keutamaan
     profile: Profil

config/locales/my.yml

@@ -1516,7 +1516,6 @@ my:
     edit_profile: ပရိုဖိုင်ပြင်ဆင်ရန်
     featured_tags: အသားပေးဖော်ပြထားသည့် ဟက်ရှ်တဂျ်များ
     import: ထည့်သွင်းခြင်း
-    import_and_export: ထည့်သွင်းခြင်းနှင့် ထုတ်ယူခြင်း
     migrate: အကောင့်ပြောင်းရွှေ့ခြင်း
     preferences: သတ်မှတ်ချက်များ
     profile: ပရိုဖိုင်

config/locales/nl.yml

@@ -1729,7 +1729,6 @@ nl:
     export: Exporteren
     featured_tags: Uitgelichte hashtags
     import: Importeren
-    import_and_export: Importeren en exporteren
     migrate: Accountmigratie
     notifications: E-mailmeldingen
     preferences: Voorkeuren

config/locales/nn.yml

@@ -1739,7 +1739,6 @@ nn:
     export: Eksporter
     featured_tags: Utvalgte emneknagger
     import: Hent inn
-    import_and_export: Importer og eksporter
     migrate: Kontoflytting
     notifications: Epostvarsel
     preferences: Innstillingar

config/locales/no.yml

@@ -1571,7 +1571,6 @@
     edit_profile: Endre profil
     featured_tags: Utvalgte emneknagger
     import: Importér
-    import_and_export: Importer og eksporter
     migrate: Kontomigrering
     preferences: Innstillinger
     profile: Profil

config/locales/oc.yml

@@ -814,7 +814,6 @@ oc:
     edit_profile: Modificar lo perfil
     featured_tags: Etiquetas en avant
     import: Importar de donadas
-    import_and_export: Import e export
     migrate: Migracion de compte
     preferences: Preferéncias
     profile: Perfil

config/locales/pl.yml

@@ -1753,7 +1753,6 @@ pl:
     export: Eksportowanie danych
     featured_tags: Wyróżnione hashtagi
     import: Importowanie danych
-    import_and_export: Import i eksport
     migrate: Migracja konta
     notifications: Powiadomienia e-mail
     preferences: Preferencje

config/locales/pt-BR.yml

@@ -1712,7 +1712,6 @@ pt-BR:
     export: Exportar
     featured_tags: Hashtags em destaque
     import: Importar
-    import_and_export: Importar e exportar
     migrate: Migração de conta
     notifications: Notificações por e-mail
     preferences: Preferências

config/locales/pt-PT.yml

@@ -1665,7 +1665,6 @@ pt-PT:
     edit_profile: Editar perfil
     featured_tags: Etiquetas destacadas
     import: Importar
-    import_and_export: Importar e exportar
     migrate: Migração de conta
     preferences: Preferências
     profile: Perfil

config/locales/ro.yml

@@ -663,7 +663,6 @@ ro:
     account: Cont
     back: Înapoi la Mastodon
     edit_profile: Editați profilul
-    import_and_export: Import și export
     profile: Profil
     relationships: Urmăriri și urmăritori
   statuses:

config/locales/ru.yml

@@ -1808,7 +1808,6 @@ ru:
     export: Экспорт
     featured_tags: Избранные хэштеги
     import: Импорт
-    import_and_export: Импорт и экспорт
     migrate: Миграция учётной записи
     notifications: E-mail уведомление
     preferences: Настройки

config/locales/sc.yml

@@ -1124,7 +1124,6 @@ sc:
     edit_profile: Modìfica profilu
     featured_tags: Etichetas in evidèntzia
     import: Importatzione
-    import_and_export: Importatzione e esportatzione
     migrate: Tràmuda de contu
     preferences: Preferèntzias
     profile: Profilu pùblicu

config/locales/sco.yml

@@ -1360,7 +1360,6 @@ sco:
     edit_profile: Edit profile
     featured_tags: Featured hashtags
     import: Import
-    import_and_export: Import an export
     migrate: Accoont flittin
     preferences: Preferences
     profile: Profile

config/locales/si.yml

@@ -1235,7 +1235,6 @@ si:
     edit_profile: පැතිකඩ සංස්කරණය
     featured_tags: විශේෂාංගගත හැෂ් ටැග්
     import: ආයාතය
-    import_and_export: ආයාත හා නිර්යාත
     migrate: ගිණුම් සංක්‍රමණය
     preferences: අභිප්‍රේත
     profile: ප්‍රසිද්ධ පැතිකඩ

config/locales/sk.yml

@@ -1234,7 +1234,6 @@ sk:
     edit_profile: Uprav profil
     featured_tags: Zvýraznené haštagy
     import: Importuj
-    import_and_export: Import a export
     migrate: Presuň účet
     preferences: Voľby
     profile: Profil

config/locales/sl.yml

@@ -1716,7 +1716,6 @@ sl:
     edit_profile: Uredi profil
     featured_tags: Vključeni ključniki
     import: Uvozi
-    import_and_export: Uvoz in izvoz
     migrate: Selitev računa
     notifications: E-poštna obvestila
     preferences: Nastavitve

config/locales/sq.yml

@@ -1733,7 +1733,6 @@ sq:
     export: Eksportim
     featured_tags: Hashtag-ë të zgjedhur
     import: Importo
-    import_and_export: Importim dhe eksportim
     migrate: Migrim llogarie
     notifications: Njoftime me email
     preferences: Parapëlqime

config/locales/sr-Latn.yml

@@ -1606,7 +1606,6 @@ sr-Latn:
     edit_profile: Uređivanje profila
     featured_tags: Istaknute heš oznake
     import: Uvoz
-    import_and_export: Uvoz i izvoz
     migrate: Prebacivanje naloga
     preferences: Podešavanja
     profile: Javni profil

config/locales/sr.yml

@@ -1636,7 +1636,6 @@ sr:
     edit_profile: Уређивање профила
     featured_tags: Истакнуте хеш ознаке
     import: Увоз
-    import_and_export: Увоз и извоз
     migrate: Пребацивање налога
     preferences: Подешавања
     profile: Јавни профил

config/locales/sv.yml

@@ -1739,7 +1739,6 @@ sv:
     export: Export
     featured_tags: Utvalda hashtaggar
     import: Importera
-    import_and_export: Import och export
     migrate: Kontoflytt
     notifications: E-postaviseringar
     preferences: Inställningar

config/locales/th.yml

@@ -1701,7 +1701,6 @@ th:
     export: ส่งออก
     featured_tags: แฮชแท็กที่น่าสนใจ
     import: การนำเข้า
-    import_and_export: การนำเข้าและการส่งออก
     migrate: การโยกย้ายบัญชี
     notifications: การแจ้งเตือนอีเมล
     preferences: การกำหนดลักษณะ

config/locales/tr.yml

@@ -1739,7 +1739,6 @@ tr:
     export: Dışa Aktar
     featured_tags: Öne çıkan etiketler
     import: İçe aktar
-    import_and_export: İçe ve dışa aktar
     migrate: Hesap taşıma
     notifications: E-posta bildirimleri
     preferences: Tercihler

config/locales/uk.yml

@@ -1738,7 +1738,6 @@ uk:
     export: Експорт
     featured_tags: Рекомендовані хештеґи
     import: Імпорт
-    import_and_export: Імпорт та експорт
     migrate: Міграція облікового запису
     notifications: Сповіщення е-поштою
     preferences: Налаштування

config/locales/vi.yml

@@ -1701,7 +1701,6 @@ vi:
     export: Xuất
     featured_tags: Hashtag thường dùng
     import: Nhập dữ liệu
-    import_and_export: Dữ liệu
     migrate: Chuyển tài khoản sang máy chủ khác
     notifications: Thông báo qua email
     preferences: Chung

config/locales/zh-CN.yml

@@ -1701,7 +1701,6 @@ zh-CN:
     export: 导出
     featured_tags: 精选话题标签
     import: 导入
-    import_and_export: 导入与导出
     migrate: 账户迁移
     notifications: 邮件通知
     preferences: 偏好设置

config/locales/zh-HK.yml

@@ -1551,7 +1551,6 @@ zh-HK:
     edit_profile: 修改個人資料
     featured_tags: 推薦的標籤
     import: 匯入
-    import_and_export: 匯入及匯出
     migrate: 帳戶遷移
     preferences: 偏好設定
     profile: 個人資料

config/locales/zh-TW.yml

@@ -1703,7 +1703,6 @@ zh-TW:
     export: 匯出
     featured_tags: 推薦主題標籤
     import: 匯入
-    import_and_export: 匯入及匯出
     migrate: 帳號搬遷
     notifications: 電子郵件通知
     preferences: 偏好設定

config/navigation.rb

@@ -34,9 +34,9 @@ SimpleNavigation::Configuration.run do |navigation|
       s.item :authorized_apps, safe_join([material_symbol('list_alt'), t('settings.authorized_apps')]), oauth_authorized_applications_path, if: -> { !self_destruct }
     end
 
-    n.item :data, safe_join([material_symbol('cloud_sync'), t('settings.import_and_export')]), settings_export_path do |s|
-      s.item :import, safe_join([material_symbol('cloud_upload'), t('settings.import')]), settings_imports_path, highlights_on: %r{/settings/imports}, if: -> { current_user.functional? && !self_destruct }
+    n.item :data, safe_join([material_symbol('cloud_sync'), t('settings.export_and_import')]), settings_export_path do |s|
       s.item :export, safe_join([material_symbol('cloud_download'), t('settings.export')]), settings_export_path
+      s.item :import, safe_join([material_symbol('cloud_upload'), t('settings.import')]), settings_imports_path, highlights_on: %r{/settings/imports}, if: -> { current_user.functional? && !self_destruct }
     end
 
     n.item :user_invites, safe_join([material_symbol('person_add'), t('invites.title')]), invites_path, if: -> { current_user.can?(:invite_users) && current_user.functional? && !self_destruct }

lint-staged.config.js

@@ -3,7 +3,7 @@ const config = {
   'Capfile|Gemfile|*.{rb,ruby,ru,rake}': 'bin/rubocop --force-exclusion -a',
   '*.{js,jsx,ts,tsx}': 'eslint --fix',
   '*.{css,scss}': 'stylelint --fix',
-  '*.haml': 'bundle exec haml-lint -a',
+  '*.haml': 'bin/haml-lint -a',
   '**/*.ts?(x)': () => 'tsc -p tsconfig.json --noEmit',
 };