Fix site notice spacing

- Removes grid row gap in favor of margins - Add container div around site notice to allow margin collapsing Bug: T315595 Change-Id: I39959f43f20880e83bef945a7535d58cfe0b6412
Add clearfix to .mw-body-subheader
2022-08-29 12:07:08 -05:00 · 2022-08-25 11:41:06 -05:00 · 2022-08-24 15:52:44 +00:00 · 2022-08-23 21:05:52 +00:00 · 2022-08-23 20:29:13 +00:00
172 changed files with 992 additions and 2535 deletions
--- a/.storybook/common.less
+++ b/.storybook/common.less
@ -22,7 +22,3 @@ ul {
 .printfooter {
 	display: none;
 }
-
-.vector-storybook-example-table tr {
-	vertical-align: top;
-}
--- a/i18n/acm.json
+++ b/i18n/acm.json
@ -1,15 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"Ahmedadeljaff"
-		]
-	},
-	"vector-language-button-label": "{{PLURAL:$1|$1 لغـة|$1 لغـات}}",
-	"vector-action-addsection": "شارك مقالة",
-	"vector-view-create": "سوي",
-	"vector-view-edit": "تعديل",
-	"vector-view-history": "شوف التاريخ",
-	"vector-view-view": "اقرأ",
-	"vector-more-actions": "بعد",
-	"vector-searchsuggest-containing": "بحث عن صفحات تحوي <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>"
-}
--- a/i18n/ami.json
+++ b/i18n/ami.json
@ -2,7 +2,6 @@
 	"@metadata": {
 		"authors": [
 			"Akamycoco",
-			"Amire80",
 			"Vickylin77s"
 		]
 	},
@ -10,10 +9,10 @@
 	"vector-action-delete": "masopitay to",
 	"vector-action-move": "malinah",
 	"vector-action-protect": "midipot",
-	"vector-view-create": "misanga’",
+	"vector-view-create": " misanga’",
 	"vector-view-edit": "misinanot",
-	"vector-view-history": "misongila’ a minengneng to likisi",
-	"vector-view-view": "miasip",
+	"vector-view-history": " misongila’ a minengneng to likisi",
+	"vector-view-view": " miasip",
 	"vector-view-viewsource": "misongila’ a minengneng to yin-se-ma",
 	"vector-more-actions": "matongal ko adihay"
 }
--- a/i18n/anp.json
+++ b/i18n/anp.json
@ -14,6 +14,5 @@
 	"vector-view-edit": "संपादन करौ",
 	"vector-view-history": "इतिहास देखौ",
 	"vector-view-view": "पढ़ौ",
-	"vector-more-actions": "आरू जादा",
-	"vector-searchsuggest-containing": "<strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong> सँ युक्त पन्ना खोजौ"
+	"vector-more-actions": "आरू जादा"
 }
--- a/i18n/ar.json
+++ b/i18n/ar.json
@ -68,6 +68,7 @@
 	"vector-main-menu-tooltip": "القائمة الرئيسة",
 	"vector-toc-menu-tooltip": "جدول المحتويات",
 	"vector-toc-collapsible-button-label": "تبديل عرض جدول المحتويات",
+	"vector-article-tools-nav-label": "الأدوات",
 	"vector-site-nav-label": "الموقع",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|نقاش]]",
 	"tooltip-vector-anon-user-menu-title": "المزيد من الخيارات"
--- a/i18n/as.json
+++ b/i18n/as.json
@ -55,6 +55,7 @@
 	"vector-main-menu-tooltip": "মুখ্য মেনু",
 	"vector-toc-menu-tooltip": "সূচীপত্ৰ",
 	"vector-toc-collapsible-button-label": "সূচীপত্ৰ টগ'ল কৰক",
+	"vector-article-tools-nav-label": "সঁজুলি",
 	"vector-site-nav-label": "ছাইট",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|আলোচনা]]",
 	"tooltip-vector-anon-user-menu-title": "অধিক বিকল্প"
--- a/i18n/az.json
+++ b/i18n/az.json
@ -6,7 +6,6 @@
 			"Gulmammad",
 			"NMW03",
 			"Sortilegus",
-			"Toghrul Rahimli",
 			"Vago",
 			"Vugar 1981",
 			"Wertuose"
@ -19,8 +18,6 @@
 	"vector.css": "/* Burada yerləşən CSS Vector istifadəçilərinə tətbiq olunur */",
 	"vector.js": "/* Burada Vector skin istifadəçiləri üçün istənilən JavaScript yüklənəcək */",
 	"vector-language-button-label": "{{PLURAL:$1|$1 dildə|$1 dildə}}",
-	"vector-no-language-button-label": "Dil əlavə et",
-	"vector-language-redirect-to-top": "Bu {{SITENAME}} layihəsində dil keçidləri məqalənin başlıq hissəsində verilmişdir. [[#p-lang-btn|Yuxarı get]].",
 	"vector-action-addsection": "Mövzu əlavə et",
 	"vector-action-delete": "Sil",
 	"vector-action-move": "Adını dəyiş",
@ -33,11 +30,5 @@
 	"vector-view-view": "Oxu",
 	"vector-view-viewsource": "Mənbəyə bax",
 	"vector-more-actions": "Daha çox",
-	"vector-search-loader": "Axtarış təklifləri yüklənir",
-	"vector-searchsuggest-containing": "<strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong> ehtiva edən səhifələri axtar",
-	"vector-toc-heading": "Mündəricat",
-	"vector-toc-toggle-position-sidebar": "yan panelə keçir",
-	"vector-toc-toggle-position-title": "gizlə",
-	"vector-toc-beginning": "Giriş",
-	"vector-toc-toggle-button-label": "$1 alt bölməsini göstər/gizlə"
+	"vector-search-loader": "Axtarış təklifləri yüklənir"
 }
--- a/i18n/be.json
+++ b/i18n/be.json
@ -21,7 +21,7 @@
 	"vector-action-toggle-sidebar": "Пераключыць бакавую панэль",
 	"vector-languages": "Мовы",
 	"vector-language-button-aria-label": "Перайсці да артыкула на іншай мове. Даступны на $1 {{PLURAL:$1|мове|мовах}}.",
-	"vector-language-button-label": "{{PLURAL:$1|$1 мова|$1 мовы|$1 моваў}}",
+	"vector-language-button-label": "{{PLURAL:$1|$1 мова|$1 моваў}}",
 	"vector-no-language-button-label": "Дадаць мовы",
 	"vector-no-language-button-aria-label": "Гэты артыкул ёсць толькі на гэтай мове. Дадайце артыкул для іншых моў",
 	"vector-language-redirect-to-top": "У гэтай пляцоўцы {{SITENAME}} моўныя спасылкі знаходзяцца ўверсе старонкі насупраць загалоўка артыкула. [[#p-lang-btn|Перайсці ўверх]].",
@ -55,6 +55,7 @@
 	"vector-main-menu-tooltip": "Галоўнае меню",
 	"vector-toc-menu-tooltip": "Змест",
 	"vector-toc-collapsible-button-label": "Пераключыць змест",
+	"vector-article-tools-nav-label": "Інструменты",
 	"vector-site-nav-label": "Праект",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Размова]]",
 	"tooltip-vector-anon-user-menu-title": "Больш магчымасцей"
--- a/i18n/bn.json
+++ b/i18n/bn.json
@ -62,6 +62,7 @@
 	"vector-main-menu-tooltip": "প্রধান মেনু",
 	"vector-toc-menu-tooltip": "সূচিপত্র",
 	"vector-toc-collapsible-button-label": "সূচিপত্র টগল করুন",
+	"vector-article-tools-nav-label": "সরঞ্জাম",
 	"vector-site-nav-label": "সাইট",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|আলোচনা]]",
 	"tooltip-vector-anon-user-menu-title": "আরও বিকল্প"
--- a/i18n/br.json
+++ b/i18n/br.json
@ -8,22 +8,18 @@
 			"Y-M D"
 		]
 	},
-	"skinname-vector": "Vektor mod kozh (2010)",
-	"skinname-vector-2022": "Vektor (2022)",
-	"vector-specialversion-name": "Vektor",
-	"vector-skin-desc": "Pourchas a ra 2 wiskadur Vektor:\n* 2011 - Stumm modern MonoBook freskaet e dres hag ennañ meur a wellaenn implijout\n* 2022 - Vektor aozet evel perzh eus raktres [[mw:Desktop Improvements|Gwellaat ar burev]] ar WMF.",
+	"skinname-vector": "Vektor",
+	"vector-skin-desc": "Pourchas a ra 2 wiskadur Vektor:\n* 2011 - Stumm modern MonoBook freskaet e dres hag enni meur a wellaenn implijout\n* 2022 - Vektor aozet evel perzh eus raktres [[mw:Desktop Improvements|Gwellaat ar burev]] ar WMF.",
 	"prefs-vector-enable-vector-1-label": "Ober gant stumm kozh Vektor",
 	"prefs-vector-enable-vector-1-help": "E-pad ar bloavezhioù a zeu e vo nevesaet ar gwiskadur Vektor tamm-ha-tamm. Gant stumm kozh Vektor e c’helloc’h gwelout stumm Vektor eus miz Du 2019. Evit gouzout hiroc’h diwar-benn an nevesaat, kit da [[mw:Reading/Web/Desktop_Improvements|bajenn ar raktres]].",
 	"vector-opt-out": "Distreiñ d'an tres kozh",
 	"vector-opt-out-tooltip": "Kemmañ hoc'h arventennoù evit distreiñ da dres kozh ar gwiskadur (Vector istorel)",
-	"vector.css": "/* Kement CSS a zo amañ a vo karget evit implijerien ar gwiskadur Vektor */",
-	"vector.js": "/* Kement JavaScript a zo amañ a vo karget evit implijerien ar gwiskadur Vektor */",
+	"vector.css": "/* Talvezout a raio ar CSS lakaet amañ evit implijerien ar gwiskadur Vektor */",
+	"vector.js": "/* Kement JavaScript amañ a vo karget evit an implijerien a ra gant ar gwiskadur Vektor */",
 	"vector-action-toggle-sidebar": "Diskwel/kuzhat ar varrenn gostez",
 	"vector-languages": "Yezhoù",
 	"vector-language-button-aria-label": "Mont d’ur pennad en ur yezh all. {{PLURAL:$1|$1 yezh}} a zo.",
-	"vector-language-button-label": "{{PLURAL:$1|$1 yezh}}",
-	"vector-no-language-button-label": "Ouzhpennañ yezhoù",
-	"vector-no-language-button-aria-label": "N’eus eus ar pennad-mañ nemet er yezh-mañ. Ouzhpennit ar pennad e yezhoù all.",
+	"vector-language-button-label": "{{PLURAL:$1|$1 yezh|$1 yezhoù}}",
 	"vector-language-redirect-to-top": "Er {{SITENAME}}-mañ emañ al liammoù yezh e deroù ar bajenn en tu all da ditl ar pennad. [[#p-lang-btn|Mont d’an deroù]].",
 	"vector-language-variant-switcher-label": "Kemmañ adstumm yezh",
 	"vector-action-addsection": "Rannbennad nevez",
@ -31,7 +27,7 @@
 	"vector-action-move": "Adenvel",
 	"vector-action-protect": "Gwareziñ",
 	"vector-action-undelete": "Diziverkañ",
-	"vector-action-unprotect": "Kemmañ ar gwarez",
+	"vector-action-unprotect": "Cheñch gwarez",
 	"vector-view-create": "Krouiñ",
 	"vector-view-edit": "Kemmañ",
 	"vector-view-history": "Gwelet an istor",
@ -45,17 +41,14 @@
 	"vector-searchsuggest-containing": "Klask pajennoù a zo <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong> enno",
 	"vector-intro-page": "Help:Introduction",
 	"vector-toc-heading": "Taolenn",
-	"vector-toc-toggle-position-sidebar": "mont d’ar varrenn gostez",
-	"vector-toc-toggle-position-title": "kuzhat",
 	"vector-toc-beginning": "Deroù",
 	"vector-toc-toggle-button-label": "Diskwel/kuzhat isrann $1",
 	"vector-anon-user-menu-pages": "Pajennoù evit implijerien digevreet",
-	"vector-anon-user-menu-pages-learn": "gouzout hiroc'h",
+	"vector-anon-user-menu-pages-learn": "Gouzout hiroc'h",
 	"vector-anon-user-menu-pages-label": "Gouzout hiroc’h a-zivout degas kemmoù",
 	"vector-main-menu-tooltip": "Lañser pennañ",
-	"vector-toc-menu-tooltip": "Taolenn",
-	"vector-toc-collapsible-button-label": "Gwintañ an daolenn",
+	"vector-article-tools-nav-label": "Ostilhoù",
 	"vector-site-nav-label": "Lec'hienn",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Kaozeadenn]]",
-	"tooltip-vector-anon-user-menu-title": "Muioc'h a zibaboù"
+	"tooltip-vector-anon-user-menu-title": "Muioc'h a zibarzhioù"
 }
--- a/i18n/ca.json
+++ b/i18n/ca.json
@ -54,6 +54,7 @@
 	"vector-anon-user-menu-pages-label": "Vegeu més informació sobre l'edició",
 	"vector-main-menu-tooltip": "Menú principal",
 	"vector-toc-menu-tooltip": "Taula de continguts",
+	"vector-article-tools-nav-label": "Eines",
 	"vector-site-nav-label": "Lloc",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Discussió]]",
 	"tooltip-vector-anon-user-menu-title": "Més opcions"
--- a/i18n/ce.json
+++ b/i18n/ce.json
@ -28,7 +28,7 @@
 	"vector-view-edit": "Нисйе бӀаьра",
 	"vector-view-history": "АгӀонан хийцамаш",
 	"vector-view-view": "Йеша",
-	"vector-view-viewsource": "Коде хьажар",
+	"vector-view-viewsource": "Билглонашка хьажа",
 	"vector-jumptonavigation": "Навигацин тӀегӀо",
 	"vector-jumptosearch": "Лахарна тӀегӀо",
 	"vector-jumptocontent": "Чулацаман тӀегӀо",
@ -40,6 +40,7 @@
 	"vector-anon-user-menu-pages-learn": "совнаха хаа",
 	"vector-anon-user-menu-pages-label": "Хийцамашбарах мадарра",
 	"vector-main-menu-tooltip": "Коьрта меню",
+	"vector-article-tools-nav-label": "ГӀирсаш",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Дискусси]]",
 	"tooltip-vector-anon-user-menu-title": "Дукха таронаш"
 }
--- a/i18n/cpx.json
+++ b/i18n/cpx.json
@ -1,19 +1,10 @@
 {
 	"@metadata": {
 		"authors": [
-			"ChoiChong",
-			"Kahin He"
+			"ChoiChong"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|$1语言}}",
-	"vector-action-addsection": "添加话题",
 	"vector-action-delete": "刪",
 	"vector-action-move": "移动",
-	"vector-action-protect": "保护",
-	"vector-view-create": "創建",
-	"vector-view-edit": "修改",
-	"vector-view-history": "看历史",
-	"vector-view-view": "读",
-	"vector-more-actions": "価兮",
-	"vector-searchsuggest-containing": "寻讨含有<strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>兮页面"
+	"vector-view-edit": "修改"
 }
--- a/i18n/de.json
+++ b/i18n/de.json
@ -55,6 +55,7 @@
 	"vector-main-menu-tooltip": "Hauptmenü",
 	"vector-toc-menu-tooltip": "Inhaltsverzeichnis",
 	"vector-toc-collapsible-button-label": "Inhaltsverzeichnis umschalten",
+	"vector-article-tools-nav-label": "Werkzeuge",
 	"vector-site-nav-label": "Website",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Diskussion]]",
 	"tooltip-vector-anon-user-menu-title": "Weitere Optionen"
--- a/i18n/el.json
+++ b/i18n/el.json
@ -58,6 +58,7 @@
 	"vector-main-menu-tooltip": "Κύριο μενού",
 	"vector-toc-menu-tooltip": "Πίνακας Περιεχομένων",
 	"vector-toc-collapsible-button-label": "Εναλλαγή του πίνακα περιεχομένων",
+	"vector-article-tools-nav-label": "Εργαλεία",
 	"vector-site-nav-label": "Ιστότοπος",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Συζήτηση]]",
 	"tooltip-vector-anon-user-menu-title": "Περισσότερες επιλογές"
--- a/i18n/en.json
+++ b/i18n/en.json
@ -49,6 +49,7 @@
 	"vector-main-menu-tooltip": "Main menu",
 	"vector-toc-menu-tooltip": "Table of Contents",
 	"vector-toc-collapsible-button-label": "Toggle the table of contents",
+	"vector-article-tools-nav-label": "Tools",
 	"vector-site-nav-label": "Site",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Discussion]]",
 	"tooltip-vector-anon-user-menu-title": "More options"
--- a/i18n/es.json
+++ b/i18n/es.json
@ -70,6 +70,7 @@
 	"vector-main-menu-tooltip": "Menú principal",
 	"vector-toc-menu-tooltip": "Tabla de contenidos",
 	"vector-toc-collapsible-button-label": "Cambiar a la tabla de contenidos",
+	"vector-article-tools-nav-label": "Herramientas",
 	"vector-site-nav-label": "Sitio",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Discusión]]",
 	"tooltip-vector-anon-user-menu-title": "Más opciones"
--- a/i18n/et.json
+++ b/i18n/et.json
@ -21,7 +21,6 @@
 	"vector-languages": "Keeled",
 	"vector-language-button-aria-label": "Mine teises keeles artiklisse. Saadaval {{PLURAL:$1|$1 keeles}}",
 	"vector-language-button-label": "{{PLURAL:$1|$1 keel|$1 keelt}}",
-	"vector-no-language-button-label": "Lisa keeled",
 	"vector-language-redirect-to-top": "Selles {{GRAMMAR:genitive|{{SITENAME}}}} artiklis on keelelingid artikli kohal pealkirja vastas. [[#p-lang-btn|Mine üles]].",
 	"vector-action-addsection": "Lisa teema",
 	"vector-action-delete": "Kustuta",
@ -42,14 +41,11 @@
 	"vector-searchsuggest-containing": "Otsi lehekülgi, kus sisaldub <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
 	"vector-intro-page": "Help:Sissejuhatus",
 	"vector-toc-heading": "Sisukord",
-	"vector-toc-toggle-position-sidebar": "vii külgpaanile",
-	"vector-toc-toggle-position-title": "peida",
 	"vector-toc-beginning": "Algus",
 	"vector-anon-user-menu-pages": "Sisse logimata kasutaja leheküljed",
 	"vector-anon-user-menu-pages-learn": "lisateave",
 	"vector-anon-user-menu-pages-label": "Loe veel muutmise kohta",
 	"vector-main-menu-tooltip": "Peamenüü",
