Issue #2048887 by pguillard, yoroy, Anul, rpayanm, meeli, ifrik, Bojhan, xjm:...

Issue #2048887 by pguillard, yoroy, Anul, rpayanm, meeli, ifrik, Bojhan, xjm: Cleanup user interface text on appearance/settings

core/modules/system/src/Form/ThemeSettingsForm.php

@@ -152,9 +152,8 @@ public function buildForm(array $form, FormStateInterface $form_state, $theme =
 
     $form['theme_settings'] = array(
       '#type' => 'details',
-      '#title' => t('Toggle display'),
+      '#title' => t('Page element display'),
       '#open' => TRUE,
-      '#description' => t('Enable or disable the display of certain page elements.'),
     );
     foreach ($toggles as $name => $title) {
       if ((!$theme) || in_array($name, $features)) {
@@ -176,12 +175,12 @@ public function buildForm(array $form, FormStateInterface $form_state, $theme =
     if ((!$theme || in_array('logo', $features)) && $this->moduleHandler->moduleExists('file')) {
       $form['logo'] = array(
         '#type' => 'details',
-        '#title' => t('Logo image settings'),
+        '#title' => t('Logo image'),
         '#open' => TRUE,
       );
       $form['logo']['default_logo'] = array(
         '#type' => 'checkbox',
-        '#title' => t('Use the default logo supplied by the theme'),
+        '#title' => t('Use the logo supplied by the theme'),
         '#default_value' => theme_get_setting('logo.use_default', $theme),
         '#tree' => FALSE,
       );
@@ -210,9 +209,9 @@ public function buildForm(array $form, FormStateInterface $form_state, $theme =
     if (((!$theme) || in_array('favicon', $features)) && $this->moduleHandler->moduleExists('file')) {
       $form['favicon'] = array(
         '#type' => 'details',
-        '#title' => t('Shortcut icon settings'),
+        '#title' => t('Favicon'),
         '#open' => TRUE,
-        '#description' => t("Your shortcut icon, or 'favicon', is displayed in the address bar and bookmarks of most browsers."),
+        '#description' => t("Your shortcut icon, or favicon, is displayed in the address bar and bookmarks of most browsers."),
         '#states' => array(
           // Hide the shortcut icon settings fieldset when shortcut icon display
           // is disabled.
@@ -223,7 +222,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $theme =
       );
       $form['favicon']['default_favicon'] = array(
         '#type' => 'checkbox',
-        '#title' => t('Use the default shortcut icon supplied by the theme'),
+        '#title' => t('Use the favicon supplied by the theme'),
         '#default_value' => theme_get_setting('favicon.use_default', $theme),
       );
       $form['favicon']['settings'] = array(
@@ -242,7 +241,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $theme =
       );
       $form['favicon']['settings']['favicon_upload'] = array(
         '#type' => 'file',
-        '#title' => t('Upload icon image'),
+        '#title' => t('Upload favicon image'),
         '#description' => t("If you don't have direct file access to the server, use this field to upload your shortcut icon.")
       );
     }

core/modules/system/system.module

@@ -122,7 +122,7 @@ function system_help($route_name, RouteMatchInterface $route_match) {
       return '<p>' . t('These options control the display settings for the %name theme. When your site is displayed using this theme, these settings will be used.', array('%name' => $theme->info['name'])) . '</p>';
 
     case 'system.theme_settings':
-      return '<p>' . t('These options control the default display settings for your entire site, across all themes. Unless they have been overridden by a specific theme, these settings will be used.') . '</p>';
+      return '<p>' . t('Control default display settings for your site, across all themes. Use theme-specific settings to override these defaults.') . '</p>';
 
     case 'system.modules_list':
       $output = '<p>' . t('Download additional <a href=":modules">contributed modules</a> to extend your site\'s functionality.', array(':modules' => 'https://www.drupal.org/project/modules')) . '</p>';