diff --git a/language_fallback.i18n.inc b/language_fallback.i18n.inc
new file mode 100644
index 0000000..89a6aeb
--- /dev/null
+++ b/language_fallback.i18n.inc
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Implements hook_i18n_string_info_alter().
+ */
+function language_fallback_i18n_string_info_alter(&$object_info) {
+  foreach ($object_info as $type => &$info) {
+    if (!isset($info['class']) || $info['class'] == 'i18n_string_textgroup_default') {
+      $info['class'] = 'language_fallback_i18n_string_textgroup_default';
+    }
+  }
+}
+
+/**
+ * Extends the default i18n string textgroup class providing language fallback.
+ */
+class language_fallback_i18n_string_textgroup_default extends i18n_string_textgroup_default {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function load_translation($i18nstring, $langcode) {
+    parent::load_translation($i18nstring, $langcode);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function multiple_translation_load($conditions, $langcode) {
+    return parent::multiple_translation_load($conditions, $langcode);
+  }
+}
diff --git a/language_fallback.module b/language_fallback.module
index 0abba2a..5f7f422 100644
--- a/language_fallback.module
+++ b/language_fallback.module
@@ -12,6 +12,7 @@ define('LANGUAGE_FALLBACK_ALL_COUNTRIES', 'all');
  */
 module_load_include('inc', 'language_fallback', 'language_fallback.admin');
 module_load_include('inc', 'language_fallback', 'language_fallback.block');
+module_load_include('inc', 'language_fallback', 'language_fallback.i18n');
 
 /**
  * Implements hook_menu().

From 68c1a6c6a370c6720679521d546ca7504927820d Mon Sep 17 00:00:00 2001
From: Alexander Tkachev <alex.leksat@gmail.com>
Date: Sat, 17 Jan 2015 16:38:28 +0300
Subject: [PATCH 2/3] VET-525 Copied parent functions code, so the next commit
 shows the actual changes.

---
 language_fallback.i18n.inc | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/language_fallback.i18n.inc b/language_fallback.i18n.inc
index 89a6aeb..3635820 100644
--- a/language_fallback.i18n.inc
+++ b/language_fallback.i18n.inc
@@ -20,13 +20,47 @@ class language_fallback_i18n_string_textgroup_default extends i18n_string_textgr
    * {@inheritdoc}
    */
   public static function load_translation($i18nstring, $langcode) {
-    parent::load_translation($i18nstring, $langcode);
+    if (!empty($i18nstring->lid)) {
+      $query = db_select('locales_target', 't');
+      $query->condition('t.lid', $i18nstring->lid);
+    }
+    else {
+      $query = db_select('i18n_string', 's')->fields('s');
+      $query->leftJoin('locales_target', 't', 's.lid = t.lid');
+      $query->condition('s.textgroup', $i18nstring->textgroup);
+      $query->condition('s.context', $i18nstring->context);
+    }
+    $query->fields('t', array('translation', 'i18n_status'));
+    $query->condition('t.language', $langcode);
+    $query->range(0, 1);
+    return $query->execute()->fetchObject();
   }
 
   /**
    * {@inheritdoc}
    */
   protected function multiple_translation_load($conditions, $langcode) {
-    return parent::multiple_translation_load($conditions, $langcode);
+    $conditions += array(
+      'language' => $langcode,
+      'textgroup' => $this->textgroup
+    );
+    $query = db_select('i18n_string', 's')->fields('s');
+    $query->leftJoin('locales_target', 't', 's.lid = t.lid');
+    $query->fields('t', array('translation', 'language', 'i18n_status'));
+    foreach ($conditions as $field => $value) {
+      if (is_array($value) && count($value) == 1) {
+        $value = reset($value);
+      }
+      if ($value === '*') {
+        continue;
+      }
+      elseif ($field == 'language') {
+        $query->condition('t.language', $value);
+      }
+      else {
+        $query->condition('s.' . $field, $value);
+      }
+    }
+    return $this->multiple_translation_build($query->execute()->fetchAll(), $langcode);
   }
 }

From dac8082e64f7ae04f17af1d9d41979ecd955e666 Mon Sep 17 00:00:00 2001
From: Alexander Tkachev <alex.leksat@gmail.com>
Date: Sat, 17 Jan 2015 16:40:15 +0300
Subject: [PATCH 3/3] VET-525 Implemented translation fallback for i18n
 strings.

