From 6e787995283e1f0af423135364491c4d215f5406 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Fri, 22 May 2020 14:21:33 +0100
Subject: [PATCH] =?UTF-8?q?Issue=20#3110669=20by=20quietone,=20ravi.shanka?=
 =?UTF-8?q?r,=20G=C3=A1bor=20Hojtsy,=20xjm:=20Migrate=20d7=20menu=20langua?=
 =?UTF-8?q?ge=20content=20settings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../d7_language_content_menu_settings.yml     |  53 -
 .../state/language.migrate_drupal.yml         |   3 -
 .../source/d7/LanguageContentSettingsMenu.php |  50 -
 ...MigrateLanguageContentMenuSettingsTest.php |  77 --
 .../d7/LanguageContentMenuSettingsTest.php    |  46 -
 .../migrate_drupal/tests/fixtures/drupal7.php | 930 ++----------------
 .../tests/src/Functional/d7/Upgrade7Test.php  |   5 +-
 7 files changed, 67 insertions(+), 1097 deletions(-)
 delete mode 100644 core/modules/language/migrations/d7_language_content_menu_settings.yml
 delete mode 100644 core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettingsMenu.php
 delete mode 100644 core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentMenuSettingsTest.php
 delete mode 100644 core/modules/language/tests/src/Kernel/Plugin/migrate/source/d7/LanguageContentMenuSettingsTest.php

diff --git a/core/modules/language/migrations/d7_language_content_menu_settings.yml b/core/modules/language/migrations/d7_language_content_menu_settings.yml
deleted file mode 100644
index 1d93a96cb11..00000000000
--- a/core/modules/language/migrations/d7_language_content_menu_settings.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-id: d7_language_content_menu_settings
-label: Drupal 7 language content menu settings
-migration_tags:
-  - Drupal 7
-  - Configuration
-source:
-  plugin: d7_language_content_settings_menu
-  constants:
-    target_type: 'menu_link_content'
-    langcode: 'site_default'
-process:
-  target_bundle:
-    -
-      plugin: migration_lookup
-      migration: d7_menu
-      source: menu_name
-    -
-      plugin: skip_on_empty
-      method: row
-  # State is the value in the i18n_mode column of menu_custom table
-  # 0: No multilingual options.
-  # 1: Localize. Localizable object. Run through the localization system
-  # 2: Fixed Language. Predefined language for this object and all related ones
-  # 4: Translate. Multilingual objects, translatable but not localizable.
-  # 5: Objects are translatable (if they have language or localizable if not)
-  language_alterable:
-    plugin: static_map
-    source: i18n_mode
-    map:
-      0: false
-      1: true
-      2: false
-      4: true
-      5: true
-  'third_party_settings/content_translation/enabled':
-    plugin: static_map
-    source: i18n_mode
-    map:
-      0: false
-      1: true
-      2: false
-      4: false
-      5: true
-  target_entity_type_id: 'constants/target_type'
-  default_langcode:
-    plugin: default_value
-    default_value: site_default
-    source: language
-destination:
-  plugin: entity:language_content_settings
-migration_dependencies:
-  required:
-    - d7_menu
diff --git a/core/modules/language/migrations/state/language.migrate_drupal.yml b/core/modules/language/migrations/state/language.migrate_drupal.yml
index 02072cee567..3babdd9f0af 100644
--- a/core/modules/language/migrations/state/language.migrate_drupal.yml
+++ b/core/modules/language/migrations/state/language.migrate_drupal.yml
@@ -8,9 +8,6 @@ finished:
     taxonomy: language
   7:
     i18n_taxonomy: language
-    i18n_menu:
-      - language
     locale:
       - language
       - system