-	"vector-toc-menu-tooltip": "Sisukord",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|arutelu]]",
 	"tooltip-vector-anon-user-menu-title": "Veel valikuid"
 }
--- a/i18n/eu.json
+++ b/i18n/eu.json
@ -21,8 +21,6 @@
 	"vector-languages": "Hizkuntzak",
 	"vector-language-button-aria-label": "Joan beste hizkuntza batean idatzitako artikulu batera. {{PLURAL:$1|Hizkuntza batean|$1 hizkuntzatan}} eskuragarri.",
 	"vector-language-button-label": "{{PLURAL:$1|Hizkuntza bat|$1 hizkuntza}}",
-	"vector-no-language-button-label": "Hizkuntzak gehitu",
-	"vector-no-language-button-aria-label": "Artikulua soilik hizkuntza honetan existitzen da. Gehitu artikulua beste hizkuntza batean",
 	"vector-language-redirect-to-top": "{{SITENAME}} honetan hizkuntzen loturak orriaren goiko aldean daude, artikuluaren izenburuaren eskuinaldean. [[#p-lang-btn|Joan gora]].",
 	"vector-language-variant-switcher-label": "Aldatu hizkuntza aldaera",
 	"vector-action-addsection": "Gehitu atala",
@ -44,16 +42,11 @@
 	"vector-searchsuggest-containing": "<strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong> duten orrialdeak bilatu",
 	"vector-intro-page": "Laguntza:Sarrera",
 	"vector-toc-heading": "Edukiak",
-	"vector-toc-toggle-position-sidebar": "mugitu alboko barrara",
-	"vector-toc-toggle-position-title": "ezkutatu",
-	"vector-toc-beginning": "⇈ Gora",
+	"vector-toc-beginning": "Hasiera",
 	"vector-toc-toggle-button-label": "Erakutsi/ezkutatu $1 azpiatal",
 	"vector-anon-user-menu-pages": "Izena eman gabeko erabiltzaileentzako orrialdeak",
 	"vector-anon-user-menu-pages-learn": "gehiago ikasi",
 	"vector-anon-user-menu-pages-label": "Artikuluak aldatzeari buruz gehiago ikasi",
 	"vector-main-menu-tooltip": "Menu nagusia",
-	"vector-toc-menu-tooltip": "Eduki-taula",
-	"vector-toc-collapsible-button-label": "Eduki taularen ikusgarritasuna aldatu",
-	"vector-site-nav-label": "Gunea",
 	"tooltip-vector-anon-user-menu-title": "Aukera gehiago"
 }
--- a/i18n/ext.json
+++ b/i18n/ext.json
@ -13,9 +13,9 @@
 	"vector-action-undelete": "Esborral",
 	"vector-action-unprotect": "Esprotegel",
 	"vector-view-create": "Crial",
-	"vector-view-edit": "Edital",
-	"vector-view-history": "Guipal l'estorial",
-	"vector-view-view": "Leyel",
+	"vector-view-edit": "Eital",
+	"vector-view-history": "Guipal estorial",
+	"vector-view-view": "Leel",
 	"vector-view-viewsource": "Guipal cóigu",
 	"vector-more-actions": "Más"
 }
--- a/i18n/fa.json
+++ b/i18n/fa.json
@ -63,6 +63,7 @@
 	"vector-main-menu-tooltip": "منوی اصلی",
 	"vector-toc-menu-tooltip": "فهرست محتوا",
 	"vector-toc-collapsible-button-label": "تغییر وضعیت فهرست محتویات",
+	"vector-article-tools-nav-label": "ابزارها",
 	"vector-site-nav-label": "وبگاه",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|بحث]]",
 	"tooltip-vector-anon-user-menu-title": "گزینه‌های بیشتر"
--- a/i18n/ff.json
+++ b/i18n/ff.json
@ -7,7 +7,7 @@
 			"Musaddam Idriss"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|ɗemngal|$1 ɗemngal}}",
+	"vector-language-button-label": "{{PLURAL:$1|$1 ɗemngal|$1 ɗemngal}}",
 	"vector-action-addsection": "Ɓeydi toɓɓere",
 	"vector-action-delete": "Momtu",
 	"vector-action-move": "Dirtin",
--- a/i18n/fr.json
+++ b/i18n/fr.json
@ -70,6 +70,7 @@
 	"vector-main-menu-tooltip": "Menu principal",
 	"vector-toc-menu-tooltip": "Table des matières",
 	"vector-toc-collapsible-button-label": "Basculer la table des matières",
+	"vector-article-tools-nav-label": "Outils",
 	"vector-site-nav-label": "Site",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Discussion]]",
 	"tooltip-vector-anon-user-menu-title": "Plus d’options"
--- a/i18n/fy.json
+++ b/i18n/fy.json
@ -56,6 +56,7 @@
 	"vector-main-menu-tooltip": "Haadmenu",
 	"vector-toc-menu-tooltip": "Ynhâldsopjefte",
 	"vector-toc-collapsible-button-label": "Ynhâldsopjefte omklappe",
+	"vector-article-tools-nav-label": "Ark",
 	"vector-site-nav-label": "Webstee",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Diskusje]]",
 	"tooltip-vector-anon-user-menu-title": "Mear opsjes"
--- a/i18n/gbm.json
+++ b/i18n/gbm.json
@ -1,8 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"बडा काजी"
-		]
-	},
-	"vector-more-actions": "खार्युं"
-}
--- a/i18n/gld.json
+++ b/i18n/gld.json
@ -1,11 +1,10 @@
 {
 	"@metadata": {
 		"authors": [
-			"Amire80",
 			"RFScott"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|$1 хэсэ}}",
+	"vector-language-button-label": "{{PLURAL:$1 хэсэ}}",
 	"vector-action-addsection": "Темава аӈгойни",
 	"vector-action-delete": "Нангалаори",
 	"vector-action-move": "Энэвэмбури",
--- a/i18n/gom-deva.json
+++ b/i18n/gom-deva.json
@ -8,7 +8,6 @@
 			"The Discoverer"
 		]
 	},
-	"vector-opt-out": "आदल्या स्वरूपांत परत वच",
 	"vector-action-addsection": "माथाळो ज़ोड",
 	"vector-action-delete": "काडून उडयात",
 	"vector-action-move": "दुसरेकडे व्हरात",
--- a/i18n/gom-latn.json
+++ b/i18n/gom-latn.json
@ -5,7 +5,6 @@
 			"The Discoverer"
 		]
 	},
-	"vector-opt-out": "Adlea sworupant porot voch",
 	"vector-language-button-label": "{{PLURAL:$1|$1 bhas|$1 bhaso}}",
 	"vector-action-addsection": "Vixoi zodd",
 	"vector-action-delete": "Kadd",
--- a/i18n/he.json
+++ b/i18n/he.json
@ -51,6 +51,7 @@
 	"vector-main-menu-tooltip": "תפריט ראשי",
 	"vector-toc-menu-tooltip": "תוכן עניינים",
 	"vector-toc-collapsible-button-label": "מצב תוכן העניינים",
+	"vector-article-tools-nav-label": "כלים",
 	"vector-site-nav-label": "אתר",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|דיון]]",
 	"tooltip-vector-anon-user-menu-title": "אפשרויות נוספות"
--- a/i18n/hi.json
+++ b/i18n/hi.json
@ -56,6 +56,7 @@
 	"vector-main-menu-tooltip": "मुख्य मेन्यू",
 	"vector-toc-menu-tooltip": "विषयसूची",
 	"vector-toc-collapsible-button-label": "विषयसूची को टॉगल करें",
+	"vector-article-tools-nav-label": "उपकरण",
 	"vector-site-nav-label": "साइट",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|चर्चा]]",
 	"tooltip-vector-anon-user-menu-title": "अन्य विकल्प"
--- a/i18n/hr.json
+++ b/i18n/hr.json
@ -23,8 +23,6 @@
 	"vector-languages": "Drugi jezici",
 	"vector-language-button-aria-label": "Idi na druge jezične varijante članka. Dostupan je na {{PLURAL:$1|$1 jeziku|$1 jezika}}",
 	"vector-language-button-label": "{{PLURAL:$1|$1 jezik|$1 jezika}}",
-	"vector-no-language-button-label": "Dodajte druge jezike",
-	"vector-no-language-button-aria-label": "Članak je napisan samo na ovom jeziku. Dodajte druge jezike.",
 	"vector-language-redirect-to-top": "Poveznice na druge jezike nalaze se uz naslov članka, pri [[#p-lang-btn|vrhu stranice]].",
 	"vector-language-variant-switcher-label": "Promijeni jezičnu varijantu",
 	"vector-action-addsection": "Dodaj temu",
@ -43,17 +41,14 @@
 	"vector-jumptocontent": "Prijeđi na sadržaj",
 	"vector-more-actions": "Više",
 	"vector-search-loader": "Učitavanje prijedloga pretrage",
-	"vector-searchsuggest-containing": "Traži stranice koje sadrže <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
-	"vector-intro-page": "Wikipedija:Dobro došli",
 	"vector-toc-heading": "Sadržaj",
-	"vector-toc-toggle-position-title": "sakrij",
 	"vector-toc-beginning": "Početak",
 	"vector-anon-user-menu-pages": "Stranice za odjavljene uređivače",
 	"vector-anon-user-menu-pages-learn": "saznajte više",
 	"vector-anon-user-menu-pages-label": "Vidi više o uređivanju",
 	"vector-main-menu-tooltip": "Glavni izbornik",
 	"vector-toc-menu-tooltip": "Sadržaj",
-	"vector-toc-collapsible-button-label": "Prikaz sadržaja stranice",
+	"vector-article-tools-nav-label": "Alati",
 	"vector-site-nav-label": "Mrežno mjesto",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Rasprava]]",
 	"tooltip-vector-anon-user-menu-title": "Više mogućnosti"
--- a/i18n/ht.json
+++ b/i18n/ht.json
@ -8,13 +8,7 @@
 			"Tisave"
 		]
 	},
-	"vector-languages": "Lang yo",
-	"vector-language-button-aria-label": "Ale nan yon atik nan yon lòt lang. Disponib nan {{PLURAL:$1|$1 lang}}",
 	"vector-language-button-label": "{{PLURAL:$1|$1 lang}}",
-	"vector-no-language-button-label": "Ajoute lang yo",
-	"vector-no-language-button-aria-label": "Atik sa a egziste sèlman nan lang sa a. Ajoute atik la pou lòt lang",
-	"vector-language-redirect-to-top": "Sou {{SITENAME}} sa a lyen lang yo nan tèt paj la anfas tit atik la. [[#p-lang-btn|Ale nan tèt]].",
-	"vector-language-variant-switcher-label": "Chanje variant lang",
 	"vector-action-addsection": "Ajoute yon sijè",
 	"vector-action-delete": "Efase",
 	"vector-action-move": "Chanje non",
@ -27,16 +21,5 @@
 	"vector-view-view": "Li",
 	"vector-view-viewsource": "Wè kòd paj la",
 	"vector-more-actions": "Plis",
-	"vector-searchsuggest-containing": "Chèche paj yo ki genyen <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
-	"vector-toc-heading": "Kontni",
-	"vector-toc-toggle-position-title": "kache",
-	"vector-anon-user-menu-pages": "Paj yo pou editè ki dekonekte yo",
-	"vector-anon-user-menu-pages-learn": "aprann plis",
-	"vector-anon-user-menu-pages-label": "Aprann plis sou modifikasyon",
-	"vector-main-menu-tooltip": "Meni prensipal la",
-	"vector-toc-menu-tooltip": "Tab dèmatyè",
-	"vector-toc-collapsible-button-label": "Deklannche tab dèmatyè la",
-	"vector-site-nav-label": "Sit",
-	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Diskisyon]]",
-	"tooltip-vector-anon-user-menu-title": "Plis opsyon"
+	"vector-searchsuggest-containing": "Fouye paj ki genyen <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>"
 }
--- a/i18n/hu.json
+++ b/i18n/hu.json
@ -6,7 +6,6 @@
 			"Dj",
 			"Hanna Tardos",
 			"Misibacsi",
-			"Mmarci72",
 			"Máté",
 			"Tacsipacsi",
 			"Tgr"
@ -21,12 +20,8 @@
 	"vector.js": "/* Az összes itteni JavaScript betöltődik Vector felület használóinak */",
 	"vector-action-toggle-sidebar": "Oldalsáv megjelenítése vagy elrejtése",
 	"vector-languages": "Más nyelveken",
-	"vector-language-button-aria-label": "Ugrás egy más nyelvű szócikkre. Elérhető $1 {{PLURAL:$1|nyelven}}",
 	"vector-language-button-label": "$1 nyelv",
-	"vector-no-language-button-label": "Nyelvek hozzáadása",
-	"vector-no-language-button-aria-label": "Ez a szócikk nem érhető el más nyelven. Szócikkek hozzáadása más nyelveken",
 	"vector-language-redirect-to-top": "Ezen a {{SITENAME}} oldalon a nyelvközi hivatkozások a lap tetején, a címmel átellenben találhatók. [[#p-lang-btn|Ugrás a tetejére.]]",
-	"vector-language-variant-switcher-label": "Nyelvvariáns váltása",
 	"vector-action-addsection": "Új téma nyitása",
 	"vector-action-delete": "Törlés",
 	"vector-action-move": "Átnevezés",
@ -43,17 +38,9 @@
 	"vector-jumptocontent": "Ugrás a tartalomhoz",
 	"vector-more-actions": "Több",
 	"vector-search-loader": "Keresési javaslatok betöltése…",
-	"vector-searchsuggest-containing": "Olyan oldalak keresése, amelyek tartalmazzák a következőt: <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
 	"vector-toc-heading": "Tartalomjegyzék",
-	"vector-toc-toggle-position-title": "elrejtés",
 	"vector-toc-beginning": "Bevezető",
-	"vector-toc-toggle-button-label": "A(z) $1 alszakasz kinyitása/becsukása",
 	"vector-anon-user-menu-pages": "Lapok kijelentkezett szerkesztőknek",
 	"vector-anon-user-menu-pages-learn": "további információk",
-	"vector-anon-user-menu-pages-label": "Tudj meg többet a szerkesztésről",
-	"vector-main-menu-tooltip": "Főmenü",
-	"vector-toc-menu-tooltip": "Tartalomjegyzék",
-	"vector-toc-collapsible-button-label": "Tartalomjegyzék kinyitása/becsukása",
-	"vector-site-nav-label": "Wiki",
-	"tooltip-vector-anon-user-menu-title": "További lehetőségek"
+	"vector-anon-user-menu-pages-label": "Tudj meg többet a szerkesztésről"
 }
--- a/i18n/ia.json
+++ b/i18n/ia.json
@ -38,6 +38,7 @@
 	"vector-anon-user-menu-pages-learn": "leger plus",
 	"vector-anon-user-menu-pages-label": "Leger plus sur le modification",
 	"vector-main-menu-tooltip": "Menu principal",
+	"vector-article-tools-nav-label": "Instrumentos",
 	"vector-site-nav-label": "Sito",
 	"tooltip-vector-anon-user-menu-title": "Plus optiones"
 }
--- a/i18n/id.json
+++ b/i18n/id.json
@ -57,6 +57,7 @@
 	"vector-anon-user-menu-pages-label": "Pelajari lebih lanjut tentang menyunting",
 	"vector-main-menu-tooltip": "Menu utama",
 	"vector-toc-menu-tooltip": "Daftar Isi",
+	"vector-article-tools-nav-label": "Perkakas",
 	"vector-site-nav-label": "Situs",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Diskusi]]",
 	"tooltip-vector-anon-user-menu-title": "Opsi lainnya"
--- a/i18n/ig.json
+++ b/i18n/ig.json
@ -12,7 +12,7 @@
 			"Uzoma Ozurumba"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|$1 asụsụ}}",
+	"vector-language-button-label": "{{PLURAL:$1|$1 asụsụ|asụsụ}}",
 	"vector-action-addsection": "Tinyé Okwu",
 	"vector-action-delete": "Kàcha",
 	"vector-action-move": "Papụ̀",
--- a/i18n/it.json
+++ b/i18n/it.json
@ -29,7 +29,7 @@
 	"vector-language-button-label": "{{PLURAL:$1|$1 lingua|$1 lingue}}",
 	"vector-no-language-button-label": "Aggiungi lingue",
 	"vector-language-redirect-to-top": "Su questa {{SITENAME}} gli interlink sono in cima alla pagina a destra del titolo. [[#p-lang-btn|Vai in cima]].",
-	"vector-action-addsection": "Aggiungi argomento",
+	"vector-action-addsection": "Aggiungi discussione",
 	"vector-action-delete": "Cancella",
 	"vector-action-move": "Sposta",
 	"vector-action-protect": "Proteggi",
@ -50,5 +50,6 @@
 	"vector-anon-user-menu-pages": "Pagine per utenti anonimi",
 	"vector-anon-user-menu-pages-learn": "ulteriori informazioni",
 	"vector-main-menu-tooltip": "Menu principale",
+	"vector-article-tools-nav-label": "Strumenti",
 	"vector-site-nav-label": "Sito"
 }
--- a/i18n/ja.json
+++ b/i18n/ja.json
@ -5,7 +5,6 @@
 			"Amire80",
 			"Foomin10",
 			"Fryed-peach",
-			"Jaw Salvager",
 			"Kkairri",
 			"LNDDYL",
 			"Marine-Blue",
@ -72,7 +71,7 @@
 	"vector-anon-user-menu-pages-label": "編集の詳細",
 	"vector-main-menu-tooltip": "メインメニュー",
 	"vector-toc-menu-tooltip": "目次",
-	"vector-toc-collapsible-button-label": "目次の表示・非表示を切り替え",
+	"vector-article-tools-nav-label": "ツール",
 	"vector-site-nav-label": "サイト",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|議論]]",
 	"tooltip-vector-anon-user-menu-title": "その他の操作"
--- a/i18n/ka.json
+++ b/i18n/ka.json
@ -22,7 +22,7 @@
 	"vector-action-toggle-sidebar": "გვერდითა პანელის გადართვა",
 	"vector-languages": "ენები",
 	"vector-language-button-aria-label": "სხვაენოვან სტატიაზე გადასვლა. ხელმისაწვდომია {{PLURAL:$1|$1 ენაზე}}",
-	"vector-language-button-label": "{{PLURAL:$1|$1 ენა}}",
+	"vector-language-button-label": "{{PLURAL:$1|$1 ენა|$1 ენა}}",
 	"vector-no-language-button-label": "ენების დამატება",
 	"vector-no-language-button-aria-label": "ეს სტატია მხოლოდ ამ ენაზე არსებობს. დაამატეთ სტატია სხვა ენებისთვის",
 	"vector-language-redirect-to-top": "ამ საიტზე სხვა ენების ბმულები მოცემულია გვერდის დასაწყისში, სათაურის გასწვრივ. [[#p-lang-btn|დასაწყისთან გადასვლა]].",