---
 language_fallback.i18n.inc | 48 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/language_fallback.i18n.inc b/language_fallback.i18n.inc
index 3635820..eef7b10 100644
--- a/language_fallback.i18n.inc
+++ b/language_fallback.i18n.inc
@@ -13,6 +13,11 @@ function language_fallback_i18n_string_info_alter(&$object_info) {
 
 /**
  * Extends the default i18n string textgroup class providing language fallback.
+ *
+ * The overridden methods contain a bit modified code of the original methods.
+ * It would be nice to not copy the code and use hook_query_alter(), but the
+ * i18n_string_textgroup_default class does not uses query tags, so
+ * hook_query_alter() is never called for its queries.
  */
 class language_fallback_i18n_string_textgroup_default extends i18n_string_textgroup_default {
 
@@ -20,6 +25,11 @@ class language_fallback_i18n_string_textgroup_default extends i18n_string_textgr
    * {@inheritdoc}
    */
   public static function load_translation($i18nstring, $langcode) {
+    $chain = language_fallback_get_chain($langcode);
+    if (empty($chain)) {
+      return parent::load_translation($i18nstring, $langcode);
+    }
+    $langcodes = array_values(array_merge(array($langcode), $chain));
     if (!empty($i18nstring->lid)) {
       $query = db_select('locales_target', 't');
       $query->condition('t.lid', $i18nstring->lid);
@@ -31,7 +41,15 @@ class language_fallback_i18n_string_textgroup_default extends i18n_string_textgr
       $query->condition('s.context', $i18nstring->context);
     }
     $query->fields('t', array('translation', 'i18n_status'));
-    $query->condition('t.language', $langcode);
+    // Pass all language chain instead of one given language.
+    $query->condition('t.language', $langcodes, 'IN');
+    // Sort results according to the language chain order.
+    $order = '(CASE ';
+    foreach ($langcodes as $index => $lang) {
+      $order .= "WHEN t.language = '$lang' THEN $index ";
+    }
+    $order .= 'END)';
+    $query->orderBy($order);
     $query->range(0, 1);
     return $query->execute()->fetchObject();
   }
@@ -44,6 +62,18 @@ class language_fallback_i18n_string_textgroup_default extends i18n_string_textgr
       'language' => $langcode,
       'textgroup' => $this->textgroup
     );
+    if (is_array($conditions['language'])) {
+      if (count($conditions['language']) !== 1) {
+        // This should never happen, but if it does, we don't know what to do.
+        return parent::multiple_translation_load($conditions, $langcode);
+      }
+      $conditions['language'] = reset($conditions['language']);
+    }
+    $chain = language_fallback_get_chain($conditions['language']);
+    if (empty($chain)) {
+      return parent::multiple_translation_load($conditions, $langcode);
+    }
+    $conditions['language'] = array_values(array_merge(array($conditions['language']), $chain));
     $query = db_select('i18n_string', 's')->fields('s');
     $query->leftJoin('locales_target', 't', 's.lid = t.lid');
     $query->fields('t', array('translation', 'language', 'i18n_status'));
@@ -61,6 +91,20 @@ class language_fallback_i18n_string_textgroup_default extends i18n_string_textgr
         $query->condition('s.' . $field, $value);
       }
     }
-    return $this->multiple_translation_build($query->execute()->fetchAll(), $langcode);
+    // Sort results according to the language chain order.
+    $order = '(CASE ';
+    foreach ($conditions['language'] as $index => $lang) {
+      $order .= "WHEN t.language = '$lang' THEN $index ";
+    }
+    $order .= 'END)';
+    $query->orderBy($order);
+    // The query now is ordered by language, but we will need to use the GROUP
+    // BY operator which is applied *before* the ORDER BY, so in the end we may
+    // have wrong translations selected. To ovid this, do the trick with
+    // subquery, so we have the correct grouping.
+    $main_query = db_select($query, 'main')
+      ->fields('main')
+      ->groupBy('main.lid');
+    return $this->multiple_translation_build($main_query->execute()->fetchAll(), $langcode);
   }
 }
