Introduces skin- prefixed message key for nav items

This takes precedent over the other messages e.g. action-protect

Since only 3 messages clash with the protection forms, only 3 are
ported for now.

The action-protect, action-move and action-undelete are reverted
to their old values as they were in
98fa55566a9df1d6dd74654979f890d75c602220

Bug: T303012
Change-Id: I5594ba4d1a60d141dbcc5ac3bd97428f765709d6

includes/skins/SkinTemplate.php

@@ -1128,7 +1128,8 @@ private function getSkinNavOverrideableLabel( $labelMessageKey, $param = null )
 		$skname = $this->skinname;
 		$msg = wfMessageFallback(
 				"$skname-$labelMessageKey",
-
+				"skin-$labelMessageKey",
+				// @todo: Can be removed when every $labelMessageKey has a `skin-` prefixed message alternative.
 				$labelMessageKey,
 				// @todo: This line can be removed when all the new message keys have been added and translated.
 				// When not defined, since this code is temporary, simply give it the same message as before,

languages/i18n/ab.json

@@ -434,5 +434,7 @@
 	"special-characters-group-cyrillic": "Акирилица",
 	"special-characters-group-arabic": "Араԥтә",
 	"view-view-foreign": "Асаит $1 аҟны ахәаԥштәуп",
-	"nstab-mainpage": "Ихадоу адаҟьа"
+	"nstab-mainpage": "Ихадоу адаҟьа",
+	"skin-action-delete": "Ианыхтәуп",
+	"skin-action-move": "Ахьӡ аԥсахра"
 }

languages/i18n/abs.json

@@ -511,5 +511,6 @@
 	"duration-days": "$1 {{PLURAL:$1|hari}}",
 	"view-view-foreign": "Lia di $1",
 	"view-create-local": "Kas tamba deskripsi lokal",
-	"nstab-mainpage": "Kintal muka"
+	"nstab-mainpage": "Kintal muka",
+	"skin-action-move": "Kas pindah"
 }

languages/i18n/ace.json

@@ -742,7 +742,7 @@
 	"action-edit": "peusaneut laman nyoë",
 	"action-createpage": "peugöt laman",
 	"action-createaccount": "peugöt akun ureueng nyoe",
-	"action-move": "Pupinah",
+	"action-move": "Peupinah laman nyoë",
 	"action-delete": "Sampôh",
 	"action-undelete": "Bateuë sampôh",
 	"action-protect": "Peulindông",
@@ -1346,5 +1346,9 @@
 	"view-view-foreign": "Eu bak $1",
 	"view-create-local": "Tamah deskripsi lokal",
 	"nstab-mainpage": "Ôn keue",
-	"view-edit-local": "Peusaneut keutrangan lokal"
+	"view-edit-local": "Peusaneut keutrangan lokal",
+	"skin-action-protect": "Peulindông",
+	"skin-action-undelete": "Bateuë sampôh",
+	"skin-action-delete": "Sampôh",
+	"skin-action-move": "Pupinah"
 }

languages/i18n/ady-cyrl.json

@@ -698,19 +698,19 @@
 	"action-createaccount": "мы нэбгырэм и аккаунт ублэн",
 	"action-history": "мы нэкIубгъом и тарихъым еплъын",
 	"action-minoredit": "мы еIэзэныгъэр цIыкIоу гъэнаф",
-	"action-move": "Хьы",
+	"action-move": "мы нэкIубгъом ыцIэ хъожь",
 	"action-move-subpages": "хьы мы нэкIубгъори, кIэтнэкIубгъохэри",
 	"action-move-categorypages": "хьы категорием и нэкIубгъохэр",
 	"action-movefile": "хьы мы файлыр",
 	"action-upload": "илъхь мы файлэр",
 	"action-reupload": "мы файлыр икIэу къэтхыжь",
 	"action-upload_by_url": "илъхь мы файлыр мы URL-кIэ",
 	"action-writeapi": "еIэзэныгъэмэ апае API гъэфедэн",