@ -56,6 +56,7 @@
 	"vector-main-menu-tooltip": "მთავარი მენიუ",
 	"vector-toc-menu-tooltip": "სარჩევი",
 	"vector-toc-collapsible-button-label": "სარჩევის დამალვა/ჩვენება",
+	"vector-article-tools-nav-label": "ხელსაწყოები",
 	"vector-site-nav-label": "საიტი",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|დისკუსია]]",
 	"tooltip-vector-anon-user-menu-title": "მეტი შესაძლებლობა"
--- a/i18n/kaa.json
+++ b/i18n/kaa.json
@ -5,7 +5,6 @@
 			"Nurlan"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|$1 til}}",
 	"vector-action-addsection": "Tema qosıw",
 	"vector-action-delete": "Óshiriw",
 	"vector-action-move": "Kóshiriw",
@ -13,7 +12,7 @@
 	"vector-action-undelete": "Qayta tiklew",
 	"vector-action-unprotect": "Qorǵawdı ózgertiw",
 	"vector-view-create": "Jaratıw",
-	"vector-view-edit": "Redaktorlaw",
+	"vector-view-edit": "Ózgertiw",
 	"vector-view-history": "Tariyxın kóriw",
 	"vector-view-view": "Oqıw",
 	"vector-view-viewsource": "Kodın kóriw",
--- a/i18n/kk-cyrl.json
+++ b/i18n/kk-cyrl.json
@ -3,7 +3,6 @@
 		"authors": [
 			"Arystanbek",
 			"Daniyar",
-			"Darzz",
 			"GaiJin",
 			"Hedeyohu22",
 			"Kaztrans",
@ -16,18 +15,17 @@
 	"vector-specialversion-name": "Vector",
 	"vector-skin-desc": "2 Vector мұқабасын ұсынады:\n* 2011 - түрі жаңа, көптеген қолданыс мүмкіндіктері қосылған MonoBook-тың заманауи нұсқасы.\n* 2022 - Уикимедиа [[mw:Desktop Improvements]] жобасының бір бөлігі ретінде құрастырылған Vector.",
 	"prefs-vector-enable-vector-1-label": "Ескі Vector қолдану",
-	"prefs-vector-enable-vector-1-help": "Алдағы бірнеше жылда біз Vector мәнерін біртіндеп жаңартамыз. Ескі Vector сізге Vector-дың бұрынғы нұсқасын көруге мүмкіндік береді (2019 жылғы желтоқсандағы жағдай бойынша). Жаңартулар туралы көбірек білу үшін [[mw:Reading/Web/Desktop_Improvements|жоба бетімізге]] өтіңіз.",
+	"prefs-vector-enable-vector-1-help": "Алдағы бірнеше жылда біз Vector мұқабасын біртіндеп жаңартамыз. Legacy Vector сізге Vector-дың бұрынғы нұсқасын көруге мүмкіндік береді (2019 жылғы желтоқсандағы жағдай бойынша). Жаңартулар туралы көбірек білу үшін біздің [[mw:Reading/Web/Desktop_Improvements|жоба бетімізге]] өтіңіз.",
 	"vector-opt-out": "Ескі көрініске ауысу",
-	"vector-opt-out-tooltip": "Мәнердің ескі көрінісіне (ескі Vector-ға) қайту үшін баптауларыңызды өзгертіңіз",
+	"vector-opt-out-tooltip": "Мұқабаның ескі көрінісіне (ескі Vector) ауысу үшін баптауларыңызды өзгертіңіз",
 	"vector.css": "/* Мұндағы барлық CSS Vector мұқабасы бар қатысушыларға жүктеледі */",
 	"vector.js": "/* Мұндағы барлық JavaScript Vector мұқабасы бар қатысушыларға жүктеледі */",
-	"vector-action-toggle-sidebar": "Бүйірлік тақтаны қосу/өшіру",
 	"vector-languages": "Тілдер",
 	"vector-language-button-aria-label": "Басқа тілдегі мақалаға өту. {{PLURAL:$1|$1 тілде}} қолжетімді",
 	"vector-language-button-label": "{{PLURAL:$1|$1 тіл}}",
 	"vector-no-language-button-label": "Тіл қосу",
 	"vector-no-language-button-aria-label": "Бұл мақала осы тілде ғана қолжетімді. Басқа тілдерге мақаланы қосыңыз",
-	"vector-language-redirect-to-top": "Бұл {{SITENAME}} сайтында тіл сілтемелері беттің жоғары жақында мақала атауына бойында орналасқан. [[#p-lang-btn|Жоғары көтерілу]].",
+	"vector-language-redirect-to-top": "Бұл {{SITENAME}} нұсқасында тіл сілтемелері беттің үстіндегі мақала тақырыбына қарсы орналасқан. [[#p-lang-btn|Жоғары өту]].",
 	"vector-language-variant-switcher-label": "Тіл нұсқасын ауыстыру",
 	"vector-action-addsection": "Тақырып қосу",
 	"vector-action-delete": "Жою",
@ -37,7 +35,7 @@
 	"vector-action-unprotect": "Қорғалуын өзгерту",
 	"vector-view-create": "Бастау",
 	"vector-view-edit": "Өңдеу",
-	"vector-view-history": "Өңделу тарихы",
+	"vector-view-history": "Тарихын көру",
 	"vector-view-view": "Оқу",
 	"vector-view-viewsource": "Кодын көру",
 	"vector-jumptonavigation": "Навигацияға өту",
@ -48,16 +46,16 @@
 	"vector-searchsuggest-containing": "<strong class=\"cdx-typeahead-search__search-footer__query\">«$1»</strong> бар беттерді іздеу",
 	"vector-intro-page": "Уикипедия:Таныстыру",
 	"vector-toc-heading": "Мазмұны",
-	"vector-toc-toggle-position-sidebar": "бүйірлік тақтаға жылжыту",
 	"vector-toc-toggle-position-title": "жасыру",
 	"vector-toc-beginning": "Кіріспе",
 	"vector-toc-toggle-button-label": "$1 суббөлімін көрсету/жасыру",
 	"vector-anon-user-menu-pages": "Шыққан өңдеушілерге арналған беттер",
 	"vector-anon-user-menu-pages-learn": "көбірек білу",
 	"vector-anon-user-menu-pages-label": "Өңдеу туралы көбірек білу",
-	"vector-main-menu-tooltip": "Басты мәзір",
+	"vector-main-menu-tooltip": "Негізгі мәзір",
 	"vector-toc-menu-tooltip": "Мазмұны",
 	"vector-toc-collapsible-button-label": "Мазмұнды көрсету/жасыру",
+	"vector-article-tools-nav-label": "Құралдар",
 	"vector-site-nav-label": "Сайт",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Талқылау]]",
 	"tooltip-vector-anon-user-menu-title": "Басқа баптаулар"
--- a/i18n/km.json
+++ b/i18n/km.json
@ -8,9 +8,7 @@
 	},
 	"skinname-vector": "វ៉ិចទ័រ",
 	"vector.css": "/* CSS បានដាក់ទីនេះនឹងមានអនុភាពលើអ្នកប្រើប្រាស់នៃសំបក Vector */",
-	"vector-languages": "ភាសា",
-	"vector-language-button-label": "{{PLURAL:$1|$1 ភាសា}}",
-	"vector-no-language-button-label": "បន្ថែមភាសា",
+	"vector-language-button-label": "{{PLURAL:$1|$1 ភាសា|$1 ភាសា}}",
 	"vector-action-addsection": "បន្ថែមប្រធានបទ",
 	"vector-action-delete": "លុបចោល",
 	"vector-action-move": "ប្តូរទីតាំង",
--- a/i18n/ko.json
+++ b/i18n/ko.json
@ -63,6 +63,7 @@
 	"vector-main-menu-tooltip": "주 메뉴",
 	"vector-toc-menu-tooltip": "목차",
 	"vector-toc-collapsible-button-label": "목차 토글",
+	"vector-article-tools-nav-label": "도구",
 	"vector-site-nav-label": "사이트",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|토론]]",
 	"tooltip-vector-anon-user-menu-title": "더 많은 옵션"
--- a/i18n/krl.json
+++ b/i18n/krl.json
@ -7,15 +7,11 @@
 			"Varvana"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|$1 kieli|$1 kieltä}}",
 	"vector-action-addsection": "Lisyä teema",
-	"vector-action-delete": "Poissa",
 	"vector-action-move": "Šiirrä",
-	"vector-action-protect": "Šuojua",
 	"vector-view-create": "Luaji",
 	"vector-view-edit": "Kohentele",
 	"vector-view-history": "Näytä istorija",
 	"vector-view-view": "Luve",
-	"vector-more-actions": "Vielä",
-	"vector-searchsuggest-containing": "Eči šivuja, kumpašissa on <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>"
+	"vector-more-actions": "Vielä"
 }
--- a/i18n/ku-latn.json
+++ b/i18n/ku-latn.json
@ -7,7 +7,6 @@
 			"Gomada"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|$1 ziman}}",
 	"vector-action-addsection": "Mijarekê lê zêde bike",
 	"vector-action-delete": "Jê bibe",
 	"vector-action-move": "Nav biguherîne",
@ -19,6 +18,5 @@
 	"vector-view-history": "Dîrokê bibîne",
 	"vector-view-view": "Bixwîne",
 	"vector-view-viewsource": "Çavkaniyan bibîne",
-	"vector-more-actions": "Bêhtir",
-	"vector-searchsuggest-containing": "Li rûpelên ku <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong> dihewînin bigere"
+	"vector-more-actions": "Bêhtir"
 }
--- a/i18n/lb.json
+++ b/i18n/lb.json
@ -37,7 +37,6 @@
 	"vector-jumptocontent": "Op den Inhalt sprangen",
 	"vector-more-actions": "Méi",
 	"vector-search-loader": "Luede vun de Propose fir ze sichen",
-	"vector-searchsuggest-containing": "No Säiten mat <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong> sichen",
 	"vector-intro-page": "Help:Aféierung",
 	"vector-toc-heading": "Inhalter",
 	"vector-toc-toggle-position-sidebar": "an déi säitlech Läischt réckelen",
@ -50,6 +49,7 @@
 	"vector-main-menu-tooltip": "Haaptmenü",
 	"vector-toc-menu-tooltip": "Inhaltsverzeechnes",
 	"vector-toc-collapsible-button-label": "Inhaltsverzeechnes wiesselen",
+	"vector-article-tools-nav-label": "Geschierkëscht",
 	"vector-site-nav-label": "Site",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Diskussioun]]",
 	"tooltip-vector-anon-user-menu-title": "Méi Optiounen"
--- a/i18n/lij.json
+++ b/i18n/lij.json
@ -17,8 +17,6 @@
 	"vector-languages": "Léngoe",
 	"vector-language-button-aria-label": "Vànni a l'artìcolo inte 'n'âtra léngoa. Disponìbile in {{PLURAL:$1|$1 léngoa|$1 léngoe}}",
 	"vector-language-button-label": "{{PLURAL:$1|$1 léngoa|$1 léngoe}}",
-	"vector-no-language-button-label": "Azónzi léngoe",
-	"vector-no-language-button-aria-label": "St'artìcolo chi o l'exìste sôlo inte quésta léngoa. Azónzi l'artìcolo inte âtre léngoe",
 	"vector-language-redirect-to-top": "Inte 'sta Wikipedia chi, i ligàmmi a-e léngoe són mìssi in çìmma a-a pàgina, da-arénte a-o sò tìtolo. [[#p-lang-btn|Vànni in çìmma]].",
 	"vector-language-variant-switcher-label": "Càngia variànte da léngoa",
 	"vector-action-addsection": "Azónzi discusción",
@ -40,8 +38,6 @@
 	"vector-searchsuggest-containing": "Çèrca inte pàgine che contêgnan <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
 	"vector-intro-page": "Help:Introduçión",
 	"vector-toc-heading": "Ìndice",
-	"vector-toc-toggle-position-sidebar": "méscia inta bâra laterâle",
-	"vector-toc-toggle-position-title": "ascóndi",
 	"vector-toc-beginning": "Prinçìpio",
 	"vector-toc-toggle-button-label": "Atîva a sotoseçión $1",
 	"vector-anon-user-menu-pages": "Pàgine pe-i contribotoî no conésci",
@ -49,7 +45,7 @@
 	"vector-anon-user-menu-pages-label": "Pe savéine de ciù in scê modìfiche",
 	"vector-main-menu-tooltip": "Menù prinçipâ",
 	"vector-toc-menu-tooltip": "Tabélla di contegnûi",
-	"vector-toc-collapsible-button-label": "Altèrna a tabélla di contegnûi",
+	"vector-article-tools-nav-label": "Struménti",
 	"vector-site-nav-label": "Scîto",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Discusción]]",
 	"tooltip-vector-anon-user-menu-title": "Âtre scèlte"
--- a/i18n/lt.json
+++ b/i18n/lt.json
@ -7,7 +7,6 @@
 			"Homo",
 			"Hugo.arg",
 			"Matasg",
-			"Pavel1513",
 			"Perkunas",
 			"Tomasdd"
 		]
@ -15,7 +14,6 @@
 	"skinname-vector": "Vektorinė",
 	"vector-skin-desc": "Moderni MonoBook versija su šviežiausia išvaizda ir daugybe panaudojamumo patobulinimų",
 	"prefs-vector-enable-vector-1-label": "Naudoti senąją vektorinę išvaizdą",
-	"vector-language-button-label": "{{PLURAL:$1|$1 kalba|$1 kalbų}}",
 	"vector-action-addsection": "Pridėti temą",
 	"vector-action-delete": "Ištrinti",
 	"vector-action-move": "Pervardyti",
@ -29,6 +27,5 @@
 	"vector-view-viewsource": "Žiūrėti kodą",
 	"vector-jumptocontent": "Pereiti prie turinio",
 	"vector-more-actions": "Daugiau",
-	"vector-search-loader": "Įkeliami paieškos pasiūlymai",
-	"vector-searchsuggest-containing": "Ieškoti puslapių, turinčių <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>"
+	"vector-search-loader": "Įkeliami paieškos pasiūlymai"
 }
--- a/i18n/lv.json
+++ b/i18n/lv.json
@ -5,17 +5,7 @@
 			"Papuass"
 		]
 	},
-	"prefs-vector-enable-vector-1-label": "Izmantot Legacy Vector",
-	"prefs-vector-enable-vector-1-help": "Dažu nākamo gadu laikā mēs pakāpeniski atjaunināsim Vector apdari. Legacy Vector ļaus skatīt veco Vector versiju (kāda tā bija 2019. gada decembrī). Lai uzzinātu vairāk par jauninājumiem, dodies uz mūsu [[mw:Reading/Web/Desktop_Improvements|projekta lapu]].",
-	"vector-opt-out": "Pārslēgties uz veco izskatu",
-	"vector-opt-out-tooltip": "Nomaini savus iestatījumus, lai atgrieztos pie vecā apdares izskata (Legacy Vector)",
-	"vector-action-toggle-sidebar": "Pārslēgt sānjoslu",
-	"vector-languages": "Valodas",
-	"vector-language-button-aria-label": "Pāriet uz rakstu citā valodā. Pieejams {{PLURAL:$1|$1 valodās|$1 valodā|$1 valodās}}",
 	"vector-language-button-label": "{{PLURAL:$1|$1 valodas|$1 valoda|$1 valodas}}",
-	"vector-no-language-button-label": "Pievienot valodas",
-	"vector-no-language-button-aria-label": "Šis raksts pastāv tikai šajā valodā. Pievienot rakstu citā valodā",
-	"vector-language-variant-switcher-label": "Mainīt valodas variantu",
 	"vector-action-addsection": "Jauna sadaļa",
 	"vector-action-delete": "Dzēst",
 	"vector-action-move": "Pārvietot",
@ -27,23 +17,8 @@
 	"vector-view-history": "Hronoloģija",
 	"vector-view-view": "Skatīt",
 	"vector-view-viewsource": "Aplūkot kodu",
-	"vector-jumptonavigation": "Pāriet uz navigāciju",
-	"vector-jumptosearch": "Pāriet uz meklēšanu",
-	"vector-jumptocontent": "Pāriet uz saturu",
 	"vector-more-actions": "Vairāk",
-	"vector-search-loader": "Ielādē meklēšanas ieteikumus",
-	"vector-searchsuggest-containing": "Meklēt lapas, kas satur <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
-	"vector-intro-page": "Vikipēdija:Ievads",
-	"vector-toc-heading": "Saturs",
-	"vector-toc-toggle-position-sidebar": "pārvietot uz sānjoslu",
-	"vector-toc-toggle-position-title": "paslēpt",
-	"vector-toc-beginning": "Sākums",
-	"vector-toc-toggle-button-label": "Pārslēgt $1 apakšsadaļu",
 	"vector-anon-user-menu-pages-learn": "uzzināt vairāk",
-	"vector-anon-user-menu-pages-label": "Uzzini vairāk par rediģēšanu",
 	"vector-main-menu-tooltip": "Galvenā izvēlne",
-	"vector-toc-menu-tooltip": "Satura rādītājs",
-	"vector-toc-collapsible-button-label": "Pārslēgt satura rādītāju",
-	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Diskusija]]",
 	"tooltip-vector-anon-user-menu-title": "Vairāk iespēju"
 }
--- a/i18n/mag.json
+++ b/i18n/mag.json
@ -1,16 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"ऐक्टिवेटेड्"
-		]
-	},
-	"vector-language-button-label": "{{PLURAL:$1|$1 भासा|$1 भासासभ}}",
-	"vector-action-addsection": "बिसय जोड़",
-	"vector-action-move": "स्थानान्तरन",
-	"vector-view-create": "बनाव",
-	"vector-view-edit": "सम्पादन",
-	"vector-view-history": "इतिहास देख",
-	"vector-view-view": "पढ़",
-	"vector-more-actions": "आउ",
-	"vector-searchsuggest-containing": "<strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong> बाला पन्ना खोज"
-}
--- a/i18n/mk.json
+++ b/i18n/mk.json
@ -53,6 +53,7 @@
 	"vector-main-menu-tooltip": "Главно мени",
 	"vector-toc-menu-tooltip": "Содржина",
 	"vector-toc-collapsible-button-label": "Прик./скр. содржина",
+	"vector-article-tools-nav-label": "Алатки",
 	"vector-site-nav-label": "Мрежно место",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Разговор]]",
 	"tooltip-vector-anon-user-menu-title": "Повеќе можности"
--- a/i18n/ml.json
+++ b/i18n/ml.json
@ -34,6 +34,7 @@
 	"vector-anon-user-menu-pages-learn": "കൂടുതൽ അറിയുക",
 	"vector-main-menu-tooltip": "പ്രധാന മെനു",
 	"vector-toc-menu-tooltip": "ഉള്ളടക്കപ്പട്ടിക",
