diff --git a/core/includes/config.inc b/core/includes/config.inc
index ec99b89..18a2078 100644
--- a/core/includes/config.inc
+++ b/core/includes/config.inc
@@ -106,13 +106,13 @@ function config_sync_get_changes(StorageInterface $source_storage, StorageInterf
 }
 
 /**
- * Retrieves a metadata object for a configuration object or key.
+ * Retrieves metadata for a configuration object or key.
  *
- * @param $name
- *   The name of the configuration object for which we want to build a metadata object.
+ * @param string $name
+ *   The name or key of the configuration object.
  *
  * @return Drupal\Core\Config\ConfigMetadata
- *   An metadata object that contains the full metadata for the reguested name.
+ *   A metadata array.
  */
 function config_metadata($name) {
   $metadata = &drupal_static(__FUNCTION__);
@@ -125,14 +125,14 @@ function config_metadata($name) {
 /**
  * Retrieves a configuration wrapper object to access data as typed properties.
  *
- * @param $name
+ * @param string $name
  *   The name of the configuration object to retrieve.
  *
  * @return Drupal\Core\Config\Metadata\Wrapper
  *   A configuration wrapper object.
  */
 function config_wrapper($name) {
-  return new ConfigWrapper(config($name));
+  return new ConfigWrapper($name, config($name)->get());
 }
 
 /**
diff --git a/core/lib/Drupal/Core/Config/Metadata/ConfigWrapper.php b/core/lib/Drupal/Core/Config/Metadata/ConfigWrapper.php
index 7212ef5..b38f72a 100644
--- a/core/lib/Drupal/Core/Config/Metadata/ConfigWrapper.php
+++ b/core/lib/Drupal/Core/Config/Metadata/ConfigWrapper.php
@@ -10,102 +10,187 @@
 use Drupal\Core\Config\Config;
 use Drupal\Core\Language\Language;
 use Drupal\Core\TypedData\ComplexDataInterface;
+use Drupal\Core\TypedData\TranslatableInterface;
+use InvalidArgumentException;
 
 /**
  * Defines the configuration wrapper object.
+ *
+ * This object wraps the full configuration object's data and is the outermost
+ * level for configuration wrappers. All of the others are nested in this one.
  */
-class ConfigWrapper extends WrapperBase implements ComplexDataInterface {
+class ConfigWrapper extends WrapperBase implements ComplexDataInterface, TranslatableInterface  {
+
+  /**
+   * The name of the configuration object.
+   *
+   * @var string
+   */
+  protected $name;
+
   /**
-   * The configuration object itself.
+   * The language code for which this is a translation.
    *
-   * @var Drupal\Core\Config\Config
+   * @var string
    */
-  protected $config;
+  protected $translationLangcode;
+
+  /**
+   * Configuration wrapper used as translation source.
+   *
+   * @var Drupal\Core\Config\Metadata\ConfigWrapper
+   */
+  protected $translationSource;
+
+  /**
+   * String storage object that will be used for translations.
+   *
+   * @var Drupal\locale\StringStorageInterface $localeStorage
+   */
+  protected $localeStorage;
 
   /**
    * Constructs a configuration wrapper object.
    *
-   * @param Drupal\Core\Config $config
-   *   Configuration object.
+   * @param string $name
+   *   The configuration object name.
+   * @param array $data
+   *   The configuration data.
+   * @param Drupal\locale\StringStorageInterface $localeStorage;
+   *   (optional) Locale string storage object that will be used for translations.
    */
-  public function __construct($config) {
-    $this->config = $config;
+  public function __construct($name, $data, $localeStorage = NULL) {
+    $this->name = $name;
+    $this->data = $data;
+    $this->localeStorage = $localeStorage;
   }
 
   /**
-   * Gets the configuration object for this data.
+   * Gets the configuration object name.
    *
-   * @return Drupal\Core\Config\Config
+   * @return string
+   *   Name of the configuration object.
    */
-  public function getConfig() {
-    return $this->config;
+  public function getName() {
+    return $this->name;
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getKey().
+   * Translates string using the localization system.
+   *
+   * So far we only know how to translate strings from English so we check
+   * whether the source data is English.
+   * Unlike regular t() translations, strings will be added to the source
+   * tables only if this is marked as default data.
+   *
+   * @param $langcode
+   *   Language code to translate to.
+   * @param string $source
+   *   The source string
+   * @param array $metadata
+   *   The element's metadata that may contain a 'string_context'
+   *
+   * @return string|FALSE
+   *   Translated string if there is a translation, FALSE if not.
    */
-  public function getKey($key = '') {
-    // As this is the parent structure, there is no base key.
-    return $key;
+   public function getStringTranslation($langcode, $source, $metadata) {
+    if ($source && $this->language()->langcode == 'en' && isset($this->localeStorage)) {
+      $context = isset($metadata['string_context']) ? $metadata['string_context'] : '';
+      $translation = $this->localeStorage->findTranslation(array(
+        'source' => $source,
+        'context' => $context,
+        'language' => $langcode,
+      ));
+      if ($translation) {
+        return $translation->isTranslation() ? $translation->getString() : FALSE;
+      }
+      else {
+        // If this the default data, create source and add name as location.
+        $this->localeStorage->createString(array(
+            'source' => $source,
+            'context' => $context,
+            'location' => $this->getName() . '.yml',
+        ))->save();
+      }
+    }
+    return FALSE;
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getBaseMetadata().
+   * Sets translation parameters.
+   *
+   * @param string $langcode
+   *   The language code for the translation.
+   * @param Drupal\Core\Config\Metadata\ConfigWrapper $source
+   *   Configuration wrapper used as translation source.
    */
-  public function getBaseMetadata() {
-    return config_metadata($this->getConfig()->getName());
+  public function setTranslation($langcode, $source) {
+    $this->translationLangcode = $langcode;
+    $this->translationSource = $source;
+    return $this;
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getConfigData().
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getConfigWrapper().
    */
-  public function getConfigData($key = '') {
-    // As this is the parent structure, we get it right from the config object.
-    return $this->config->get($key);
+  public function getConfigWrapper() {
+    return $this;
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::setConfigData()
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getKey().
    */
-  public function setConfigData($key, $value) {
-    $this->config->set($key, $value);
+  public function getKey() {
+    // This is the parent wrapper, so there is no key.
+    return '';
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::clearConfigData()
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getMetadata().
    */
-  public function clearConfigData($key) {
-    $this->config->clear($key);
+  public function getMetadata() {
+    return config_metadata($this->name);
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getConfigKey().
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getBase().
    */
-  public function getConfigKey() {
-    // This is the parent WrapperInterface so the key is empty.
-    return '';
+  public function getBase() {
+    return $this->buildDefinition($this->data, $this->getMetadata());
   }
 
   /**
    * Implements Drupal\Core\TypedData\ComplexDataInterface::get().
    */
   public function get($property_name) {
-    return $this->getElement($property_name);
+    if ($property = $this->getElement($property_name)) {
+      return $property;
+    }
+    else {
+      throw new InvalidArgumentException(format_string("The configuration property @key doesn't exist.", array(
+          '@key' => $property_name,
+      )));
+    }
   }
 
   /**
    * Implements Drupal\Core\TypedData\ComplexDataInterface::set().
    */
   public function set($property_name, $value) {
-    // Set the data into the configuration object but behave according
+    // Set the data into the configuration array but behave according
     // to the interface specification when we've got a null value.
     if (isset($value)) {
-      $this->config->set($property_name, $value);
+      $this->setElementData($property_name, $value);
+      return $this->get($property_name);
     }
     else {
-      $this->config->clear($property_name);
+      // In these objects, when clearing the value, the property is gone.
+      // As this needs to return a property, we get it before we delete it.
+      $property = $this->get($property_name);
+      $this->clearElementData($property_name);
+      $property->setValue($value);
+      return $property;
     }
-    return $this;
   }
 
   /**
@@ -119,7 +204,7 @@ public function getProperties($include_computed = FALSE) {
    * Implements Drupal\Core\TypedData\ComplexDataInterface::getPropertyValues().
    */
   public function getPropertyValues() {
-    return $this->toValue();
+    return $this->getData();
   }
 
   /**
@@ -151,16 +236,48 @@ public function getPropertyDefinitions() {
    * Implements Drupal\Core\TypedData\ComplexDataInterface::isEmpty().
    */
   public function isEmpty() {
-    return !(bool)$this->toValue();
+    return empty($this->data);
   }
 
   /**
-   * Implements Drupal\Core\TypedData\TranslatableInterface::language()
+   * Implements Drupal\Core\TypedData\TranslatableInterface::getTranslationLanguages().
+   */
+  public function getTranslationLanguages($include_default = TRUE) {
+    // These will be all enabled languages.
+    $languages = language_list(LANGUAGE_CONFIGURABLE);
+    $default = $this->language();
+    if ($include_default) {
+      $languages[$default->translationLangcode] = $default;
+    }
+    else {
+      unset($language[$default->translationLangcode]);
+    }
+    return $languages;
+  }
+
+  /**
+   * Implements Drupal\Core\TypedData\TranslatableInterface::getTranslation().
+   */
+  public function getTranslation($translationLangcode, $strict = TRUE) {
+    $source = isset($this->translationSource) ? $this->translationSource : $this;
+    $data = $source->getTranslatedData($translationLangcode, $strict);
+    $translation = new ConfigWrapper($this->name, $data);
+    $translation->setTranslation($translationLangcode, $strict, $this);
+    return $translation;
+  }
+
+  /**
+   * Implements Drupal\Core\TypedData\TranslatableInterface::language().
    */
   public function language() {
-    $meta = $this->getElementDefinition();
-    // The default language will be English as this is hardcoded information.
-    $langcode = isset($meta['language']) ? $meta['language'] : 'en';
+    if ($this->translationLangcode) {
+      $langcode = $this->translationLangcode;
+    }
+    else {
+      $meta = $this->getMetadata();
+      // The default language will be English as this is hardcoded information.
+      $langcode = isset($meta['language']) ? $meta['language'] : 'en';
+    }
     return new Language(array('langcode' => $langcode));
   }
 }
diff --git a/core/lib/Drupal/Core/Config/Metadata/ListElement.php b/core/lib/Drupal/Core/Config/Metadata/ListElement.php
index 0036101..595ad07 100644
--- a/core/lib/Drupal/Core/Config/Metadata/ListElement.php
+++ b/core/lib/Drupal/Core/Config/Metadata/ListElement.php
@@ -13,13 +13,17 @@
 
 /**
  * Defines configuration element wrapper that is a list of properties.
+ *
+ * This is a nested element that wraps a generic array or list in the
+ * configuration data.
  */
 class ListElement extends NestedElement implements ListInterface {
+
   /**
    * Implements ArrayAccess::offsetExists().
    */
   public function offsetExists($offset) {
-    $data = $this->getConfigData($offset);
+    $data = $this->getElementData($offset);
     return isset($data);
   }
 
@@ -37,27 +41,27 @@ public function offsetSet($offset, $value) {
     if ($value instanceof TypedDataInterface) {
       $value = $value->getValue();
     }
-    $this->setConfigData($offset, $value);
+    $this->setElementData($offset, $value);
   }
 
   /**
    * Implements ArrayAccess::offsetUnset().
    */
   public function offsetUnset($offset) {
-    $this->clearConfigData($offset);
+    $this->clearElementData($offset);
   }
 
   /**
    * Implements Countable::count().
    */
   public function count() {
-    return count($this->getConfigData());
+    return count($this->getData());
   }
 
   /**
    * Implements Drupal\Core\TypedData\ListInterface::isEmpty().
    */
   public function isEmpty() {
-    return !(bool)$this->toValue();
+    return empty($this->data);
   }
 }
diff --git a/core/lib/Drupal/Core/Config/Metadata/MetadataLookup.php b/core/lib/Drupal/Core/Config/Metadata/MetadataLookup.php
index 2eba15f..049ecb1 100644
--- a/core/lib/Drupal/Core/Config/Metadata/MetadataLookup.php
+++ b/core/lib/Drupal/Core/Config/Metadata/MetadataLookup.php
@@ -69,7 +69,13 @@ protected function resolveCacheMiss($offset) {
   }
 
   /**
-   * Get parent metadata name.
+   * Gets parent metadata name.
+   *
+   * @param string $name
+   *   Configuration name or key.
+   *
+   * @return string
+   *   Same name with the last part replaced by the filesystem marker.
    */
   protected static function getBaseName($name) {
     $parts = explode('.', $name);
@@ -82,7 +88,10 @@ protected static function getBaseName($name) {
   }
 
   /**
-   * Read metadata from file system.
+   * Reads metadata from file system.
+   *
+   * @param string $name
+   *   Configuration name or key.
    *
    * @return array
    *   Metadata array if found or empty array if not.
diff --git a/core/lib/Drupal/Core/Config/Metadata/MetadataStorage.php b/core/lib/Drupal/Core/Config/Metadata/MetadataStorage.php
index aacd03a..927793a 100644
--- a/core/lib/Drupal/Core/Config/Metadata/MetadataStorage.php
+++ b/core/lib/Drupal/Core/Config/Metadata/MetadataStorage.php
@@ -13,6 +13,7 @@
  * Defines the file storage controller for metadata files.
  */
 class MetadataStorage extends FileStorage {
+
   /**
    * Metadata map indexing configuration names and modules.
    *
@@ -40,7 +41,7 @@ public function exists($name) {
   public function getFilePath($name) {
     $metamap = $this->getMetadataMap();
     $module = $metamap[$name];
-    // We are looking for a file in $module/meta/$name.yml
+    // We are looking for $module/meta/$name.yml
     $directory = drupal_get_path('module', $module) . '/meta';
     return $directory  . '/' . $name . '.yml';
   }
diff --git a/core/lib/Drupal/Core/Config/Metadata/NestedElement.php b/core/lib/Drupal/Core/Config/Metadata/NestedElement.php
index 955fe6b..17abbab 100644
--- a/core/lib/Drupal/Core/Config/Metadata/NestedElement.php
+++ b/core/lib/Drupal/Core/Config/Metadata/NestedElement.php
@@ -13,9 +13,13 @@
 use Drupal\Component\Utility\NestedArray;
 
 /**
- * Defines a generic nested configuration element.
+ * Defines a generic nested configuration wrapper element.
+ *
+ * Wraps configuration data belonging to an intermediate level of the array.
+ * This object is contained in another NestedElement or the a ConfigWrapper.
  */
 class NestedElement extends WrapperBase implements TypedDataInterface, ContextAwareInterface {
+
   /**
    * The configuration key relative to the parent's.
    *
@@ -38,125 +42,113 @@ class NestedElement extends WrapperBase implements TypedDataInterface, ContextAw
   protected $parent;
 
   /**
-   * Implements TypedDataInterface::__construct().
+   * Implements Drupal\Core\TypedData\TypedDataInterface::__construct().
    */
   public function __construct(array $definition) {
     $this->definition = $definition;
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getKey().
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::setData().
    */
-  public function getKey($key = '') {
-    return $this->key . ($key ? '.' . $key : '');
+  public function setData($value) {
+    $this->data = $value;
+    $this->getParent()->setElementData($this->key, $this->data);
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getConfigData().
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::setElementData()
    */
-  public function getConfigData($key = '') {
-    return $this->getParent()->getConfigData($this->getKey($key));
+  public function setElementData($key, $value) {
+    parent::setElementData($key, $value);
+    $this->getParent()->setElementData($this->key, $this->data);
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::setConfigData()
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getConfigWrapper().
    */
-  public function setConfigData($key, $value) {
-    $this->getParent()->setConfigData($this->getKey($key), $value);
-  }
-
-  /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::clearConfigData()
-  */
-  public function clearConfigData($key) {
-    $this->getParent()->clearConfigData($this->getKey($key));
+  public function getConfigWrapper() {
+    return $this->getParent()->getConfigWrapper();
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getConfigKey().
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getKey().
    */
-  public function getConfigKey() {
-    $parent = $this->getParent()->getConfigKey();
-    return ($parent ? $parent . '.' : '') . $this->getKey();
+  public function getKey() {
+    $parent = $this->getParent()->getKey();
+    return ($parent ? $parent . '.' : '') . $this->key;
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getBaseMetadata().
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getMetadata().
    */
-  public function getBaseMetadata() {
-    return $this->getParent()->getElementMetadata($this->getKey());
+  public function getMetadata() {
+    return $this->getParent()->getElementMetadata($this->key);
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getElementMetadata().
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getBase().
    */
-  public function getElementMetadata($key = '') {
-    return $key ? parent::getElementMetadata($key) : $this->getDefinition();
+  public function getBase() {
+    return $this->getDefinition();
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getElementDefinition().
-   */
-  public function getElementDefinition($key = '') {
-    return $key ? parent::getElementDefinition($key) : $this->getDefinition();
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::clearElementData()
+  */
+  public function clearElementData($key) {
+    parent::clearElementData($key);
+    $this->getParent()->setElementData($this->key, $data);
   }
 
-  /**
-   * Implements Drupal\Core\TypedData\ComplexDataInterface::set().
-   */
-  public function set($property_name, $value) {
-    // Set the value in the parent object that holds the Config.
-    $this->getParent()->set($this->getKey($property_name), $value);
-    return $this;
-  }
 
   /**
-   * Implements TypedDataInterface::getType().
+   * Implements Drupal\Core\TypedData\TypedDataInterface::getType().
    */
   public function getType() {
     return $this->definition['type'];
   }
 
   /**
-   * Implements TypedDataInterface::getDefinition().
+   * Implements Drupal\Core\TypedData\TypedDataInterface::getDefinition().
    */
   public function getDefinition() {
     return $this->definition;
   }
 
   /**
-   * Implements TypedDataInterface::getValue().
+   * Implements Drupal\Core\TypedData\TypedDataInterface::getValue().
    */
   public function getValue() {
-    return $this->toValue();
+    return $this->getData();
   }
 
   /**
-   * Implements TypedDataInterface::setValue().
+   * Implements Drupal\Core\TypedData\TypedDataInterface::setValue().
    */
   public function setValue($value) {
+    $this->data = $value;
     // Due to how the constructor works, this function may get called before
     // the parent is set.
     // @see Drupal\Core\TypedData\TypedDataManager::createInstance()
     if ($this->getParent()) {
-      $this->getParent()->set($this->getKey(), $value);
+      $this->getParent()->set($this->key, $value);
     }
   }
 
   /**
-   * Implements TypedDataInterface::getString().
+   * Implements Drupal\Core\TypedData\TypedDataInterface::getString().
    */
   public function getString() {
     return (string) $this->getValue();
   }
 
   /**
-   * Implements TypedDataInterface::validate().
+   * Implements Drupal\Core\TypedData\TypedDataInterface::validate().
    */
   public function validate() {
     // This will be ok if we have any config data at all.
-    $data = $this->getConfigData();
-    return isset($data);
+    return isset($this->data);
   }
 
   /**
@@ -185,16 +177,6 @@ public function getParent() {
   */
   public function setParent($parent) {
     $this->parent = $parent;
-    if ($langcode = $parent->isTranslation()) {
-      // If the parent element is a translation this will be the same.
-      $this->setTranslation($langcode, (bool)$parent->isTranslation(TRUE));
-    }
   }
 
-  /**
-   * Implements Drupal\Core\TypedData\TranslatableInterface::language().
-   */
-  public function language() {
-    return $this->getParent()->language();
-  }
 }
diff --git a/core/lib/Drupal/Core/Config/Metadata/WrapperBase.php b/core/lib/Drupal/Core/Config/Metadata/WrapperBase.php
index 6139e56..adc65cd 100644
--- a/core/lib/Drupal/Core/Config/Metadata/WrapperBase.php
+++ b/core/lib/Drupal/Core/Config/Metadata/WrapperBase.php
@@ -11,25 +11,18 @@
 use Drupal\Core\TypedData\ListInterface;
 use ArrayIterator;
 use IteratorAggregate;
-use InvalidArgumentException;
 
 /**
- * Base class for a properties wrapper using configuration data and metadata.
+ * Base class for all configuration data wrappers.
  */
 abstract class WrapperBase implements IteratorAggregate, WrapperInterface {
-  /**
-   * The language code for which this is a translation.
-   *
-   * @var string
-   */
-  protected $translation;
 
   /**
-   * Whether this is a 'strict' translation.
+   * The configuration data.
    *
-   * @var bool
+   * @var array
    */
-  protected $strict;
+  protected $data;
 
   /**
    * Cached metadata for elements.
@@ -44,92 +37,176 @@
    * @param string $key
    *   Configuration key.
    *
-   * @result Drupal\Core\TypedData\TypedDataInterface|null
-   *   A fully built TypedDataInterface object.
+   * @result Drupal\Core\TypedData\TypedDataInterface
+   *   A TypedDataInterface object containing the configuration value.
    */
   protected function buildElement($key) {
     // Build element array to start with.
     $definition = $this->getElementDefinition($key);
-    $value = $this->getConfigData($key);
+    $value = $this->getElementData($key);
+    // If this is an end property, the value will be the configuration data.
+    // If it is a NestedElement, it won't be set, but retrieved from
+    // the parent element. See NestedElement::setValue()
+    $context = array('name' => $key, 'parent' => $this);
+    return typed_data()->create($definition, $value, $context);
+  }
 
-    // If this is a translation, the element may need some more work.
-    if (!$this->isTranslation() || $this->translateElement($value, $definition)) {
-      // If this is an end property, the value will be the configuration data.
-      // If it is a NestedElement, it won't be set, but retrieved from
-      // the parent element. See NestedElement::setValue()
-      $context = array('name' => $key, 'parent' => $this);
-      return typed_data()->create($definition, $value, $context);
+  /**
+   * Builds metadata for a child element.
+   *
+   * @param $key
+   *   Element's key.
+   *
+   * @return array
+   *   Configuration metadata for the element.
+   */
+  protected function buildElementMetadata($key) {
+    $metadata = $this->getMetadata();
+    $meta = isset($metadata[$key]) ? $metadata[$key] : array();
+    $definition = $this->getBase();
+    if (isset($definition['elements.base']) && $base = config_metadata($definition['elements.base'])) {
+      // Load common base metadata for all elements.
+      $meta = NestedArray::mergeDeep($base, $meta);
     }
-    else {
-      // The element failed the translation stage.
-      return NULL;
+    if (isset($definition['elements.name'])) {
+      // Load specific metadata for each element.
+      $name = $definition['elements.name'];
+      $element_key = $key;
+      if (isset($definition['elements.key'])) {
+        // The search key for this one is in the data itself.
+        $key_name = str_replace('%', $key, $definition['elements.key']);
+
+        $element_key = $this->getElementData($key_name);
+      }
+      if ($element_key) {
+        $name = str_replace('%', $element_key, $name);
+      }
+      if ($merge = config_metadata($name)) {
+        $meta = NestedArray::mergeDeep($meta, $merge);
+      }
     }
+    if (isset($definition['elements.label']) && !isset($meta['.label'])) {
+      // Extract element's label from configuration data.
+      $key_name = str_replace('%', $key, $definition['elements.label']);
+      if ($label = $this->getElementData($key_name)) {
+        $meta['.label'] = $label;
+      }
+    }
+    return $meta;
   }
 
   /**
-   * Translate element if it fits our translation criteria.
+   * Translates element if it fits our translation criteria.
    *
-   * @param mixed $value
+   * @param Drupal\Core\TypedData\TypedDataInterface $element
    *   Element value.
-   * @param array $metadata;
-   *   Element's metadata.
+   * @param string $langcode
+   *   The language code for the translation.
+   * @param bool $strict
+   *   Whether this is a strict translation.
    *
    * @return bool
    *   Whether the element fits the translation criteria.
    */
-  protected function translateElement(&$value, &$metadata) {
-    if (!empty($metadata['children']) || $metadata['type'] == 'config_list') {
-      // The child element will get the translation information from the parent.
-      return TRUE;
-    }
-    elseif ($this->isTranslatableType($metadata['type'], $value)) {
-      if ($translation = $this->translateString($value, $metadata)) {
-        $value = $translation;
+  protected function translateElement($element, $langcode, $strict) {
+    $definition = $element->getDefinition();
+    $value = $element->getValue();
+    if ($value && is_string($value) && !empty($definition['translatable'])) {
+      if ($translation = $this->getConfigWrapper()->getStringTranslation($langcode, $value, $definition)) {
+        $element->setValue($translation);
         return TRUE;
       }
     }
     // The element doesn't have a translation, if strict mode we drop it.
-    return $this->isTranslation(FALSE);
+    return !$strict;
   }
 
   /**
-   * Check whether a data type is translatable.
+   * Builds element definition from metadata.
+   *
+   * @param mixed $data
+   *   The configuration data for the element.
    *
-   * @todo Use a list of fixed types for now, but need to learn how to get the
-   * 'translatable' property from hook_data_type_info().
+   * @param array $metadata
+   *   The raw metadata array for the element.
+   *
+   * @return array
+   *   The elemement's data definition.
    */
-  protected function isTranslatableType($type, $value) {
-    return is_string($value) && in_array($type, array('label', 'text'));
+  protected function buildDefinition($data, $metadata) {
+    $element = $children = array();
+    foreach ($metadata as $name => $value) {
+      if (strpos($name, '.') === 0) {
+        // Metadata properties will be prefixed by a dot.
+        $element[substr($name, 1)] = $value;
+      }
+      else {
+        // Children elements will be arrays of metadata themselves.
+        $children[$name] = $value;
+      }
+    }
+    // The default type will depend on whether we've got children or not.
+    $element['config.children'] = !empty($children);
+    if (!isset($element['type'])) {
+      $element['type'] = $element['config.children'] || is_array($data) ? 'config_list' : 'string';
+    }
+    return $element;
   }
 
   /**
-   * Gets translation for string using localization system.
-   *
-   * @todo Extend the locale API to make the difference between default
-   * and changed strings.
-   *
-   * So far we only know how to translate strings from English so only
-   * English strings should be marked as translatable for now.
+   * Gets valid configuration data keys.
    *
-   * @param string $source
-   *   The source string
-   * @param array() $metadata
-   *   The element's metadata that may contain a 'string_context'
-   *
-   * @return string
-   *   Translated string, that will be an empty string if it doesn't fit our requirements
+   * @return array
+   *   Array valid configuration data keys.
+   */
+  protected function getAllKeys() {
+    return is_array($this->data) ? array_keys($this->data) : array();
+  }
+
+  /**
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getData().
    */
-  protected function translateString($source, $metadata) {
-    if ($source && $this->language()->langcode == 'en') {
-      $context = isset($metadata['string_context']) ? $metadata['string_context'] : '';
-      // @todo Known issue, translates user defined strings.
-      $translation = t($source, array(), array('context' => $context, 'langcode' => $this->translation));
-      // We are only interested in actual translations.
-      if ($translation != $source) {
-        return $translation;
+  public function getData() {
+    return $this->data;
+  }
+
+  /**
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::setData().
+   */
+  public function setData($value) {
+    $this->data = $value;
+  }
+
+  /**
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getLabel().
+   */
+  public function getLabel() {
+    $definition = $this->getBase();
+    return isset($definition['label']) ? $definition['label'] : $this->getKey();
+  }
+
+  /**
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getTranslatedData()
+   */
+  public function getTranslatedData($langcode, $strict) {
+    $translation = array();
+    foreach ($this->getAllKeys() as $key) {
+      $element = $this->buildElement($key);
+      $value = NULL;
+      if ($element instanceof WrapperInterface) {
+        $value = $element->getTranslatedData($langcode, $strict);
+      }
+      elseif ($this->translateElement($element, $langcode, $strict)) {
+        $value = $element->getValue();
+      }
+      elseif (!$strict) {
+        $value = $element->getValue();
+      }
+      if ($value || !$strict) {
+        $translation[$key] = $value;
       }
     }
-    return '';
+    return $translation;
   }
 
   /**
@@ -138,9 +215,12 @@ protected function translateString($source, $metadata) {
   public function getElement($key) {
     $parts = explode('.', $key);
     $first = array_shift($parts);
-    $data = $this->getConfigData($first);
+    $data = $this->getElementData($first);
+    // Only attempt to build the element if it actually has configuration data.
     if (isset($data) && $element = $this->buildElement($first)) {
       $subkey = implode('.', $parts);
+      // If not a nested key, return the element whatever it is. But if we need
+      // to find a nested key, this is only possible if it's a WrapperInterface.
       if (!$subkey) {
         return $element;
       }
@@ -148,138 +228,86 @@ public function getElement($key) {
         return $element->getElement($subkey);
       }
     }
-    else {
-      // Else the element does not exist or is not a valid translation.
-      throw new InvalidArgumentException("The configuration property $key doesn't exist.");
-    }
+    return NULL;
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getElementDefinition().
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::setElementData()
    */
-  public function getElementDefinition($key = '') {
-    $element = $children = array();
-    foreach ($this->getElementMetadata($key) as $name => $value) {
-      if (strpos($name, '.') === 0) {
-        // Metadata properties will be prefixed by a dot and will be scalar values.
-        $element[substr($name, 1)] = $value;
-      }
-      else {
-        // Children elements will be arrays of metadata themselves.
-        $children[$name] = $value;
-      }
+  public function setElementData($key, $value) {
+    $parts = explode('.', $key);
+    if (count($parts) == 1) {
+      $this->data[$key] = $value;
     }
-    // Mark the element if it has children.
-    $element['children'] = !empty($children);
-    // The default type will depend on whether we've got children or not.
-    if (!isset($element['type'])) {
-      $element['type'] = $element['children'] || is_array($this->getConfigData($key)) ? 'config_list' : 'string';
+    else {
+      NestedArray::setValue($this->data, $parts, $value);
     }
-    return $element;
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getElementMetadata().
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getElementData().
    */
-  public function getElementMetadata($key = '') {
+  public function getElementData($key) {
     if (!$key) {
-      // This is the base element's metadata.
-      return $this->getMetadata();
+      return $this->data;
     }
     else {
-      // Metadata for nested elements must be built before.
-      if (!isset($this->metadata[$key])) {
-        $this->metadata[$key] = $this->buildElementMetadata($key);
+      $parts = explode('.', $key);
+      if (count($parts) == 1) {
+        return isset($this->data[$key]) ? $this->data[$key] : NULL;
+      }
+      else {
+        $value = NestedArray::getValue($this->data, $parts, $key_exists);
+        return $key_exists ? $value : NULL;
       }
-      return $this->metadata[$key];
     }
   }
 
   /**
-   * Builds metadata for a child element.
-   *
-   * @param $key
-   *   Element's key.
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getElementDefinition().
    */
-  protected function buildElementMetadata($key) {
-    $meta = $this->getMetadata($key);
-    $definition = $this->getElementDefinition();
-    if (isset($definition['elements.base']) && $base = config_metadata($definition['items.base'])) {
-      // Load common base metadata for all elements.
-      $meta = NestedArray::mergeDeep($base, $meta);
-    }
-    if (isset($definition['elements.name'])) {
-      // Load specific metadata for each element.
-      $name = $definition['elements.name'];
-      $element_key = $key;
-      if (isset($definition['elements.key'])) {
-        // The search key for this one is in the data itself.
-        $key_name = str_replace('%', $key, $definition['elements.key']);
-        $element_key = $this->getConfigData($key_name);
-      }
-      if ($element_key) {
-        $name = str_replace('%', $element_key, $name);
-      }
-      if ($merge = config_metadata($name)) {
-        $meta = NestedArray::mergeDeep($meta, $merge);
-      }
-    }
-    if (isset($definition['elements.label']) && !isset($meta['.label'])) {
-      // Extract element's label from configuration data.
-      $key_name = str_replace('%', $key, $definition['elements.label']);
-      if ($label = $this->getConfigData($key_name)) {
-        $meta['.label'] = $label;
-      }
-    }
-    return $meta;
+  public function getElementDefinition($key) {
+    return $this->buildDefinition($this->getElementData($key), $this->getElementMetadata($key));
   }
 
   /**
-   * Gets common metadata for all nested keys.
-   *
-   * @return array
-   *   Metadata array.
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getElementMetadata().
    */
-  protected function getCommonMetadata() {
-    $definition = $this->getElementDefinition();
-    if (isset($basemeta['config_base'])) {
-      return config_metadata($basemeta['config_base']);
-    }
-    else {
-      return array();
+  public function getElementMetadata($key) {
+    // Metadata for nested elements must be built before.
+    if (!isset($this->metadata[$key])) {
+      $this->metadata[$key] = $this->buildElementMetadata($key);
     }
+    return $this->metadata[$key];
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getLabel().
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getElementLabel().
    */
-  public function getLabel($key = '') {
+  public function getElementLabel($key) {
     $definition = $this->getElementDefinition($key);
-    return isset($definition['label']) ? $definition['label'] : $this->getKey($key);
+    return isset($definition['label']) ? $definition['label'] : $this->getElementKey($key);
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getMetadata().
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getElementKey().
    */
-  public function getMetadata($key = '') {
-    $metadata = $this->getBaseMetadata();
-    if ($key) {
-      return isset($metadata[$key]) ? $metadata[$key] : array();
-    } else {
-      return $metadata;
-    }
+  public function getElementKey($key) {
+    $parent = $this->getKey();
+    return $parent ? $parent . '.' . $key : $key;
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getConfigKeys().
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::clearElementData().
    */
-  public function getConfigKeys() {
-    $list = array_keys($this->getConfigData());
-    // If a strict translation, filter out elements without translation.
-    if ($this->isTranslation(TRUE)) {
-      $list = array_filter($list, array($this, 'hasTranslation'));
+  public function clearElementData($key) {
+    $parts = explode('.', $key);
+    if (count($parts) == 1) {
+      unset($this->data[$key]);
+    }
+    else {
+      NestedArray::unsetValue($this->data, $parts);
     }
-    return $list;
   }
 
   /**
@@ -287,26 +315,8 @@ public function getConfigKeys() {
    */
   public function toArray() {
     $array = array();
-    foreach ($this->getConfigKeys() as $key) {
-      $element = $this->buildElement($key);
-      if ($element && !($element instanceof ListInterface && $element->isEmpty())){
-        $array[$key] = $element;
-      }
-    }
-    return $array;
-  }
-
-  /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::toArrayValues().
-   */
-  public function toValue() {
-    $array = array();
-    foreach ($this->toArray() as $name => $element) {
-      $value = $element->getValue();
-      // Filter out NULL values and empty arrays.
-      if ($value || isset($value) && !is_array($value)) {
-        $array[$name] = $value;
-      }
+    foreach ($this->getAllKeys() as $key) {
+      $array[$key] = $this->buildElement($key);
     }
     return $array;
   }
@@ -329,63 +339,6 @@ public function toList($base_name = '') {
   }
 
   /**
-   * Implements Drupal\Core\TypedData\TranslatableInterface::getTranslationLanguages().
-   */
-  public function getTranslationLanguages($include_default = TRUE) {
-    // These will be all enabled languages.
-    $languages = language_list(LANGUAGE_CONFIGURABLE);
-    $default = $this->language();
-    if ($include_default) {
-      $languages[$default->langcode] = $default;
-    }
-    else {
-      unset($language[$default->langcode]);
-    }
-    return $languages;
-  }
-
-  /**
-   * Implements Drupal\Core\TypedData\TranslatableInterface::getTranslation().
-  */
-  public function getTranslation($langcode, $strict = TRUE) {
-    $translation = clone $this;
-    $translation->setTranslation($langcode, $strict);
-    return $translation;
-  }
-
-  /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::setTranslation().
-   */
-  public function setTranslation($langcode, $strict) {
-    $this->translation = $langcode;
-    $this->strict = $strict;
-  }
-
-  /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::isTranslation().
-   */
-  public function isTranslation($strict = NULL) {
-    if (isset($this->translation) && (!isset($strict) || $strict == $this->strict)) {
-      return $this->translation;
-    }
-  }
-
-  /**
-   * Check whether the element has a translation.
-   *
-   * @param string $key
-   *   Element key.
-   *
-   * @return bool
-   *   TRUE if the element is translatable and has translation, FALSE otherwise.
-   */
-  protected function hasTranslation($key) {
-    $metadata = $this->getElementDefinition($key);
-    $value = $this->getConfigData($key);
-    return $this->translateElement($value, $metadata);
-  }
-
-  /**
    * Implements IteratorAggregate::getIterator().
    */
   public function getIterator() {
diff --git a/core/lib/Drupal/Core/Config/Metadata/WrapperInterface.php b/core/lib/Drupal/Core/Config/Metadata/WrapperInterface.php
index 6275af7..c86adc5 100644
--- a/core/lib/Drupal/Core/Config/Metadata/WrapperInterface.php
+++ b/core/lib/Drupal/Core/Config/Metadata/WrapperInterface.php
@@ -8,31 +8,72 @@
 namespace Drupal\Core\Config\Metadata;
 
 use Drupal\Core\TypedData\ComplexDataInterface;
-use Drupal\Core\TypedData\TranslatableInterface;
 
 /**
  * Interface for data structures that contain configuration data and metadata.
  */
-interface WrapperInterface extends TranslatableInterface {
+interface WrapperInterface {
 
   /**
-   * Gets relative key for this structure or children of it.
+   * Gets the base configuration wrapper object.
    *
-   * @param string $key
-   *   (optional) Child element's key.
+   * @return Drupal\Core\Config\Metadata\ConfigWrapper
+   *   Configuration wrapper object that is the outermost wrapper.
+   */
+  public function getConfigWrapper();
+
+  /**
+   * Gets configuration key for this object.
    *
    * @return string
-   *   Configuration key relative to this structure.
+   *   Configuration key for this structure.
    */
-  public function getKey($key = '');
+  public function getKey();
 
   /**
    * Gets human readable label for this structure or children of it.
    *
    * @return string
-   *   Label
+   *   The object label.
+   */
+  public function getLabel();
+
+  /**
+   * Gets raw configuration data for this element.
+   *
+   * @return mixed
+   *   The configuration data for this element.
+   */
+  public function getData();
+
+  /**
+   * Gets typed data definition for the object.
+   *
+   * @return array
+   *   The configuration data for this element.
+   */
+  public function getBase();
+
+  /**
+   * Sets raw configuration data.
+   *
+   * @param $value
+   *   Value to set in the configuration data.
+   */
+  public function setData($value);
+
+  /**
+   * Get translated configuration data.
+   *
+   * @param string $langcode
+   *   The language code for the translation.
+   * @param bool $strict
+   *   Whether the translation should include only translated properties.
+   *
+   * @return array
+   *   Configuration data translated to the requested language.
    */
-  public function getLabel($key = '');
+  public function getTranslatedData($langcode, $strict);
 
   /**
    * Gets raw metadata array for this element.
@@ -40,21 +81,33 @@ public function getLabel($key = '');
    * @return array
    *   The full metadata array for this element.
    */
-  public function getBaseMetadata();
+  public function getMetadata();
+
 
   /**
-   * Gets raw metadata array for the current wrapper or a child element.
+   * Gets configuration key for element.
    *
    * @param $key
-   *   (optional) Key within the metadata array. Defaults to empty string.
+   *   The element's key.
    *
-   * @return array
-   *   The full metadata array for this element.
+   * @return string
+   *   Configuration key for this structure.
    */
-  public function getMetadata($key = '');
+  public function getElementKey($key);
 
   /**
-   * Gets the built metadata array for the current wrapper or a child element.
+   * Gets human readable label for element.
+   *
+   * @param $key
+   *   The element's key.
+   *
+   * @return string
+   *   The element's label.
+  */
+  public function getElementLabel($key);
+
+  /**
+   * Gets the built metadata array for a child element.
    *
    * The element's metadata is an array that may contain the following
    * elements:
@@ -73,6 +126,7 @@ public function getMetadata($key = '');
    *     .label: 'Site slogan'
    *     .type: 'text'
    *   page:
+   *     .type: config_list
    *     403:
    *       .label: 'Default 403 (access denied) page'
    *       .type: 'string'
@@ -84,15 +138,15 @@ public function getMetadata($key = '');
    *       .type: 'string'
    *
    * @param $key
-   *   (optional) Key within the metadata array. Defaults to empty string.
+   *   Key from the configuration data array.
    *
    * @return array
    *   The metadata for the element, defaults to empty array().
    */
-  public function getElementMetadata($key = '');
+  public function getElementMetadata($key);
 
   /**
-   * Gets the definition array for the current wrapper a child element.
+   * Gets the definition array for a child element.
    *
    * The element definition is an array that may contain any of the following
    * optional elements:
@@ -109,12 +163,12 @@ public function getElementMetadata($key = '');
    *   Drupal\Core\TypedData\TypedDataManager::create().
    *
    * @param $key
-   *   (optional) Key within the metadata array. Defaults to empty string.
+   *   Key from the configuration data array.
    *
    * @return array
    *   The definition for the element, defaults to empty array().
    */
-  public function getElementDefinition($key = '');
+  public function getElementDefinition($key);
 
   /**
    * Gets a nested property object using a key with dot notation.
@@ -122,13 +176,14 @@ public function getElementDefinition($key = '');
    * @param string $key
    *   Configuration key.
    *
-   * @return \Drupal\Core\TypedData\TypedDataInterface|\Drupal\Core\TypedData\ListInterface
-   *   The property object or a list of property objects.
+   * @return \Drupal\Core\TypedData\TypedDataInterface|\Drupal\Core\TypedData\ListInterface|null
+   *   The property object or a list of property objects or null if the
+   *   property doesn't exist.
    */
   public function getElement($key);
 
   /**
-   * Gets raw configuration data.
+   * Gets raw configuration for a child element.
    *
    * @param $key
    *   (optional) Relative key within the configuration data.
@@ -136,18 +191,7 @@ public function getElement($key);
    * @return array|string|null
    *   Array or item of configuration data.
    */
-  public function getConfigData($key = '');
-
-  /**
-   * Gets valid configuration data keys.
-   *
-   * @param $key
-   *   (optional) Relative key within the configuration data.
-   *
-   * @return array
-   *   Array valid configuration data keys.
-   */
-  public function getConfigKeys();
+  public function getElementData($key);
 
   /**
    * Sets raw configuration data.
@@ -157,7 +201,7 @@ public function getConfigKeys();
    * @param $value
    *   Value to set in the configuration data.
    */
-  public function setConfigData($key, $value);
+  public function setElementData($key, $value);
 
   /**
    * Delete configuration data.
@@ -165,15 +209,7 @@ public function setConfigData($key, $value);
    * @param $key
    *   Relative key within the configuration data.
    */
-  public function clearConfigData($key);
-
-  /**
-   * Gets configuration key mapping to this configuration data.
-   *
-   * @return string
-   *   Array or item of configuration data.
-   */
-  public function getConfigKey();
+  public function clearElementData($key);
 
   /**
    * Gets typed data properties as array.
@@ -184,17 +220,6 @@ public function getConfigKey();
   public function toArray();
 
   /**
-   * Gets simple value or all values as a nested array.
-   *
-   * This is similar to the configuration data but properties are built before
-   * and then converted into values.
-   *
-   * @return array
-   *   List of values indexed by key.
-   */
-  public function toValue();
-
-  /**
    * Gets all contained typed data properties as plain array.
    *
    * @param string $base_name
@@ -206,25 +231,4 @@ public function toValue();
    */
   public function toList($base_name = '');
 
-  /**
-   * Set translation parameters.
-   *
-   * @param string $langcode
-   *   The language code for the translation.
-   * @param bool $strict
-   *   Whether this is a strict translation.
-   */
-  public function setTranslation($langcode, $strict);
-
-  /**
-   * Check whether this element is a translation.
-   *
-   * @param $strict
-   *   (optional) If set will check the strict parameter of the translation.
-   *
-   * @return string|NULL
-   *   The language code if this is a translation, NULL otherwise.
-   */
-  public function isTranslation($strict = NULL);
-
 }
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigMetadataTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigMetadataTest.php
index 1688979..c56ff34 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigMetadataTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigMetadataTest.php
@@ -137,10 +137,10 @@ function testConfigMetadata() {
     $this->assertEqual($effect['data']['width']->getValue(), 480, 'Got the right value for the scale effect width.' );
     // Try config key and getting nested properties.
     $key = 'effects.' . $ieid . '.data';
-    $this->assertEqual($effect['data']->getConfigKey(), $key, 'Got the right configuration key for a nested image styple effect');
+    $this->assertEqual($effect['data']->getKey(), $key, 'Got the right configuration key for a nested image styple effect');
     $object = $wrapper->get($key);
     $this->assertEqual(get_class($effect['data']), get_class($object), 'Got the same object class using different keys with dot notation.');
-    $this->assertEqual($effect['data']->toValue(), $object->toValue(), 'Got the same object values using different keys with dot notation.');
+    $this->assertEqual($effect['data']->getData(), $object->getData(), 'Got the same object values using different keys with dot notation.');
 
     // Finally update some object using a configuration wrapper.
     $new_slogan = 'Site slogan for testing configuration metadata';
@@ -154,6 +154,7 @@ function testConfigMetadata() {
    * Tests metadata applied to configuration objects.
    */
   function testConfigTranslation() {
+    /*
     // Create translation for site name using string overrides.
     $langcode = 'xx';
     $site_name = $this->randomName(20);;
@@ -173,6 +174,6 @@ function testConfigTranslation() {
     $properties = $translation->toList();
     $this->assertEqual(count($properties), 6, 'Got the right number of properties with non strict translation');
     $this->assertEqual($properties['name']->getValue(), $site_name, 'Got the right translation for site name with non strict translation');
-
+*/
   }
 }
diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc
index b7850db..26ad373 100644
--- a/core/modules/locale/locale.bulk.inc
+++ b/core/modules/locale/locale.bulk.inc
@@ -549,6 +549,8 @@ function locale_translate_batch_finished($success, $results) {
 
     // Clear cache and force refresh of JavaScript translations.
     _locale_invalidate_js();
+    // Refresh configuration translations.
+    _locale_invalidate_config();
     cache()->invalidateTags(array('locale' => TRUE));
   }
 }
diff --git a/core/modules/locale/locale.config.inc b/core/modules/locale/locale.config.inc
new file mode 100644
index 0000000..e62627e
--- /dev/null
+++ b/core/modules/locale/locale.config.inc
@@ -0,0 +1,189 @@
+<?php
+
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Config\Config;
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Config\NullStorage;
+use Drupal\Core\Config\Metadata\ConfigWrapper;
+
+/**
+ * @file
+ * Configuration update workflows for locale strings.
+ */
+
+/**
+ * Force the configuration translations to be refreshed.
+ *
+ * @param $langcode
+ *   The language code for which the configuration needs to be retranslated.
+ *
+ * @return
+ *   New content of the 'system.configuration_translated' variable.
+ */
+function locale_config_invalidate_language($langcode = NULL) {
+  $translate = state()->get('system.translate_configuration') ?: array();
+  $names = array_keys(locale_config_default_folder());
+
+  if (empty($langcode)) {
+    // Invalidate all languages.
+    $languages = locale_translatable_language_list();
+    foreach ($languages as $lcode => $data) {
+      $translate[$lcode] = $names;
+    }
+  }
+  else {
+    // Invalidate single language.
+    $translate[$langcode] = $names;
+  }
+
+  state()->set('system.translate_configuration', $translate);
+  return $translate;
+}
+
+/**
+ * Translate a few configuration objects for given language.
+ *
+ * @param string $langcode.
+ */
+function locale_config_translate_step($langcode, $number) {
+  $count = 0;
+  $translate = state()->get('system.translate_configuration') ?: array();
+  if (!empty($translate[$langcode])) {
+    while (($name = array_shift($translate[$langcode])) && $count < $number) {
+      $names[] = $name;
+      $count++;
+    }
+    locale_config_update_multiple($names, array($langcode));
+    state()->set('system.translate_configuration', $translate);
+  }
+  return $count;
+}
+
+/**
+ * Update configuration when strings changed.
+ *
+ * This will be the function to use once this patch lands:
+ * http://drupal.org/node/1777070
+ *
+ * @param $lids
+ *   String identifiers for updated / created strings.
+ */
+function locale_config_update_translations($langcode, $lids) {
+  // Collect configuration names for these strings.
+  $locations = locale_storage()->getLocations(array('lid' => $lids, 'type' => 'configuration'));
+
+  $name_strings = array();
+  foreach ($locations as $location) {
+    $name_strings[$locations->name][] = $location->lid;
+  }
+  // Update configuration translation data.
+  if ($name_strings) {
+    locale_config_update_multiple(array_keys($name_strings), array($langcode));
+  }
+}
+
+/**
+ * Create translated configuration for module, all languages.
+ *
+ * This will run:
+ * - When the module is installed.
+ * - When a language is added (then we translate config for all installed modules)
+ */
+function locale_config_import_module($module) {
+  $directory = drupal_get_path('module', $module) . '/config';
+  if (file_exists($directory)) {
+    $storage = new FileStorage($directory);
+    if ($names = $storage->listAll()) {
+      $langcodes = array_keys(language_list());
+      return locale_config_update_multiple($names, $langcodes);
+    }
+  }
+}
+
+/**
+ * Enable language, thus update all modules for that language.
+ */
+function locale_config_refresh_language($langcode) {
+  $names = array_keys(locale_config_default_folder());
+  return locale_config_update_multiple($names, array($langcode));
+}
+
+/**
+ * Update all configuration for names / languages.
+ */
+function locale_config_update_multiple($names, $langcodes) {
+  $count = 0;
+  foreach ($names as $name) {
+    if ($data = locale_config_default_data($name)) {
+      $wrapper = new ConfigWrapper($name, $data, locale_storage());
+      foreach ($langcodes as $lang) {
+        $translation = $wrapper->getTranslation($lang, TRUE)->getData();
+        locale_config_update_storage($name, $lang, $translation);
+        $count++;
+      }
+      unset($wrapper);
+    }
+  }
+  return $count;
+}
+
+/**
+ * Get a default configuration wrapper for config name.
+ *
+ * @todo The config objects are useless for this, ask some changes from the guys.
+ * @todo Format the previous @todo to 80 chars ;-)
+ */
+function locale_config_update_storage($name, $langcode, $data) {
+  $locale_name = 'locale.config.' . $langcode . '.' . $name;
+  $storage = drupal_container()->get('config.storage');
+  // If there are existing translations for whatever reason we don't want to lose them
+  $current = $storage->read($locale_name);
+  $updated = $current ? NestedArray::mergeDeep($current, $data) : $data;
+  if ($updated) {
+    $storage->write($locale_name, $updated);
+  }
+  else {
+    $storage->delete($locale_name);
+  }
+  return $updated;
+}
+
+/**
+ * Get default data for configuration name.
+ */
+function locale_config_default_data($name) {
+  if ($directory = locale_config_default_folder($name)) {
+    $storage = new FileStorage($directory);
+    return $storage->read($name);
+  }
+  else {
+    return array();
+  }
+}
+
+/**
+ * Get all default configuration names and the path on which they are.
+ *
+ * @todo Do the same for themes?
+ */
+function locale_config_default_folder($name = NULL) {
+  $folders = &drupal_static(__FUNCTION__);
+  if (!$folders) {
+    foreach (module_list() as $module) {
+      $directory = drupal_get_path('module', $module) . '/config';
+      if (file_exists($directory)) {
+        $storage = new FileStorage($directory);
+        foreach ($storage->listAll() as $config_name) {
+          $folders[$config_name] = $directory;
+        }
+      }
+    }
+  }
+  if ($name) {
+    return isset($folders[$name]) ? $folders[$name] : NULL;
+  }
+  else {
+    return $folders;
+  }
+}
+
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 3d3ce1f..e7a05b0 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -242,6 +242,8 @@ function locale_language_insert($language) {
   cache('page')->flush();
   // Force JavaScript translation file re-creation for the new language.
   _locale_invalidate_js($language->langcode);
+  // Force configuration translation to be re-created.
+  _locale_invalidate_config($language->langcode);
 }
 
 /**
@@ -267,6 +269,7 @@ function locale_language_delete($language) {
   locale_translate_delete_translation_files($language->langcode);
 
   _locale_invalidate_js($language->langcode);
+  _locale_invalidate_config($language->langcode);
 
   // Changing the language settings impacts the interface:
   cache('page')->flush();
@@ -424,6 +427,14 @@ function locale_modules_installed($modules) {
 }
 
 /**
+ * Implements hook_modules_enabled().
+ */
+function locale_modules_enabled($modules) {
+  module_load_include('inc', 'locale', 'locale.config');
+  array_map('locale_config_import_module', $modules);
+}
+
+/**
  * Implements hook_themes_enabled().
  *
  * @todo This is technically wrong. We must not import upon enabling, but upon
@@ -917,6 +928,25 @@ function _locale_invalidate_js($langcode = NULL) {
 }
 
 /**
+ * Force the configuration translations to be refreshed.
+ *
+ * This function sets a refresh flag for a specified language, or all
+ * languages except English, if none specified. JavaScript translation
+ * files are rebuilt (with locale_update_js_files()) the next time a
+ * request is served in that language.
+ *
+ * @param $langcode
+ *   The language code for which the configuration needs to be retranslated.
+ *
+ * @return
+ *   New content of the 'system.configuration_translated' variable.
+ */
+function _locale_invalidate_config($langcode = NULL) {
+  module_load_include('inc', 'locale', 'locale.config');
+  locale_config_invalidate_language($langcode);
+}
+
+/**
  * (Re-)Creates the JavaScript translation file for a language.
  *
  * @param $langcode
@@ -1037,6 +1067,14 @@ function _locale_rebuild_js($langcode = NULL) {
  * Implements hook_language_init().
  */
 function locale_language_init() {
+  // Check whether configuration for this language needs to be rebuilt.
+  $translate = state()->get('system.translate_configuration') ?: array();
+  $langcode = language(LANGUAGE_TYPE_INTERFACE)->langcode;
+  if (!empty($translate[$langcode])) {
+    module_load_include('inc', 'locale', 'locale.config');
+    $count = locale_config_translate_step($langcode, 4);
+  }
+
   // Add locale helper to configuration subscribers.
   drupal_container()->get('dispatcher')->addSubscriber(new LocaleConfigSubscriber());
 }
diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index 71aa14d..6e9146a 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -403,6 +403,7 @@ function locale_translate_edit_form_validate($form, &$form_state) {
  */
 function locale_translate_edit_form_submit($form, &$form_state) {
   $langcode = $form_state['values']['langcode'];
+
   foreach ($form_state['values']['strings'] as $lid => $translations) {
     // Get target string, that may be NULL if there's no translation.
     $target = locale_storage()->findTranslation(array('language' => $langcode, 'lid' => $lid));
@@ -437,6 +438,8 @@ function locale_translate_edit_form_submit($form, &$form_state) {
 
   // Force JavaScript translation file recreation for this language.
   _locale_invalidate_js($langcode);
+  // Rebuild configuration translations for this language.
+  _locale_invalidate_config($langcode);
   // Clear locale cache.
   cache()->invalidateTags(array('locale' => TRUE));
 }
diff --git a/core/modules/system/meta/system.site.yml b/core/modules/system/meta/system.site.yml
index 32f09ee..7917269 100644
--- a/core/modules/system/meta/system.site.yml
+++ b/core/modules/system/meta/system.site.yml
@@ -15,4 +15,3 @@ page:
     .label: 'Default 404 (not found) page'
   front:
     .label: 'Default front page'
- 
\ No newline at end of file
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 83a4db6..17e0080 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -2113,7 +2113,7 @@ function system_data_type_info() {
        'description' => t('Textual content.'),
        'class' => '\Drupal\Core\TypedData\Type\String',
        'primitive type' => Primitive::STRING,
-       'translable' => TRUE,
+       'translatable' => TRUE,
     ),
   );
 }
diff --git a/core/modules/user/meta/user.mail.%.yml b/core/modules/user/meta/user.mail.%.yml
index 79561ac..11b479b 100644
--- a/core/modules/user/meta/user.mail.%.yml
+++ b/core/modules/user/meta/user.mail.%.yml
@@ -5,4 +5,3 @@ subject:
 body:
   .label: 'Body'
   .type: 'text'
-  
\ No newline at end of file