-	"action-delete": "ТегъэкӀ",
+	"action-delete": "мы нэкIубгъор тегъэкI",
 	"action-deleterevision": "мы версиер тегъэкI",
 	"action-deletedhistory": "мы нэкIубгъом и тегъэкIыгъэ тарихъым еплъын",
 	"action-browsearchive": "тегъэкIыжьыгъэ нэкIубгъомэ алъыхъу",
-	"action-undelete": "УмылъэкӀ",
+	"action-undelete": "мы нэкIубгъор теМыгъэкI",
 	"action-suppressrevision": "еплъи зэтегъэуцожь мы гъэбылъыгъэ версиер",
 	"action-protect": "Ухъум",
 	"action-import": "нэмыкI виким нэкIубгъохэр къих",
@@ -1234,5 +1234,9 @@
 	"view-view-foreign": "Сайтэу $1-м къыщыгъэлъагъу",
 	"view-create-local": "Хьанэгъунэ гурыӀоныгъэ пыдзэжь",
 	"nstab-mainpage": "НэкӀубгъо шъхьаӀ",
-	"view-edit-local": "Хьанэгъунэ гурыӀоныгъэм еIэзэн"
+	"view-edit-local": "Хьанэгъунэ гурыӀоныгъэм еIэзэн",
+	"skin-action-protect": "Ухъум",
+	"skin-action-undelete": "УмылъэкӀ",
+	"skin-action-delete": "ТегъэкӀ",
+	"skin-action-move": "Хьы"
 }

languages/i18n/aeb-arab.json

@@ -768,5 +768,8 @@
 	"logentry-newusers-create": "إتحلّ حساب {{GENDER:$2|المستعمل|المستعملة}} $1",
 	"searchsuggest-search": "لوّج في {{SITENAME}}",
 	"view-view-foreign": "ورّي على $1",
-	"nstab-mainpage": "الپاج الأولانيّة"
+	"nstab-mainpage": "الپاج الأولانيّة",
+	"skin-action-undelete": "استرجع الحذف",
+	"skin-action-delete": "احذف",
+	"skin-action-move": "حوّل"
 }

languages/i18n/aeb-latn.json

@@ -424,5 +424,7 @@
 	"specialpages": "Safḩāt spēsyāl",
 	"logentry-upload-upload": "$1 {{GENDER:$2|şab|şabbit}} $3",
 	"searchsuggest-search": "Lawwij",
-	"view-view-foreign": "Cūf ģlā $1"
+	"view-view-foreign": "Cūf ģlā $1",
+	"skin-action-protect": "Ħàmi",
+	"skin-action-move": "Ḩawwil"
 }

languages/i18n/af.json

@@ -1071,7 +1071,7 @@
 	"action-createaccount": "skep die gebruiker",
 	"action-history": "wys die bladsy se geskiedenis",
 	"action-minoredit": "merk die wysiging as 'n klein verandering",
-	"action-move": "Skuif",
+	"action-move": "skuif die bladsy",
 	"action-move-subpages": "skuif die bladsy met sy subbladsye",
 	"action-move-rootuserpages": "gebruikersbladsye van die hoogste vlak te skuif nie",
 	"action-move-categorypages": "skuif kategoriebladsye",
@@ -1081,15 +1081,15 @@
 	"action-reupload-shared": "die lêer op te laai, terwyl daar reeds 'n lêer met dieselfde naam in die gedeelde lêerbank is nie",
 	"action-upload_by_url": "laai die lêer vanaf 'n URL",
 	"action-writeapi": "die API te gebruik nie",
-	"action-delete": "Skrap",
+	"action-delete": "verwyder die bladsy",
 	"action-deleterevision": "skrap die weergawe",
 	"action-deletedhistory": "wys die bladsy se verwyderingsgeskiedenis",
 	"action-browsearchive": "te soek vir geskrapte bladsye nie",
-	"action-undelete": "Ontskrap",
+	"action-undelete": "ontskrap die bladsy",
 	"action-suppressrevision": "hersiening en terugplaas van hierdie verborge weergawe",
 	"action-suppressionlog": "na die privaat logboek te kyk nie",
 	"action-block": "blokkeer die gebruiker om wysigings te maak",