+	"vector-article-tools-nav-label": "ഉപകരണങ്ങൾ",
 	"vector-site-nav-label": "സൈറ്റ്",
 	"tooltip-vector-anon-user-menu-title": "കൂടുതൽ ഐച്ഛികങ്ങൾ"
 }
--- a/i18n/mn.json
+++ b/i18n/mn.json
@ -7,12 +7,6 @@
 			"Wisdom"
 		]
 	},
-	"prefs-vector-enable-vector-1-label": "Хуучны Vector ашиглах",
-	"vector-opt-out": "Хуучин хувилбарт шилжих",
-	"vector-opt-out-tooltip": "Сайтын скинийг хуучин хувилбарт шилжүүлэх (legacy Vector)",
-	"vector-action-toggle-sidebar": "Хажуугийн цэсийг нээж хаах",
-	"vector-languages": "Хэлүүд",
-	"vector-language-redirect-to-top": "Тус сайтанд хэлний цэсийг хуудасны баруун дээд талаас харна уу. [[#p-lang-btn|Эхлэл рүү шилжих]].",
 	"vector-action-addsection": "Сэдэв нэмэх",
 	"vector-action-delete": "Устгах",
 	"vector-action-move": "Зөөх",
@ -24,14 +18,5 @@
 	"vector-view-history": "Түүх",
 	"vector-view-view": "Унших",
 	"vector-view-viewsource": "Кодыг харах",
-	"vector-more-actions": "Дэлгэрэнгүй",
-	"vector-toc-heading": "Гарчиг",
-	"vector-toc-toggle-position-sidebar": "хажуугийн цэсэнд шилжүүлэх",
-	"vector-toc-toggle-position-title": "хумих",
-	"vector-toc-beginning": "Эхлэл",
-	"vector-toc-toggle-button-label": "$1 хэсгийг нээж хаах",
-	"vector-main-menu-tooltip": "Үндсэн цэс",
-	"vector-toc-menu-tooltip": "Гарчиг",
-	"vector-toc-collapsible-button-label": "Гарчигийг нээж хаах",
-	"vector-site-nav-label": "Сайт"
+	"vector-more-actions": "Дэлгэрэнгүй"
 }
--- a/i18n/mni.json
+++ b/i18n/mni.json
@ -14,6 +14,5 @@
 	"vector-view-edit": "ꯁꯦꯝꯒꯠꯄꯥ",
 	"vector-view-history": "ꯄꯨꯋꯥꯔꯤ ꯎꯠꯂꯨ",
 	"vector-view-view": "ꯄꯥꯑꯣ",
-	"vector-more-actions": "ꯋꯥꯠꯂꯤ",
-	"vector-searchsuggest-containing": "ꯂꯃꯥꯏꯁꯤꯡ ꯑꯁꯤ ꯌꯥꯎꯕ ꯊꯤꯕꯥ <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>"
+	"vector-more-actions": "ꯋꯥꯠꯂꯤ"
 }
--- a/i18n/mt.json
+++ b/i18n/mt.json
@ -7,16 +7,12 @@
 			"ToniSant"
 		]
 	},
-	"vector-skin-desc": "Tipprovdi żewġ dehriet tal-Vector:\n* 2011 - Il-verżjoni moderna tal-MonoBook b'dehra friska u titjib fl-użabilità.\n* 2022 - Il-Vector mibni bħala parti mill-proġett tal-WMF [[mw:Desktop Improvements]]",
-	"prefs-vector-enable-vector-1-label": "Uża l-verżjoni preċedenti tal-Vector",
 	"prefs-vector-enable-vector-1-help": "Fis-snin li ġejjin se naġġornaw id-dehra tal-Vector. Id-dehra tal-Vector l-antika se tħallik tara l-verżjoni preċedenti tal-Vector (sa Diċembru tal-2019). Biex tkun taf aktar dwar dawn l-aġġornament żur il-[[mw:Reading/Web/Desktop_Improvements|paġna tal-proġett]].",
 	"vector-opt-out": "Mur lura għad-dehra l-antika",
 	"vector-opt-out-tooltip": "Aqleb l-preferenzi tiegħek sabiex tmur lura għad-dehra l-antika (Vector antik)",
 	"vector-languages": "Lingwi",
 	"vector-language-button-aria-label": "Żur artiklu f'lingwa differenti. Disponibbli fi {{PLURAL:$1|$1 lingwa|$1 lingwi}}",
 	"vector-language-button-label": "{{PLURAL:$1|$1 lingwa|$1 lingwi}}",
-	"vector-no-language-button-label": "Żid lingwi",
-	"vector-no-language-button-aria-label": "Dan l-artiklu jeżisti biss f'din il-lingwa. Żid l-artiklu għal lingwi oħra.",
 	"vector-language-redirect-to-top": "Fuq il-{{SITENAME}}, il-ħoloq tal-lingwi jinsabu fuq in-naħa ta' fuq tal-paġna, ħdejn it-titlu tal-artiklu. [[#p-lang-btn|Mur fuq]].",
 	"vector-language-variant-switcher-label": "Biddel il-varjant tal-lingwa",
 	"vector-action-addsection": "Żid diskussjoni",
@ -38,15 +34,13 @@
 	"vector-searchsuggest-containing": "Fittex għal paġni li għandhom <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
 	"vector-intro-page": "Help:Introduction",
 	"vector-toc-heading": "Kontenut",
-	"vector-toc-toggle-position-title": "aħbi",
 	"vector-toc-beginning": "Bidu",
 	"vector-toc-toggle-button-label": "Uri jew aħbi s-sottosezzjoni $1",
 	"vector-anon-user-menu-pages": "Il-paġni għal edituri anonimi",
 	"vector-anon-user-menu-pages-learn": "kun af aktar",
 	"vector-anon-user-menu-pages-label": "Tgħallem iktar dwar kif timmodifika",
 	"vector-main-menu-tooltip": "Menu prinċipali",
-	"vector-toc-menu-tooltip": "Werrej",
-	"vector-toc-collapsible-button-label": "Aħbi jew uri l-werrej",
+	"vector-article-tools-nav-label": "Għodda",
 	"vector-site-nav-label": "Sit",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Diskussjoni]]",
 	"tooltip-vector-anon-user-menu-title": "Aktar għażliet"
--- a/i18n/nap.json
+++ b/i18n/nap.json
@ -3,7 +3,6 @@
 		"authors": [
 			"C.R.",
 			"Chelin",
-			"Finizio",
 			"Ruthven",
 			"Sannita"
 		]
@ -21,6 +20,5 @@
 	"vector-view-history": "Vide 'a cronologgia",
 	"vector-view-view": "Liegge",
 	"vector-view-viewsource": "Vire sorgente",
-	"vector-more-actions": "Cchiù",
-	"vector-searchsuggest-containing": "Truova 'e paggene ca teneno <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>"
+	"vector-more-actions": "Cchiù"
 }
--- a/i18n/nb.json
+++ b/i18n/nb.json
@ -22,7 +22,6 @@
 	"vector-language-button-aria-label": "Gå til en artikkel på et annet språk. Tilgjengelig på {{PLURAL:$1|$1 språk}}",
 	"vector-language-button-label": "{{PLURAL:$1|$1 språk}}",
 	"vector-no-language-button-label": "Legg til språk",
-	"vector-no-language-button-aria-label": "Artikkelen finnes kun på dette språket. Legg til artikkelen på andre språk",
 	"vector-language-redirect-to-top": "På denne {{SITENAME}}-utgaven finner man språklenkene i toppen av siden på motsatt side av artikkeltittelen. [[#p-lang-btn|Gå til toppen]].",
 	"vector-language-variant-switcher-label": "Bytt språkvariant",
 	"vector-action-addsection": "Nytt emne",
@ -54,6 +53,7 @@
 	"vector-main-menu-tooltip": "Hovedmeny",
 	"vector-toc-menu-tooltip": "Innholdsfortegnelse",
 	"vector-toc-collapsible-button-label": "Vis/skjul innholdsfortegnelsen",
+	"vector-article-tools-nav-label": "Verktøy",
 	"vector-site-nav-label": "Nettsted",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Diskusjon]]",
 	"tooltip-vector-anon-user-menu-title": "Flere alternativer"
--- a/i18n/ne.json
+++ b/i18n/ne.json
@ -5,56 +5,27 @@
 			"Bhawani Gautam",
 			"RajeshPandey",
 			"पर्वत सुबेदी",
-			"बडा काजी",
 			"बिप्लब आनन्द",
 			"राम प्रसाद जोशी",
 			"सरोज कुमार ढकाल"
 		]
 	},
 	"skinname-vector": "भेक्टर",
-	"skinname-vector-2022": "भेक्टर (२०२२)",
-	"vector-skin-desc": "२ भेक्टर स्किनहरू प्रदान गर्दछ:\n* २०११ - ताजा लुक र धेरै उपयोगिता सुधारहरू सहित मोनोबुक को आधुनिक संस्करण।\n* २०२२ - डब्ल्यूएमएफ [[mw:Desktop Improvements]] परियोजनाको भागको रूपमा निर्मित भेक्टर।",
-	"prefs-vector-enable-vector-1-label": "पुरानो संस्करण प्रयोग गर्नुहोस्",
-	"vector-opt-out": "पुरानो रूपमा परिवर्तन गर्नुहोस्",
+	"vector-opt-out": "पुरानो रूप मा स्विच गर्ने",
 	"vector.css": "/* यहाँ राखिएको CSS ले भेक्टर स्किनको प्रयोगकर्ताहरूलाई प्रभावित गर्ने छ  */",
-	"vector-action-toggle-sidebar": "बाँया खण्ड सक्षम गर्नुहोस्",
-	"vector-languages": "भाषाहरू",
-	"vector-language-button-aria-label": "$1  {{PLURAL:$1|भाषामा}} उपलब्ध छ। अर्को भाषाको लेखमा जानुहोस्।",
-	"vector-language-button-label": "{{PLURAL:$1|$1 भाषा|$1 भाषाहरू}}",
 	"vector-no-language-button-label": "भाषाहरू थप्नुहोस्",
-	"vector-no-language-button-aria-label": "यो लेख यस भाषामा मात्र अवस्थित छ। अन्य भाषाहरूको लागि लेख थप्नुहोस्",
-	"vector-language-redirect-to-top": "यस {{SITENAME}}मा भाषा कडीहरू लेख शीर्षकबाट पृष्ठको शीर्षमा छन्। [[#p-lang-btn|शीर्षमा जानुहोस्]]।",
-	"vector-language-variant-switcher-label": "भाषा भिन्नता परिवर्तन गर्नुहोस्",
 	"vector-action-addsection": "विषय थप्नुहोस्",
 	"vector-action-delete": "हटाउने",
-	"vector-action-move": "सार्नुहोस्",
+	"vector-action-move": "सार्ने",
 	"vector-action-protect": "सुरक्षित गर्ने",
 	"vector-action-undelete": "हटाएको रद्द गर्ने",
 	"vector-action-unprotect": "सुरक्षा परिवर्तन गर्ने",
-	"vector-view-create": "सिर्जना गर्नुहोस्",
+	"vector-view-create": "सृजना गर्ने",
 	"vector-view-edit": "सम्पादन",
 	"vector-view-history": "इतिहास हेर्नुहोस्",
 	"vector-view-view": "पढ्नुहोस्",
 	"vector-view-viewsource": "स्रोत हेर्ने",
-	"vector-jumptonavigation": "अन्वेषणमा जानुहाेस्",
-	"vector-jumptosearch": "खाेजमा जानुहाेस्",
-	"vector-jumptocontent": "सामग्रीमा जानुहोस्",
 	"vector-more-actions": "थप",
-	"vector-search-loader": "खोज सुझावहरू खोल्दै",
-	"vector-searchsuggest-containing": "<strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong> भएको पृष्ठहरू खोज्नुहोस्",
-	"vector-intro-page": "विकिपिडिया:स्वशिक्षा",
-	"vector-toc-heading": "विषयसूची",
-	"vector-toc-toggle-position-sidebar": "बाँया खण्डमा सार्नुहोस्",
-	"vector-toc-toggle-position-title": "लुकाउनुहोस्",
-	"vector-toc-beginning": "शुरुवात",
-	"vector-toc-toggle-button-label": "$1 उपखण्ड सक्षम गर्नुहोस्",
-	"vector-anon-user-menu-pages": "निर्गमन सम्पादकहरूका लागि पृष्ठहरू",
-	"vector-anon-user-menu-pages-learn": "थप जान्नुहोस्",
-	"vector-anon-user-menu-pages-label": "सम्पादन गर्ने बारे थप जान्नुहोस्",
-	"vector-main-menu-tooltip": "मुख्य सूचीपत्र",
-	"vector-toc-menu-tooltip": "विषयसूची",
-	"vector-toc-collapsible-button-label": "सामग्रीको तालिका सक्षम गर्नुहोस्",
-	"vector-site-nav-label": "साइट",
-	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|चर्चा]]",
-	"tooltip-vector-anon-user-menu-title": "थप विकल्पहरू"
+	"vector-toc-heading": "सामग्रीहरू",
+	"vector-toc-toggle-position-title": "लुकाउनुहोस्"
 }
--- a/i18n/nl.json
+++ b/i18n/nl.json
@ -54,6 +54,7 @@
 	"vector-anon-user-menu-pages-label": "Meer leren over bewerken",
 	"vector-main-menu-tooltip": "Hoofdmenu",
 	"vector-toc-menu-tooltip": "Inhoudsopgave",
+	"vector-article-tools-nav-label": "Hulpmiddelen",
 	"vector-site-nav-label": "Site",
 	"tooltip-vector-anon-user-menu-title": "Meer opties"
 }
--- a/i18n/nmz.json
+++ b/i18n/nmz.json
@ -5,7 +5,7 @@
 			"GastonJeremiah"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|gwɛɛlb $1|$1 lam}}",
+	"vector-language-button-label": "{{PLURAL:$1|gwɛɛlb $ 1|$1 lam}}",
 	"vector-action-addsection": "Hewlb gwɛɛtjugu",
 	"vector-action-delete": "Kpii",
 	"vector-action-move": "Tɔtg",
--- a/i18n/nn.json
+++ b/i18n/nn.json
@ -6,20 +6,9 @@
 			"Ranveig"
 		]
 	},
-	"skinname-vector": "Vector, eldre (2010)",
-	"vector-skin-desc": "Gjev 2 Vector-drakter:\n* 2011 – Den moderne versjonen av Monobook med eut friskt nytt utseende og mange brukarvennlege forbetringar.\n* 2022 – Vector som bygga av [[mw:Desktop Improvements]]-prosjektet til WMF.",
-	"prefs-vector-enable-vector-1-label": "Bruk klassisk Vector",
-	"prefs-vector-enable-vector-1-help": "I løpet av dei neste åra vil Vector-drakta stadig gå gjennom oppdateringar. Klassisk Vector vil la deg visa den gamle versjonen av Vector (per desember 2019). For å læra meir om oppdateringane, gå til [[mw:Reading/Web/Desktop_Improvements|prosjektsida vår]].",
+	"skinname-vector": "Vector",
 	"vector-opt-out": "Bytt til den gamle utsjånaden",
-	"vector-opt-out-tooltip": "Endra innstillingane dine for å gå tilbake til den klassiske utsjånaden til drakta (klassisk Vector)",
-	"vector-action-toggle-sidebar": "Vis/skjul sidefelt",
-	"vector-languages": "Språk",
-	"vector-language-button-aria-label": "Gå til ein artikkel på eit anna språk. Tilgjengeleg på {{PLURAL:$1|$1 språk}}",
 	"vector-language-button-label": "{{PLURAL:$1|$1 språk}}",
-	"vector-no-language-button-label": "Legg til språk",
-	"vector-no-language-button-aria-label": "Denne artikkelen finst berre på dette språket. Legg til artikkelen på andre språk",
-	"vector-language-redirect-to-top": "På denne utgåva av {{SITENAME}} er språklenkjene plasserte på toppen av sida, på motsett side av tittelen.\n[[#p-lang-btn|Gå til toppen]].",
-	"vector-language-variant-switcher-label": "Endre språkvariant",
 	"vector-action-addsection": "Nytt emne",
 	"vector-action-delete": "Slett",
 	"vector-action-move": "Flytt",
@ -31,25 +20,5 @@
 	"vector-view-history": "Sjå historikken",
 	"vector-view-view": "Les",
 	"vector-view-viewsource": "Sjå kjelda",
-	"vector-jumptonavigation": "Hopp til navigering",
-	"vector-jumptosearch": "Hopp til søk",
-	"vector-jumptocontent": "Hopp til innhald",
-	"vector-more-actions": "Meir",
-	"vector-search-loader": "Hentar søkeforslag",
-	"vector-searchsuggest-containing": "Søk etter sider som inneheld <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
-	"vector-intro-page": "Help:Introduksjon",
-	"vector-toc-heading": "Innhald",
-	"vector-toc-toggle-position-sidebar": "flytt til sidefeltet",
-	"vector-toc-toggle-position-title": "gøym",
-	"vector-toc-beginning": "Byrjinga",
-	"vector-toc-toggle-button-label": "Vis/skjul underseksjonen $1",
-	"vector-anon-user-menu-pages": "Sider for utlogga bidragsytarar",
-	"vector-anon-user-menu-pages-learn": "lær meir",
-	"vector-anon-user-menu-pages-label": "Lær meir om redigering",
-	"vector-main-menu-tooltip": "Hovudmeny",
-	"vector-toc-menu-tooltip": "Innhaldsliste",
-	"vector-toc-collapsible-button-label": "Vis/skjul innhaldslista",
-	"vector-site-nav-label": "Nettstad",
-	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Diskusjon]]",
-	"tooltip-vector-anon-user-menu-title": "Fleire val"
+	"vector-more-actions": "Meir"
 }