-    system: language
diff --git a/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettingsMenu.php b/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettingsMenu.php
deleted file mode 100644
index a4fd07da681..00000000000
--- a/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettingsMenu.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Drupal\language\Plugin\migrate\source\d7;
-
-use Drupal\system\Plugin\migrate\source\Menu;
-
-/**
- * Drupal 7 i18n menu links source from database.
- *
- * @MigrateSource(
- *   id = "d7_language_content_settings_menu",
- *   source_module = "i18n_menu"
- * )
- */
-class LanguageContentSettingsMenu extends Menu {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function query() {
-    $query = parent::query();
-    if ($this->getDatabase()
-      ->schema()
-      ->fieldExists('menu_custom', 'i18n_mode')) {
-      $query->addField('m', 'language');
-      $query->addField('m', 'i18n_mode');
-    }
-    return $query;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function fields() {
-    $fields = parent::fields();
-    $fields['language'] = $this->t('i18n language');
-    $fields['i18n_mode'] = $this->t('i18n mode');
-    return $fields;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIds() {
-    $ids = parent::getIds();
-    $ids['language']['type'] = 'string';
-    return $ids;
-  }
-
-}
diff --git a/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentMenuSettingsTest.php b/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentMenuSettingsTest.php
deleted file mode 100644
index ae510b3197a..00000000000
--- a/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentMenuSettingsTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Drupal\Tests\language\Kernel\Migrate\d7;
-
-use Drupal\language\Entity\ContentLanguageSettings;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of i18n_menu settings.
- *
- * @group migrate_drupal_7
- */
-class MigrateLanguageContentMenuSettingsTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = [
-    'content_translation',
-    'language',
-    'menu_link_content',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp(): void {
-    parent::setUp();
-    $this->executeMigrations([
-      'language',
-      'd7_menu',
-      'd7_language_content_menu_settings',
-    ]);
-  }
-
-  /**
-   * Tests migration of menu translation ability.
-   */
-  public function testLanguageContentMenu() {
-    $target_entity = 'menu_link_content';
-    // No multilingual options, i18n_mode = 0.
-    $this->assertLanguageContentSettings($target_entity, 'main', LanguageInterface::LANGCODE_NOT_SPECIFIED, FALSE, ['enabled' => FALSE]);
-    $this->assertLanguageContentSettings($target_entity, 'admin', LanguageInterface::LANGCODE_NOT_SPECIFIED, FALSE, ['enabled' => FALSE]);
-    $this->assertLanguageContentSettings($target_entity, 'tools', LanguageInterface::LANGCODE_NOT_SPECIFIED, FALSE, ['enabled' => FALSE]);
-    $this->assertLanguageContentSettings($target_entity, 'account', LanguageInterface::LANGCODE_NOT_SPECIFIED, FALSE, ['enabled' => FALSE]);
-    // Translate and localize, i18n_mode = 5.
-    $this->assertLanguageContentSettings($target_entity, 'menu-test-menu', LanguageInterface::LANGCODE_NOT_SPECIFIED, TRUE, ['enabled' => TRUE]);
-    // Fixed language, i18n_mode = 2.
-    $this->assertLanguageContentSettings($target_entity, 'menu-fixedlang', 'is', FALSE, ['enabled' => FALSE]);
-  }
-
-  /**
-   * Asserts a content language settings configuration.
-   *
-   * @param string $target_entity
-   *   The expected target entity type.
-   * @param string $bundle
-   *   The expected bundle.
-   * @param string $default_langcode
-   *   The default language code.
-   * @param bool $language_alterable
-   *   The expected state of language alterable.
-   * @param array $third_party_settings
-   *   The content translation setting.
-   */
-  public function assertLanguageContentSettings($target_entity, $bundle, $default_langcode, $language_alterable, array $third_party_settings) {
-    $config = ContentLanguageSettings::load($target_entity . '.' . $bundle);
-    $this->assertInstanceOf(ContentLanguageSettings::class, $config);
-    $this->assertSame($target_entity, $config->getTargetEntityTypeId());
-    $this->assertSame($bundle, $config->getTargetBundle());
-    $this->assertSame($default_langcode, $config->getDefaultLangcode());
-    $this->assertSame($language_alterable, $config->isLanguageAlterable());
-    $this->assertSame($third_party_settings, $config->getThirdPartySettings('content_translation'));
-  }
-
-}
diff --git a/core/modules/language/tests/src/Kernel/Plugin/migrate/source/d7/LanguageContentMenuSettingsTest.php b/core/modules/language/tests/src/Kernel/Plugin/migrate/source/d7/LanguageContentMenuSettingsTest.php
deleted file mode 100644
index d84f2716bed..00000000000
--- a/core/modules/language/tests/src/Kernel/Plugin/migrate/source/d7/LanguageContentMenuSettingsTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\Tests\language\Kernel\Plugin\migrate\source\d7;
-
-use Drupal\Tests\system\Kernel\Plugin\migrate\source\MenuTest;
-
-/**
- * Tests i18n menu links source plugin.
- *
- * @covers \Drupal\language\Plugin\migrate\source\d7\LanguageContentSettingsMenu
- *
- * @group language
- */
-class LanguageContentMenuSettingsTest extends MenuTest {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = [
-    'menu_link_content',
-    'language',
-    'migrate_drupal',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function providerSource() {
-    // Get the source data from parent.
-    $tests = parent::providerSource();
-
-    foreach ($tests as &$test) {
-      // Add the extra columns provided by i18n_menu.
-      foreach ($test['source_data']['menu_custom'] as &$vocabulary) {
-        $vocabulary['language'] = 'und';
-        $vocabulary['i18n_mode'] = 2;
-      }
-      foreach ($test['expected_data'] as &$expected) {
-        $expected['language'] = 'und';
-        $expected['i18n_mode'] = 2;
-      }
-    }
-    return $tests;
-  }
-
-}
diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
index 1e2049fb8b8..ce6569976c2 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
@@ -20961,19 +20961,6 @@ $connection->schema()->createTable('menu_custom', array(
       'not null' => FALSE,
       'size' => 'normal',
     ),
-    'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '12',
-      'default' => 'und',
-    ),
-    'i18n_mode' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
   ),
   'primary key' => array(
     'menu_name',
@@ -20986,50 +20973,31 @@ $connection->insert('menu_custom')
   'menu_name',
   'title',
   'description',
-  'language',
-  'i18n_mode',
 ))
 ->values(array(
   'menu_name' => 'main-menu',
   'title' => 'Main menu',
   'description' => 'The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.',
-  'language' => 'und',
-  'i18n_mode' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
   'title' => 'Management',
   'description' => 'The <em>Management</em> menu contains links for administrative tasks.',
-  'language' => 'und',
-  'i18n_mode' => '0',
-))
-->values(array(
-  'menu_name' => 'menu-fixedlang',
-  'title' => 'FixedLang',
-  'description' => '',
-  'language' => 'is',
-  'i18n_mode' => '2',
 ))
 ->values(array(
   'menu_name' => 'menu-test-menu',
   'title' => 'Test Menu',
   'description' => 'Test menu description.',
-  'language' => 'und',
-  'i18n_mode' => '5',
 ))
 ->values(array(
   'menu_name' => 'navigation',
   'title' => 'Navigation',
   'description' => 'The <em>Navigation</em> menu contains links intended for site visitors. Links are added to the <em>Navigation</em> menu automatically by some modules.',
-  'language' => 'und',
-  'i18n_mode' => '0',
 ))
 ->values(array(
   'menu_name' => 'user-menu',
   'title' => 'User menu',
   'description' => "The <em>User</em> menu contains links related to the user's account, as well as the 'Log out' link.",
-  'language' => 'und',
-  'i18n_mode' => '0',
 ))
 ->execute();
 $connection->schema()->createTable('menu_links', array(
@@ -21193,19 +21161,6 @@ $connection->schema()->createTable('menu_links', array(
       'size' => 'normal',
       'default' => '0',
     ),
-    'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '12',
-      'default' => 'und',
-    ),
-    'i18n_tsid' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
   ),
   'primary key' => array(
     'mlid',
@@ -21240,8 +21195,6 @@ $connection->insert('menu_links')
   'p8',
   'p9',
   'updated',
-  'language',
-  'i18n_tsid',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -21269,8 +21222,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'user-menu',
@@ -21298,8 +21249,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -21327,8 +21276,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -21356,8 +21303,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -21385,8 +21330,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -21414,8 +21357,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -21443,8 +21384,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -21472,8 +21411,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -21501,8 +21438,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'user-menu',
@@ -21530,8 +21465,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -21559,8 +21492,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'user-menu',
@@ -21588,8 +21519,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'user-menu',
@@ -21617,8 +21546,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -21646,8 +21573,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -21675,8 +21600,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -21704,8 +21627,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -21733,8 +21654,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'user-menu',
@@ -21762,8 +21681,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -21791,8 +21708,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -21820,8 +21735,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -21849,8 +21762,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -21878,8 +21789,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -21907,8 +21816,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -21936,8 +21843,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -21965,8 +21870,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -21994,8 +21897,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22023,8 +21924,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -22052,8 +21951,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22081,8 +21978,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22110,8 +22005,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22139,8 +22032,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22168,8 +22059,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -22197,8 +22086,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22226,8 +22113,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -22255,8 +22140,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -22284,8 +22167,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22313,8 +22194,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22342,8 +22221,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22371,8 +22248,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22400,8 +22275,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22429,8 +22302,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22458,8 +22329,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22487,8 +22356,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22516,8 +22383,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22545,8 +22410,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -22574,8 +22437,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22603,8 +22464,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22632,8 +22491,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22661,8 +22518,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22690,8 +22545,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22719,8 +22572,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22748,8 +22599,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22777,8 +22626,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22806,8 +22653,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -22835,8 +22680,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -22864,8 +22707,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22893,8 +22734,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22922,8 +22761,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22951,8 +22788,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -22980,8 +22815,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23009,8 +22842,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23038,8 +22869,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23067,8 +22896,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23096,8 +22923,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23125,8 +22950,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23154,8 +22977,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23183,8 +23004,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23212,8 +23031,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23241,8 +23058,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23270,8 +23085,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23299,8 +23112,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23328,8 +23139,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23357,8 +23166,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23386,8 +23193,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23415,8 +23220,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23444,8 +23247,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23473,8 +23274,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23502,8 +23301,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23531,8 +23328,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23560,8 +23355,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23589,8 +23382,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23618,8 +23409,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23647,8 +23436,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23676,8 +23463,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23705,8 +23490,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23734,8 +23517,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23763,8 +23544,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23792,8 +23571,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23821,8 +23598,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23850,8 +23625,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23879,8 +23652,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -23908,8 +23679,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23937,8 +23706,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23966,8 +23733,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -23995,8 +23760,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24024,8 +23787,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24053,8 +23814,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24082,8 +23841,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24111,8 +23868,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24140,8 +23895,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24169,8 +23922,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24198,8 +23949,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24227,8 +23976,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24256,8 +24003,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24285,8 +24030,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24314,8 +24057,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -24343,8 +24084,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -24372,8 +24111,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -24401,8 +24138,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24430,8 +24165,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24459,8 +24192,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24488,8 +24219,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24517,8 +24246,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24546,8 +24273,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24575,8 +24300,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24604,8 +24327,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -24633,8 +24354,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24662,8 +24381,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24691,8 +24408,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24720,8 +24435,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24749,8 +24462,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24778,8 +24489,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24807,8 +24516,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24836,8 +24543,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24865,8 +24570,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24894,8 +24597,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24906,7 +24607,7 @@ $connection->insert('menu_links')
   'link_title' => 'Edit menu link',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
@@ -24923,8 +24624,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24952,8 +24651,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -24981,8 +24678,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25010,8 +24705,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25039,8 +24732,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25068,8 +24759,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25077,14 +24766,14 @@ $connection->insert('menu_links')
   'plid' => '146',
   'link_path' => 'admin/structure/block/manage/%/%/configure',
   'router_path' => 'admin/structure/block/manage/%/%/configure',
-  'link_title' => 'Configure',
+  'link_title' => 'Configure block',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-100',
+  'weight' => '0',
   'depth' => '5',
   'customized' => '0',
   'p1' => '1',
@@ -25097,8 +24786,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25126,8 +24813,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25155,8 +24840,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25184,8 +24867,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25213,8 +24894,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25242,8 +24921,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25271,8 +24948,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25300,8 +24975,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25329,8 +25002,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -25358,8 +25029,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -25387,8 +25056,33 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '174',
+  'plid' => '172',
+  'link_path' => 'search/user',
+  'router_path' => 'search/user',
+  'link_title' => 'Users',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '172',
+  'p2' => '174',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25416,8 +25110,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -25445,8 +25137,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -25474,8 +25164,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25503,8 +25191,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -25532,8 +25218,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25561,8 +25245,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25590,8 +25272,33 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '182',
+  'plid' => '174',
+  'link_path' => 'search/user/%',
+  'router_path' => 'search/user/%',
+  'link_title' => 'Users',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '172',
+  'p2' => '174',
+  'p3' => '182',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25619,8 +25326,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25648,8 +25353,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25677,8 +25380,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25706,8 +25407,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25735,8 +25434,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25764,8 +25461,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25793,8 +25488,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25822,8 +25515,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25851,8 +25542,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25880,8 +25569,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25909,8 +25596,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25938,8 +25623,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25967,8 +25650,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -25996,8 +25677,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26025,8 +25704,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26054,8 +25731,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26083,8 +25758,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26112,8 +25785,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26141,8 +25812,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26170,8 +25839,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26199,8 +25866,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26228,8 +25893,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26257,8 +25920,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26286,8 +25947,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26315,8 +25974,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -26344,8 +26001,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -26373,8 +26028,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26402,8 +26055,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26431,8 +26082,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26460,8 +26109,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26489,8 +26136,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26518,8 +26163,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26547,8 +26190,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26576,8 +26217,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26605,8 +26244,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26634,8 +26271,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26663,8 +26298,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26692,8 +26325,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26721,8 +26352,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26750,8 +26379,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26779,8 +26406,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26808,8 +26433,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26837,8 +26460,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26866,8 +26487,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26895,8 +26514,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26924,8 +26541,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26953,8 +26568,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -26982,8 +26595,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27011,8 +26622,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27040,8 +26649,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27069,8 +26676,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27098,8 +26703,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27127,8 +26730,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27156,8 +26757,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27185,8 +26784,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27214,8 +26811,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27243,8 +26838,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27272,8 +26865,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'shortcut-set-1',
@@ -27301,8 +26892,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'shortcut-set-1',
@@ -27330,8 +26919,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'main-menu',
@@ -27359,8 +26946,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -27388,8 +26973,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -27417,8 +27000,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27446,8 +27027,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27475,8 +27054,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27504,8 +27081,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27533,8 +27108,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27562,8 +27135,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27591,8 +27162,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27620,8 +27189,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27649,8 +27216,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27678,8 +27243,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27707,8 +27270,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27736,8 +27297,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27765,8 +27324,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27794,8 +27351,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27823,8 +27378,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27852,8 +27405,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27881,8 +27432,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27910,8 +27459,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27939,8 +27486,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27968,8 +27513,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -27997,8 +27540,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28026,8 +27567,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28055,8 +27594,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28084,8 +27621,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28113,8 +27648,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28142,8 +27675,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28171,8 +27702,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28200,8 +27729,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28229,8 +27756,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28258,8 +27783,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28287,8 +27810,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28316,8 +27837,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28345,8 +27864,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28374,8 +27891,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28403,8 +27918,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28432,8 +27945,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28461,8 +27972,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28490,8 +27999,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28519,8 +28026,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28548,8 +28053,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28577,8 +28080,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28606,8 +28107,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28635,8 +28134,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28664,8 +28161,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28693,8 +28188,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28722,8 +28215,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28751,8 +28242,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28780,8 +28269,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28809,8 +28296,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -28838,8 +28323,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -28867,8 +28350,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -28896,8 +28377,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -28925,8 +28404,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -28954,8 +28431,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -28983,8 +28458,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29012,8 +28485,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29041,8 +28512,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29070,8 +28539,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29099,8 +28566,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29128,8 +28593,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29157,8 +28620,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29186,8 +28647,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29215,8 +28674,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29244,8 +28701,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29273,8 +28728,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29302,8 +28755,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29331,8 +28782,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29360,8 +28809,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29389,8 +28836,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29418,8 +28863,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29447,8 +28890,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29476,8 +28917,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29505,8 +28944,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29534,8 +28971,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29563,8 +28998,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29592,8 +29025,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29621,8 +29052,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29650,8 +29079,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29679,8 +29106,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -29693,9 +29118,9 @@ $connection->insert('menu_links')
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
+  'weight' => '2',
   'depth' => '2',
   'customized' => '0',
   'p1' => '5',
@@ -29708,8 +29133,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29737,8 +29160,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29766,8 +29187,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29795,8 +29214,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29824,8 +29241,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29853,8 +29268,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29882,8 +29295,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29911,8 +29322,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29940,8 +29349,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29969,8 +29376,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -29998,8 +29403,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30027,8 +29430,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30056,8 +29457,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30085,8 +29484,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30114,8 +29511,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -30143,8 +29538,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -30172,8 +29565,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -30201,8 +29592,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -30230,8 +29619,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -30259,8 +29646,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -30288,8 +29673,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30317,8 +29700,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30346,8 +29727,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30375,8 +29754,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30404,8 +29781,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30433,8 +29808,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30462,8 +29835,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30491,8 +29862,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -30520,8 +29889,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30549,8 +29916,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30578,8 +29943,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30607,8 +29970,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30636,8 +29997,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30665,8 +30024,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30694,8 +30051,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30723,8 +30078,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -30752,8 +30105,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -30781,8 +30132,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30810,8 +30159,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30839,8 +30186,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30868,8 +30213,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30897,8 +30240,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30926,8 +30267,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30955,8 +30294,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -30984,8 +30321,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31013,8 +30348,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31042,8 +30375,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31071,8 +30402,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31100,8 +30429,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31129,8 +30456,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31158,8 +30483,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31187,8 +30510,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31216,8 +30537,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31245,8 +30564,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31274,8 +30591,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31303,8 +30618,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31332,8 +30645,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31361,8 +30672,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31390,8 +30699,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31419,8 +30726,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31448,8 +30753,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31477,8 +30780,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31506,8 +30807,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31535,8 +30834,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31564,8 +30861,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31593,8 +30888,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31622,8 +30915,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31651,8 +30942,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31680,8 +30969,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31709,8 +30996,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31738,8 +31023,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31767,8 +31050,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31796,8 +31077,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31825,8 +31104,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31854,8 +31131,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31883,8 +31158,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31912,8 +31185,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -31941,8 +31212,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -31970,8 +31239,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'menu-test-menu',
@@ -31999,8 +31266,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'menu-test-menu',
@@ -32028,8 +31293,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'menu-test-menu',
@@ -32057,8 +31320,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'menu-test-menu',
@@ -32086,8 +31347,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'shortcut-set-2',
@@ -32115,8 +31374,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'shortcut-set-2',
@@ -32144,8 +31401,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -32173,8 +31428,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -32202,8 +31455,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -32231,15 +31482,13 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
   'mlid' => '479',
   'plid' => '0',
   'link_path' => 'node/2',
-  'router_path' => 'node/%',
+  'router_path' => 'node/2',
   'link_title' => 'node link test',
   'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:6:"node 2";}}',
   'module' => 'menu',
@@ -32260,8 +31509,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'book-toc-1',
@@ -32289,8 +31536,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'book-toc-1',
@@ -32318,8 +31563,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'book-toc-1',
@@ -32347,8 +31590,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'book-toc-2',
@@ -32376,8 +31617,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -32405,8 +31644,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -32434,8 +31671,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -32463,8 +31698,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'navigation',
@@ -32492,8 +31725,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
@@ -32521,37 +31752,6 @@ $connection->insert('menu_links')
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
-))
-->values(array(
-  'menu_name' => 'management',
-  'mlid' => '535',
-  'plid' => '44',
-  'link_path' => 'admin/structure/menu/manage/menu-fixedlang',
-  'router_path' => 'admin/structure/menu/manage/%',
-  'link_title' => 'FixedLang',
-  'options' => 'a:0:{}',
-  'module' => 'menu',
-  'hidden' => '0',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
-  'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '535',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
 ))
 ->execute();
 $connection->schema()->createTable('menu_router', array(
@@ -55525,11 +54725,11 @@ $connection->insert('system')
   'name' => 'i18n_menu',
   'type' => 'module',
   'owner' => '',
-  'status' => '1',
+  'status' => '0',
   'bootstrap' => '0',
-  'schema_version' => '7001',
-  'weight' => '5',
-  'info' => 'a:10:{s:4:"name";s:16:"Menu translation";s:11:"description";s:40:"Supports translatable custom menu items.";s:12:"dependencies";a:4:{i:0;s:4:"i18n";i:1;s:4:"menu";i:2;s:11:"i18n_string";i:3;s:16:"i18n_translation";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:13:"i18n_menu.inc";i:1;s:14:"i18n_menu.test";}s:5:"mtime";i:1569454741;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:12:{s:4:"name";s:16:"Menu translation";s:11:"description";s:40:"Supports translatable custom menu items.";s:12:"dependencies";a:4:{i:0;s:4:"i18n";i:1;s:4:"menu";i:2;s:11:"i18n_string";i:3;s:16:"i18n_translation";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:13:"i18n_menu.inc";i:1;s:14:"i18n_menu.test";}s:7:"version";s:8:"7.x-1.26";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1534531985";s:5:"mtime";i:1534531985;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_node/i18n_node.module',
@@ -57755,7 +56955,7 @@ $connection->insert('variable')
 ))
 ->values(array(
   'name' => 'menu_masks',
-  'value' => 'a:47:{i:0;i:501;i:1;i:493;i:2;i:490;i:3;i:250;i:4;i:247;i:5;i:246;i:6;i:245;i:7;i:242;i:8;i:238;i:9;i:234;i:10;i:126;i:11;i:125;i:12;i:123;i:13;i:122;i:14;i:121;i:15;i:119;i:16;i:117;i:17;i:108;i:18;i:63;i:19;i:62;i:20;i:61;i:21;i:60;i:22;i:59;i:23;i:58;i:24;i:56;i:25;i:54;i:26;i:44;i:27;i:31;i:28;i:30;i:29;i:29;i:30;i:26;i:31;i:24;i:32;i:22;i:33;i:21;i:34;i:15;i:35;i:14;i:36;i:13;i:37;i:12;i:38;i:11;i:39;i:10;i:40;i:8;i:41;i:7;i:42;i:6;i:43;i:5;i:44;i:3;i:45;i:2;i:46;i:1;}',
+  'value' => 'a:36:{i:0;i:501;i:1;i:493;i:2;i:250;i:3;i:247;i:4;i:246;i:5;i:245;i:6;i:126;i:7;i:125;i:8;i:123;i:9;i:122;i:10;i:121;i:11;i:117;i:12;i:63;i:13;i:62;i:14;i:61;i:15;i:60;i:16;i:59;i:17;i:58;i:18;i:44;i:19;i:31;i:20;i:30;i:21;i:29;i:22;i:24;i:23;i:21;i:24;i:15;i:25;i:14;i:26;i:13;i:27;i:12;i:28;i:11;i:29;i:8;i:30;i:7;i:31;i:6;i:32;i:5;i:33;i:3;i:34;i:2;i:35;i:1;}',
 ))
 ->values(array(
   'name' => 'menu_options_article',
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
index 8e4585bc586..373ddd8efbf 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
@@ -92,7 +92,7 @@ class Upgrade7Test extends MigrateUpgradeExecuteTestBase {
       'file' => 3,
       'filter_format' => 7,
       'image_style' => 6,
-      'language_content_settings' => 26,
+      'language_content_settings' => 20,
       'node' => 7,
       'node_type' => 7,
       'rdf_mapping' => 8,
@@ -100,7 +100,7 @@ class Upgrade7Test extends MigrateUpgradeExecuteTestBase {
       'shortcut' => 6,
       'shortcut_set' => 2,
       'action' => 19,
-      'menu' => 7,
+      'menu' => 6,
       'taxonomy_term' => 24,
       'taxonomy_vocabulary' => 7,
       'path_alias' => 8,
@@ -200,7 +200,6 @@ class Upgrade7Test extends MigrateUpgradeExecuteTestBase {
       'Field translation',
       'Internationalization',
       'Locale',
-      'Menu translation',
       'String translation',
       'Taxonomy translation',
       'Translation sets',