-	"action-protect": "Beskerm",
+	"action-protect": "verander veiligheidsvlak van die bladsy",
 	"action-rollback": "rol die wysigings van die laaste gebruiker wat 'n bladsy gewysig het vinnig terug",
 	"action-import": "hierdie bladsy van 'n ander wiki te importeer nie",
 	"action-importupload": "die bladsy van 'n opgelaaide lêer te importeer nie",
@@ -2887,5 +2887,9 @@
 	"view-view-foreign": "Wys op $1",
 	"view-create-local": "Voeg 'n plaaslike beskrywing by",
 	"nstab-mainpage": "Tuisblad",
-	"view-edit-local": "Wysig plaaslike beskrywing"
+	"view-edit-local": "Wysig plaaslike beskrywing",
+	"skin-action-protect": "Beskerm",
+	"skin-action-undelete": "Ontskrap",
+	"skin-action-delete": "Skrap",
+	"skin-action-move": "Skuif"
 }

languages/i18n/aln.json

@@ -720,20 +720,20 @@
 	"action-createtalk": "hap faqe bisedimi",
 	"action-createaccount": "hapë këtë llogari",
 	"action-minoredit": "shëno këtë redaktim si të vogël",
-	"action-move": "Zhvendos",
+	"action-move": "lëviz këtë faqe",
 	"action-move-subpages": "zhvendos këtë faqe dhe nënfaqet që ka",
 	"action-movefile": "lëviz këtë skedë",
 	"action-upload": "ngarko këtë skedë",
 	"action-reupload": "rishkruaj këtë skedë ekzistuese",
 	"action-upload_by_url": "ngarko këtë skedë nga një URL",
-	"action-delete": "Fshij",
+	"action-delete": "grise këtë faqe",
 	"action-deleterevision": "grise këtë revizion",
 	"action-deletedhistory": "shiko historinë e kësaj faqeje të grisur",
 	"action-browsearchive": "kërko faqe të grisura",
-	"action-undelete": "Kthe fshimjen mbrapsht",
+	"action-undelete": "Restauro këtë faqe",
 	"action-suppressrevision": "rishiko dhe rikthe këtë revizion të fshehur",
 	"action-block": "blloko përdoruesin",
-	"action-protect": "Mbroj",
+	"action-protect": "ndrysho nivelin e mbrojtjes për këtë faqe",
 	"action-import": "importo këtë faqe nga një wiki tjetër",
 	"action-patrol": "shëno redaktimin e tjerëve si të patrulluar",
 	"action-autopatrol": "shëno redaktimet tua si të patrulluara",
@@ -1028,5 +1028,9 @@
 	"special-characters-group-sinhala": "Sinhala",
 	"special-characters-group-gujarati": "Guxharati",
 	"view-view-foreign": "Shiko në $1",
-	"view-edit-local": "Redakto përshkrimin vendor"
+	"view-edit-local": "Redakto përshkrimin vendor",
+	"skin-action-protect": "Mbroj",
+	"skin-action-undelete": "Kthe fshimjen mbrapsht",
+	"skin-action-delete": "Fshij",
+	"skin-action-move": "Zhvendos"
 }

languages/i18n/alt.json

@@ -1318,7 +1318,7 @@
 	"action-autocreateaccount": "Тыш туружаачыныҥ аккаунттын автоматикалык эдери",
 	"action-history": "бу бӱктиҥ тӱӱкизин кӧрӧри",
 	"action-minoredit": "бу тӱзедӱни кичӱ этире темдектер",
-	"action-move": "Адын солыыр",
+	"action-move": "Бу бӱктиҥ адын солыр",
 	"action-move-subpages": "бу бӱктиҥ адын солыр, ичине кирген бӱктер ле катай",
 	"action-move-rootuserpages": "туружаачылардыҥ тӧс бӱктериниҥ аттарын солыыры",
 	"action-move-categorypages": "категориялардыҥ бӱктериниҥ аттарын солыыры",