--- a/i18n/nqo.json
+++ b/i18n/nqo.json
@ -1,7 +1,6 @@
 {
 	"@metadata": {
 		"authors": [
-			"Amire80",
 			"Babamamadidiane",
 			"Lancine.kounfantoh.fofana",
 			"Lanciné.kounfantoh.fofana",
@ -9,7 +8,7 @@
 		]
 	},
 	"vector-languages": "ߞߊ߲ ߠߎ߬",
-	"vector-language-button-label": "{{PLURAL:$1|ߞߊ߲ $1|ߞߊ߲ $1 ߠߎ߬}}",
+	"vector-language-button-label": "{{PLURAL:ߞߊ߲ $1|ߞߊ߲ $1 ߠߎ߬}}",
 	"vector-no-language-button-label": "ߞߊ߲ ߠߎ߬ ߟߊߘߏ߲߬",
 	"vector-no-language-button-aria-label": "ߞߎߡߘߊ ߢߌ߲߬ ߦߋ߫ ߞߊ߲ ߣߌ߲߬ ߘߐߙߐ߲߫ ߠߋ߬ ߘߐ߫. ߞߎߡߘߊ ߢߌ߲߬ ߠߊߘߏ߲߬ ߞߊ߲ ߜߘߍ ߟߎ߫ ߘߐ߫.",
 	"vector-action-addsection": "ߥߟߊ߬ߘߊ߫ ߝߙߊ߬",
--- a/i18n/pa.json
+++ b/i18n/pa.json
@ -3,14 +3,12 @@
 		"authors": [
 			"Aalam",
 			"Babanwalia",
-			"Bgo eiu",
 			"Raj Singh",
 			"TariButtar",
 			"Tow"
 		]
 	},
 	"vector-skin-desc": "ਮੋਨੋਬੁੱਕ ਦੀ ਆਧੁਨਿਕ ਵਰਜਨ ਜਿਸ ਵਿਚ ਤਾਜ਼ਾ ਦਿੱਖ ਅਤੇ ਬਹੁਤ ਸਾਰੇ ਉਪਯੋਗਤਾ ਸੁਧਾਰ ਹਨ",
-	"vector-language-button-label": "{{PLURAL:$1|$1 ਭਾਸ਼ਾ|$1 ਭਾਸ਼ਾਵਾਂ}}",
 	"vector-action-addsection": "ਵਿਸ਼ਾ ਜੋੜੋ",
 	"vector-action-delete": "ਹਟਾਓ",
 	"vector-action-move": "ਭੇਜੋ",
--- a/i18n/pl.json
+++ b/i18n/pl.json
@ -12,7 +12,7 @@
 	},
 	"skinname-vector": "Stary Wektor (2010)",
 	"skinname-vector-2022": "Wektor (2022)",
-	"vector-skin-desc": "Dodaje dwie skórki Wektor:\n* 2011 – Odświeżona wersja skórki Książka, z nowym wyglądem i usprawnieniami.\n* 2022 – Skórka Wektor zbudowana jako część projektu [[mw:Desktop Improvements|ulepszania interfejsu]] Fundacji Wikimedia.",
+	"vector-skin-desc": "Dodaje dwie skórki Vector:\n* 2011 – Odświeżona wersja skórki Książka, z nowym wyglądem i usprawnieniami.\n* 2022 – Skórka Vector zbudowana jako część projektu [[mw:Reading/Web/Desktop_Improvements/pl|ulepszania interfejsu]] Fundacji Wikimedia.",
 	"prefs-vector-enable-vector-1-label": "Użyj starego Wektora",
 	"prefs-vector-enable-vector-1-help": "W ciągu najbliższych kilku lat będziemy stopniowo aktualizować skórkę Wektor. Stary Wektor umożliwi ci używanie poprzedniej wersji skórki (na grudzień 2019). Aby dowiedzieć się więcej o aktualizacjach przejdź do naszej [[mw:Reading/Web/Desktop_Improvements|strony projektu]].",
 	"vector-opt-out": "Przełącz na stary widok",
@ -44,7 +44,7 @@
 	"vector-more-actions": "Więcej",
 	"vector-search-loader": "Wczytywanie sugestii",
 	"vector-searchsuggest-containing": "Szukaj stron zawierających <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
-	"vector-intro-page": "Help:Pierwsze kroki",
+	"vector-intro-page": "Pomoc:Pierwsze kroki",
 	"vector-toc-heading": "Zawartość",
 	"vector-toc-toggle-position-sidebar": "przenieś do paska bocznego",
 	"vector-toc-toggle-position-title": "ukryj",
@ -56,6 +56,7 @@
 	"vector-main-menu-tooltip": "Główne menu",
 	"vector-toc-menu-tooltip": "Spis treści",
 	"vector-toc-collapsible-button-label": "Przełącz stan spisu treści",
+	"vector-article-tools-nav-label": "Narzędzia",
 	"vector-site-nav-label": "Witryna",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|dyskusja]]",
 	"tooltip-vector-anon-user-menu-title": "Więcej opcji"
--- a/i18n/pnb.json
+++ b/i18n/pnb.json
@ -3,22 +3,20 @@
 		"authors": [
 			"Abbas dhothar",
 			"Arslan",
-			"Bgo eiu",
 			"Khalid Mahmood"
 		]
 	},
 	"vector-language-button-label": "{{PLURAL:$1|$1 بولی|$1 بولیاں}}",
 	"vector-action-addsection": "مضمون پاؤ",
-	"vector-action-delete": "مٹاؤ",
+	"vector-action-delete": "مکاؤ",
 	"vector-action-move": "لے چلو",
 	"vector-action-protect": "بچاؤ",
 	"vector-action-undelete": "واپس لیاؤ",
 	"vector-action-unprotect": "تبدیلی بچاؤ",
-	"vector-view-create": "بݨاؤ",
-	"vector-view-edit": "سودھو",
+	"vector-view-create": "بناؤ",
+	"vector-view-edit": "لِکھو",
 	"vector-view-history": "تریخ دیکھو",
 	"vector-view-view": "پڑھو",
 	"vector-view-viewsource": "سورس ویکھو",
-	"vector-more-actions": "ہور",
-	"vector-searchsuggest-containing": "اس ٹرم نوں صفحےآں وچ کھوجو <strong class=\"cdx-$1typeahead-search__search-footer__query\"></strong>"
+	"vector-more-actions": "ہور"
 }
--- a/i18n/pt-br.json
+++ b/i18n/pt-br.json
@ -19,7 +19,7 @@
 		]
 	},
 	"skinname-vector": "Vector",
-	"vector-skin-desc": "Fornece 2 temas Vector:\n* 2011 - Versão moderna do MonoBook com um aspeto fresco e várias melhorias de usabilidade.\n* 2022 - O Vector criado como parte do projeto [[mw:Desktop Improvements|Melhoramentos do ambiente de trabalho]] da WMF.",
+	"vector-skin-desc": "Versão moderna do MonoBook com um visual limpo e várias melhorias de usabilidade",
 	"prefs-vector-enable-vector-1-label": "Usar Vector legado",
 	"prefs-vector-enable-vector-1-help": "Nos próximos anos, atualizaremos gradualmente o tema Vector. O Vector legado permitirá que você visualize a versão antiga do Vector (a partir de dezembro de 2019). Para saber mais sobre as atualizações, acesse nossa [[mw:Reading/Web/Desktop_Improvements|página do projeto]].",
 	"vector-opt-out": "Mudar para aparência antiga",
@ -48,7 +48,7 @@
 	"vector-more-actions": "Mais",
 	"vector-search-loader": "Carregando sugestões de pesquisa",
 	"vector-searchsuggest-containing": "Procurar pelas páginas contendo <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
-	"vector-intro-page": "Help:Introduction",
+	"vector-intro-page": "Wikipédia:Boas-vindas",
 	"vector-toc-heading": "Conteúdo",
 	"vector-toc-toggle-position-title": "Esconder",
 	"vector-toc-beginning": "Início",
@ -56,5 +56,6 @@
 	"vector-anon-user-menu-pages-learn": "saiba mais",
 	"vector-anon-user-menu-pages-label": "Saiba mais sobre edição",
 	"vector-main-menu-tooltip": "Menu principal",
+	"vector-article-tools-nav-label": "Ferramentas",
 	"tooltip-vector-anon-user-menu-title": "Mais opções"
 }
--- a/i18n/pt.json
+++ b/i18n/pt.json
@ -15,22 +15,16 @@
 			"Waldyrious"
 		]
 	},
-	"skinname-vector": "Vector antigo (2010)",
-	"vector-skin-desc": "Fornece 2 temas Vector:\n* 2011 - Versão moderna do MonoBook com um aspeto fresco e várias melhorias de usabilidade.\n* 2022 - O Vector criado como parte do projeto [[mw:Desktop Improvements|Melhoramentos do ambiente de trabalho]] da WMF.",
+	"skinname-vector": "Vector",
+	"vector-skin-desc": "Versão moderna do MonoBook com um aspeto fresco e várias melhorias de usabilidade",
 	"prefs-vector-enable-vector-1-label": "Usar o Vector antigo",
 	"prefs-vector-enable-vector-1-help": "Durante os próximos anos iremos atualizar gradualmente o tema Vector. O Vetor antigo permitirá ver a versão antiga do tema Vector (a partir de dezembro de 2019). Para saber mais sobre as atualizações, consulte a  [[mw:Reading/Web/Desktop_Improvements|página do projeto]].",
 	"vector-opt-out": "Mudar para aparência antiga",
 	"vector-opt-out-tooltip": "Alterar as suas configurações para voltar ao aspeto anterior do tema (Vector anterior)",
-	"vector.css": "/* Todo o código CSS colocado aqui será carregado para os utilizadores do tema Vector */",
-	"vector.js": "/* Todo o código Javascript colocado aqui será carregado para os utilizadores do tema Vector */",
+	"vector.css": "/* Código CSS colocado aqui afectará os utilizadores do tema Vector */",
+	"vector.js": "/* Código Javascript colocado aqui será carregado para utilizadores do tema Vector */",
 	"vector-action-toggle-sidebar": "Alternar barra lateral",
-	"vector-languages": "Línguas",
-	"vector-language-button-aria-label": "Ir para um artigo noutra língua. Disponível em {{PLURAL:$1|$1 língua|$1 línguas}}",
 	"vector-language-button-label": "{{PLURAL:$1|$1 língua|$1 línguas}}",
-	"vector-no-language-button-label": "Adicionar línguas",
-	"vector-no-language-button-aria-label": "Este artigo só existe nesta língua. Adicione o artigo noutras línguas",
-	"vector-language-redirect-to-top": "Na wiki {{SITENAME}} as hiperligações interlínguas estão localizadas no topo da página do lado oposto ao título. [[#p-lang-btn|Ir para o topo]].",
-	"vector-language-variant-switcher-label": "Mudar a variante da língua",
 	"vector-action-addsection": "Adicionar tópico",
 	"vector-action-delete": "Eliminar",
 	"vector-action-move": "Mover",
@ -48,19 +42,6 @@
 	"vector-more-actions": "Mais",
 	"vector-search-loader": "A carregar sugestões de pesquisa",
 	"vector-searchsuggest-containing": "Procurar páginas que contenham <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
-	"vector-intro-page": "Help:Introduction",
-	"vector-toc-heading": "Conteúdo",
-	"vector-toc-toggle-position-sidebar": "mover para a barra lateral",
-	"vector-toc-toggle-position-title": "ocultar",
-	"vector-toc-beginning": "Início",
-	"vector-toc-toggle-button-label": "Alternar a subsecção $1",
-	"vector-anon-user-menu-pages": "Páginas para editores sem sessão iniciada",
-	"vector-anon-user-menu-pages-learn": "saber mais",
-	"vector-anon-user-menu-pages-label": "Saiba mais sobre edição",
-	"vector-main-menu-tooltip": "Menu principal",
-	"vector-toc-menu-tooltip": "Índice",
-	"vector-toc-collapsible-button-label": "Alternar o índice",
-	"vector-site-nav-label": "''Site''",
-	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Discussão]]",
-	"tooltip-vector-anon-user-menu-title": "Mais opções"
+	"vector-intro-page": "Wikipédia:Boas-vindas",
+	"vector-anon-user-menu-pages-label": "Saiba mais sobre edição"
 }
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@ -64,6 +64,7 @@
 	"vector-main-menu-tooltip": "Used as title attribute for main menu icon on hover.",
 	"vector-toc-menu-tooltip": "Used as title attribute for table of contents icon on hover.",
 	"vector-toc-collapsible-button-label": "Used as the label for the table of contents collapsible toggle button",
+	"vector-article-tools-nav-label": "Accessible label for the article tools nav landmark",
 	"vector-site-nav-label": "Accessible label for site (main menu) nav landmark",
 	"vector-2022-prefs-talkpage": "Link to the desktop improvements project talk page which is shown before the preview link in skin preferences. See T307113 for more information.",
 	"tooltip-vector-anon-user-menu-title": "Used as title attribute for user menu icon on hover for anonymous users."
--- a/i18n/ro.json
+++ b/i18n/ro.json
@ -24,7 +24,6 @@
 	"vector-language-button-aria-label": "Mergeți la un articol în altă limbă. Disponibil în {{PLURAL:$1|$1 limbă|$1 limbi}}",
 	"vector-language-button-label": "{{PLURAL:$1|$1 limbă|$1 limbi}}",
 	"vector-no-language-button-label": "Adaugă limbi",
-	"vector-language-redirect-to-top": "Pe acest wiki {{SITENAME}}, legăturile limbii sunt situate în partea de sus a paginii în rând cu titlul articolului. [[#p-lang-btn|Mergi sus]].",
 	"vector-action-addsection": "Adăugare subiect",
 	"vector-action-delete": "Ștergere",
 	"vector-action-move": "Redenumire",
--- a/i18n/rsk.json
+++ b/i18n/rsk.json
@ -23,5 +23,6 @@
 	"vector-searchsuggest-containing": "Найдз боки хтори содержа <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
 	"vector-toc-heading": "Змист",
 	"vector-toc-toggle-position-title": "скриц",
-	"vector-anon-user-menu-pages-learn": "дознайце вецей"
+	"vector-anon-user-menu-pages-learn": "дознайце вецей",
+	"vector-article-tools-nav-label": "Алатки"
 }
--- a/i18n/ru.json
+++ b/i18n/ru.json
@ -69,7 +69,8 @@
 	"vector-main-menu-tooltip": "Главное меню",
 	"vector-toc-menu-tooltip": "Содержание",
 	"vector-toc-collapsible-button-label": "Скрыть/показать содержание",
+	"vector-article-tools-nav-label": "Инструменты",
 	"vector-site-nav-label": "Сайт",
-	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Обсуждение]]",
+	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Дискуссия]]",
 	"tooltip-vector-anon-user-menu-title": "Больше возможностей"
 }
--- a/i18n/sh.json
+++ b/i18n/sh.json
@ -5,11 +5,9 @@
 			"Conquistador",
 			"OC Ripper",
 			"Srdjan m",
-			"Srđan",
-			"Vlad5250"
+			"Srđan"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|$1 jezik|$1 jezika}}",
 	"vector-action-addsection": "Dodaj temu",
 	"vector-action-delete": "Brisanje",
 	"vector-action-move": "Premjesti",
@ -21,6 +19,5 @@
 	"vector-view-history": "Historija/Историја",
 	"vector-view-view": "Čitaj",
 	"vector-view-viewsource": "Vidi izvor (source)",
-	"vector-more-actions": "Više",
-	"vector-searchsuggest-containing": "Traži stranice koje sadrže <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>"
+	"vector-more-actions": "Više"
 }
--- a/i18n/sje.json
+++ b/i18n/sje.json
@ -5,7 +5,6 @@
 			"Olve Utne"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|$1 giella|$1 giela}}",
 	"vector-action-addsection": "Lasedä ábdnasav",
 	"vector-action-delete": "Gádodä",
 	"vector-action-move": "Sirde",
@ -15,6 +14,5 @@
 	"vector-view-history": "Vuosedä histurjav",
 	"vector-view-view": "Lågå",
 	"vector-view-viewsource": "Vuosedä wikitiekstav",
-	"vector-more-actions": "Ienap",
-	"vector-searchsuggest-containing": "Åtså belijda májdne lä tjállám <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>"
+	"vector-more-actions": "Ienap"
 }
--- a/i18n/sl.json
+++ b/i18n/sl.json
@ -8,20 +8,9 @@
 			"Yerpo"
 		]
 	},
-	"vector-specialversion-name": "Vector",
-	"vector-skin-desc": "Ponuja dve preobleki Vector:\n* 2011 – sodobna različica MonoBook s svežim videzom in številnimi izboljšavami uporabnosti.\n* 2022 – preobleka Vector, ustvarjena kot del projekta WMF [[mw:Desktop Improvements|Izboljšave namizja]]",
+	"vector-skin-desc": "Nudi dve preobleki Vector:\n* 2011 – Sodobna različica MonoBook s svežim videzom in mnogimi izboljšavami uporabnosti.\n* 2022 – Preobleka Vector, zgrajena kot del projekta WMF [[mw:Desktop Improvements|Izboljšave namizja]].",
 	"prefs-vector-enable-vector-1-label": "Uporabljaj stari Vector",
 	"prefs-vector-enable-vector-1-help": "V naslednjih nekaj letih bomo postopoma posodabljali preobleko Vector. Stari Vector vam omogoča prikaz stare različice preobleke Vector (iz decembra 2019). Več o posodobitvah lahko izveste na naši [[mw:Reading/Web/Desktop_Improvements|projektni strani]].",
-	"vector-opt-out": "Preklopi na stari videz",
-	"vector-opt-out-tooltip": "Spremenite nastavitve, da se vrnete na stari videz preobleke (stari Vector)",
-	"vector-action-toggle-sidebar": "Vklopi stransko vrstico",
-	"vector-languages": "Jeziki",
-	"vector-language-button-aria-label": "P9jdi na članek v drugem jeziku. Na voljo v  {{PLURAL:$1|$1 jeziku|$1 jezikih}}.",
-	"vector-language-button-label": "{{PLURAL:$1|$1 jezik|$1 jezika|$1 jeziki|$1 jezikov}}",
-	"vector-no-language-button-label": "Dodaj jezike",
-	"vector-no-language-button-aria-label": "Ta članek obstaja samo v tem jeziku. Dodajte članke v drugih jezikih.",
-	"vector-language-redirect-to-top": "V {{GRAMMAR:dative|{{SITENAME}}}} so jezikovne povezave na vrhu strani ob naslovu članka. [[#p-lang-btn|Pojdi na vrh]].",
-	"vector-language-variant-switcher-label": "Spremeni različico jezika",
 	"vector-action-addsection": "Dodaj temo",
 	"vector-action-delete": "Izbriši",
 	"vector-action-move": "Prestavi",
@ -33,25 +22,5 @@
 	"vector-view-history": "Zgodovina",
 	"vector-view-view": "Preberi",
 	"vector-view-viewsource": "Izvorno besedilo",
-	"vector-jumptonavigation": "Pojdi na navigacijo",
-	"vector-jumptosearch": "Pojdi na iskanje",
-	"vector-jumptocontent": "Pojdi na vsebino",
-	"vector-more-actions": "Več",
-	"vector-search-loader": "Nalagam predloge za iskanje",
-	"vector-searchsuggest-containing": "Poišči strani, ki vsebujejo <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
-	"vector-intro-page": "Help:Uvod",
-	"vector-toc-heading": "Vsebina",
-	"vector-toc-toggle-position-sidebar": "prestavi v stransko vrstico",
-	"vector-toc-toggle-position-title": "skrij",
-	"vector-toc-beginning": "Začetek",
-	"vector-toc-toggle-button-label": "Vklopi podrazdelek $1",
-	"vector-anon-user-menu-pages": "Strani za odjavljene urejevalce",
-	"vector-anon-user-menu-pages-learn": "več o tem",
-	"vector-anon-user-menu-pages-label": "Več o urejanju",
-	"vector-main-menu-tooltip": "Glavni meni",
-	"vector-toc-menu-tooltip": "Kazalo vsebine",
-	"vector-toc-collapsible-button-label": "Vklopi kazalo vsebine",
-	"vector-site-nav-label": "Projekt",
-	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Pogovor]]",
-	"tooltip-vector-anon-user-menu-title": "Več možnosti"
+	"vector-more-actions": "Več"
 }
--- a/i18n/sms.json
+++ b/i18n/sms.json
@ -10,7 +10,6 @@
 	"vector-action-delete": "Jaukkâd",
 	"vector-action-move": "Seeʹrd",
 	"vector-action-protect": "Suõjjâd",
-	"vector-action-undelete": "Maaccât",
 	"vector-view-create": "Raaj",
 	"vector-view-edit": "Muuʹtt",
 	"vector-view-history": "Čuäʹjet historia",
@ -18,10 +17,7 @@
 	"vector-view-viewsource": "Čuäʹjet käivvkood",
 	"vector-more-actions": "Lââʹzz",
 	"vector-searchsuggest-containing": "Ooʒʒ seeidaid, koin lij <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>",
-	"vector-toc-heading": "Siiskâžlooǥǥtõs",
-	"vector-toc-toggle-position-title": "čiõǥǥ",
 	"vector-anon-user-menu-pages-learn": "lââʹssteâđ",
 	"vector-main-menu-tooltip": "Väʹlddvaʹlljõk",
-	"vector-toc-menu-tooltip": "Siiskâžlooǥǥtõs",
 	"vector-site-nav-label": "Seiddõs"
 }
--- a/i18n/sr-ec.json
+++ b/i18n/sr-ec.json
@ -50,6 +50,7 @@
 	"vector-anon-user-menu-pages-learn": "детаљније",
 	"vector-anon-user-menu-pages-label": "Детаљније о уређивању",
 	"vector-main-menu-tooltip": "Главни мени",
+	"vector-article-tools-nav-label": "Алатке",
 	"vector-site-nav-label": "Сајт",
 	"tooltip-vector-anon-user-menu-title": "Више опција"
 }
--- a/i18n/sr-el.json
+++ b/i18n/sr-el.json
@ -31,5 +31,6 @@
 	"vector-jumptosearch": "Idi na pretragu",
 	"vector-more-actions": "Više",
 	"vector-toc-heading": "Sadržaj",
-	"vector-toc-beginning": "Početak"
+	"vector-toc-beginning": "Početak",
+	"vector-article-tools-nav-label": "Alatke"
 }
--- a/i18n/st.json
+++ b/i18n/st.json
@ -2,15 +2,14 @@
 	"@metadata": {
 		"authors": [
 			"Amire80",
-			"Coldfact",
 			"Gustave London",
 			"Tšepo"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|$1 puo|$1 lipuo}}",
+	"vector-language-button-label": "{{PLURAL:$1| $1 puo| $1 lipuo}}",
 	"vector-view-edit": "Fetola",
 	"vector-view-history": "Sheba histori",
 	"vector-view-view": "Bala",
-	"vector-more-actions": "Tse ling",
+	"vector-more-actions": "Lihlooho Tse Ling",
 	"vector-searchsuggest-containing": "Batla maqephe a nang le <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>"
 }
--- a/i18n/sv.json
+++ b/i18n/sv.json
@ -56,6 +56,7 @@
 	"vector-main-menu-tooltip": "Huvudmeny",
 	"vector-toc-menu-tooltip": "Innehållsförteckning",
 	"vector-toc-collapsible-button-label": "Växla innehållsförteckningen",
+	"vector-article-tools-nav-label": "Verktyg",
 	"vector-site-nav-label": "Webbplats",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Diskussion]]",
 	"tooltip-vector-anon-user-menu-title": "Fler alternativ"
--- a/i18n/sw.json
+++ b/i18n/sw.json
@ -11,7 +11,7 @@
 			"Yasen igra"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|$1 lugha}}",
+	"vector-language-button-label": "{{PLURAL:$1|lugha}}",
 	"vector-action-addsection": "Weka mada",
 	"vector-action-delete": "Futa",
 	"vector-action-move": "Hamisha",
--- a/i18n/szy.json
+++ b/i18n/szy.json
@ -1,14 +1,12 @@
 {
 	"@metadata": {
 		"authors": [
-			"Akamycoco",
 			"Benel",
 			"Bunukwiki",
 			"Tokoabibi"
 		]
 	},
 	"vector-skin-desc": "ayzaay a MonoBook, izaw baluhayay a nuhekalan atu yadah pisaungayay a sakapahay.",
-	"vector-language-button-label": "{{PLURAL:$1|$1 kamu}}",
 	"vector-action-addsection": "micunus sasakamuen",
 	"vector-action-delete": "misipu",
 	"vector-action-move": "milimad",
--- a/i18n/te.json
+++ b/i18n/te.json
@ -16,7 +16,6 @@
 	"vector-opt-out": "పాత రూపానికి మార్చు",
 	"vector-opt-out-tooltip": "పాత వెక్టర్ రూపానికి వెళ్లడానికి  మీ అమరికలు మార్చు",
 	"vector-language-button-label": "{{PLURAL:$1|$1 భాష|$1 భాషలు}}",
-	"vector-language-redirect-to-top": "ఈ {{SITENAME}} లో భాషా లింకులు పేజీకి పైన, వ్యాస శీర్షిక ఉండే వరుసలో కుడి చివర ఉంటాయి. [[#p-lang-btn|పైకి వెళ్ళు]].",
 	"vector-action-addsection": "అంశాన్ని చేర్చు",
 	"vector-action-delete": "తొలగించు",
 	"vector-action-move": "తరలించు",
--- a/i18n/tl.json
+++ b/i18n/tl.json
@ -5,7 +5,6 @@
 			"AnakngAraw",
 			"GinawaSaHapon",
 			"Ianlopez1115",
-			"Jojit fb",
 			"Sky Harbor"
 		]
 	},
@ -25,7 +24,7 @@
 	"vector-action-undelete": "Alisin ang pagbubura",
 	"vector-action-unprotect": "Baguhin ang pagsasanggalang",
 	"vector-view-create": "Gawin",
-	"vector-view-edit": "Baguhin",
+	"vector-view-edit": "I-edit",
 	"vector-view-history": "Tingnan ang nakaraan",
 	"vector-view-view": "Basahin",
 	"vector-view-viewsource": "Tingnan ang pinagmulan",
--- a/i18n/tok.json
+++ b/i18n/tok.json
@ -7,12 +7,10 @@
 			"שוקו מוקה"
 		]
 	},
-	"vector-language-button-label": "toki $1",
 	"vector-action-delete": "o weka",
 	"vector-action-protect": "o awen",
 	"vector-view-create": "o pali",
 	"vector-view-edit": "o ante",
-	"vector-view-history": "o lukin e tenpo pini",
 	"vector-view-view": "lukin",
 	"vector-more-actions": "mute",
 	"vector-toc-beginning": "open"
--- a/i18n/tr.json
+++ b/i18n/tr.json
@ -62,6 +62,7 @@
 	"vector-anon-user-menu-pages-label": "Düzenleme hakkında daha fazla bilgi edinin",
 	"vector-main-menu-tooltip": "Ana menü",
 	"vector-toc-menu-tooltip": "İçindekiler",
+	"vector-article-tools-nav-label": "Araçlar",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Tartışma]]",
 	"tooltip-vector-anon-user-menu-title": "Daha fazla seçenek"
 }
--- a/i18n/uk.json
+++ b/i18n/uk.json
@ -64,6 +64,7 @@
 	"vector-main-menu-tooltip": "Головне меню",
 	"vector-toc-menu-tooltip": "Зміст",
 	"vector-toc-collapsible-button-label": "Сховати/показати зміст",
+	"vector-article-tools-nav-label": "Інструменти",
 	"vector-site-nav-label": "Сайт",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Обговорення]]",
 	"tooltip-vector-anon-user-menu-title": "Більше опцій"
--- a/i18n/vi.json
+++ b/i18n/vi.json
@ -32,7 +32,6 @@
 	"vector-language-button-aria-label": "Xem bài viết trong ngôn ngữ khác. Bài có sẵn trong {{PLURAL:$1}}$1 ngôn ngữ",
 	"vector-language-button-label": "$1 ngôn ngữ",
 	"vector-no-language-button-label": "Thêm ngôn ngữ",
-	"vector-no-language-button-aria-label": "Bài viết này chỉ tồn tại bằng ngôn ngữ này. Thêm bài viết cho các ngôn ngữ khác",
 	"vector-language-redirect-to-top": "Ở {{SITENAME}} này, các liên kết giữa ngôn ngữ nằm ở đầu trang, đối diện với tiêu đề bài viết. [[#p-lang-btn|Đi tới đầu trang]].",
 	"vector-language-variant-switcher-label": "Thay đổi biến thể ngôn ngữ",
 	"vector-action-addsection": "Thêm đề tài",
@ -63,6 +62,7 @@
 	"vector-anon-user-menu-pages-label": "Tìm hiểu thêm về sửa đổi",
 	"vector-main-menu-tooltip": "Trình đơn chính",
 	"vector-toc-menu-tooltip": "Mục lục",
+	"vector-article-tools-nav-label": "Công cụ",
 	"vector-site-nav-label": "Trang Web",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Thảo luận]]",
 	"tooltip-vector-anon-user-menu-title": "Thêm tùy chọn"
--- a/i18n/war.json
+++ b/i18n/war.json
@ -5,7 +5,6 @@
 			"JinJian"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|$1 ka pinulongan|$1 ka mga pinulongan}}",
 	"vector-action-addsection": "Igdugang hin himangrawon",
 	"vector-action-delete": "Para-a",
 	"vector-action-move": "Balhina",
@ -17,6 +16,5 @@
 	"vector-view-history": "Kitaa an kaagi",
 	"vector-view-view": "Basaha",
 	"vector-view-viewsource": "Kitaa an ginkuhaan",
-	"vector-more-actions": "Damo pa",
-	"vector-searchsuggest-containing": "Pamiling hin mga pakli nga nagsusulod hin <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong>"
+	"vector-more-actions": "Damo pa"
 }
--- a/i18n/wls.json
+++ b/i18n/wls.json
@ -19,7 +19,7 @@
 	"vector-action-toggle-sidebar": "Faka'asi te pou hema",
 	"vector-languages": "Lea",
 	"vector-language-button-aria-label": "'Alu ki he fakamatala i he tahi lea. E ma'u i te {{PLURAL:$1|lea e $1|lea e$1}}",
-	"vector-language-button-label": "{{PLURAL:$1|$1 lea|lea e $1}}",
+	"vector-language-button-label": "{{PLURAL:$1|$1 lea| lea e $1}}",
 	"vector-no-language-button-label": "Kumi he tahi lea",
 	"vector-no-language-button-aria-label": "E tohi pe te fakamatala i te lea aeni. Fakaliliu ki ni tahi 'u lea.",
 	"vector-language-redirect-to-top": "I te {{SITENAME}} e fai te fili o tau lea i te fuga pāsina i te faha'i mata'u o te higoa o te fakamatala. [[#p-lang-btn|'Alu ki 'oluga]].",
@ -53,6 +53,7 @@
 	"vector-main-menu-tooltip": "Fakatu'utu'u tāfito",
 	"vector-toc-menu-tooltip": "Laupapa fakatu'utu'u",
 	"vector-toc-collapsible-button-label": "Ave kehe te laupapa fakatu'utu'u",
+	"vector-article-tools-nav-label": "Me'a gaue",
 	"vector-site-nav-label": "Site",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|Felogo'i]]",
 	"tooltip-vector-anon-user-menu-title": "Hoko atu"
--- a/i18n/yua.json
+++ b/i18n/yua.json
@ -5,7 +5,6 @@
 			"Lorenzoitza"
 		]
 	},
-	"vector-language-button-label": "{{PLURAL:$1|Junp'éel t'aan|$1 t'aano'ob}}",
 	"vector-action-delete": "Tupej",
 	"vector-view-edit": "K'eex",
 	"vector-view-history": "Ba'ax a ilmaj",
--- a/i18n/yue.json
+++ b/i18n/yue.json
@ -1,7 +1,6 @@
 {
 	"@metadata": {
 		"authors": [
-			"Deryck Chan",
 			"Hello903hello",
 			"Ktchankt",
 			"Moon0319",
@ -21,10 +20,7 @@
 	"vector.js": "/* 響每一次個頁面載入時，用域達畫面嘅用戶都會載入呢度任何嘅JavaScript */",
 	"vector-action-toggle-sidebar": "邊欄開閂",
 	"vector-languages": "語言",
-	"vector-language-button-aria-label": "去睇另一種語文嘅文章。有$1種語言版本。",
 	"vector-language-button-label": "{{PLURAL:$1|$1種語言}}",
-	"vector-no-language-button-label": "加語言",
-	"vector-no-language-button-aria-label": "呢篇文淨係喺呢種語言先有。喺第種語言開呢篇文。",
 	"vector-language-redirect-to-top": "喺呢個{{SITENAME}}度，其他語言嘅連結喺頁頂文章標題側邊。[[#p-lang-btn|去頁頂]]。",
 	"vector-action-addsection": "加主題",
 	"vector-action-delete": "剷走",
@ -42,13 +38,5 @@
 	"vector-jumptocontent": "跳去內容",
 	"vector-more-actions": "多啲",
 	"vector-search-loader": "載入緊搜索提議",
-	"vector-searchsuggest-containing": "搵包含 <strong class=\"cdx-typeahead-search__search-footer__query\">$1</strong> 嘅版",
-	"vector-toc-heading": "目錄",
-	"vector-toc-toggle-position-title": "收埋",
-	"vector-toc-beginning": "文頭",
-	"vector-anon-user-menu-pages-learn": "知多啲",
-	"vector-main-menu-tooltip": "主目錄",
-	"vector-toc-menu-tooltip": "內容一覽",
-	"vector-toc-collapsible-button-label": "開/收內容一覽",
-	"vector-site-nav-label": "站點"
+	"vector-toc-heading": "目錄"
 }
--- a/i18n/zh-hans.json
+++ b/i18n/zh-hans.json
@ -48,7 +48,6 @@
 	"vector-language-button-aria-label": "前往另一种语言写成的文章。{{PLURAL:$1|$1种语言}}可用",
 	"vector-language-button-label": "{{PLURAL:$1|$1种语言}}",
 	"vector-no-language-button-label": "添加语言",
-	"vector-no-language-button-aria-label": "这篇条目只存在于此语言中。添加其他语言的条目",
 	"vector-language-redirect-to-top": "在{{SITENAME}}中，语言链接位于页面顶部标题旁。[[#p-lang-btn|前往顶部]]。",
 	"vector-language-variant-switcher-label": "更改语言变体",
 	"vector-action-addsection": "添加话题",
@ -79,7 +78,7 @@
 	"vector-anon-user-menu-pages-label": "了解有关编辑的更多信息",
 	"vector-main-menu-tooltip": "主菜单",
 	"vector-toc-menu-tooltip": "目录",
-	"vector-toc-collapsible-button-label": "切换目录",
+	"vector-article-tools-nav-label": "工具",
 	"vector-site-nav-label": "站点",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|讨论]]",
 	"tooltip-vector-anon-user-menu-title": "更多选项"
--- a/i18n/zh-hant.json
+++ b/i18n/zh-hant.json
@ -65,6 +65,7 @@
 	"vector-main-menu-tooltip": "主選單",
 	"vector-toc-menu-tooltip": "目次",
 	"vector-toc-collapsible-button-label": "切換目錄",
+	"vector-article-tools-nav-label": "工具",
 	"vector-site-nav-label": "站台",
 	"vector-2022-prefs-talkpage": "[[mw:Talk:Reading/Web/Desktop_Improvements|討論]]",
 	"tooltip-vector-anon-user-menu-title": "更多選項"
