From e94c581e09fde28aa273328062b37034457643c8 Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Thu, 28 Jul 2016 18:58:39 -0500
Subject: [PATCH] Issue #2667242 by Anul, felribeiro, eojthebrave,
 pranavbabbar: Use consistent terminology when referencing administration
 themes in the UI (not "admin theme")

---
 core/lib/Drupal/Core/Extension/ThemeInstaller.php       | 2 +-
 core/modules/node/config/schema/node.schema.yml         | 2 +-
 core/modules/system/src/Controller/SystemController.php | 2 +-
 core/themes/seven/seven.info.yml                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/lib/Drupal/Core/Extension/ThemeInstaller.php b/core/lib/Drupal/Core/Extension/ThemeInstaller.php
index 99de3860ef9..050e04afad7 100644
--- a/core/lib/Drupal/Core/Extension/ThemeInstaller.php
+++ b/core/lib/Drupal/Core/Extension/ThemeInstaller.php
@@ -223,7 +223,7 @@ class ThemeInstaller implements ThemeInstallerInterface {
         throw new \InvalidArgumentException("The current default theme $key cannot be uninstalled.");
       }
       if ($key === $theme_config->get('admin')) {
-        throw new \InvalidArgumentException("The current admin theme $key cannot be uninstalled.");
+        throw new \InvalidArgumentException("The current administration theme $key cannot be uninstalled.");
       }
       // Base themes cannot be uninstalled if sub themes are installed, and if
       // they are not uninstalled at the same time.
diff --git a/core/modules/node/config/schema/node.schema.yml b/core/modules/node/config/schema/node.schema.yml
index 84e4d123102..11a93c53104 100644
--- a/core/modules/node/config/schema/node.schema.yml
+++ b/core/modules/node/config/schema/node.schema.yml
@@ -6,7 +6,7 @@ node.settings:
   mapping:
     use_admin_theme:
       type: boolean
-      label: 'Use admin theme when editing or creating content'
+      label: 'Use administration theme when editing or creating content'
 
 node.type.*:
   type: config_entity
diff --git a/core/modules/system/src/Controller/SystemController.php b/core/modules/system/src/Controller/SystemController.php
index 98d61797116..062a11ba793 100644
--- a/core/modules/system/src/Controller/SystemController.php
+++ b/core/modules/system/src/Controller/SystemController.php
@@ -307,7 +307,7 @@ class SystemController extends ControllerBase {
         $theme->notes[] = $this->t('default theme');
       }
       if ($theme->is_admin) {
-        $theme->notes[] = $this->t('admin theme');
+        $theme->notes[] = $this->t('administration theme');
       }
 
       // Sort installed and uninstalled themes into their own groups.
diff --git a/core/themes/seven/seven.info.yml b/core/themes/seven/seven.info.yml
index 993e0003d83..369515ef4b9 100644
--- a/core/themes/seven/seven.info.yml
+++ b/core/themes/seven/seven.info.yml
@@ -4,7 +4,7 @@
 # As the UI of Drupal improves between minor versions, the mark up and assets
 # in the Seven theme will change. The Seven theme is not backwards
 # compatible. If you wish to modify the output or assets of Seven you can:
-# 1. Copy the whole of Seven and rename it as your own admin theme. You
+# 1. Copy the whole of Seven and rename it as your own administration theme. You
 # will need to manually manage your own updates if you want to stay up to
 # date with Seven's bug fixes and feature support.
 #