@@ -1328,18 +1328,18 @@
 	"action-reupload-shared": "текши салатан јердеҥ файлды ӱстине саларга",
 	"action-upload_by_url": "URL-ду адрестеҥ файлды кийдире тартарга",
 	"action-writeapi": "API-ни эдинер бичиирге",
-	"action-delete": "Јоголтор",
+	"action-delete": "бу бӱкти јоголтор",
 	"action-delete-redirect": "бир версиялу уландырышты ӱстинеҥ бичиири",
 	"action-deleterevision": "бӱктердиҥ версияларын кырарга",
 	"action-deletelogentry": "журналдардыҥ бичимелдерин кырарга",
 	"action-deletedhistory": "бӱктиҥ кырылган тӱӱкизин кӧрӧргӧ",
 	"action-deletedtext": "кырылган версияныҥ бичимелдерин кӧрӧргӧ",
 	"action-browsearchive": "кырылган бӱктерди бедрерге",
-	"action-undelete": "Орныктырар",
+	"action-undelete": "бӱктерди орныкырары",
 	"action-suppressrevision": "бӱктердиҥ јажырган версияларын кӧрӧргӧ лӧ орныктырарга",
 	"action-suppressionlog": "бойы керегинде журналды кӧрӧргӧ",
 	"action-block": "бу туружаачыныҥ бичиирин туйуктарга",
-	"action-protect": "Корыыр",
+	"action-protect": "бу бӱктиҥ корулар јазалталарды солыыр",
 	"action-rollback": "калганчы туружаачы эткен бӱктеги тӱзедӱни тӱрген этире тескерледер",
 	"action-import": "ӧскӧ викилердеҥ бӱктерди импорт эдери",
 	"action-importupload": "файлдарды кийдире тартып бӱктерди импорт эдери",
@@ -2489,5 +2489,9 @@
 	"view-view-foreign": "$1 сайттаҥ кӧрӧр",
 	"view-create-local": "Ичи-бойына јартамал кожор",
 	"nstab-mainpage": "Тӧс бӱк",
-	"view-edit-local": "Ичи-бойына јартамал кожор"
+	"view-edit-local": "Ичи-бойына јартамал кожор",
+	"skin-action-protect": "Корыыр",
+	"skin-action-undelete": "Орныктырар",
+	"skin-action-delete": "Јоголтор",
+	"skin-action-move": "Адын солыыр"
 }

languages/i18n/am.json

@@ -767,19 +767,19 @@
 	"action-createtalk": "የውይይት ገጽ ለመፍጠር",
 	"action-createaccount": "ይህን አባል ስም ለመፍጠር",
 	"action-minoredit": "ይህን ለውጥ ጥቃቅን ሆኖ ለማመልከት",
-	"action-move": "ለማዛወር",
+	"action-move": "ይህንን ገጽ ለማዛወር",
 	"action-move-subpages": "ይህንን ገጽ ከነንዑስ-ገጾቹ ለማዛወር",
 	"action-movefile": "ይህን ፋይል ለማዛወር",
 	"action-upload": "ይህንን ፋይል ለመላክ",
-	"action-delete": "አጥፋ",
+	"action-delete": "ይህን ገጽ ለማጥፋት",
 	"action-deleterevision": "ይህን እትም ለማጥፋት",
 	"action-deletedhistory": "ለዚሁ ገጽ የጠፉትን ዕትሞች ታሪክ ለማየት",
 	"action-browsearchive": "የጠፉትን ገጾች ለመፈለግ",
-	"action-undelete": "አታጥፋ",
+	"action-undelete": "ይህንን ገጽ ለመመልስ",
 	"action-suppressrevision": "ይህን የተደበቅ ዕትም አይተው ለመመልስ",
 	"action-suppressionlog": "ይህንን የግል መዝገብ ለማየት",
 	"action-block": "ይህንን ተጠቃሚ ከማዘጋጀት ለማገድ",