--- a/includes/Constants.php
+++ b/includes/Constants.php
@ -98,6 +98,17 @@ final class Constants {
 	 */
 	public const REQUIREMENT_LANGUAGE_IN_HEADER = 'LanguageInHeader';

+	/**
+	 * Defines whether or not the Language in header A/B test is running. See
+	 * https://phabricator.wikimedia.org/T280825 for additional detail about the test.
+	 *
+	 * Note well that if the associated config value is falsy, then we fall back to choosing the
+	 * language treatment based on the `VectorLanguageInHeader` config variable.
+	 *
+	 * @var string
+	 */
+	public const CONFIG_LANGUAGE_IN_HEADER_TREATMENT_AB_TEST = 'VectorLanguageInHeaderTreatmentABTest';
+
 	/**
 	 * @var string
 	 */
@ -198,48 +209,18 @@ final class Constants {
 	/**
 	 * @var string
 	 */
-	public const FEATURE_TABLE_OF_CONTENTS_AB_TEST = 'TableOfContentsLegacyTOC';
+	public const FEATURE_TABLE_OF_CONTENTS = 'TableOfContents';

 	/**
 	 * @var string
 	 */
-	public const REQUIREMENT_TABLE_OF_CONTENTS_AB_TEST = 'TableOfContentsLegacy';
+	public const REQUIREMENT_TABLE_OF_CONTENTS = 'TableOfContents';

 	/**
 	 * @var string
 	 */
 	public const WEB_AB_TEST_ARTICLE_ID_FACTORY_SERVICE = 'WikimediaEvents.WebABTestArticleIdFactory';

-	/**
-	 * @var string
-	 */
-	public const FEATURE_VISUAL_ENHANCEMENTS = 'VisualEnhancementNext';
-
-	/**
-	 * @var string
-	 */
-	public const REQUIREMENT_VISUAL_ENHANCEMENTS = 'VisualEnhancementNext';
-
-	/**
-	 * @var string
-	 */
-	public const CONFIG_KEY_VISUAL_ENHANCEMENTS = 'VectorVisualEnhancementNext';
-
-	/**
-	 * @var string
-	 */
-	public const CONFIG_ARTICLE_TOOLS = 'VectorArticleTools';
-
-	/**
-	 * @var string
-	 */
-	public const REQUIREMENT_ARTICLE_TOOLS = 'ArticleTools';
-
-	/**
-	 * @var string
-	 */
-	public const FEATURE_ARTICLE_TOOLS = 'ArticleTools';
-
 	/**
 	 * This class is for namespacing constants only. Forbid construction.
 	 * @throws FatalError
--- a/includes/FeatureManagement/FeatureManager.php
+++ b/includes/FeatureManagement/FeatureManager.php
@ -126,21 +126,6 @@ final class FeatureManager {
 		$this->features[$feature] = $requirements;
 	}

-	/**
-	 * Return a list of classes that should be added to the body tag
-	 *
-	 * @return array
-	 */
-	public function getFeatureBodyClass() {
-		$featureManager = $this;
-		return array_map( static function ( $featureName ) use ( $featureManager ) {
-			// switch to lower case and switch from camel case to hyphens
-			$featureClass = ltrim( strtolower( preg_replace( '/[A-Z]([A-Z](?![a-z]))*/', '-$0', $featureName ) ), '-' );
-			$prefix = 'vector-feature-' . $featureClass . '-';
-			return $featureManager->isFeatureEnabled( $featureName ) ? $prefix . 'enabled' : $prefix . 'disabled';
-		}, array_keys( $this->features ) );
-	}
-
 	/**
 	 * Gets whether the feature's requirements are met.
 	 *
--- a/includes/FeatureManagement/Requirements/TableOfContentsTreatmentRequirement.php
+++ b/includes/FeatureManagement/Requirements/TableOfContentsTreatmentRequirement.php
@ -6,7 +6,6 @@ use CentralIdLookup;
 use Config;
 use MediaWiki\Skins\Vector\Constants;
 use MediaWiki\Skins\Vector\FeatureManagement\Requirement;
-use RuntimeException;
 use User;

 /**
@ -52,7 +51,7 @@ final class TableOfContentsTreatmentRequirement implements Requirement {
 	 * @inheritDoc
 	 */
 	public function getName(): string {
-		return Constants::REQUIREMENT_TABLE_OF_CONTENTS_AB_TEST;
+		return Constants::REQUIREMENT_TABLE_OF_CONTENTS;
 	}

 	/**
@ -63,17 +62,8 @@ final class TableOfContentsTreatmentRequirement implements Requirement {
 	 */
 	public function isMet(): bool {
 		$currentAbTest = $this->config->get( Constants::CONFIG_WEB_AB_TEST_ENROLLMENT );
-		$isTOCExperiment = $currentAbTest['name'] === 'skin-vector-toc-experiment';
-		if ( $isTOCExperiment && $currentAbTest['enabled'] && $this->user->isRegistered() ) {
+		if ( $currentAbTest['enabled'] && $this->user->isRegistered() ) {
 			$id = null;
-			$buckets = $currentAbTest['buckets'] ?? [];
-			$control = $buckets['control']['samplingRate'] ?? -1;
-			$unsampled = $buckets['unsampled']['samplingRate'] ?? -1;
-			$numBuckets = count( array_keys( $buckets ) );
-			if ( $unsampled !== 0 || $control !== 0.5 || $numBuckets !== 3 ) {
-				throw new RuntimeException( 'TableOfContents A/B test only supports 3 buckets with 0 unsampled.' );
-			}
-
 			if ( $this->centralIdLookup ) {
 				$id = $this->centralIdLookup->centralIdFromLocalUser( $this->user );
 			}
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@ -98,7 +98,7 @@ class Hooks implements
 		Config $config
 	) {
 		return [
-			'wgVectorSearchApiUrl' => $config->get( 'VectorSearchApiUrl' ),
+			'wgVectorSearchHost' => $config->get( 'VectorSearchHost' ),
 			'wgVectorWebABTestEnrollment' => self::getActiveABTest( $config ),
 		];
 	}
@ -153,7 +153,7 @@ class Hooks implements
 	}

 	/**
-	 * Moves watch item from actions to views menu.
+	 * Transforms watch item inside the action navigation menu
 	 *
 	 * @param array &$content_navigation
 	 */
@ -167,87 +167,47 @@ class Hooks implements
 		}

 		// Promote watch link from actions to views and add an icon
-		// The second check to isset is pointless but shuts up phan.
-		if ( $key !== null && isset( $content_navigation['actions'][ $key ] ) ) {
+		if ( $key !== null ) {
+			self::appendClassToListItem(
+				$content_navigation['actions'][$key],
+				'icon'
+			);
 			$content_navigation['views'][$key] = $content_navigation['actions'][$key];
 			unset( $content_navigation['actions'][$key] );
 		}
 	}

 	/**
-	 * Adds icons to items in the "views" menu.
+	 * Updates class list on list item
 	 *
-	 * @param array &$content_navigation
-	 * @param bool $isLegacy is this the legacy Vector skin?
+	 * @param array &$item to update for use in makeListItem
+	 * @param array $classes to add to the item
+	 * @param bool $applyToLink (optional) and defaults to false.
+	 *   If set will modify `link-class` instead of `class`
 	 */
-	private static function updateViewsMenuIcons( &$content_navigation, $isLegacy ) {
-		$featureManager = VectorServices::getFeatureManager();
-		$visualEnhancements = $featureManager->isFeatureEnabled( Constants::FEATURE_VISUAL_ENHANCEMENTS );
+	private static function addListItemClass( &$item, $classes, $applyToLink = false ) {
+		$property = $applyToLink ? 'link-class' : 'class';
+		$existingClass = $item[$property] ?? [];

-		foreach ( $content_navigation['views'] as $key => $item ) {
-			$icon = $item['icon'] ?? null;
-			if ( $icon ) {
-				if ( $isLegacy || !$featureManager->isFeatureEnabled( Constants::FEATURE_VISUAL_ENHANCEMENTS ) ) {
-					self::appendClassToItem(
-						$item['class'],
-						[ 'icon' ]
-					);
-				} else {
-					// Force the item as a button with hidden text.
-					$item['button'] = true;
-					$item['text-hidden'] = true;
-					$item = self::updateMenuItemData( $item, true );
-				}
-			} else {
-				self::appendClassToItem(
-					$item['class'],
-					[ 'vector-tab-noicon' ]
-				);
-			}
-			$content_navigation['views'][$key] = $item;
-		}
-	}
-
-	/**
-	 * All associated pages menu items do not have icons so are given the vector-tab-noicon class.
-	 *
-	 * @param array &$content_navigation
-	 */
-	private static function updateAssociatedPagesMenuIcons( &$content_navigation ) {
-		foreach ( $content_navigation['associated-pages'] as $key => $item ) {
-			self::appendClassToItem(
-				$item['class'],
-				[ 'vector-tab-noicon' ]
-			);
-			$content_navigation['associated-pages'][$key] = $item;
-		}
-	}
-
-	/**
-	 * Adds class to a property
-	 *
-	 * @param array &$item to update
-	 * @param array|string $classes to add to the item
-	 */
-	private static function appendClassToItem( &$item, $classes ) {
-		$existingClasses = $item;
-
-		if ( is_array( $existingClasses ) ) {
-			// Treat as array
-			$newArrayClasses = is_array( $classes ) ? $classes : [ trim( $classes ) ];
-			$item = array_merge( $existingClasses, $newArrayClasses );
-		} elseif ( is_string( $existingClasses ) ) {
-			// Treat as string
-			$newStrClasses = is_string( $classes ) ? trim( $classes ) : implode( ' ', $classes );
-			$item .= ' ' . $newStrClasses;
+		if ( is_array( $existingClass ) ) {
+			$item[$property] = array_merge( $existingClass, $classes );
+		} elseif ( is_string( $existingClass ) ) {
+			// treat as string
+			$item[$property] = array_merge( [ $existingClass ], $classes );
 		} else {
-			// Treat as whatever $classes is
-			$item = $classes;
+			$item[$property] = $classes;
 		}
+	}

-		if ( is_string( $item ) ) {
-			$item = trim( $item );
-		}
+	/**
+	 * Updates the class on an existing item taking into account whether
+	 * a class exists there already.
+	 *
+	 * @param array &$item
+	 * @param string $newClass
+	 */
+	private static function appendClassToListItem( &$item, $newClass ) {
+		self::addListItemClass( $item, [ $newClass ] );
 	}

 	/**
@ -267,12 +227,12 @@ class Hooks implements
 			if ( isset( $content_navigation['user-page']['tmpuserpage'] ) ) {
 				$content_navigation['user-page']['tmpuserpage']['collapsible'] = true;
 				$content_navigation['user-page']['tmpuserpage'] =
-					self::updateMenuItemData( $content_navigation['user-page']['tmpuserpage'] );
+					self::updateMenuItem( $content_navigation['user-page']['tmpuserpage'] );
 			}
 			if ( isset( $content_navigation['user-menu']['tmpuserpage'] ) ) {
 				$content_navigation['user-menu']['tmpuserpage']['collapsible'] = true;
 				$content_navigation['user-menu']['tmpuserpage'] =
-					self::updateMenuItemData( $content_navigation['user-menu']['tmpuserpage'] );
+					self::updateMenuItem( $content_navigation['user-menu']['tmpuserpage'] );
 			}
 		} elseif ( $isRegistered ) {
 			// Remove user page from personal menu dropdown for logged in use
@ -317,8 +277,6 @@ class Hooks implements
 	private static function updateUserLinksOverflowItems( $sk, &$content_navigation ) {
 		$overflow = 'vector-user-menu-overflow';
 		$content_navigation[$overflow] = [];
-		$featureManager = VectorServices::getFeatureManager();
-		$visualEnhancements = $featureManager->isFeatureEnabled( Constants::FEATURE_VISUAL_ENHANCEMENTS );

 		// Logged in and logged out overflow items
 		if ( isset( $content_navigation['user-interface-preferences']['uls'] ) ) {
@ -342,22 +300,6 @@ class Hooks implements
 		if ( isset( $content_navigation['notifications'] ) ) {
 			foreach ( $content_navigation['notifications'] as $key => $data ) {
 				$content_navigation[$overflow][$key] = $data;
-				$icon = $data['icon'] ?? null;
-				if ( $visualEnhancements && $icon ) {
-					$linkClass = $content_navigation[$overflow][$key]['link-class'];
-					$item = $content_navigation[$overflow][$key];
-					$newLinkClass = [
-						// Allows Echo to react to clicks
-						'mw-echo-notification-badge-nojs'
-					];
-					if ( in_array( 'mw-echo-unseen-notifications', $linkClass ) ) {
-						$newLinkClass[] = 'mw-echo-unseen-notifications';
-					}
-					$item['button'] = true;
-					$item['text-hidden'] = true;
-					$item['link-class'] = $newLinkClass;
-					$content_navigation[$overflow][$key] = $item;
-				}
 			}
 		}
 		if ( isset( $content_navigation['user-menu']['watchlist'] ) ) {
@ -418,7 +360,10 @@ class Hooks implements
 	 */
 	private static function makeMenuItemCollapsible( array &$item, string $prefix = 'user-links-' ) {
 		$COLLAPSE_MENU_ITEM_CLASS = $prefix . 'collapsible-item';
-		self::appendClassToItem( $item[ 'class' ], $COLLAPSE_MENU_ITEM_CLASS );
+		self::appendClassToListItem(
+			$item,
+			$COLLAPSE_MENU_ITEM_CLASS
+		);
 	}

 	/**
@ -434,16 +379,14 @@ class Hooks implements
 	}

 	/**
-	 * Update template data to include classes and html that handle buttons, icons, and collapsible items.
+	 * Updates template data for Vector menu items.
 	 *
-	 * @internal for use inside Vector skin.
-	 * @param array $item data to update
-	 * @param string $buttonClassProp property to append button classes
-	 * @param string $iconHtmlProp property to set icon HTML
-	 * @param bool $isSmallIcon when set a small icon will be applied rather than the standard icon size
-	 * @return array $item Updated data
+	 * @param array $item Menu data to update
+	 * @param bool $isLinkData false if data is for li element (i.e. makeListItem()),
+	 * true if for link element (i.e. makeLink())
+	 * @return array $item Updated menu data
 	 */
-	private static function updateItemData( $item, $buttonClassProp, $iconHtmlProp, $isSmallIcon = false ) {
+	public static function updateMenuItem( $item, $isLinkData = false ) {
 		$hasButton = $item['button'] ?? false;
 		$hideText = $item['text-hidden'] ?? false;
 		$isCollapsible = $item['collapsible'] ?? false;
@ -452,12 +395,11 @@ class Hooks implements
 		unset( $item['icon'] );
 		unset( $item['text-hidden'] );
 		unset( $item['collapsible'] );
-
 		if ( $isCollapsible ) {
 			self::makeMenuItemCollapsible( $item );
 		}
 		if ( $hasButton ) {
-			self::appendClassToItem( $item[ $buttonClassProp ], [ 'mw-ui-button', 'mw-ui-quiet' ] );
+			self::addListItemClass( $item, [ 'mw-ui-button', 'mw-ui-quiet' ], !$isLinkData );
 		}
 		if ( $icon ) {
 			if ( $hideText ) {
@ -468,54 +410,14 @@ class Hooks implements
 					// We should seek to remove all these instances.
 					'mw-ui-icon-wikimedia-' . $icon
 				];
-				if ( $isSmallIcon ) {
-					$iconElementClasses[] = 'mw-ui-icon-small';
-				}
-				self::appendClassToItem( $item[ $buttonClassProp ], $iconElementClasses );
+				self::addListItemClass( $item, $iconElementClasses, !$isLinkData );
 			} else {
-				$item[ $iconHtmlProp ] = self::makeIcon( $icon );
+				$item['link-html'] = self::makeIcon( $icon );
 			}
 		}
 		return $item;
 	}

-	/**
-	 * Updates template data for Vector dropdown menus.
-	 *
-	 * @param array $item Menu data to update
-	 * @return array $item Updated menu data
-	 */
-	public static function updateDropdownMenuData( $item ) {
-		$buttonClassProp = 'heading-class';
-		$iconHtmlProp = 'html-vector-heading-icon';
-		return self::updateItemData( $item, $buttonClassProp, $iconHtmlProp );
-	}
-
-	/**
-	 * Updates template data for Vector link items.
-	 *
-	 * @param array $item link data to update
-	 * @return array $item Updated link data
-	 */
-	public static function updateLinkData( $item ) {
-		$buttonClassProp = 'class';
-		$iconHtmlProp = 'link-html';
-		return self::updateItemData( $item, $buttonClassProp, $iconHtmlProp );
-	}
-
-	/**
-	 * Updates template data for Vector menu items.
-	 *
-	 * @param array $item menu item data to update
-	 * @param bool $isSmallIcon when set a small icon will be applied rather than the standard icon size
-	 * @return array $item Updated menu item data
-	 */
-	public static function updateMenuItemData( $item, $isSmallIcon = false ) {
-		$buttonClassProp = 'link-class';
-		$iconHtmlProp = 'link-html';
-		return self::updateItemData( $item, $buttonClassProp, $iconHtmlProp, $isSmallIcon );
-	}
-
 	/**
 	 * Updates user interface preferences for modern Vector to upgrade icon/button menu items.
 	 *
@ -524,7 +426,7 @@ class Hooks implements
 	 */
 	private static function updateMenuItems( &$content_navigation, $menu ) {
 		foreach ( $content_navigation[$menu] as $key => $item ) {
-			$content_navigation[$menu][$key] = self::updateMenuItemData( $item );
+			$content_navigation[$menu][$key] = self::updateMenuItem( $item );
 		}
 	}

@ -569,27 +471,19 @@ class Hooks implements
 		$title = $sk->getRelevantTitle();

 		$skinName = $sk->getSkinName();
-		// These changes should only happen in Vector.
-		if ( !$skinName || !self::isVectorSkin( $skinName ) ) {
-			return;
-		}
+		if ( self::isVectorSkin( $skinName ) ) {
+			if (
+				$sk->getConfig()->get( 'VectorUseIconWatch' ) &&
+				$title && $title->canExist()
+			) {
+				self::updateActionsMenu( $content_navigation );
+			}

-		if (
-			$sk->getConfig()->get( 'VectorUseIconWatch' ) &&
-			$title && $title->canExist()
-		) {
-			self::updateActionsMenu( $content_navigation );
+			self::updateUserLinksItems( $sk, $content_navigation );
 		}
-
-		self::updateUserLinksItems( $sk, $content_navigation );
 		if ( $skinName === Constants::SKIN_NAME_MODERN ) {
 			self::createMoreOverflowMenu( $content_navigation );
 		}
-
-		// The updating of the views menu happens /after/ the overflow menu has been created
-		// this avoids icons showing in the more overflow menu.
-		self::updateViewsMenuIcons( $content_navigation, self::isSkinVersionLegacy( $skinName ) );
-		self::updateAssociatedPagesMenuIcons( $content_navigation );
 	}

 	/**
@ -726,12 +620,10 @@ class Hooks implements
 			$bodyAttrs['class'] .= ' skin-vector-disable-max-width';
 		}

-		// TOC is not collapsed by default
-		$bodyAttrs['class'] .= ' vector-toc-not-collapsed';
-
 		$featureManager = VectorServices::getFeatureManager();
-		$bodyAttrs['class'] .= ' ' . implode( ' ', $featureManager->getFeatureBodyClass() );
-		$bodyAttrs['class'] = trim( $bodyAttrs['class'] );
+		if ( $featureManager->isFeatureEnabled( Constants::FEATURE_LANGUAGE_IN_MAIN_PAGE_HEADER ) ) {
+			$bodyAttrs['class'] .= ' vector-language-in-header-enabled';
+		}
 	}

 	/**
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@ -53,7 +53,8 @@ return [
 				$services->getCentralIdLookupFactory()->getNonLocalLookup(),
 				Constants::CONFIG_KEY_LANGUAGE_IN_HEADER,
 				Constants::REQUIREMENT_LANGUAGE_IN_HEADER,
-				null
+				null,
+				Constants::CONFIG_LANGUAGE_IN_HEADER_TREATMENT_AB_TEST
 			)
 		);

@ -62,9 +63,13 @@ return [
 		// Temporary T286932 - remove after languages A/B test is finished.
 		$requirementName = 'T286932';

-		// MultiConfig checks each config in turn, allowing us to override the main config for specific keys.
+		// MultiConfig checks each config in turn, allowing us to override the main config for specific keys. In this
+		// case, override the "VectorLanguageInHeaderABTest" configuration value so that the following requirement
+		// always buckets the user as if the language treatment A/B test were running.
 		$config = new MultiConfig( [
-			new HashConfig( [] ),
+			new HashConfig( [
+				Constants::CONFIG_LANGUAGE_IN_HEADER_TREATMENT_AB_TEST => true,
+			] ),
 			$services->getMainConfig(),
 		] );

@ -76,7 +81,8 @@ return [
 				$services->getCentralIdLookupFactory()->getNonLocalLookup(),
 				Constants::CONFIG_KEY_LANGUAGE_IN_HEADER,
 				$requirementName,
-				/* $overrideName = */ ''
+				/* $overrideName = */ '',
+				Constants::CONFIG_LANGUAGE_IN_HEADER_TREATMENT_AB_TEST
 			)
 		);

@ -193,51 +199,10 @@ return [
 		);

 		$featureManager->registerFeature(
-			Constants::FEATURE_TABLE_OF_CONTENTS_AB_TEST,
+			Constants::FEATURE_TABLE_OF_CONTENTS,
 			[
 				Constants::REQUIREMENT_FULLY_INITIALISED,
-				Constants::REQUIREMENT_TABLE_OF_CONTENTS_AB_TEST,
-			]
-		);
-
-		// Temporary feature: Visual enhancements
-		// ================================
-		$featureManager->registerRequirement(
-			new OverridableConfigRequirement(
-				$services->getMainConfig(),
-				$context->getUser(),
-				$context->getRequest(),
-				$services->getCentralIdLookupFactory()->getNonLocalLookup(),
-				Constants::CONFIG_KEY_VISUAL_ENHANCEMENTS,
-				Constants::REQUIREMENT_VISUAL_ENHANCEMENTS
-			)
-		);
-
-		$featureManager->registerFeature(
-			Constants::FEATURE_VISUAL_ENHANCEMENTS,
-			[
-				Constants::REQUIREMENT_FULLY_INITIALISED,
-				Constants::REQUIREMENT_VISUAL_ENHANCEMENTS,
-			]
-		);
-
-		// Feature: Article tools menu
-		// ================================
-		$featureManager->registerRequirement(
-			new OverridableConfigRequirement(
-				$services->getMainConfig(),
-				$context->getUser(),
-				$context->getRequest(),
-				null,
-				Constants::CONFIG_ARTICLE_TOOLS,
-				Constants::REQUIREMENT_ARTICLE_TOOLS
-			)
-		);
-		$featureManager->registerFeature(
-			Constants::FEATURE_ARTICLE_TOOLS,
-			[
-				Constants::REQUIREMENT_FULLY_INITIALISED,
-				Constants::REQUIREMENT_ARTICLE_TOOLS,
+				Constants::REQUIREMENT_TABLE_OF_CONTENTS,
 			]
 		);

--- a/includes/SkinVector.php
+++ b/includes/SkinVector.php
@ -126,7 +126,9 @@ abstract class SkinVector extends SkinMustache {
 	];
 	private const SEARCH_SHOW_THUMBNAIL_CLASS = 'vector-search-box-show-thumbnail';
 	private const SEARCH_AUTO_EXPAND_WIDTH_CLASS = 'vector-search-box-auto-expand-width';
+	private const CLASS_QUIET_BUTTON = 'mw-ui-button mw-ui-quiet';
 	private const CLASS_PROGRESSIVE = 'mw-ui-progressive';
+	private const CLASS_ICON_BUTTON = 'mw-ui-icon mw-ui-icon-element';

 	/**
 	 * T243281: Code used to track clicks to opt-out link.
@ -140,6 +142,17 @@ abstract class SkinVector extends SkinMustache {
 	 */
 	private const OPT_OUT_LINK_TRACKING_CODE = 'vctw1';

+	/**
+	 * @param string $icon the name of the icon without wikimedia- prefix.
+	 * @return string
+	 */
+	private function iconClass( $icon ) {
+		if ( $icon ) {
+			return 'mw-ui-icon-wikimedia-' . $icon;
+		}
+		return '';
+	}
+
 	abstract protected function isLegacy(): bool;

 	/**
@ -222,19 +235,21 @@ abstract class SkinVector extends SkinMustache {
 	/**
 	 * Returns HTML for the create account link inside the anon user links
 	 * @param string[] $returnto array of query strings used to build the login link
+	 * @param bool $isDropdownItem Set true for create account link inside the user menu dropdown
+	 *  which includes icon classes and is not styled like a button
 	 * @return string
 	 */
-	private function getCreateAccountHTML( $returnto ) {
+	private function getCreateAccountHTML( $returnto, $isDropdownItem ) {
 		$createAccountData = $this->buildCreateAccountData( $returnto );
 		$createAccountData = array_merge( $createAccountData, [
-			'class' => [
+			'class' => $isDropdownItem ? [
 				'vector-menu-content-item',
-			],
+			] : '',
 			'collapsible' => true,
-			'icon' => $createAccountData['icon'],
-			'button' => false
+			'icon' => $isDropdownItem ? $createAccountData['icon'] : null,
+			'button' => !$isDropdownItem,
 		] );
-		$createAccountData = Hooks::updateLinkData( $createAccountData );
+		$createAccountData = Hooks::updateMenuItem( $createAccountData, true );
 		return $this->makeLink( 'create-account', $createAccountData );
 	}

@ -250,9 +265,9 @@ abstract class SkinVector extends SkinMustache {
 		$loginLinkData = array_merge( $this->buildLoginData( $returnto, $useCombinedLoginLink ), [
 			'class' => [ 'vector-menu-content-item', 'vector-menu-content-item-login' ],
 		] );
-		$loginLinkData = Hooks::updateLinkData( $loginLinkData );
+		$loginLinkData = Hooks::updateMenuItem( $loginLinkData, true );
 		$templateData = [
-			'htmlCreateAccount' => $this->getCreateAccountHTML( $returnto ),
+			'htmlCreateAccount' => $this->getCreateAccountHTML( $returnto, true ),
 			'htmlLogin' => $this->makeLink( 'login', $loginLinkData ),
 		];

@ -281,7 +296,7 @@ abstract class SkinVector extends SkinMustache {
 		$logoutLinkData = array_merge( $this->buildLogoutLinkData(), [
 			'class' => [ 'vector-menu-content-item', 'vector-menu-content-item-logout' ],
 		] );
-		$logoutLinkData = Hooks::updateLinkData( $logoutLinkData );
+		$logoutLinkData = Hooks::updateMenuItem( $logoutLinkData, true );

 		$templateParser = $this->getTemplateParser();
 		return $templateParser->processTemplate( 'UserLinks__logout', [
@ -364,9 +379,11 @@ abstract class SkinVector extends SkinMustache {
 			'html-items' => '',
 			'html-vector-menu-checkbox-attributes' => 'tabindex="-1"',
 			'html-vector-menu-heading-attributes' => 'tabindex="-1"',
-			'button' => true,
-			'text-hidden' => true,
-			'icon' => 'listBullet'
+			'heading-class' => implode( ' ', [
+				self::CLASS_QUIET_BUTTON,
+				self::CLASS_ICON_BUTTON,
+				$this->iconClass( 'listBullet' )
+			] ),
 		] );

 		// Show sticky ULS if the ULS extension is enabled and the ULS in header is not hidden
@ -642,25 +659,16 @@ abstract class SkinVector extends SkinMustache {
 	}

 	/**
-	 * Get the ULS button label, accounting for the number of available
-	 * languages.
+	 * Returns ULS button label within the context of the translated message taking a placeholder.
 	 *
-	 * @return array
+	 * @param string $message
+	 * @param int $count
+	 * @return string
 	 */
-	private function getULSLabels(): array {
-		$numLanguages = count( $this->getLanguagesCached() );
-
-		if ( $numLanguages === 0 ) {
-			return [
-				'label' => $this->msg( 'vector-no-language-button-label' )->text(),
-				'aria-label' => $this->msg( 'vector-no-language-button-aria-label' )->text()
-			];
-		} else {
-			return [
-				'label' => $this->msg( 'vector-language-button-label' )->numParams( $numLanguages )->escaped(),
-				'aria-label' => $this->msg( 'vector-language-button-aria-label' )->numParams( $numLanguages )->escaped()
-			];
-		}
+	private function getULSLabel( string $message, int $count ): string {
+		return $this->msg( $message )
+			->numParams( $count )
+			->escaped();
 	}

 	/**
@ -694,7 +702,7 @@ abstract class SkinVector extends SkinMustache {
 			'class' => 'mw-interlanguage-selector',
 			'is-quiet' => true,
 			'tabindex' => '-1',
-			'label' => $this->getULSLabels()[ 'label' ],
+			'label' => $this->getULSLabel( 'vector-language-button-label', $numLanguages ),
 			'html-vector-button-icon' => Hooks::makeIcon( 'wikimedia-language' ),
 			'event' => 'ui.dropdown-p-lang-btn-sticky-header'
 		];
@ -710,13 +718,19 @@ abstract class SkinVector extends SkinMustache {

 		$languageButtonData = [
 			'id' => 'p-lang-btn',
-			'label' => $this->getULSLabels()['label'],
-			'aria-label' => $this->getULSLabels()['aria-label'],
+			// No languages present for the article.
+			// But the page can show languages if there were languages.
+			'label' => $numLanguages === 0 ?
+				$this->msg( 'vector-no-language-button-label' )->text() :
+				$this->getULSLabel( 'vector-language-button-label', $numLanguages ),
+			'aria-label' => $numLanguages === 0 ?
+				$this->msg( 'vector-no-language-button-aria-label' )->text() :
+				$this->getULSLabel( 'vector-language-button-aria-label', $numLanguages ),
 			// ext.uls.interface attaches click handler to this selector.
 			'checkbox-class' => ' mw-interlanguage-selector ',
-			'icon' => 'language-progressive',
-			'button' => true,
-			'heading-class' => self::CLASS_PROGRESSIVE . ' mw-portlet-lang-heading-' . strval( $numLanguages ),
+			'html-vector-heading-icon' => Hooks::makeIcon( 'wikimedia-language-progressive' ),
+			'heading-class' => self::CLASS_QUIET_BUTTON . ' ' . self::CLASS_PROGRESSIVE .
+				' mw-portlet-lang-heading-' . strval( $numLanguages ),
 		];

 		// Adds class to hide language button
@ -729,43 +743,13 @@ abstract class SkinVector extends SkinMustache {
 	}

 	/**
-	 * Creates portlet data for the user menu dropdown
-	 *
-	 * @param array $portletData
-	 * @return array
-	 */
-	private function getUserMenuPortletData( $portletData ) {
-		// Add target class to apply different icon to personal menu dropdown for logged in users.
-		$portletData['class'] .= ' vector-user-menu';
-		$portletData['class'] .= $this->loggedin ?
-			' vector-user-menu-logged-in' :
-			' vector-user-menu-logged-out';
-		if ( $this->getUser()->isTemp() ) {
-			$icon = 'userAnonymous';
-		} elseif ( $this->loggedin ) {
-			$icon = 'userAvatar';
-		} else {
-			$icon = 'ellipsis';
-			// T287494 We use tooltip messages to provide title attributes on hover over certain menu icons.
-			// For modern Vector, the "tooltip-p-personal" key is set to "User menu" which is appropriate for
-			// the user icon (dropdown indicator for user links menu) for logged-in users.
-			// This overrides the tooltip for the user links menu icon which is an ellipsis for anonymous users.
-			$portletData['html-tooltip'] = Linker::tooltip( 'vector-anon-user-menu-title' );
-		}
-		$portletData['icon'] = $icon;
-		$portletData['button'] = true;
-		$portletData['text-hidden'] = true;
-		return $portletData;
-	}
-
-	/**
-	 * Helper for applying Vector menu classes to portlets
+	 * helper for applying Vector menu classes to portlets
 	 *
 	 * @param array $portletData returned by SkinMustache to decorate
 	 * @param int $type representing one of the menu types (see MENU_TYPE_* constants)
 	 * @return array modified version of portletData input
 	 */
-	private function updatePortletClasses(
+	private function decoratePortletClass(
 		array $portletData,
 		int $type = self::MENU_TYPE_DEFAULT
 	) {
@ -778,17 +762,47 @@ abstract class SkinVector extends SkinMustache {
 		if ( $this->isLegacy() ) {
 			$extraClasses[self::MENU_TYPE_TABS] .= ' vector-menu-tabs-legacy';
 		}
-		$portletData['class'] .= ' ' . $extraClasses[$type];
-
 		if ( !isset( $portletData['heading-class'] ) ) {
 			$portletData['heading-class'] = '';
 		}
-		if ( $type === self::MENU_TYPE_DROPDOWN ) {
-			$portletData = Hooks::updateDropdownMenuData( $portletData );
+		// Add target class to apply different icon to personal menu dropdown for logged in users.
+		if ( $portletData['id'] === 'p-personal' ) {
+			if ( $this->isLegacy() ) {
+				$portletData['class'] .= ' vector-user-menu-legacy';
+			} else {
+				$portletData['class'] .= ' vector-user-menu';
+				$portletData['class'] .= $this->loggedin ?
+					' vector-user-menu-logged-in' :
+					' vector-user-menu-logged-out';
+				$portletData['heading-class'] .= ' ' . self::CLASS_QUIET_BUTTON . ' ' .
+					self::CLASS_ICON_BUTTON . ' ';
+				if ( $this->getUser()->isTemp() ) {
+					$icon = 'userAnonymous';
+				} elseif ( $this->loggedin ) {
+					$icon = 'userAvatar';
+				} else {
+					$icon = 'ellipsis';
+				}
+				$portletData['heading-class'] .= $this->iconClass( $icon );
+			}
+		}
+		switch ( $portletData['id'] ) {
+			case 'p-variants':
+			case 'p-cactions':
+				$portletData['class'] .= ' vector-menu-dropdown-noicon';
+				break;
+			case 'p-vector-user-menu-overflow':
+				$portletData['class'] .= ' vector-user-menu-overflow';
+				break;
+			default:
+				break;
 		}

-		$portletData['class'] = trim( $portletData['class'] );
-		$portletData['heading-class'] = trim( $portletData['heading-class'] );
+		if ( $portletData['id'] === 'p-lang' && $this->isLanguagesInContent() ) {
+			$portletData = array_merge( $portletData, $this->getULSPortletData() );
+		}
+		$class = $portletData['class'];
+		$portletData['class'] = trim( "$class $extraClasses[$type]" );
 		return $portletData;
 	}

@ -833,19 +847,14 @@ abstract class SkinVector extends SkinMustache {
 		string $key,
 		array $portletData
 	): array {
-		$isIconDropdown = false;
 		switch ( $key ) {
 			case 'data-user-menu':
-				$type = self::MENU_TYPE_DROPDOWN;
-				$isIconDropdown = true;
-				break;
 			case 'data-actions':
 			case 'data-variants':
 			case 'data-sticky-header-toc':
 				$type = self::MENU_TYPE_DROPDOWN;
 				break;
 			case 'data-views':
-			case 'data-associated-pages':
 			case 'data-namespaces':
 				$type = self::MENU_TYPE_TABS;
 				break;
@ -864,29 +873,10 @@ abstract class SkinVector extends SkinMustache {
 				break;
 		}

-		if ( $key === 'data-languages' && $this->isLanguagesInContent() ) {
-			$portletData = array_merge( $portletData, $this->getULSPortletData() );
-		}
-
-		if ( $key === 'data-user-menu' && !$this->isLegacy() ) {
-			$portletData = $this->getUserMenuPortletData( $portletData );
-		}
-
-		if ( $key === 'data-vector-user-menu-overflow' ) {
-			$portletData['class'] .= ' vector-user-menu-overflow';
-		}
-
-		$isDropdown = $type === self::MENU_TYPE_DROPDOWN;
-		if ( $isDropdown && !$isIconDropdown ) {
-			$portletData['class'] .= ' vector-menu-dropdown-noicon';
-		}
-
-		if ( $key === 'data-personal' && $this->isLegacy() ) {
-			// Set tooltip to empty string for the personal menu for both logged-in and logged-out users
-			// to avoid showing the tooltip for legacy version.
-			$portletData['html-tooltip'] = '';
-			$portletData['class'] .= ' vector-user-menu-legacy';
-		}
+		$portletData = $this->decoratePortletClass(
+			$portletData,
+			$type
+		);

 		// Special casing for Variant to change label to selected.
 		// Hopefully we can revisit and possibly remove this code when the language switcher is moved.
@ -901,13 +891,22 @@ abstract class SkinVector extends SkinMustache {
 			$portletData['aria-label'] = $this->msg( 'vector-language-variant-switcher-label' );
 		}

-		$portletData = $this->updatePortletClasses(
-			$portletData,
-			$type
-		);
+		// T287494 We use tooltip messages to provide title attributes on hover over certain menu icons. For modern
+		// Vector, the "tooltip-p-personal" key is set to "User menu" which is appropriate for the user icon (dropdown
+		// indicator for user links menu) for logged-in users. This overrides the tooltip for the user links menu icon
+		// which is an ellipsis for anonymous users.
+		if ( $key === 'data-user-menu' && !$this->isLegacy() && !$this->loggedin ) {
+			$portletData['html-tooltip'] = Linker::tooltip( 'vector-anon-user-menu-title' );
+		}
+
+		// Set tooltip to empty string for the personal menu for both logged-in and logged-out users to avoid showing
+		// the tooltip for legacy version.
+		if ( $key === 'data-personal' && $this->isLegacy() ) {
+			$portletData['html-tooltip'] = '';
+		}

 		return $portletData + [
-			'is-dropdown' => $isDropdown,
+			'is-dropdown' => $type === self::MENU_TYPE_DROPDOWN,
 			'is-portal' => $type === self::MENU_TYPE_PORTAL,
 		];
 	}
--- a/includes/SkinVector22.php
+++ b/includes/SkinVector22.php
@ -45,7 +45,7 @@ class SkinVector22 extends SkinVector {
 	 */
 	public function isUserInTocTreatmentBucket(): bool {
 		$featureManager = VectorServices::getFeatureManager();
-		return !$featureManager->isFeatureEnabled( Constants::FEATURE_TABLE_OF_CONTENTS_AB_TEST );
+		return $featureManager->isFeatureEnabled( Constants::FEATURE_TABLE_OF_CONTENTS );
 	}

 	/**
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
bwang	8a5962a2c7	Fix site notice spacing - Removes grid row gap in favor of margins - Add container div around site notice to allow margin collapsing Bug: T315595 Change-Id: I39959f43f20880e83bef945a7535d58cfe0b6412	2022-08-29 12:07:08 -05:00
Jan Drewniak	fe3382ea74	Add clearfix to .mw-body-subheader Clears the indicators and subtitle in modern Vector. Bug: T316134 Bug: T316095 Change-Id: I49a4801320f9680c75b2bdcb6e5704e3db70b38b	2022-08-25 11:41:06 -05:00
Jon Robson	66bcb6c2df	Vector legacy no longer imports variables from Vector modern In `f7f78023e` we added new variables to the Vector 2022 variables that overrode the defaults, but forgot to preserve the defaults in Vector legacy. This resulted in changes documented in T213778#8181795 Going forward it makes sense to separate these. Bug: T213778 Change-Id: I5e4f1729fc0f41b21579807fc83a7dda9c3519ea (cherry picked from commit `2be7ce5c47`)	2022-08-24 15:52:44 +00:00
Urbanecm	9864380758	Revert "Remove grid row gap in favor of margins" This reverts commit `d931ca99ed`. Reason for revert: makes the problem worse, per jan_drewniak Change-Id: I274dc9b5bf3397e5a11ebca9b9277879b797ffb2	2022-08-23 21:05:52 +00:00
bwang	d931ca99ed	Remove grid row gap in favor of margins Bug: T315595 Change-Id: Ibf837775d972deb29e9619cc6c12c919aae5155a	2022-08-23 20:29:13 +00:00