diff --git a/core/lib/Drupal/Core/Entity/EntityFormController.php b/core/lib/Drupal/Core/Entity/EntityFormController.php
index ceb09de..b16f5cc 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormController.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormController.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\Core\Entity;
 
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Drupal\entity\EntityFormDisplayInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Language\Language;
@@ -15,7 +17,7 @@
 /**
  * Base class for entity form controllers.
  */
-class EntityFormController implements EntityFormControllerInterface {
+class EntityFormController extends FormBase implements EntityFormControllerInterface {
 
   /**
    * The name of the current operation.
@@ -61,10 +63,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
   }
 
   /**
-   * Sets the operation for this form.
-   *
-   * @param string $operation
-   *   The name of the current operation.
+   * {@inheritdoc}
    */
   public function setOperation($operation) {
     // If NULL is passed, do not overwrite the operation.
@@ -129,12 +128,6 @@ public function buildForm(array $form, array &$form_state) {
   /**
    * {@inheritdoc}
    */
-  public function validateForm(array &$form, array &$form_state) {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function submitForm(array &$form, array &$form_state) {
   }
 
@@ -269,7 +262,7 @@ protected function actions(array $form, array &$form_state) {
     return array(
       // @todo Rename the action key from submit to save.
       'submit' => array(
-        '#value' => t('Save'),
+        '#value' => $this->t('Save'),
         '#validate' => array(
           array($this, 'validate'),
         ),
@@ -279,7 +272,7 @@ protected function actions(array $form, array &$form_state) {
         ),
       ),
       'delete' => array(
-        '#value' => t('Delete'),
+        '#value' => $this->t('Delete'),
         // No need to validate the form when deleting the entity.
         '#submit' => array(
           array($this, 'delete'),
@@ -566,4 +559,13 @@ public function setFormDisplay(EntityFormDisplayInterface $form_display, array &
   public function getOperation() {
     return $this->operation;
   }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setTranslationManager(TranslatorInterface $translation_manager) {
+    $this->translationManager = $translation_manager;
+    return $this;
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Entity/EntityFormControllerInterface.php b/core/lib/Drupal/Core/Entity/EntityFormControllerInterface.php
index d52363c..9ce343e 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormControllerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormControllerInterface.php
@@ -8,6 +8,7 @@
 namespace Drupal\Core\Entity;
 
 use Drupal\Core\Form\BaseFormIdInterface;
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Drupal\entity\EntityFormDisplayInterface;
 
 /**
@@ -38,6 +39,14 @@ public function getFormLangcode(array $form_state);
   public function isDefaultFormLangcode(array $form_state);
 
   /**
+   * Sets the operation for this form.
+   *
+   * @param string $operation
+   *   The name of the current operation.
+   */
+  public function setOperation($operation);
+
+  /**
    * Returns the operation identifying the form controller.
    *
    * @return string
@@ -139,4 +148,15 @@ public function validate(array $form, array &$form_state);
    */
   public function submit(array $form, array &$form_state);
 
+  /**
+   * Sets the translation manager for this form.
+   *
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
+   *
+   * @return self
+   *   The entity form.
+   */
+  public function setTranslationManager(TranslatorInterface $translation_manager);
+
 }
diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index a662259..f6daa62 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -230,12 +230,15 @@ public function getFormController($entity_type, $operation) {
     if (!isset($this->controllers['form'][$operation][$entity_type])) {
       $class = $this->getControllerClass($entity_type, 'form', $operation);
       if (in_array('Drupal\Core\Entity\EntityControllerInterface', class_implements($class))) {
-        $this->controllers['form'][$operation][$entity_type] = $class::createInstance($this->container, $entity_type, $this->getDefinition($entity_type));
+        $controller = $class::createInstance($this->container, $entity_type, $this->getDefinition($entity_type));
       }
       else {
-        $this->controllers['form'][$operation][$entity_type] = new $class($this->container->get('module_handler'));
+        $controller = new $class($this->container->get('module_handler'));
       }
-      $this->controllers['form'][$operation][$entity_type]->setOperation($operation);
+
+      $controller->setTranslationManager($this->container->get('string_translation'));
+      $controller->setOperation($operation);
+      $this->controllers['form'][$operation][$entity_type] = $controller;
     }
     return $this->controllers['form'][$operation][$entity_type];
   }
diff --git a/core/lib/Drupal/Core/Form/ConfirmFormBase.php b/core/lib/Drupal/Core/Form/ConfirmFormBase.php
index e5899c5..b0b61f4 100644
--- a/core/lib/Drupal/Core/Form/ConfirmFormBase.php
+++ b/core/lib/Drupal/Core/Form/ConfirmFormBase.php
@@ -12,7 +12,7 @@
 /**
  * Provides an generic base class for a confirmation form.
  */
-abstract class ConfirmFormBase implements ConfirmFormInterface {
+abstract class ConfirmFormBase extends FormBase implements ConfirmFormInterface {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php b/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php
index ac1aa91..47343a5 100644
--- a/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php
+++ b/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Controller\ControllerInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\ban\BanIpManager;
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -29,9 +30,14 @@ class BanDelete extends ConfirmFormBase implements ControllerInterface {
   /**
    * Constructs a new BanDelete object.
    *
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
    * @param \Drupal\ban\BanIpManager $ip_manager
+   *   The IP manager.
    */
-  public function __construct(BanIpManager $ip_manager) {
+  public function __construct(TranslatorInterface $translation_manager, BanIpManager $ip_manager) {
+    parent::__construct($translation_manager);
+
     $this->ipManager = $ip_manager;
   }
 
@@ -40,6 +46,7 @@ public function __construct(BanIpManager $ip_manager) {
    */
   public static function create(ContainerInterface $container) {
     return new static(
+      $container->get('string_translation'),
       $container->get('ban.ip_manager')
     );
   }
@@ -55,14 +62,14 @@ public function getFormID() {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return t('Are you sure you want to unblock %ip?', array('%ip' => $this->banIp));
+    return $this->t('Are you sure you want to unblock %ip?', array('%ip' => $this->banIp));
   }
 
   /**
    * {@inheritdoc}
    */
   public function getConfirmText() {
-    return t('Delete');
+    return $this->t('Delete');
   }
 
   /**
diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleAddForm.php b/core/modules/image/lib/Drupal/image/Form/ImageStyleAddForm.php
index 8af0640..e472cdb 100644
--- a/core/modules/image/lib/Drupal/image/Form/ImageStyleAddForm.php
+++ b/core/modules/image/lib/Drupal/image/Form/ImageStyleAddForm.php
@@ -19,7 +19,7 @@ class ImageStyleAddForm extends ImageStyleFormBase {
    */
   public function save(array $form, array &$form_state) {
     parent::save($form, $form_state);
-    drupal_set_message($this->translator->translate('Style %name was created.', array('%name' => $this->entity->label())));
+    drupal_set_message($this->t('Style %name was created.', array('%name' => $this->entity->label())));
   }
 
   /**
@@ -27,7 +27,7 @@ public function save(array $form, array &$form_state) {
    */
   public function actions(array $form, array &$form_state) {
     $actions = parent::actions($form, $form_state);
-    $actions['submit']['#value'] = $this->translator->translate('Create new style');
+    $actions['submit']['#value'] = $this->t('Create new style');
 
     return $actions;
   }
diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php b/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php
index 0625cdd..6229739 100644
--- a/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php
+++ b/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php
@@ -37,11 +37,9 @@ class ImageStyleEditForm extends ImageStyleFormBase {
    *   The storage controller.
    * @param \Drupal\image\ImageEffectManager $image_effect_manager
    *   The image effect manager service.
-   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translator
-   *   The translator service.
    */
-  public function __construct(ModuleHandlerInterface $module_handler, EntityStorageControllerInterface $image_style_storage, TranslatorInterface $translator, ImageEffectManager $image_effect_manager) {
-    parent::__construct($module_handler, $image_style_storage, $translator);
+  public function __construct(ModuleHandlerInterface $module_handler, EntityStorageControllerInterface $image_style_storage, ImageEffectManager $image_effect_manager) {
+    parent::__construct($module_handler, $image_style_storage);
     $this->imageEffectManager = $image_effect_manager;
   }
 
@@ -52,7 +50,6 @@ public static function createInstance(ContainerInterface $container, $entity_typ
     return new static(
       $container->get('module_handler'),
       $container->get('plugin.manager.entity')->getStorageController($entity_type),
-      $container->get('string_translation'),
       $container->get('plugin.manager.image.effect')
     );
   }
@@ -63,7 +60,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
   public function form(array $form, array &$form_state) {
 
     // @todo Remove drupal_set_title() in http://drupal.org/node/1981644
-    $title = $this->translator->translate('Edit style %name', array('%name' => $this->entity->label()));
+    $title = $this->t('Edit style %name', array('%name' => $this->entity->label()));
     drupal_set_title($title, PASS_THROUGH);
 
     $form['#tree'] = TRUE;
@@ -73,7 +70,7 @@ public function form(array $form, array &$form_state) {
     $preview_arguments = array('#theme' => 'image_style_preview', '#style' => $this->entity);
     $form['preview'] = array(
       '#type' => 'item',
-      '#title' => $this->translator->translate('Preview'),
+      '#title' => $this->t('Preview'),
       '#markup' => drupal_render($preview_arguments),
       // Render preview above parent elements.
       '#weight' => -5,
@@ -94,7 +91,7 @@ public function form(array $form, array &$form_state) {
       $form['effects'][$key]['summary'] = $effect->getSummary();
       $form['effects'][$key]['weight'] = array(
         '#type' => 'weight',
-        '#title' => $this->translator->translate('Weight for @title', array('@title' => $effect->label())),
+        '#title' => $this->t('Weight for @title', array('@title' => $effect->label())),
         '#title_display' => 'invisible',
         '#default_value' => $effect->getWeight(),
       );
@@ -103,12 +100,12 @@ public function form(array $form, array &$form_state) {
       $is_configurable = $effect instanceof ConfigurableImageEffectInterface;
       if ($is_configurable) {
         $links['edit'] = array(
-          'title' => $this->translator->translate('edit'),
+          'title' => $this->t('edit'),
           'href' => 'admin/config/media/image-styles/manage/' . $this->entity->id() . '/effects/' . $key,
         );
       }
       $links['delete'] = array(
-        'title' => $this->translator->translate('delete'),
+        'title' => $this->t('delete'),
         'href' => 'admin/config/media/image-styles/manage/' . $this->entity->id() . '/effects/' . $key . '/delete',
       );
       $form['effects'][$key]['operations'] = array(
@@ -117,13 +114,13 @@ public function form(array $form, array &$form_state) {
       );
       $form['effects'][$key]['configure'] = array(
         '#type' => 'link',
-        '#title' => $this->translator->translate('edit'),
+        '#title' => $this->t('edit'),
         '#href' => 'admin/config/media/image-styles/manage/' . $this->entity->id() . '/effects/' . $key,
         '#access' => $is_configurable,
       );
       $form['effects'][$key]['remove'] = array(
         '#type' => 'link',
-        '#title' => $this->translator->translate('delete'),
+        '#title' => $this->t('delete'),
         '#href' => 'admin/config/media/image-styles/manage/' . $this->entity->id() . '/effects/' . $key . '/delete',
       );
     }
@@ -143,20 +140,20 @@ public function form(array $form, array &$form_state) {
     );
     $form['effects']['new']['new'] = array(
       '#type' => 'select',
-      '#title' => $this->translator->translate('Effect'),
+      '#title' => $this->t('Effect'),
       '#title_display' => 'invisible',
       '#options' => $new_effect_options,
-      '#empty_option' => $this->translator->translate('Select a new effect'),
+      '#empty_option' => $this->t('Select a new effect'),
     );
     $form['effects']['new']['weight'] = array(
       '#type' => 'weight',
-      '#title' => $this->translator->translate('Weight for new effect'),
+      '#title' => $this->t('Weight for new effect'),
       '#title_display' => 'invisible',
       '#default_value' => count($form['effects']) - 1,
     );
     $form['effects']['new']['add'] = array(
       '#type' => 'submit',
-      '#value' => $this->translator->translate('Add'),
+      '#value' => $this->t('Add'),
       '#validate' => array(array($this, 'effectValidate')),
       '#submit' => array(array($this, 'effectSave')),
     );
@@ -169,7 +166,7 @@ public function form(array $form, array &$form_state) {
    */
   public function effectValidate($form, &$form_state) {
     if (!$form_state['values']['new']) {
-      form_error($form['effects']['new']['new'], $this->translator->translate('Select an effect to add.'));
+      form_error($form['effects']['new']['new'], $this->t('Select an effect to add.'));
     }
   }
 
@@ -189,7 +186,7 @@ public function effectSave($form, &$form_state) {
     $status = parent::save($form, $form_state);
 
     if ($status == SAVED_UPDATED) {
-      drupal_set_message($this->translator->translate('Changes to the style have been saved.'));
+      drupal_set_message($this->t('Changes to the style have been saved.'));
     }
 
     // Check if this field has any configuration options.
@@ -209,7 +206,7 @@ public function effectSave($form, &$form_state) {
       );
       $effect_id = $this->entity->saveImageEffect($effect);
       if (!empty($effect_id)) {
-        drupal_set_message($this->translator->translate('The image effect was successfully applied.'));
+        drupal_set_message($this->t('The image effect was successfully applied.'));
       }
     }
   }
@@ -225,7 +222,7 @@ public function save(array $form, array &$form_state) {
     }
 
     parent::save($form, $form_state);
-    drupal_set_message($this->translator->translate('Changes to the style have been saved.'));
+    drupal_set_message($this->t('Changes to the style have been saved.'));
   }
 
   /**
@@ -233,7 +230,7 @@ public function save(array $form, array &$form_state) {
    */
   public function actions(array $form, array &$form_state) {
     $actions = parent::actions($form, $form_state);
-    $actions['submit']['#value'] = $this->translator->translate('Update style');
+    $actions['submit']['#value'] = $this->t('Update style');
 
     return $actions;
   }
diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php b/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php
index a050434..55837b9 100644
--- a/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php
+++ b/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php
@@ -27,26 +27,16 @@
   protected $imageStyleStorage;
 
   /**
-   * The translator service.
-   *
-   * @var \Drupal\Core\StringTranslation\Translator\TranslatorInterface
-   */
-  protected $translator;
-
-  /**
    * Constructs a base class for image style add and edit forms.
    *
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler service.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $image_style_storage
    *   The image style entity storage controller.
-   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translator
-   *   The translator service.
    */
-  public function __construct(ModuleHandlerInterface $module_handler, EntityStorageControllerInterface $image_style_storage, TranslatorInterface $translator) {
+  public function __construct(ModuleHandlerInterface $module_handler, EntityStorageControllerInterface $image_style_storage) {
     parent::__construct($module_handler);
     $this->imageStyleStorage = $image_style_storage;
-    $this->translator = $translator;
   }
 
   /**
@@ -55,8 +45,7 @@ public function __construct(ModuleHandlerInterface $module_handler, EntityStorag
   public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
     return new static(
       $container->get('module_handler'),
-      $container->get('plugin.manager.entity')->getStorageController($entity_type),
-      $container->get('string_translation')
+      $container->get('plugin.manager.entity')->getStorageController($entity_type)
     );
   }
 
@@ -67,7 +56,7 @@ public function form(array $form, array &$form_state) {
 
     $form['label'] = array(
       '#type' => 'textfield',
-      '#title' => $this->translator->translate('Image style name'),
+      '#title' => $this->t('Image style name'),
       '#default_value' => $this->entity->label(),
       '#required' => TRUE,
     );
diff --git a/core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php b/core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php
index d4c69ec..d15b497 100644
--- a/core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php
+++ b/core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Controller\ControllerInterface;
 use Drupal\Core\Entity\EntityStorageControllerInterface;
 use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Drupal\node\NodeInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -36,10 +37,14 @@ class NodeRevisionRevertForm extends ConfirmFormBase implements ControllerInterf
   /**
    * Constructs a new NodeRevisionRevertForm.
    *
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $node_storage
    *   The node storage.
    */
-  public function __construct(EntityStorageControllerInterface $node_storage) {
+  public function __construct(TranslatorInterface $translation_manager, EntityStorageControllerInterface $node_storage) {
+    parent::__construct($translation_manager);
+
     $this->nodeStorage = $node_storage;
   }
 
@@ -48,6 +53,7 @@ public function __construct(EntityStorageControllerInterface $node_storage) {
    */
   public static function create(ContainerInterface $container) {
     return new static(
+      $container->get('string_translation'),
       $container->get('plugin.manager.entity')->getStorageController('node')
     );
   }
diff --git a/core/modules/path/lib/Drupal/path/Form/DeleteForm.php b/core/modules/path/lib/Drupal/path/Form/DeleteForm.php
index 2d4bcff..df8ab85 100644
--- a/core/modules/path/lib/Drupal/path/Form/DeleteForm.php
+++ b/core/modules/path/lib/Drupal/path/Form/DeleteForm.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Controller\ControllerInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Path\Path;
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -35,10 +36,14 @@ class DeleteForm extends ConfirmFormBase implements ControllerInterface {
   /**
    * Constructs a \Drupal\Core\Path\Path object.
    *
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
    * @param \Drupal\Core\Path\Path $path
    *   The path crud service.
    */
-  public function __construct(Path $path) {
+  public function __construct(TranslatorInterface $translation_manager, Path $path) {
+    parent::__construct($translation_manager);
+
     $this->path = $path;
   }
 
@@ -47,6 +52,7 @@ public function __construct(Path $path) {
    */
   public static function create(ContainerInterface $container) {
     return new static(
+      $container->get('string_translation'),
       $container->get('path.crud')
     );
   }
diff --git a/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php b/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php
index eb63894..8463355 100644
--- a/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php
+++ b/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php
@@ -6,6 +6,7 @@
 
 namespace Drupal\search\Form;
 
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Drupal\system\SystemConfigFormBase;
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
@@ -39,13 +40,15 @@ class SearchSettingsForm extends SystemConfigFormBase {
    *   The configuration factory object that manages search settings.
    * @param \Drupal\Core\Config\Context\ContextInterface $context
    *   The context interface
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
    * @param \Drupal\Core\Extension\ModuleHandler $module_handler
    *   The module handler
    * @param \Drupal\Core\KeyValueStore\KeyValueStoreInterface $state
    *   The state key/value store interface, gives access to state based config settings.
    */
-  public function __construct(ConfigFactory $config_factory, ContextInterface $context, ModuleHandler $module_handler, KeyValueStoreInterface $state) {
-    parent::__construct($config_factory, $context);
+  public function __construct(ConfigFactory $config_factory, ContextInterface $context, TranslatorInterface $translation_manager, ModuleHandler $module_handler, KeyValueStoreInterface $state) {
+    parent::__construct($config_factory, $context, $translation_manager);
     $this->moduleHandler = $module_handler;
     $this->state = $state;
   }
@@ -57,6 +60,7 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
       $container->get('config.context.free'),
+      $container->get('string_translation'),
       $container->get('module_handler'),
       $container->get('state')
     );
diff --git a/core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php b/core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php
index d1bb1c4..1c3c769 100644
--- a/core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php
+++ b/core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php
@@ -6,6 +6,8 @@
 
 namespace Drupal\statistics;
 
+use Drupal\Core\Config\Context\ContextInterface;
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Drupal\system\SystemConfigFormBase;
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Extension\ModuleHandler;
@@ -28,11 +30,16 @@ class StatisticsSettingsForm extends SystemConfigFormBase {
    *
    * @param \Drupal\Core\Config\ConfigFactory $config_factory
    *   The factory for configuration objects.
+   * @param \Drupal\Core\Config\Context\ContextInterface $context
+   *   The configuration context to use.
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
    * @param \Drupal\Core\Extension\ModuleHandler $module_handler
    *   The module handler.
    */
-  public function __construct(ConfigFactory $config_factory, ModuleHandler $module_handler) {
-    $this->configFactory = $config_factory;
+  public function __construct(ConfigFactory $config_factory, ContextInterface $context, TranslatorInterface $translation_manager, ModuleHandler $module_handler) {
+    parent::__construct($config_factory, $context, $translation_manager);
+
     $this->moduleHandler = $module_handler;
   }
 
@@ -42,6 +49,8 @@ public function __construct(ConfigFactory $config_factory, ModuleHandler $module
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.context.free'),
+      $container->get('string_translation'),
       $container->get('module_handler')
     );
   }
diff --git a/core/modules/system/lib/Drupal/system/Form/CronForm.php b/core/modules/system/lib/Drupal/system/Form/CronForm.php
index dd83495..7cfeeca 100644
--- a/core/modules/system/lib/Drupal/system/Form/CronForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/CronForm.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\KeyValueStore\KeyValueStoreInterface;
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Drupal\system\SystemConfigFormBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -33,11 +34,13 @@ class CronForm extends SystemConfigFormBase {
    *   The factory for configuration objects.
    * @param \Drupal\Core\Config\Context\ContextInterface $context
    *   The configuration context used for this configuration object.
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
    * @param \Drupal\Core\KeyValueStore\KeyValueStoreInterface $state
    *   The state key value store.
    */
-  public function __construct(ConfigFactory $config_factory, ContextInterface $context, KeyValueStoreInterface $state) {
-    parent::__construct($config_factory, $context);
+  public function __construct(ConfigFactory $config_factory, ContextInterface $context, TranslatorInterface $translation_manager, KeyValueStoreInterface $state) {
+    parent::__construct($config_factory, $context, $translation_manager);
     $this->state = $state;
   }
 
@@ -48,6 +51,7 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
       $container->get('config.context.free'),
+      $container->get('string_translation'),
       $container->get('state')
     );
   }
diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php b/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php
index d3de481..9456281 100644
--- a/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Controller\ControllerInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Config\ConfigFactory;
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -34,8 +35,14 @@ class DateFormatLocalizeResetForm extends ConfirmFormBase implements ControllerI
 
   /**
    * Constructs a DateFormatLocalizeResetForm object.
+   *
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
+   * @param \Drupal\Core\Config\ConfigFactory $config_factory
+   *   The config factory.
    */
-  public function __construct(ConfigFactory $config_factory) {
+  public function __construct(TranslatorInterface $translation_manager, ConfigFactory $config_factory) {
+    parent::__construct($translation_manager);
     $this->configFactory = $config_factory;
   }
 
@@ -44,6 +51,7 @@ public function __construct(ConfigFactory $config_factory) {
    */
   public static function create(ContainerInterface $container) {
     return new static(
+      $container->get('string_translation'),
       $container->get('config.factory')
     );
   }
diff --git a/core/modules/system/lib/Drupal/system/Form/ImageToolkitForm.php b/core/modules/system/lib/Drupal/system/Form/ImageToolkitForm.php
index 100553c..f304aa7 100644
--- a/core/modules/system/lib/Drupal/system/Form/ImageToolkitForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/ImageToolkitForm.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Drupal\system\SystemConfigFormBase;
 use Drupal\system\Plugin\ImageToolkitManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -32,11 +33,13 @@ class ImageToolkitForm extends SystemConfigFormBase {
    *   The factory for configuration objects.
    * @param \Drupal\Core\Config\Context\ContextInterface $context
    *   The configuration context used for this configuration object.
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
    * @param \Drupal\system\Plugin\ImageToolkitManager $manager
    *   The image toolkit plugin manager.
    */
-  public function __construct(ConfigFactory $config_factory, ContextInterface $context, ImageToolkitManager $manager) {
-    parent::__construct($config_factory, $context);
+  public function __construct(ConfigFactory $config_factory, ContextInterface $context, TranslatorInterface $translation_manager, ImageToolkitManager $manager) {
+    parent::__construct($config_factory, $context, $translation_manager);
 
     foreach ($manager->getAvailableToolkits() as $id => $definition) {
       $this->availableToolkits[$id] = $manager->createInstance($id);
@@ -50,6 +53,7 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
       $container->get('config.context.free'),
+      $container->get('string_translation'),
       $container->get('image.toolkit.manager')
     );
   }
diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php
index 8296ba6..e62da0e 100644
--- a/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php
@@ -36,13 +36,6 @@ class ModulesListConfirmForm extends ConfirmFormBase implements ControllerInterf
   protected $keyValueExpirable;
 
   /**
-   * The translation manager service.
-   *
-   * @var \Drupal\Core\StringTranslation\TranslationManager
-   */
-  protected $translationManager;
-
-  /**
    * The request object.
    *
    * @var \Symfony\Component\HttpFoundation\Request
@@ -78,16 +71,17 @@ public static function create(ContainerInterface $container) {
    *   The translation manager.
    */
   public function __construct(ModuleHandlerInterface $module_handler, KeyValueStoreExpirableInterface $key_value_expirable, TranslationManager $translation_manager) {
+    parent::__construct($translation_manager);
+
     $this->moduleHandler = $module_handler;
     $this->keyValueExpirable = $key_value_expirable;
-    $this->translationManager = $translation_manager;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->translationManager->translate('Some required modules must be enabled');
+    return $this->t('Some required modules must be enabled');
   }
 
   /**
@@ -101,14 +95,14 @@ public function getCancelPath() {
    * {@inheritdoc}
    */
   public function getConfirmText() {
-    return $this->translationManager->translate('Continue');
+    return $this->t('Continue');
   }
 
   /**
    * {@inheritdoc}
    */
   public function getDescription() {
-    return $this->translationManager->translate('Would you like to continue with the above?');
+    return $this->t('Would you like to continue with the above?');
   }
 
   /**
@@ -181,7 +175,7 @@ public function submitForm(array &$form, array &$form_state) {
     // message if there are changes.
     if ($before != $this->moduleHandler->getModuleList()) {
       drupal_flush_all_caches();
-      drupal_set_message($this->translationManager->translate('The configuration options have been saved.'));
+      drupal_set_message($this->t('The configuration options have been saved.'));
     }
 
     $form_state['redirect'] = $this->getCancelPath();
diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php
index 463eb5a..f0a5a4b 100644
--- a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php
@@ -37,13 +37,6 @@ class ModulesUninstallConfirmForm extends ConfirmFormBase implements ControllerI
   protected $keyValueExpirable;
 
   /**
-   * The translation manager service.
-   *
-   * @var \Drupal\Core\StringTranslation\TranslationManager
-   */
-  protected $translationManager;
-
-  /**
    * The request object.
    *
    * @var \Symfony\Component\HttpFoundation\Request
@@ -79,23 +72,24 @@ public static function create(ContainerInterface $container) {
    *   The translation manager.
    */
   public function __construct(ModuleHandlerInterface $module_handler, KeyValueStoreExpirableInterface $key_value_expirable, TranslationManager $translation_manager) {
+    parent::__construct($translation_manager);
+
     $this->moduleHandler = $module_handler;
     $this->keyValueExpirable = $key_value_expirable;
-    $this->translationManager = $translation_manager;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->translationManager->translate('Confirm uninstall');
+    return $this->t('Confirm uninstall');
   }
 
   /**
    * {@inheritdoc}
    */
   public function getConfirmText() {
-    return $this->translationManager->translate('Uninstall');
+    return $this->t('Uninstall');
   }
 
   /**
@@ -109,7 +103,7 @@ public function getCancelPath() {
    * {@inheritdoc}
    */
   public function getDescription() {
-    return $this->translationManager->translate('Would you like to continue with uninstalling the above?');
+    return $this->t('Would you like to continue with uninstalling the above?');
   }
 
   /**
@@ -136,7 +130,7 @@ public function buildForm(array $form, array &$form_state, Request $request = NU
     }
 
     $data = system_rebuild_module_data();
-    $form['text']['#markup'] = '<p>' . $this->translationManager->translate('The following modules will be completely uninstalled from your site, and <em>all data from these modules will be lost</em>!') . '</p>';
+    $form['text']['#markup'] = '<p>' . $this->t('The following modules will be completely uninstalled from your site, and <em>all data from these modules will be lost</em>!') . '</p>';
     $form['modules'] = array(
       '#theme' => 'item_list',
       '#items' => array_map(function ($module) use ($data) {
@@ -158,7 +152,7 @@ public function submitForm(array &$form, array &$form_state) {
     // Uninstall the modules.
     $this->moduleHandler->uninstall($this->modules);
 
-    drupal_set_message($this->translationManager->translate('The selected modules have been uninstalled.'));
+    drupal_set_message($this->t('The selected modules have been uninstalled.'));
     $form_state['redirect'] = 'admin/modules/uninstall';
   }
 
diff --git a/core/modules/system/lib/Drupal/system/Form/PerformanceForm.php b/core/modules/system/lib/Drupal/system/Form/PerformanceForm.php
index 92404b7..3b555be 100644
--- a/core/modules/system/lib/Drupal/system/Form/PerformanceForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/PerformanceForm.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\system\Form;
 
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Drupal\system\SystemConfigFormBase;
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
@@ -32,10 +33,12 @@ class PerformanceForm extends SystemConfigFormBase {
    *   The factory for configuration objects.
    * @param \Drupal\Core\Config\Context\ContextInterface $context
    *   The configuration context used for this configuration object.
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
    * @param \Drupal\Core\Cache\CacheBackendInterface $page_cache
    */
-  public function __construct(ConfigFactory $config_factory, ContextInterface $context, CacheBackendInterface $page_cache) {
-    parent::__construct($config_factory, $context);
+  public function __construct(ConfigFactory $config_factory, ContextInterface $context, TranslatorInterface $translation_manager, CacheBackendInterface $page_cache) {
+    parent::__construct($config_factory, $context, $translation_manager);
 
     $this->pageCache = $page_cache;
   }
@@ -47,6 +50,7 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
       $container->get('config.context.free'),
+      $container->get('string_translation'),
       $container->get('cache.page')
     );
   }
diff --git a/core/modules/system/lib/Drupal/system/Form/RegionalForm.php b/core/modules/system/lib/Drupal/system/Form/RegionalForm.php
index 5bb5b2b..a71b754 100644
--- a/core/modules/system/lib/Drupal/system/Form/RegionalForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/RegionalForm.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\Locale\CountryManagerInterface;
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Drupal\system\SystemConfigFormBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -32,11 +33,13 @@ class RegionalForm extends SystemConfigFormBase {
    *   The factory for configuration objects.
    * @param \Drupal\Core\Config\Context\ContextInterface $context
    *   The configuration context used for this configuration object.
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
    * @param \Drupal\Core\Locale\CountryManagerInterface $country_manager
    *   The country manager.
    */
-  public function __construct(ConfigFactory $config_factory, ContextInterface $context, CountryManagerInterface $country_manager) {
-    parent::__construct($config_factory, $context);
+  public function __construct(ConfigFactory $config_factory, ContextInterface $context, TranslatorInterface $translation_manager, CountryManagerInterface $country_manager) {
+    parent::__construct($config_factory, $context, $translation_manager);
     $this->countryManager = $country_manager;
   }
 
@@ -47,6 +50,7 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
       $container->get('config.context.free'),
+      $container->get('string_translation'),
       $container->get('country_manager')
     );
   }
diff --git a/core/modules/system/lib/Drupal/system/Form/SiteInformationForm.php b/core/modules/system/lib/Drupal/system/Form/SiteInformationForm.php
index 55b1175..b3daf4c 100644
--- a/core/modules/system/lib/Drupal/system/Form/SiteInformationForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/SiteInformationForm.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\Path\AliasManagerInterface;
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Drupal\system\SystemConfigFormBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -32,11 +33,13 @@ class SiteInformationForm extends SystemConfigFormBase {
    *   The factory for configuration objects.
    * @param \Drupal\Core\Config\Context\ContextInterface $context
    *   The configuration context used for this configuration object.
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
    * @param \Drupal\Core\Path\AliasManagerInterface $alias_manager
    *   The path alias manager.
    */
-  public function __construct(ConfigFactory $config_factory, ContextInterface $context, AliasManagerInterface $alias_manager) {
-    parent::__construct($config_factory, $context);
+  public function __construct(ConfigFactory $config_factory, ContextInterface $context, TranslatorInterface $translation_manager, AliasManagerInterface $alias_manager) {
+    parent::__construct($config_factory, $context, $translation_manager);
 
     $this->aliasManager = $alias_manager;
   }
@@ -48,6 +51,7 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
       $container->get('config.context.free'),
+      $container->get('string_translation'),
       $container->get('path.alias_manager')
     );
   }
diff --git a/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php b/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php
index 216d0d1..04ee621 100644
--- a/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\system\Form;
 
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Drupal\Core\Cache\Cache;
@@ -34,11 +35,13 @@ class ThemeSettingsForm extends SystemConfigFormBase {
    *   The factory for configuration objects.
    * @param \Drupal\Core\Config\Context\ContextInterface $context
    *   The configuration context to use.
-   * @param Drupal\Core\Extension\ModuleHandlerInterface
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface
    *   The module handler instance to use.
    */
-  public function __construct(ConfigFactory $config_factory, ContextInterface $context, ModuleHandlerInterface $module_handler) {
-    parent::__construct($config_factory, $context);
+  public function __construct(ConfigFactory $config_factory, ContextInterface $context, TranslatorInterface $translation_manager, ModuleHandlerInterface $module_handler) {
+    parent::__construct($config_factory, $context, $translation_manager);
 
     $this->moduleHandler = $module_handler;
   }
@@ -50,6 +53,7 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
       $container->get('config.context.free'),
+      $container->get('string_translation'),
       $container->get('module_handler')
     );
   }
diff --git a/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php b/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php
index eb82bdc..064c235 100644
--- a/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php
+++ b/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php
@@ -7,16 +7,17 @@
 
 namespace Drupal\system;
 
-use Drupal\Core\Form\FormInterface;
+use Drupal\Core\Form\FormBase;
 use Drupal\Core\Controller\ControllerInterface;
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Base class for implementing system configuration forms.
  */
-abstract class SystemConfigFormBase implements FormInterface, ControllerInterface {
+abstract class SystemConfigFormBase extends FormBase implements ControllerInterface {
 
   /**
    * Stores the configuration factory.
@@ -32,8 +33,12 @@
    *   The factory for configuration objects.
    * @param \Drupal\Core\Config\Context\ContextInterface $context
    *   The configuration context to use.
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
    */
-  public function __construct(ConfigFactory $config_factory, ContextInterface $context) {
+  public function __construct(ConfigFactory $config_factory, ContextInterface $context, TranslatorInterface $translation_manager) {
+    parent::__construct($translation_manager);
+
     $this->configFactory = $config_factory;
     $this->configFactory->enterContext($context);
   }
@@ -44,7 +49,8 @@ public function __construct(ConfigFactory $config_factory, ContextInterface $con
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
-      $container->get('config.context.free')
+      $container->get('config.context.free'),
+      $container->get('string_translation')
     );
   }
 
@@ -55,7 +61,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['actions']['#type'] = 'actions';
     $form['actions']['submit'] = array(
       '#type' => 'submit',
-      '#value' => t('Save configuration'),
+      '#value' => $this->t('Save configuration'),
       '#button_type' => 'primary',
     );
 
@@ -66,16 +72,10 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::validateForm().
-   */
-  public function validateForm(array &$form, array &$form_state) {
-  }
-
-  /**
    * Implements \Drupal\Core\Form\FormInterface::submitForm().
    */
   public function submitForm(array &$form, array &$form_state) {
-    drupal_set_message(t('The configuration options have been saved.'));
+    drupal_set_message($this->t('The configuration options have been saved.'));
   }
 
 }
diff --git a/core/modules/user/lib/Drupal/user/AccountSettingsForm.php b/core/modules/user/lib/Drupal/user/AccountSettingsForm.php
index c43dc6d..d4ccb94 100644
--- a/core/modules/user/lib/Drupal/user/AccountSettingsForm.php
+++ b/core/modules/user/lib/Drupal/user/AccountSettingsForm.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\user;
 
+use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Drupal\system\SystemConfigFormBase;
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Context\ContextInterface;
@@ -32,11 +33,13 @@ class AccountSettingsForm extends SystemConfigFormBase {
    *   The factory for configuration objects.
    * @param \Drupal\Core\Config\Context\ContextInterface $context
    *   The configuration context.
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
+   *   The translation manager.
    * @param \Drupal\Core\Extension\ModuleHandler $module_handler
    *   The module handler.
    */
-  public function __construct(ConfigFactory $config_factory, ContextInterface $context, ModuleHandler $module_handler) {
-    parent::__construct($config_factory, $context);
+  public function __construct(ConfigFactory $config_factory, ContextInterface $context, TranslatorInterface $translation_manager, ModuleHandler $module_handler) {
+    parent::__construct($config_factory, $context, $translation_manager);
     $this->moduleHandler = $module_handler;
   }
 
@@ -47,6 +50,7 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
       $container->get('config.context.free'),
+      $container->get('string_translation'),
       $container->get('module_handler')
     );
   }