diff --git a/core/modules/block/block.install b/core/modules/block/block.install
index c16e50af109bcc0881c60b3e72b4ef269c5f4c6b..6cdb67cf95dff31625345d5563c93501241e6247 100644
--- a/core/modules/block/block.install
+++ b/core/modules/block/block.install
@@ -128,7 +128,7 @@ function block_update_8003() {
     'length' => 255,
     'not null' => TRUE,
     'default' => '',
-    'description' => 'Custom title for the block. (Empty string will use block default title, <none> will remove the title, text will cause block to use specified title.)',
+    'description' => 'Custom title for the block. (Empty string will use block default title, - None - will remove the title, text will cause block to use specified title.)',
     'translatable' => TRUE,
     )
   );
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 50f1081c8fa3d3140853ebb73cbacb77f04c822c..f0e0dfdec1ace961e7a440687ffe6644660f225c 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -558,7 +558,7 @@ function image_image_style_load($styles) {
  * Gets an array of image styles suitable for using as select list options.
  *
  * @param $include_empty
- *   If TRUE a <none> option will be inserted in the options array.
+ *   If TRUE a '- None -' option will be inserted in the options array.
  * @return
  *   Array of image styles both key and value are set to style name.
  */
@@ -566,7 +566,7 @@ function image_style_options($include_empty = TRUE) {
   $styles = entity_load_multiple('image_style');
   $options = array();
   if ($include_empty && !empty($styles)) {
-    $options[''] = t('<none>');
+    $options[''] = t('- None -');
   }
   foreach ($styles as $name => $style) {
     $options[$name] = $style->label();
diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index 42e5ad3c84026dc9fca382bd0cdc1a9e17fab665..125af8d6cfce3fa10c574e76ef3d6471aeea97e0 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -183,7 +183,7 @@ function locale_translate_filter_form($form, &$form_state) {
       );
     }
     else {
-      $empty_option = isset($filter['options'][$filter['default']]) ? $filter['options'][$filter['default']] : '<none>';
+      $empty_option = isset($filter['options'][$filter['default']]) ? $filter['options'][$filter['default']] : '- None -';
       $form['filters']['status'][$key] = array(
         '#title' => $filter['title'],
         '#type' => 'select',
@@ -257,7 +257,7 @@ function locale_translate_edit_form($form, &$form_state) {
   drupal_static_reset('language_list');
   $languages = language_list();
 
-  $langname = isset($langcode) ? $languages[$langcode]->name : "<none>";
+  $langname = isset($langcode) ? $languages[$langcode]->name : "- None -";
 
   $path = drupal_get_path('module', 'locale');
   $form['#attached']['css'] = array(
diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php b/core/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php
index 29e4dbf2ccf6b56e8ceaa68fe6832ddd5e3a476f..529ce03232064ceea6512fd81956c9fe8d170c3a 100644
--- a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php
+++ b/core/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php
@@ -22,7 +22,7 @@ abstract class DefaultNumberFormatter extends FormatterBase {
    */
   public function settingsForm(array $form, array &$form_state) {
     $options = array(
-      ''  => t('<none>'),
+      ''  => t('- None -'),
       '.' => t('Decimal point'),
       ',' => t('Comma'),
       ' ' => t('Space'),
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ProgrammaticTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/ProgrammaticTest.php
index 8e5880a9817daa37c2c52d531ac8eb34568c7383..553abdb4182246d5e5412682a1fbd98d51b50045 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/ProgrammaticTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/ProgrammaticTest.php
@@ -87,7 +87,7 @@ private function submitForm($values, $valid_input) {
       '%values' => print_r($values, TRUE),
       '%errors' => $valid_form ? t('None') : implode(' ', $errors),
     );
-    $this->assertTrue($valid_input == $valid_form, format_string('Input values: %values<br/>Validation handler errors: %errors', $args));
+    $this->assertTrue($valid_input == $valid_form, format_string('Input values: %values<br />Validation handler errors: %errors', $args));
 
     // We check submitted values only if we have a valid input.
     if ($valid_input) {
diff --git a/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc b/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
index bd4ee5c0e8d678333cf22a6d86c85787d304eb64..6d9a9a60ac3d47b379f34cdd8d6a6ad9c05c06df 100644
--- a/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
+++ b/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
@@ -91,7 +91,7 @@ function _batch_test_finished_helper($batch_id, $success, $results, $operations)
   if (!$success) {
     // A fatal error occurred during the processing.
     $error_operation = reset($operations);
-    $messages[] = t('An error occurred while processing @op with arguments:<br/>@args', array('@op' => $error_operation[0], '@args' => print_r($error_operation[1], TRUE)));
+    $messages[] = t('An error occurred while processing @op with arguments:<br />@args', array('@op' => $error_operation[0], '@args' => print_r($error_operation[1], TRUE)));
   }
 
   drupal_set_message(implode('<br />', $messages));
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
index cd2a73f86da54e6ef6dfca370b83c9e3a20027ea..88ac2f45773edad3d22565e182657ba0dd6107b7 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
@@ -122,7 +122,7 @@ public function buildOptionsForm(&$form, &$form_state) {
 
     // WIP: This stuff doens't work yet: namespacing issues.
     // A list of suitable views to pick one as the subview.
-    $views = array('' => '<none>');
+    $views = array('' => '- None -');
     $all_views = views_get_all_views();
     foreach ($all_views as $view) {
       // Only get views that are suitable: