Change the groupings of menu items in settings navigation (#10533)

* Change the groupings of menu items in settings navigation

Fix #10307

* Remove unused translations

50 files changed, 44 insertions, 125 deletions

diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 3cb91631ede..d81ee61add4 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -6,6 +6,7 @@
   %li= link_to t('preferences.publishing'), '#settings_publishing'
   %li= link_to t('preferences.other'), '#settings_other'
   %li= link_to t('preferences.web'), '#settings_web'
+  %li= link_to t('settings.notifications'), settings_notifications_path
 
 = simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
   = render 'shared/error_messages', object: current_user
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index e0ccb63a947..fe49ac7f6bd 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -812,9 +812,7 @@ ar:
     migrate: تهجير الحساب
     notifications: الإخطارات
     preferences: التفضيلات
-    settings: الإعدادات
     two_factor_authentication: المُصادقة بخُطوَتَيْن
-    your_apps: تطبيقاتك
   statuses:
     attached:
       description: 'مُرفَق : %{attached}'
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index f6892923c18..7a51be7cf44 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -300,7 +300,6 @@ ast:
     import: Importación
     notifications: Avisos
     preferences: Preferencies
-    settings: Axustes
     two_factor_authentication: Autenticación en dos pasos
   statuses:
     attached:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 2424d93991f..57aa6f87e01 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -122,7 +122,6 @@ bg:
     export: Експортиране на данни
     import: Импортиране
     preferences: Предпочитания
-    settings: Настройки
     two_factor_authentication: Двустепенно удостоверяване
   statuses:
     open_in_web: Отвори в уеб
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 5fd2ff8234e..17a5d9d0cef 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -867,9 +867,7 @@ ca:
     notifications: Notificacions
     preferences: Preferències
     relationships: Seguits i seguidors
-    settings: Configuració
     two_factor_authentication: Autenticació de dos factors
-    your_apps: Les teves aplicacions
   statuses:
     attached:
       description: 'Adjunt: %{attached}'
diff --git a/config/locales/co.yml b/config/locales/co.yml
index c4122b6d94c..311e3f1427c 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -873,9 +873,7 @@ co:
     notifications: Nutificazione
     preferences: Priferenze
     relationships: Abbunamenti è abbunati
-    settings: Parametri
     two_factor_authentication: Identificazione à dui fattori
-    your_apps: E vostre applicazione
   statuses:
     attached:
       description: 'Aghjuntu: %{attached}'
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 7917166de7b..fdb0252bd45 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -883,9 +883,7 @@ cs:
     notifications: Oznámení
     preferences: Předvolby
     relationships: Sledovaní a sledující
-    settings: Nastavení
     two_factor_authentication: Dvoufázové ověřování
-    your_apps: Vaše aplikace
   statuses:
     attached:
       description: 'Přiloženo: %{attached}'
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 9ab4fc394e1..f365f717336 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -812,9 +812,7 @@ cy:
     migrate: Mudo cyfrif
     notifications: Hysbysiadau
     preferences: Dewisiadau
-    settings: Gosodiadau
     two_factor_authentication: Awdurdodi dau-gam
-    your_apps: Eich rhaglenni
   statuses:
     attached:
       description: 'Ynghlwm: %{attached}'
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 2156acb4431..0787db621f1 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -700,9 +700,7 @@ da:
     migrate: Konto migrering
     notifications: Notifikationer
     preferences: Præferencer
-    settings: Indstillinger
     two_factor_authentication: To-faktor godkendelse
-    your_apps: Dine applikationer
   statuses:
     attached:
       description: 'Vedhæftede: %{attached}'
diff --git a/config/locales/de.yml b/config/locales/de.yml
index cfe527b0a62..aaf1c30b2c4 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -868,9 +868,7 @@ de:
     notifications: Benachrichtigungen
     preferences: Einstellungen
     relationships: Folgende und Follower
-    settings: Einstellungen
     two_factor_authentication: Zwei-Faktor-Auth
-    your_apps: Deine Anwendungen
   statuses:
     attached:
       description: 'Angehängt: %{attached}'
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 8ff42acbfe9..f2b6751ff6f 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -859,9 +859,7 @@ el:
     notifications: Ειδοποιήσεις
     preferences: Προτιμήσεις
     relationships: Ακολουθεί και ακολουθείται
-    settings: Ρυθμίσεις
     two_factor_authentication: Πιστοποίηση 2 παραγόντων (2FA)
-    your_apps: Οι εφαρμογές σου
   statuses:
     attached:
       description: 'Συνημμένα: %{attached}'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 60540ecdcec..838d6adc325 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -860,6 +860,8 @@ en:
     revoke_success: Session successfully revoked
     title: Sessions
   settings:
+    account: Account
+    account_settings: Account settings
     authorized_apps: Authorized apps
     back: Back to Mastodon
     delete: Account deletion
@@ -869,13 +871,13 @@ en:
     featured_tags: Featured hashtags
     identity_proofs: Identity proofs
     import: Import
+    import_and_export: Import and export
     migrate: Account migration
     notifications: Notifications
     preferences: Preferences
+    profile: Profile
     relationships: Follows and followers
-    settings: Settings
     two_factor_authentication: Two-factor Auth
-    your_apps: Your applications
   statuses:
     attached:
       description: 'Attached: %{attached}'
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 743989879e4..d428a95c3f5 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -854,9 +854,7 @@ en_GB:
     notifications: Notifications
     preferences: Preferences
     relationships: Follows and followers
-    settings: Settings
     two_factor_authentication: Two-factor Auth
-    your_apps: Your applications
   statuses:
     attached:
       description: 'Attached: %{attached}'
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index cce32cc561b..b85cb1a4912 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -869,9 +869,7 @@ eo:
     notifications: Sciigoj
     preferences: Preferoj
     relationships: Follows and followers
-    settings: Agordoj
     two_factor_authentication: Dufaktora aŭtentigo
-    your_apps: Viaj aplikaĵoj
   statuses:
     attached:
       description: 'Ligita: %{attached}'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index c0b6cfb3b58..3a8e8dc0b00 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -705,9 +705,7 @@ es:
     migrate: Migración de cuenta
     notifications: Notificaciones
     preferences: Preferencias
-    settings: Ajustes
     two_factor_authentication: Autenticación de dos factores
-    your_apps: Tus aplicaciones
   statuses:
     attached:
       description: 'Adjunto: %{attached}'
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 50e5b663946..5ae664cadde 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -787,9 +787,7 @@ eu:
     migrate: Kontuaren migrazioa
     notifications: Jakinarazpenak
     preferences: Hobespenak
-    settings: Ezarpenak
     two_factor_authentication: Bi faktoreetako autentifikazioa
-    your_apps: Zure aplikazioak
   statuses:
     attached:
       description: 'Erantsita: %{attached}'
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 0cf38092180..3a3455c6d1f 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -860,9 +860,7 @@ fa:
     notifications: اعلان‌ها
     preferences: ترجیحات
     relationships: پیگیری‌ها و پیگیران
-    settings: تنظیمات
     two_factor_authentication: ورود دومرحله‌ای
-    your_apps: برنامهٔ شما
   statuses:
     attached:
       description: 'پیوست‌شده: %{attached}'
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 47ff00434e7..e4a0ed22cb9 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -613,9 +613,7 @@ fi:
     migrate: Tilin muutto muualle
     notifications: Ilmoitukset
     preferences: Ominaisuudet
-    settings: Asetukset
     two_factor_authentication: Kaksivaiheinen todentaminen
-    your_apps: Omat sovellukset
   statuses:
     attached:
       description: 'Liitetty: %{attached}'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index f1d81acf02c..a6c806de39a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -798,9 +798,7 @@ fr:
     migrate: Migration de compte
     notifications: Notifications
     preferences: Préférences
-    settings: Réglages
     two_factor_authentication: Identification à deux facteurs
-    your_apps: Vos applications
   statuses:
     attached:
       description: 'Attaché : %{attached}'
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 0ee3a329ca9..9c4673186b5 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -855,9 +855,7 @@ gl:
     notifications: Notificacións
     preferences: Preferencias
     relationships: Seguindo e seguidoras
-    settings: Axustes
     two_factor_authentication: Validar Doble Factor
-    your_apps: As súas aplicacións
   statuses:
     attached:
       description: 'Axenado: %{attached}'
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 089af2bebde..e471c4d0252 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -310,7 +310,6 @@ he:
     export: יצוא מידע
     import: יבוא
     preferences: העדפות
-    settings: הגדרות
     two_factor_authentication: אימות דו-שלבי
   statuses:
     open_in_web: פתח ברשת
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index f53515d7aff..f9c552bce14 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -115,7 +115,6 @@ hr:
     export: Izvoz podataka
     import: Uvezi
     preferences: Postavke
-    settings: Podešenja
     two_factor_authentication: Dvo-faktorska Autentifikacija
   statuses:
     open_in_web: Otvori na webu
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index f32f6f40790..b6029eecab7 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -533,9 +533,7 @@ hu:
     migrate: Fiók átirányítása
     notifications: Értesítések
     preferences: Általános beállítások
-    settings: Beállítások
     two_factor_authentication: Kétlépcsős azonosítás
-    your_apps: Alkalmazásaid
   statuses:
     open_in_web: Megnyitás a weben
     over_character_limit: Túllépted a maximális %{max} karakteres keretet
diff --git a/config/locales/id.yml b/config/locales/id.yml
index a27f1f00886..4323c145fc5 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -334,7 +334,6 @@ id:
     export: Expor data
     import: Impor
     preferences: Pilihan
-    settings: Pengaturan
     two_factor_authentication: Autentikasi Two-factor
   statuses:
     open_in_web: Buka di web
diff --git a/config/locales/io.yml b/config/locales/io.yml
index b926fe64150..b5edb2aa324 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -235,7 +235,6 @@ io:
     export: Exportacar datumi
     import: Importacar
     preferences: Preferi
-    settings: Settings
     two_factor_authentication: Dufaktora autentikigo
   statuses:
     open_in_web: Apertar retnavigile
diff --git a/config/locales/it.yml b/config/locales/it.yml
index bb170bc4a2f..508b8a0dc99 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -762,9 +762,7 @@ it:
     migrate: Migrazione dell'account
     notifications: Notifiche
     preferences: Preferenze
-    settings: Impostazioni
     two_factor_authentication: Autenticazione a due fattori
-    your_apps: Le tue applicazioni
   statuses:
     attached:
       description: 'Allegato: %{attached}'
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 85e97580e8c..a4026fcfc03 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -871,9 +871,7 @@ ja:
     notifications: 通知
     preferences: ユーザー設定
     relationships: フォロー・フォロワー
-    settings: 設定
     two_factor_authentication: 二段階認証
-    your_apps: アプリ
   statuses:
     attached:
       description: '添付: %{attached}'
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 758a0429e33..9781fc5be90 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -668,9 +668,7 @@ ka:
     migrate: ანგარიშ