diff --git a/core/modules/field/modules/number/number.module b/core/modules/field/modules/number/number.module
index b3f5615..5fe30c5 100644
--- a/core/modules/field/modules/number/number.module
+++ b/core/modules/field/modules/number/number.module
@@ -214,7 +214,7 @@ function number_field_formatter_settings_form($field, $instance, $view_mode, $fo
 
   if ($display['type'] == 'number_decimal' || $display['type'] == 'number_integer') {
     $options = array(
-      ''  => t('<none>'),
+      ''  => t('- None -'),
       '.' => t('Decimal point'),
       ',' => t('Comma'),
       ' ' => t('Space'),
diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc
index 5871be0..9d5d722 100644
--- a/core/modules/field_ui/field_ui.admin.inc
+++ b/core/modules/field_ui/field_ui.admin.inc
@@ -945,7 +945,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
   $field_label_options = array(
     'above' => t('Above'),
     'inline' => t('Inline'),
-    'hidden' => t('<Hidden>'),
+    'hidden' => '<' . t('Hidden') . '>',
   );
   $extra_visibility_options = array(
     'visible' => t('Visible'),
@@ -1001,7 +1001,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
     );
 
     $formatter_options = field_ui_formatter_options($field['type']);
-    $formatter_options['hidden'] = t('<Hidden>');
+    $formatter_options['hidden'] = '<' . t('Hidden') . '>';
     $table[$name]['format'] = array(
       'type' => array(
         '#type' => 'select',
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 397ac95..99a3d39 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -695,7 +695,7 @@ function image_style_options($include_empty = TRUE) {
   $styles = image_styles();
   $options = array();
   if ($include_empty && !empty($styles)) {
-    $options[''] = t('<none>');
+    $options[''] = t('- None -');
   }
   // Use the array concatenation operator '+' here instead of array_merge(),
   // because the latter loses the datatype of the array keys, turning
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 9919231..3ac23c3 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/ProgrammaticTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/ProgrammaticTest.php
@@ -84,7 +84,7 @@ class ProgrammaticTest extends WebTestBase {
       '%values' => print_r($values, TRUE),
       '%errors' => $valid_form ? t('None') : implode(' ', $errors),
     );
-    $this->assertTrue($valid_input == $valid_form, t('Input values: %values<br/>Validation handler errors: %errors', $args));
+    $this->assertTrue($valid_input == $valid_form, t('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 75e6655..0ec653f 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
@@ -92,7 +92,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));