-	"action-protect": "ጠብቅ",
+	"action-protect": "ለዚሁ ገጽ የመቆለፍ ደረጃ ለመቀይር",
 	"action-import": "ይህን ገጽ ከሌላ ዊኪ ለማስገባት",
 	"action-patrol": "የሰው ለውጦች የተሣለፉ ሆነው ለማመልከት",
 	"action-autopatrol": "የራስዎ ለውጥ የተሣለፈ ሆኖ መመልከት",
@@ -1686,5 +1686,9 @@
 	"api-error-unknown-warning": "ያልታወቀ ማስጠንቀቂያ $1",
 	"api-error-unknownerror": "ያልታወቀ ስህተት: \"$1\"",
 	"expand_templates_ok": "እሺ",
-	"nstab-mainpage": "ዋናው ገጽ"
+	"nstab-mainpage": "ዋናው ገጽ",
+	"skin-action-protect": "ጠብቅ",
+	"skin-action-undelete": "አታጥፋ",
+	"skin-action-delete": "አጥፋ",
+	"skin-action-move": "ለማዛወር"
 }

languages/i18n/ami.json

@@ -315,7 +315,7 @@
 	"action-addsection": "micomod hasasowalen",
 	"action-edit": "misinanot to inian a felih",
 	"action-createaccount": " misanga’ tona cang-haw no micokaymasay",
-	"action-move": "malinah",
+	"action-move": "linahen kona felih",
 	"action-delete": "masopitay to",
 	"enhancedrc-history": " likisi",
 	"recentchanges": "I ngataay nipifalic",
@@ -727,5 +727,7 @@
 	"paramvalidator-help-type-user-subtype-ip": "IP",
 	"view-view-foreign": "misongila’ a minengneng i $1",
 	"view-create-local": " mitongal to sowal to itiniay",
-	"nstab-mainpage": "‎ sa’ayayaw pising no tyin-naw"
+	"nstab-mainpage": "‎ sa’ayayaw pising no tyin-naw",
+	"skin-action-delete": "masopitay to",
+	"skin-action-move": "malinah"
 }

languages/i18n/an.json

@@ -886,7 +886,7 @@
 	"action-createtalk": "creyar pachinas de descusión",
 	"action-createaccount": "creyar ista cuenta d'usuario",
 	"action-minoredit": "sinyalar iste cambeo como menor",
-	"action-move": "Tresladar",
+	"action-move": "tresladar ista pachina",
 	"action-move-subpages": "tresladar ista pachina y as suyas subpachinas",
 	"action-move-rootuserpages": "tresladar as pachinas de l'usuario radiz",
 	"action-movefile": "tresladar iste fichero",
@@ -895,15 +895,15 @@
 	"action-reupload-shared": "cargar dencima d'iste fichero en un reposte compartito",
 	"action-upload_by_url": "cargar iste fichero dende una adreza URL",
 	"action-writeapi": "fer servir l'API d'escritura",
-	"action-delete": "Borrar",
+	"action-delete": "borrar ista pachina",
 	"action-deleterevision": "borrar ista versión",
 	"action-deletedhistory": "veyer o historial borrato d'ista pachina",
 	"action-browsearchive": "mirar pachinas borratas",
-	"action-undelete": "Restaurar",
+	"action-undelete": "recuperar ista pachina",
 	"action-suppressrevision": "revisar y restaurar ista versión amagata",
 	"action-suppressionlog": "veyer iste rechistro privato",
 	"action-block": "bloqueyar iste usuario ta que no pueda editar",
-	"action-protect": "Protecher",
+	"action-protect": "cambiar os livels de protección d'ista pachina",
 	"action-rollback": "Desfer a escape as edicions d'o zaguer usuario que cambió una pachina determinada",
 	"action-import": "importar ista pachina dende atro wiki",
 	"action-importupload": "importar ista pachina dende un fichero cargato",
@@ -2254,5 +2254,9 @@
 	"randomrootpage": "Pachina radiz aleatoria",
 	"view-view-foreign": "Veyer en $1",
 	"view-create-local": "Adhibir una descripción local",
-	"nstab-mainpage": "Pachina principal"
+	"nstab-mainpage": "Pachina principal",
+	"skin-action-protect": "Protecher",
+	"skin-action-undelete": "Restaurar",
+	"skin-action-delete": "Borrar",
+	"skin-action-move": "Tresladar"
 }

languages/i18n/ang.json

@@ -1112,5 +1112,9 @@
 	"view-view-foreign": "Sihþ on $1",
 	"view-create-local": "Besete stowlice gemearcunge",
 	"nstab-mainpage": "Heafodtramet",
-	"view-edit-local": "Adiht þa stowlican gemearcunge"
+	"view-edit-local": "Adiht þa stowlican gemearcunge",
+	"skin-action-protect": "Beorg",
+	"skin-action-undelete": "Scieppan tramet eft",
+	"skin-action-delete": "Forleos",
+	"skin-action-move": "Wegan"
 }

languages/i18n/anp.json

@@ -917,5 +917,8 @@
 	"view-view-foreign": "$1 प॑ देखऽ",
 	"view-create-local": "स्थानीय विवरण जोड़ऽ",
 	"nstab-mainpage": "मुखपृष्ठ",
-	"view-edit-local": "स्थानीय विवरण सम्पादित करऽ"
+	"view-edit-local": "स्थानीय विवरण सम्पादित करऽ",
+	"skin-action-protect": "सुरक्षित करौ",
+	"skin-action-delete": "मेटाबऽ",
+	"skin-action-move": "चलऽ"
 }

languages/i18n/ar.json

@@ -1410,7 +1410,7 @@
 	"action-autocreateaccount": "تلقائيا إنشاء هذا الحساب الخارجي للمستخدم",
 	"action-history": "اعرض تاريخ هذه الصفحة",
 	"action-minoredit": "التعليم على هذا التعديل كطفيف",
-	"action-move": "انقل",
+	"action-move": "نقل هذه الصفحة",
 	"action-move-subpages": "نقل هذه الصفحة، وصفحاتها الفرعية",
 	"action-move-rootuserpages": "نقل صفحات المستخدمين الأساسية",
 	"action-move-categorypages": "انقل صفحات التصنيف",
@@ -1420,18 +1420,18 @@
 	"action-reupload-shared": "الكتابة على هذا الملف في مستودع مشترك",
 	"action-upload_by_url": "رفع هذا الملف من عنوان مسار",
 	"action-writeapi": "استخدام API الكتابة",
-	"action-delete": "احذف",
+	"action-delete": "حذف هذه الصفحة",
 	"action-delete-redirect": "استبدال حالات إعادة التوجيه ذات المراجعة الوحيدة",
 	"action-deleterevision": "حذف المراجعات",
 	"action-deletelogentry": "حذف مدخلات السجل",
 	"action-deletedhistory": "رؤية تاريخ الصفحات المحذوف",
 	"action-deletedtext": "رؤية تاريخ المراجعات المحذوف",
 	"action-browsearchive": "البحث في الصفحات المحذوفة",
-	"action-undelete": "ألغ الحذف",
+	"action-undelete": "استرجاع الصفحات",
 	"action-suppressrevision": "مراجعة واسترجاع المراجعات المخفية",
 	"action-suppressionlog": "رؤية هذا السجل الخاص",
 	"action-block": "منع هذا المستخدم من التعديل",
-	"action-protect": "احمِ",
+	"action-protect": "تغيير مستويات الحماية لهذه الصفحة",
 	"action-rollback": "استرجاع تعديلات آخر مستخدم عدل صفحة معينة سريعا",
 	"action-import": "استيراد صفحات من ويكي آخر",
 	"action-importupload": "استيراد صفحات من ملف مرفوع",
@@ -4096,5 +4096,9 @@
 	"view-view-foreign": "اعرض في $1",
 	"view-create-local": "أضف وصفًا محليًا",
 	"nstab-mainpage": "الصفحة الرئيسية",
-	"view-edit-local": "عدل الوصف المحلي"
+	"view-edit-local": "عدل الوصف المحلي",
+	"skin-action-protect": "احمِ",
+	"skin-action-undelete": "ألغ الحذف",
+	"skin-action-delete": "احذف",
+	"skin-action-move": "انقل"
 }