Index: metatag.entity_translation.inc
===================================================================
--- metatag.entity_translation.inc	(revision 27392)
+++ metatag.entity_translation.inc	(revision 27559)
@@ -1,54 +0,0 @@
-<?php
-/**
- * @file
- * Meta Tags implementation of Entity Translation hooks.
- */
-
-/**
- * Implements hook_entity_translation_insert().
- */
-function metatag_entity_translation_insert($entity_type, $entity, $translation, $values = array()) {
-  // The update hook can handle both cases so just call that one.
-  metatag_entity_translation_update($entity_type, $entity, $translation, $values);
-}
-
-/**
- * Implements hook_entity_translation_update().
- */
-function metatag_entity_translation_update($entity_type, $entity, $translation, $values = array()) {
-  // Get the ID of the entity.
-  list($entity_id) = entity_extract_ids($entity_type, $entity);
-
-  // Grab the meta tag data only; we don't need anything else.
-  $values = (array)$values;
-  $values = isset($values['metatags']) ? $values['metatags'] : array();
-
-  // Set the default values to be that of the entity's original language (whose
-  // tags are shown if the current language has none set) so that we can
-  // extract these from the form elements if they haven't been changed.
-  $entity_language = function_exists('entity_language') ?
-    entity_language($entity_type, $entity) : $entity->language;
-  if ($entity_language && isset($entity->metatags[$entity_language])) {
-    $defaults = $entity->metatags[$entity_language];
-  }
-  else {
-    $defaults = array();
-  }
-
-  // Remove all of the defaults.
-  metatag_filter_values_from_defaults($values, $defaults);
-
-  // Save the new data.
-  metatag_metatags_save($entity_type, $entity_id, $values, $translation['language']);
-}
-
-/**
- * Implements hook_entity_translation_delete().
- */
-function metatag_entity_translation_delete($entity_type, $entity, $langcode) {
-  // Get the entity's ID.
-  list($entity_id) = entity_extract_ids($entity_type, $entity);
-
-  // Delete the translation.
-  metatag_metatags_delete($entity_type, $entity_id, $langcode);
-}
Index: metatag_context/metatag_context.context.inc
===================================================================
--- metatag_context/metatag_context.context.inc	(revision 27392)
+++ metatag_context/metatag_context.context.inc	(revision 27559)
@@ -101,7 +101,9 @@
           $metadata_array = $context->reactions['metatag_context_reaction']['metatags'];
           foreach ($metadata_array as $key => $data) {
             if (!empty($data['value'])) {
-              $metatags[$key] = $data;//t(check_plain($data['value']));
+              $name = 'metatag:context:' . $context->name . ':' . $key;
+              $data['value'] = metatag_translate($name, $data['value']);
+              $metatags[$key] = $data;
             }
           }
 
Index: metatag_context/metatag_context.admin.inc
===================================================================
--- metatag_context/metatag_context.admin.inc	(revision 27392)
+++ metatag_context/metatag_context.admin.inc	(revision 27559)
@@ -85,6 +85,13 @@
   $context = metatag_context_load_default_context();
   $context->name = $form_state['values']['name'];
   context_save($context);
+  // Update the i18n string
+  if (function_exists('i18n_string_update')) {
+    foreach ($context->reactions['metatag_context_reaction']['metatags'] as $field => $item) {
+      $name = "metatag:context:" . $context->name . ":" . $field;
+      i18n_string_update($name, $item['value']);
+    }
+  }
   $form_state['redirect'] = 'admin/config/search/metatags/context/' . $context->name;
 }
 
@@ -168,6 +175,13 @@
   $paths = array_combine($paths, $paths);
   $context->conditions['path']['values'] = $paths;
   context_save($context);
+  // Update the i18n string
+  if (function_exists('i18n_string_update')) {
+    foreach ($context->reactions['metatag_context_reaction']['metatags'] as $field => $item) {
+      $name = "metatag:context:" . $context->name . ":" . $field;
+      i18n_string_update($name, $item['value']);
+    }
+  }
   $form_state['redirect'] = 'admin/config/search/metatags/context';
 }