updated features

sites/all/modules/features/mailing/mailing.default_elysia_cron_rules.inc

@@ -18,7 +18,7 @@ function mailing_default_elysia_cron_rules() {
   $cron_rule->rule = '* * * * *';
   $cron_rule->weight = -11;
   $cron_rule->context = 'mailing';
-  $cron_rules['simplenews_cron'] = $cron_rule;
+  $cron_rules[''] = $cron_rule;
 
   $cron_rule = new stdClass;
   $cron_rule->disabled = FALSE; /* Edit this to true to make a default cron_rule disabled initially */
@@ -28,7 +28,7 @@ function mailing_default_elysia_cron_rules() {
   $cron_rule->rule = '* * * * *';
   $cron_rule->weight = NULL;
   $cron_rule->context = NULL;
-  $cron_rules['simplenews_scheduler_cron'] = $cron_rule;
+  $cron_rules[''] = $cron_rule;
 
   return $cron_rules;
 

sites/all/modules/features/mailing/mailing.strongarm.inc

@@ -223,7 +223,7 @@ function mailing_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'mailgun_domain';
-  $strongarm->value = 'mail.materio.com';
+  $strongarm->value = 'materio.com';
   $export['mailgun_domain'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -237,7 +237,7 @@ function mailing_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'mailgun_log';
-  $strongarm->value = 0;
+  $strongarm->value = 1;
   $export['mailgun_log'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -258,21 +258,21 @@ function mailing_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'mailgun_tracking';
-  $strongarm->value = 'default';
+  $strongarm->value = 'enabled';
   $export['mailgun_tracking'] = $strongarm;
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'mailgun_tracking_clicks';
-  $strongarm->value = 'default';
+  $strongarm->value = 'enabled';
   $export['mailgun_tracking_clicks'] = $strongarm;
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'mailgun_tracking_opens';
-  $strongarm->value = 'default';
+  $strongarm->value = 'enabled';
   $export['mailgun_tracking_opens'] = $strongarm;
 
   $strongarm = new stdClass();

sites/all/modules/features/materio_administration/materio_administration.features.menu_custom.inc

@@ -23,6 +23,5 @@ function materio_administration_menu_default_menu_custom() {
   t('Navigation');
   t('The <em>Navigation</em> menu contains links intended for site visitors. Links are added to the <em>Navigation</em> menu automatically by some modules.');
 
-
   return $menus;
 }

sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc

@@ -10,7 +10,7 @@
 function materio_administration_menu_default_menu_links() {
   $menu_links = array();
 
-  // Exported menu link: navigation_add-user:admin/people/create
+  // Exported menu link: navigation_add-user:admin/people/create.
   $menu_links['navigation_add-user:admin/people/create'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/people/create',
@@ -25,13 +25,13 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -45,
+    'weight' => -50,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:admin/users',
+    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
   );
-  // Exported menu link: navigation_adhsions:node/11186/webform-results
+  // Exported menu link: navigation_adhsions:node/11186/webform-results.
   $menu_links['navigation_adhsions:node/11186/webform-results'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'node/11186/webform-results',
@@ -46,13 +46,13 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -50,
+    'weight' => -43,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:admin/users',
+    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
   );
-  // Exported menu link: navigation_company:admin/structure/taxonomy_manager/voc/company
+  // Exported menu link: navigation_company:admin/structure/taxonomy_manager/voc/company.
   $menu_links['navigation_company:admin/structure/taxonomy_manager/voc/company'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/structure/taxonomy_manager/voc/company',
@@ -73,7 +73,7 @@ function materio_administration_menu_default_menu_links() {
     'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_taxonomy-manager:admin/structure/taxonomy_manager/voc',
   );
-  // Exported menu link: navigation_compose-tips:filter/tips
+  // Exported menu link: navigation_compose-tips:filter/tips.
   $menu_links['navigation_compose-tips:filter/tips'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'filter/tips',
@@ -85,14 +85,14 @@ function materio_administration_menu_default_menu_links() {
     'module' => 'system',
     'hidden' => 1,
     'external' => 0,
-    'has_children' => 0,
+    'has_children' => 1,
     'expanded' => 0,
-    'weight' => -43,
+    'weight' => -44,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_customers:http://www.materio.com/fr/admin/store/customers
+  // Exported menu link: navigation_customers:http://www.materio.com/fr/admin/store/customers.
   $menu_links['navigation_customers:http://www.materio.com/fr/admin/store/customers'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'http://www.materio.com/fr/admin/store/customers',
@@ -113,28 +113,33 @@ function materio_administration_menu_default_menu_links() {
     'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store',
   );
-  // Exported menu link: navigation_feedback:admin/reports/feedback
+  // Exported menu link: navigation_feedback:admin/reports/feedback.
   $menu_links['navigation_feedback:admin/reports/feedback'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/reports/feedback',
     'router_path' => 'admin/reports/feedback',
     'link_title' => 'Feedback',
     'options' => array(
-      'attributes' => array(),
       'identifier' => 'navigation_feedback:admin/reports/feedback',
+      'attributes' => array(),
+      'item_attributes' => array(
+        'id' => '',
+        'class' => '',
+        'style' => '',
+      ),
     ),
     'module' => 'menu',
     'hidden' => 0,
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -47,
+    'weight' => -40,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:admin/users',
+    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
   );
-  // Exported menu link: navigation_formulaires-dadhsion:http://www.materio.com/fr/node/11186/webform-results
+  // Exported menu link: navigation_formulaires-dadhsion:http://www.materio.com/fr/node/11186/webform-results.
   $menu_links['navigation_formulaires-dadhsion:http://www.materio.com/fr/node/11186/webform-results'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'http://www.materio.com/fr/node/11186/webform-results',
@@ -145,17 +150,17 @@ function materio_administration_menu_default_menu_links() {
       'identifier' => 'navigation_formulaires-dadhsion:http://www.materio.com/fr/node/11186/webform-results',
     ),
     'module' => 'menu',
-    'hidden' => 0,
+    'hidden' => 1,
     'external' => 1,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -49,
+    'weight' => -42,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:admin/users',
+    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
   );
-  // Exported menu link: navigation_frequently-asked-questions:faq-page
+  // Exported menu link: navigation_frequently-asked-questions:faq-page.
   $menu_links['navigation_frequently-asked-questions:faq-page'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'faq-page',
@@ -169,12 +174,12 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -40,
+    'weight' => -41,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_ip-address-tracking:admin/reports/ip_tracking
+  // Exported menu link: navigation_ip-address-tracking:admin/reports/ip_tracking.
   $menu_links['navigation_ip-address-tracking:admin/reports/ip_tracking'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/reports/ip_tracking',
@@ -191,16 +196,16 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -38,
+    'weight' => -40,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_mandrill:admin/reports/mandrill
+  // Exported menu link: navigation_mandrill:admin/reports/mandrill.
   $menu_links['navigation_mandrill:admin/reports/mandrill'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/reports/mandrill',
-    'router_path' => 'admin/reports/mandrill',
+    'router_path' => 'admin/reports',
     'link_title' => 'Mandrill',
     'options' => array(
       'attributes' => array(),
@@ -211,12 +216,12 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -37,
+    'weight' => -39,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_my-sessions:mysessions
+  // Exported menu link: navigation_my-sessions:mysessions.
   $menu_links['navigation_my-sessions:mysessions'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'mysessions',
@@ -230,12 +235,12 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -42,
+    'weight' => -43,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_node-export-import:node/add/node_export
+  // Exported menu link: navigation_node-export-import:node/add/node_export.
   $menu_links['navigation_node-export-import:node/add/node_export'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'node/add/node_export',
@@ -256,9 +261,9 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
+    'parent_identifier' => 'navigation_ajouter-du-contenu:node/add',
   );
-  // Exported menu link: navigation_onthologie:admin/structure/taxonomy_manager/voc/onthologie
+  // Exported menu link: navigation_onthologie:admin/structure/taxonomy_manager/voc/onthologie.
   $menu_links['navigation_onthologie:admin/structure/taxonomy_manager/voc/onthologie'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/structure/taxonomy_manager/voc/onthologie',
@@ -279,7 +284,7 @@ function materio_administration_menu_default_menu_links() {
     'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_taxonomy-manager:admin/structure/taxonomy_manager/voc',
   );
-  // Exported menu link: navigation_orders:admin/store/orders/view
+  // Exported menu link: navigation_orders:admin/store/orders/view.
   $menu_links['navigation_orders:admin/store/orders/view'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/store/orders/view',
@@ -300,7 +305,7 @@ function materio_administration_menu_default_menu_links() {
     'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store',
   );
-  // Exported menu link: navigation_reports:admin/store/reports
+  // Exported menu link: navigation_reports:admin/store/reports.
   $menu_links['navigation_reports:admin/store/reports'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/store/reports',
@@ -321,7 +326,7 @@ function materio_administration_menu_default_menu_links() {
     'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store',
   );
-  // Exported menu link: navigation_shopping-cart:cart
+  // Exported menu link: navigation_shopping-cart:cart.
   $menu_links['navigation_shopping-cart:cart'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'cart',
@@ -338,12 +343,12 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -41,
+    'weight' => -42,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_store:http://www.materio.com/fr/admin/store
+  // Exported menu link: navigation_store:http://www.materio.com/fr/admin/store.
   $menu_links['navigation_store:http://www.materio.com/fr/admin/store'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'http://www.materio.com/fr/admin/store',
@@ -358,12 +363,12 @@ function materio_administration_menu_default_menu_links() {
     'external' => 1,
     'has_children' => 1,
     'expanded' => 0,
-    'weight' => -36,
+    'weight' => -38,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_subscriptions-newsletter:admin/people/simplenews
+  // Exported menu link: navigation_subscriptions-newsletter:admin/people/simplenews.
   $menu_links['navigation_subscriptions-newsletter:admin/people/simplenews'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/people/simplenews',
@@ -378,13 +383,13 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -48,
+    'weight' => -41,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:admin/users',
+    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
   );
-  // Exported menu link: navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres
+  // Exported menu link: navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres.
   $menu_links['navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/structure/taxonomy_manager/voc/tag_libres',
@@ -405,7 +410,7 @@ function materio_administration_menu_default_menu_links() {
     'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_taxonomy-manager:admin/structure/taxonomy_manager/voc',
   );
-  // Exported menu link: navigation_user-account:user
+  // Exported menu link: navigation_user-account:user.
   $menu_links['navigation_user-account:user'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'user',
@@ -426,46 +431,6 @@ function materio_administration_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_users:admin/people
-  $menu_links['navigation_users:admin/people'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'admin/people',
-    'router_path' => 'admin/people',
-    'link_title' => 'Users',
-    'options' => array(
-      'attributes' => array(),
-      'identifier' => 'navigation_users:admin/people',
-    ),
-    'module' => 'menu',
-    'hidden' => 1,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -39,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-  );
-  // Exported menu link: navigation_users:admin/users
-  $menu_links['navigation_users:admin/users'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'admin/users',
-    'router_path' => 'admin/users',
-    'link_title' => 'Users',
-    'options' => array(
-      'attributes' => array(),
-      'identifier' => 'navigation_users:admin/users',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 1,
-    'expanded' => 0,
-    'weight' => -44,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-  );
 
   // Translatables
   // Included for use with string extractors like potx.
@@ -488,7 +453,6 @@ function materio_administration_menu_default_menu_links() {
   t('Subscriptions newsletter');
   t('Tag Libres');
   t('User account');
-  t('Users');
   t('customers');
 
   return $menu_links;

sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc

@@ -10,10 +10,26 @@
 function materio_administration_user_default_permissions() {
   $permissions = array();
 
+  // Exported permission: 'access admin theme'.
+  $permissions['access admin theme'] = array(
+    'name' => 'access admin theme',
+    'roles' => array(
+      'Translator CN' => 'Translator CN',
+      'Translator EN' => 'Translator EN',
+      'Translator FR' => 'Translator FR',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'admin_theme',
+  );
+
   // Exported permission: 'access administration menu'.
   $permissions['access administration menu'] = array(
     'name' => 'access administration menu',
     'roles' => array(
+      'Translator CN' => 'Translator CN',
+      'Translator EN' => 'Translator EN',
+      'Translator FR' => 'Translator FR',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -29,6 +45,54 @@ function materio_administration_user_default_permissions() {
     'module' => 'workflow_views',
   );
 
+  // Exported permission: 'access_translation_table_content_type'.
+  $permissions['access_translation_table_content_type'] = array(
+    'name' => 'access_translation_table_content_type',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'translate_perms',
+  );
+
+  // Exported permission: 'access_translation_table_fields'.
+  $permissions['access_translation_table_fields'] = array(
+    'name' => 'access_translation_table_fields',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'translate_perms',
+  );
+
+  // Exported permission: 'access_translation_table_menu'.
+  $permissions['access_translation_table_menu'] = array(
+    'name' => 'access_translation_table_menu',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'translate_perms',
+  );
+
+  // Exported permission: 'access_translation_table_taxonomy'.
+  $permissions['access_translation_table_taxonomy'] = array(
+    'name' => 'access_translation_table_taxonomy',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'translate_perms',
+  );
+
+  // Exported permission: 'access_translations_overview'.
+  $permissions['access_translations_overview'] = array(
+    'name' => 'access_translations_overview',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'translate_perms',
+  );
+
   // Exported permission: 'administer entity translation'.
   $permissions['administer entity translation'] = array(
     'name' => 'administer entity translation',
@@ -42,6 +106,7 @@ function materio_administration_user_default_permissions() {
   $permissions['administer remove_duplicates'] = array(
     'name' => 'administer remove_duplicates',
     'roles' => array(
+      'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'remove_duplicates',
@@ -214,6 +279,15 @@ function materio_administration_user_default_permissions() {
     'module' => 'entity_translation',
   );
 
+  // Exported permission: 'export_translations'.
+  $permissions['export_translations'] = array(
+    'name' => 'export_translations',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'translate_perms',
+  );
+
   // Exported permission: 'flush caches'.
   $permissions['flush caches'] = array(
     'name' => 'flush caches',
@@ -223,6 +297,15 @@ function materio_administration_user_default_permissions() {
     'module' => 'admin_menu',
   );
 
+  // Exported permission: 'import_translations'.
+  $permissions['import_translations'] = array(
+    'name' => 'import_translations',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'translate_perms',
+  );
+
   // Exported permission: 'participate in workflow'.
   $permissions['participate in workflow'] = array(
     'name' => 'participate in workflow',
@@ -231,6 +314,9 @@ function materio_administration_user_default_permissions() {
       'Contact opérationnel' => 'Contact opérationnel',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Translator CN' => 'Translator CN',
+      'Translator EN' => 'Translator EN',
+      'Translator FR' => 'Translator FR',
       'Unverified' => 'Unverified',
       'Utilisateur' => 'Utilisateur',
       'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',
@@ -242,6 +328,15 @@ function materio_administration_user_default_permissions() {
     'module' => 'workflow_admin_ui',
   );
 
+  // Exported permission: 'refresh_strings'.
+  $permissions['refresh_strings'] = array(
+    'name' => 'refresh_strings',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'translate_perms',
+  );
+
   // Exported permission: 'schedule workflow transitions'.
   $permissions['schedule workflow transitions'] = array(
     'name' => 'schedule workflow transitions',
@@ -251,6 +346,15 @@ function materio_administration_user_default_permissions() {
     'module' => 'workflow',
   );
 
+  // Exported permission: 'select different theme'.
+  $permissions['select different theme'] = array(
+    'name' => 'select different theme',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'admin',
+  );
+
   // Exported permission: 'send newsletter'.
   $permissions['send newsletter'] = array(
     'name' => 'send newsletter',
@@ -328,20 +432,49 @@ function materio_administration_user_default_permissions() {
     'module' => 'entity_translation',
   );
 
+  // Exported permission: 'translate admin strings'.
+  $permissions['translate admin strings'] = array(
+    'name' => 'translate admin strings',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'i18n_string',
+  );
+
   // Exported permission: 'translate any entity'.
   $permissions['translate any entity'] = array(
     'name' => 'translate any entity',
     'roles' => array(
+      'Translator CN' => 'Translator CN',
+      'Translator EN' => 'Translator EN',
+      'Translator FR' => 'Translator FR',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'entity_translation',
   );
 
+  // Exported permission: 'translate content'.
+  $permissions['translate content'] = array(
+    'name' => 'translate content',
+    'roles' => array(
+      'Translator CN' => 'Translator CN',
+      'Translator EN' => 'Translator EN',
+      'Translator FR' => 'Translator FR',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'translation',
+  );
+
   // Exported permission: 'translate node entities'.
   $permissions['translate node entities'] = array(
     'name' => 'translate node entities',
     'roles' => array(
+      'Translator CN' => 'Translator CN',
+      'Translator EN' => 'Translator EN',
+      'Translator FR' => 'Translator FR',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -352,11 +485,43 @@ function materio_administration_user_default_permissions() {
   $permissions['translate taxonomy_term entities'] = array(
     'name' => 'translate taxonomy_term entities',
     'roles' => array(
+      'Translator CN' => 'Translator CN',
+      'Translator EN' => 'Translator EN',
+      'Translator FR' => 'Translator FR',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'entity_translation',
   );
 
+  // Exported permission: 'translate user-defined strings'.
+  $permissions['translate user-defined strings'] = array(
+    'name' => 'translate user-defined strings',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'i18n_string',
+  );
+
+  // Exported permission: 'translate_strings'.
+  $permissions['translate_strings'] = array(
+    'name' => 'translate_strings',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'translate_perms',
+  );
+
+  // Exported permission: 'update_modules_translations'.
+  $permissions['update_modules_translations'] = array(
+    'name' => 'update_modules_translations',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'translate_perms',
+  );
+
   return $permissions;
 }

sites/all/modules/features/materio_administration/materio_administration.info

@@ -5,12 +5,14 @@ dependencies[] = admin
 dependencies[] = admin_menu
 dependencies[] = admin_menu_source
 dependencies[] = admin_menu_toolbar
+dependencies[] = admin_theme
 dependencies[] = ctools
 dependencies[] = elysia_cron
 dependencies[] = entity_translation
 dependencies[] = entity_translation_actions
 dependencies[] = entity_translation_export_import
 dependencies[] = features
+dependencies[] = i18n_string
 dependencies[] = login_destination
 dependencies[] = logintoboggan
 dependencies[] = logintoboggan_rules
@@ -24,6 +26,8 @@ dependencies[] = strongarm
 dependencies[] = taxonomy_csv
 dependencies[] = taxonomy_wrangler
 dependencies[] = title
+dependencies[] = translate_perms
+dependencies[] = translation
 dependencies[] = views
 dependencies[] = views_bulk_operations
 dependencies[] = views_data_export
@@ -58,10 +62,14 @@ features[menu_links][] = navigation_store:http://www.materio.com/fr/admin/store
 features[menu_links][] = navigation_subscriptions-newsletter:admin/people/simplenews
 features[menu_links][] = navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres
 features[menu_links][] = navigation_user-account:user
-features[menu_links][] = navigation_users:admin/people
-features[menu_links][] = navigation_users:admin/users
+features[user_permission][] = access admin theme
 features[user_permission][] = access administration menu
 features[user_permission][] = access workflow summary views
+features[user_permission][] = access_translation_table_content_type
+features[user_permission][] = access_translation_table_fields
+features[user_permission][] = access_translation_table_menu
+features[user_permission][] = access_translation_table_taxonomy
+features[user_permission][] = access_translations_overview
 features[user_permission][] = administer entity translation
 features[user_permission][] = administer remove_duplicates
 features[user_permission][] = administer workflow
@@ -81,9 +89,13 @@ features[user_permission][] = edit original values
 features[user_permission][] = edit taxonomy_term original values
 features[user_permission][] = edit taxonomy_term translation shared fields
 features[user_permission][] = edit translation shared fields
+features[user_permission][] = export_translations
 features[user_permission][] = flush caches
+features[user_permission][] = import_translations
 features[user_permission][] = participate in workflow
+features[user_permission][] = refresh_strings
 features[user_permission][] = schedule workflow transitions
+features[user_permission][] = select different theme
 features[user_permission][] = send newsletter
 features[user_permission][] = show workflow state form
 features[user_permission][] = subscribe to newsletters
@@ -91,9 +103,14 @@ features[user_permission][] = subscribe to simplenews category 6274
 features[user_permission][] = subscribe to simplenews category 6374
 features[user_permission][] = subscribe to simplenews category 6585
 features[user_permission][] = toggle field translatability
+features[user_permission][] = translate admin strings
 features[user_permission][] = translate any entity
+features[user_permission][] = translate content
 features[user_permission][] = translate node entities
 features[user_permission][] = translate taxonomy_term entities
+features[user_permission][] = translate user-defined strings
+features[user_permission][] = translate_strings
+features[user_permission][] = update_modules_translations
 features[variable][] = admin_menu_cache_client
 features[variable][] = admin_menu_devel_modules_enabled
 features[variable][] = admin_menu_devel_modules_skip

sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc

@@ -10,7 +10,7 @@
 function materio_content_types_field_default_field_bases() {
   $field_bases = array();
 
-  // Exported field_base: 'field_attachments'
+  // Exported field_base: 'field_attachments'.
   $field_bases['field_attachments'] = array(
     'active' => 1,
     'cardinality' => -1,
@@ -40,7 +40,7 @@ function materio_content_types_field_default_field_bases() {
     'type' => 'file',
   );
 
-  // Exported field_base: 'field_authored_on'
+  // Exported field_base: 'field_authored_on'.
   $field_bases['field_authored_on'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -75,7 +75,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'computed',
   );
 
-  // Exported field_base: 'field_bandeau'
+  // Exported field_base: 'field_bandeau'.
   $field_bases['field_bandeau'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -104,7 +104,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'image',
   );
 
-  // Exported field_base: 'field_breve_ref'
+  // Exported field_base: 'field_breve_ref'.
   $field_bases['field_breve_ref'] = array(
     'active' => 1,
     'cardinality' => -1,
@@ -148,7 +148,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'entityreference',
   );
 
-  // Exported field_base: 'field_company_distrib'
+  // Exported field_base: 'field_company_distrib'.
   $field_bases['field_company_distrib'] = array(
     'active' => 1,
     'cardinality' => -1,
@@ -173,14 +173,14 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
         ),
       ),
       'entity_translation_sync' => FALSE,
-      'options_list_callback' => 'i18n_taxonomy_allowed_values',
+      'options_list_callback' => NULL,
       'profile2_private' => FALSE,
     ),
     'translatable' => 0,
     'type' => 'taxonomy_term_reference',
   );
 
-  // Exported field_base: 'field_company_fab'
+  // Exported field_base: 'field_company_fab'.
   $field_bases['field_company_fab'] = array(
     'active' => 1,
     'cardinality' => -1,
@@ -205,14 +205,14 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
         ),
       ),
       'entity_translation_sync' => FALSE,
-      'options_list_callback' => 'i18n_taxonomy_allowed_values',
+      'options_list_callback' => NULL,
       'profile2_private' => FALSE,
     ),
     'translatable' => 0,
     'type' => 'taxonomy_term_reference',
   );
 
-  // Exported field_base: 'field_department'
+  // Exported field_base: 'field_department'.
   $field_bases['field_department'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -238,7 +238,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_description'
+  // Exported field_base: 'field_description'.
   $field_bases['field_description'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -263,7 +263,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'text_with_summary',
   );
 
-  // Exported field_base: 'field_emvideo'
+  // Exported field_base: 'field_emvideo'.
   $field_bases['field_emvideo'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -284,7 +284,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'video_embed_field',
   );
 
-  // Exported field_base: 'field_famille'
+  // Exported field_base: 'field_famille'.
   $field_bases['field_famille'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -322,7 +322,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'list_text',
   );
 
-  // Exported field_base: 'field_identifiant'
+  // Exported field_base: 'field_identifiant'.
   $field_bases['field_identifiant'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -356,7 +356,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'computed',
   );
 
-  // Exported field_base: 'field_infos_from_company'
+  // Exported field_base: 'field_infos_from_company'.
   $field_bases['field_infos_from_company'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -381,7 +381,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'text_long',
   );
 
-  // Exported field_base: 'field_liens'
+  // Exported field_base: 'field_liens'.
   $field_bases['field_liens'] = array(
     'active' => 1,
     'cardinality' => -1,
@@ -415,7 +415,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'link_field',
   );
 
-  // Exported field_base: 'field_localisation'
+  // Exported field_base: 'field_localisation'.
   $field_bases['field_localisation'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -441,7 +441,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_materiau_image'
+  // Exported field_base: 'field_materiau_image'.
   $field_bases['field_materiau_image'] = array(
     'active' => 1,
     'cardinality' => -1,
@@ -470,7 +470,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'image',
   );
 
-  // Exported field_base: 'field_materiau_ref'
+  // Exported field_base: 'field_materiau_ref'.
   $field_bases['field_materiau_ref'] = array(
     'active' => 1,
     'cardinality' => -1,
@@ -510,7 +510,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'entityreference',
   );
 
-  // Exported field_base: 'field_nature_titre'
+  // Exported field_base: 'field_nature_titre'.
   $field_bases['field_nature_titre'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -532,7 +532,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_note'
+  // Exported field_base: 'field_note'.
   $field_bases['field_note'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -566,7 +566,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'list_integer',
   );
 
-  // Exported field_base: 'field_onthologie'
+  // Exported field_base: 'field_onthologie'.
   $field_bases['field_onthologie'] = array(
     'active' => 1,
     'cardinality' => -1,
@@ -592,14 +592,14 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
         ),
       ),
       'entity_translation_sync' => FALSE,
-      'options_list_callback' => 'i18n_taxonomy_allowed_values',
+      'options_list_callback' => NULL,
       'profile2_private' => FALSE,
     ),
     'translatable' => 0,
     'type' => 'taxonomy_term_reference',
   );
 
-  // Exported field_base: 'field_public_address'
+  // Exported field_base: 'field_public_address'.
   $field_bases['field_public_address'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -620,7 +620,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'addressfield',
   );
 
-  // Exported field_base: 'field_public_email'
+  // Exported field_base: 'field_public_email'.
   $field_bases['field_public_email'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -641,7 +641,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'email',
   );
 
-  // Exported field_base: 'field_public_phone'
+  // Exported field_base: 'field_public_phone'.
   $field_bases['field_public_phone'] = array(
     'active' => 1,
     'cardinality' => -1,
@@ -663,7 +663,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'phone_number',
   );
 
-  // Exported field_base: 'field_reference_materio'
+  // Exported field_base: 'field_reference_materio'.
   $field_bases['field_reference_materio'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -701,7 +701,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'computed',
   );
 
-  // Exported field_base: 'field_source'
+  // Exported field_base: 'field_source'.
   $field_bases['field_source'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -735,7 +735,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'link_field',
   );
 
-  // Exported field_base: 'field_tags_libres'
+  // Exported field_base: 'field_tags_libres'.
   $field_bases['field_tags_libres'] = array(
     'active' => 1,
     'cardinality' => -1,
@@ -761,14 +761,14 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
         ),
       ),
       'entity_translation_sync' => FALSE,
-      'options_list_callback' => 'i18n_taxonomy_allowed_values',
+      'options_list_callback' => NULL,
       'profile2_private' => FALSE,
     ),
     'translatable' => 0,
     'type' => 'taxonomy_term_reference',
   );
 
-  // Exported field_base: 'field_tode_company'
+  // Exported field_base: 'field_tode_company'.
   $field_bases['field_tode_company'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -794,7 +794,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
         ),
       ),
       'entity_translation_sync' => FALSE,
-      'options_list_callback' => 'i18n_taxonomy_allowed_values',
+      'options_list_callback' => NULL,
       'profile2_private' => FALSE,
       'user_role_field' => array(
         1 => 0,
@@ -808,7 +808,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'taxonomy_term_reference',
   );
 
-  // Exported field_base: 'field_used_on_advanced_search'
+  // Exported field_base: 'field_used_on_advanced_search'.
   $field_bases['field_used_on_advanced_search'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -838,7 +838,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'list_boolean',
   );
 
-  // Exported field_base: 'field_video_filter'
+  // Exported field_base: 'field_video_filter'.
   $field_bases['field_video_filter'] = array(
     'active' => 1,
     'cardinality' => -1,
@@ -866,7 +866,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'video_filter',
   );
 
-  // Exported field_base: 'field_visible_sur_la_home'
+  // Exported field_base: 'field_visible_sur_la_home'.
   $field_bases['field_visible_sur_la_home'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -896,7 +896,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'list_boolean',
   );
 
-  // Exported field_base: 'field_visuel'
+  // Exported field_base: 'field_visuel'.
   $field_bases['field_visuel'] = array(
     'active' => 1,
     'cardinality' => 5,
@@ -925,7 +925,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'image',
   );
 
-  // Exported field_base: 'field_website'
+  // Exported field_base: 'field_website'.
   $field_bases['field_website'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -959,7 +959,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'link_field',
   );
 
-  // Exported field_base: 'field_workflow_state'
+  // Exported field_base: 'field_workflow_state'.
   $field_bases['field_workflow_state'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -1002,7 +1002,7 @@ foreach ($states as $state) {
     'type' => 'computed',
   );
 
-  // Exported field_base: 'name_field'
+  // Exported field_base: 'name_field'.
   $field_bases['name_field'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -1028,7 +1028,7 @@ foreach ($states as $state) {
     'type' => 'text',
   );
 
-  // Exported field_base: 'title_field'
+  // Exported field_base: 'title_field'.
   $field_bases['title_field'] = array(
     'active' => 1,
     'cardinality' => 1,

sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc

@@ -10,7 +10,7 @@
 function materio_content_types_field_default_field_instances() {
   $field_instances = array();
 
-  // Exported field_instance: 'node-breve-body'
+  // Exported field_instance: 'node-breve-body'.
   $field_instances['node-breve-body'] = array(
     'bundle' => 'breve',
     'default_value' => NULL,
@@ -98,7 +98,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-breve-field_authored_on'
+  // Exported field_instance: 'node-breve-field_authored_on'.
   $field_instances['node-breve-field_authored_on'] = array(
     'bundle' => 'breve',
     'default_value' => NULL,
@@ -186,7 +186,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-breve-field_materiau_ref'
+  // Exported field_instance: 'node-breve-field_materiau_ref'.
   $field_instances['node-breve-field_materiau_ref'] = array(
     'bundle' => 'breve',
     'default_value' => NULL,
@@ -278,7 +278,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-breve-field_memo'
+  // Exported field_instance: 'node-breve-field_memo'.
   $field_instances['node-breve-field_memo'] = array(
     'bundle' => 'breve',
     'default_value' => NULL,
@@ -360,7 +360,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-breve-field_onthologie'
+  // Exported field_instance: 'node-breve-field_onthologie'.
   $field_instances['node-breve-field_onthologie'] = array(
     'bundle' => 'breve',
     'default_value' => NULL,
@@ -451,7 +451,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-breve-field_source'
+  // Exported field_instance: 'node-breve-field_source'.
   $field_instances['node-breve-field_source'] = array(
     'bundle' => 'breve',
     'default_value' => NULL,
@@ -553,7 +553,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-breve-field_tags_libres'
+  // Exported field_instance: 'node-breve-field_tags_libres'.
   $field_instances['node-breve-field_tags_libres'] = array(
     'bundle' => 'breve',
     'default_value' => NULL,
@@ -641,7 +641,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-breve-field_video_filter'
+  // Exported field_instance: 'node-breve-field_video_filter'.
   $field_instances['node-breve-field_video_filter'] = array(
     'bundle' => 'breve',
     'default_value' => array(
@@ -731,7 +731,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-breve-field_visuel'
+  // Exported field_instance: 'node-breve-field_visuel'.
   $field_instances['node-breve-field_visuel'] = array(
     'bundle' => 'breve',
     'deleted' => 0,
@@ -848,7 +848,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-breve-field_workflow_state'
+  // Exported field_instance: 'node-breve-field_workflow_state'.
   $field_instances['node-breve-field_workflow_state'] = array(
     'bundle' => 'breve',
     'default_value' => NULL,
@@ -932,7 +932,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-breve-title_field'
+  // Exported field_instance: 'node-breve-title_field'.
   $field_instances['node-breve-title_field'] = array(
     'bundle' => 'breve',
     'default_value' => NULL,
@@ -1025,7 +1025,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-company-body'
+  // Exported field_instance: 'node-company-body'.
   $field_instances['node-company-body'] = array(
     'bundle' => 'company',
     'default_value' => NULL,
@@ -1116,7 +1116,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-company-field_attachments'
+  // Exported field_instance: 'node-company-field_attachments'.
   $field_instances['node-company-field_attachments'] = array(
     'bundle' => 'company',
     'deleted' => 0,
@@ -1203,7 +1203,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-company-field_department'
+  // Exported field_instance: 'node-company-field_department'.
   $field_instances['node-company-field_department'] = array(
     'bundle' => 'company',
     'default_value' => NULL,
@@ -1288,7 +1288,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-company-field_infos_from_company'
+  // Exported field_instance: 'node-company-field_infos_from_company'.
   $field_instances['node-company-field_infos_from_company'] = array(
     'bundle' => 'company',
     'default_value' => NULL,
@@ -1374,7 +1374,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-company-field_memo'
+  // Exported field_instance: 'node-company-field_memo'.
   $field_instances['node-company-field_memo'] = array(
     'bundle' => 'company',
     'default_value' => NULL,
@@ -1456,7 +1456,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-company-field_note'
+  // Exported field_instance: 'node-company-field_note'.
   $field_instances['node-company-field_note'] = array(
     'bundle' => 'company',
     'default_value' => array(
@@ -1541,7 +1541,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-company-field_public_address'
+  // Exported field_instance: 'node-company-field_public_address'.
   $field_instances['node-company-field_public_address'] = array(
     'bundle' => 'company',
     'default_value' => NULL,
@@ -1663,7 +1663,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-company-field_public_email'
+  // Exported field_instance: 'node-company-field_public_email'.
   $field_instances['node-company-field_public_email'] = array(
     'bundle' => 'company',
     'default_value' => NULL,
@@ -1749,7 +1749,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-company-field_public_phone'
+  // Exported field_instance: 'node-company-field_public_phone'.
   $field_instances['node-company-field_public_phone'] = array(
     'bundle' => 'company',
     'deleted' => 0,
@@ -2076,7 +2076,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-company-field_tode_company'
+  // Exported field_instance: 'node-company-field_tode_company'.
   $field_instances['node-company-field_tode_company'] = array(
     'bundle' => 'company',
     'deleted' => 0,
@@ -2167,7 +2167,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-company-field_website'
+  // Exported field_instance: 'node-company-field_website'.
   $field_instances['node-company-field_website'] = array(
     'bundle' => 'company',
     'default_value' => NULL,
@@ -2183,22 +2183,28 @@ function materio_content_types_field_default_field_instances() {
       'cardbig' => array(
         'label' => 'hidden',
         'module' => 'link',
-        'settings' => array(),
-        'type' => 'link_default',
+        'settings' => array(
+          'strip_www' => 1,
+        ),
+        'type' => 'link_domain',
         'weight' => 4,
       ),
       'cardfull' => array(
         'label' => 'hidden',
         'module' => 'link',
-        'settings' => array(),
-        'type' => 'link_default',
+        'settings' => array(
+          'strip_www' => 1,
+        ),
+        'type' => 'link_domain',
         'weight' => 2,
       ),
       'cardmedium' => array(
         'label' => 'hidden',
         'module' => 'link',
-        'settings' => array(),
-        'type' => 'link_default',
+        'settings' => array(
+          'strip_www' => 1,
+        ),
+        'type' => 'link_domain',
         'weight' => 4,
       ),
       'cardsmall' => array(
@@ -2242,6 +2248,7 @@ function materio_content_types_field_default_field_instances() {
       'absolute_url' => 1,
       'attributes' => array(
         'class' => '',
+        'configurable_class' => 0,
         'configurable_title' => 0,
         'rel' => '',
         'target' => '_blank',
@@ -2254,12 +2261,12 @@ function materio_content_types_field_default_field_instances() {
       'entity_translation_sync' => FALSE,
       'rel_remove' => 'default',
       'title' => 'none',
-      'title_label_use_field_label' => FALSE,
+      'title_label_use_field_label' => 0,
       'title_maxlength' => 128,
       'title_value' => '',
       'url' => 0,
       'user_register_form' => FALSE,
-      'validate_url' => 1,
+      'validate_url' => 0,
     ),
     'widget' => array(
       'active' => 0,
@@ -2270,7 +2277,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_attachments'
+  // Exported field_instance: 'node-materiau-field_attachments'.
   $field_instances['node-materiau-field_attachments'] = array(
     'bundle' => 'materiau',
     'deleted' => 0,
@@ -2358,7 +2365,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_breve_ref'
+  // Exported field_instance: 'node-materiau-field_breve_ref'.
   $field_instances['node-materiau-field_breve_ref'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -2444,7 +2451,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_company_distrib'
+  // Exported field_instance: 'node-materiau-field_company_distrib'.
   $field_instances['node-materiau-field_company_distrib'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -2492,9 +2499,9 @@ function materio_content_types_field_default_field_instances() {
       ),
       'default' => array(
         'label' => 'inline',
-        'module' => 'i18n_taxonomy',
+        'module' => 'taxonomy',
         'settings' => array(),
-        'type' => 'i18n_taxonomy_term_reference_link',
+        'type' => 'taxonomy_term_reference_link',
         'weight' => 18,
       ),
       'homeblock' => array(
@@ -2541,7 +2548,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_company_fab'
+  // Exported field_instance: 'node-materiau-field_company_fab'.
   $field_instances['node-materiau-field_company_fab'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -2589,9 +2596,9 @@ function materio_content_types_field_default_field_instances() {
       ),
       'default' => array(
         'label' => 'inline',
-        'module' => 'i18n_taxonomy',
+        'module' => 'taxonomy',
         'settings' => array(),
-        'type' => 'i18n_taxonomy_term_reference_link',
+        'type' => 'taxonomy_term_reference_link',
         'weight' => 17,
       ),
       'homeblock' => array(
@@ -2638,7 +2645,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_description'
+  // Exported field_instance: 'node-materiau-field_description'.
   $field_instances['node-materiau-field_description'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -2727,7 +2734,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_famille'
+  // Exported field_instance: 'node-materiau-field_famille'.
   $field_instances['node-materiau-field_famille'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -2809,7 +2816,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_identifiant'
+  // Exported field_instance: 'node-materiau-field_identifiant'.
   $field_instances['node-materiau-field_identifiant'] = array(
     'bundle' => 'materiau',
     'deleted' => 0,
@@ -2888,7 +2895,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_localisation'
+  // Exported field_instance: 'node-materiau-field_localisation'.
   $field_instances['node-materiau-field_localisation'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -2976,7 +2983,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_materiau_image'
+  // Exported field_instance: 'node-materiau-field_materiau_image'.
   $field_instances['node-materiau-field_materiau_image'] = array(
     'bundle' => 'materiau',
     'deleted' => 0,
@@ -3093,7 +3100,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_materiau_ref'
+  // Exported field_instance: 'node-materiau-field_materiau_ref'.
   $field_instances['node-materiau-field_materiau_ref'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -3188,7 +3195,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_memo'
+  // Exported field_instance: 'node-materiau-field_memo'.
   $field_instances['node-materiau-field_memo'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -3270,7 +3277,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_nature_titre'
+  // Exported field_instance: 'node-materiau-field_nature_titre'.
   $field_instances['node-materiau-field_nature_titre'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -3364,7 +3371,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_onthologie'
+  // Exported field_instance: 'node-materiau-field_onthologie'.
   $field_instances['node-materiau-field_onthologie'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -3403,9 +3410,9 @@ function materio_content_types_field_default_field_instances() {
       ),
       'default' => array(
         'label' => 'hidden',
-        'module' => 'i18n_taxonomy',
+        'module' => 'taxonomy',
         'settings' => array(),
-        'type' => 'i18n_taxonomy_term_reference_link',
+        'type' => 'taxonomy_term_reference_link',
         'weight' => 16,
       ),
       'homeblock' => array(
@@ -3456,7 +3463,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_reference_materio'
+  // Exported field_instance: 'node-materiau-field_reference_materio'.
   $field_instances['node-materiau-field_reference_materio'] = array(
     'bundle' => 'materiau',
     'deleted' => 0,
@@ -3542,7 +3549,7 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_tags_libres'
+  // Exported field_instance: 'node-materiau-field_tags_libres'.
   $field_instances['node-materiau-field_tags_libres'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -3582,9 +3589,9 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
       ),
       'default' => array(
         'label' => 'hidden',
-        'module' => 'i18n_taxonomy',
+        'module' => 'taxonomy',
         'settings' => array(),
-        'type' => 'i18n_taxonomy_term_reference_link',
+        'type' => 'taxonomy_term_reference_link',
         'weight' => 15,
       ),
       'homeblock' => array(
@@ -3629,7 +3636,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_video_filter'
+  // Exported field_instance: 'node-materiau-field_video_filter'.
   $field_instances['node-materiau-field_video_filter'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -3712,7 +3719,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_workflow_state'
+  // Exported field_instance: 'node-materiau-field_workflow_state'.
   $field_instances['node-materiau-field_workflow_state'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -3795,7 +3802,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'node-materiau-title_field'
+  // Exported field_instance: 'node-materiau-title_field'.
   $field_instances['node-materiau-title_field'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
@@ -3889,7 +3896,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'node-page-body'
+  // Exported field_instance: 'node-page-body'.
   $field_instances['node-page-body'] = array(
     'bundle' => 'page',
     'default_value' => NULL,
@@ -3979,7 +3986,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'node-page-field_bandeau'
+  // Exported field_instance: 'node-page-field_bandeau'.
   $field_instances['node-page-field_bandeau'] = array(
     'bundle' => 'page',
     'deleted' => 0,
@@ -4074,7 +4081,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'node-page-field_emvideo'
+  // Exported field_instance: 'node-page-field_emvideo'.
   $field_instances['node-page-field_emvideo'] = array(
     'bundle' => 'page',
     'default_value' => NULL,
@@ -4168,7 +4175,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'node-page-field_liens'
+  // Exported field_instance: 'node-page-field_liens'.
   $field_instances['node-page-field_liens'] = array(
     'bundle' => 'page',
     'default_value' => NULL,
@@ -4262,7 +4269,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'node-page-title_field'
+  // Exported field_instance: 'node-page-title_field'.
   $field_instances['node-page-title_field'] = array(
     'bundle' => 'page',
     'default_value' => NULL,
@@ -4353,7 +4360,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'node-webform-body'
+  // Exported field_instance: 'node-webform-body'.
   $field_instances['node-webform-body'] = array(
     'bundle' => 'webform',
     'default_value' => NULL,
@@ -4440,7 +4447,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'node-webform-title_field'
+  // Exported field_instance: 'node-webform-title_field'.
   $field_instances['node-webform-title_field'] = array(
     'bundle' => 'webform',
     'default_value' => NULL,
@@ -4525,7 +4532,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'taxonomy_term-company-synonyms_synonym'
+  // Exported field_instance: 'taxonomy_term-company-synonyms_synonym'.
   $field_instances['taxonomy_term-company-synonyms_synonym'] = array(
     'bundle' => 'company',
     'default_value' => NULL,
@@ -4560,7 +4567,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
   );
 
   // Exported field_instance:
-  // 'taxonomy_term-onthologie-field_used_on_advanced_search'
+  // 'taxonomy_term-onthologie-field_used_on_advanced_search'.
   $field_instances['taxonomy_term-onthologie-field_used_on_advanced_search'] = array(
     'bundle' => 'onthologie',
     'default_value' => array(
@@ -4598,7 +4605,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'taxonomy_term-onthologie-name_field'
+  // Exported field_instance: 'taxonomy_term-onthologie-name_field'.
   $field_instances['taxonomy_term-onthologie-name_field'] = array(
     'bundle' => 'onthologie',
     'default_value' => NULL,
@@ -4642,7 +4649,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'taxonomy_term-onthologie-synonyms_synonym'
+  // Exported field_instance: 'taxonomy_term-onthologie-synonyms_synonym'.
   $field_instances['taxonomy_term-onthologie-synonyms_synonym'] = array(
     'bundle' => 'onthologie',
     'default_value' => NULL,
@@ -4684,7 +4691,45 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
     ),
   );
 
-  // Exported field_instance: 'taxonomy_term-tag_libres-synonyms_synonym'
+  // Exported field_instance: 'taxonomy_term-tag_libres-name_field'.
+  $field_instances['taxonomy_term-tag_libres-name_field'] = array(
+    'bundle' => 'tag_libres',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 1,
+      ),
+    ),
+    'entity_type' => 'taxonomy_term',
+    'field_name' => 'name_field',
+    'label' => 'Nom',
+    'required' => 1,
+    'settings' => array(
+      'entity_translation_sync' => FALSE,
+      'hide_label' => array(
+        'entity' => 'entity',
+        'page' => 'page',
+      ),
+      'text_processing' => 0,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'text',
+      'settings' => array(
+        'size' => 60,
+      ),
+      'type' => 'text_textfield',
+      'weight' => -5,
+    ),
+  );
+
+  // Exported field_instance: 'taxonomy_term-tag_libres-synonyms_synonym'.
   $field_instances['taxonomy_term-tag_libres-synonyms_synonym'] = array(
     'bundle' => 'tag_libres',
     'default_value' => NULL,

sites/all/modules/features/materio_content_types/materio_content_types.features.taxonomy.inc

@@ -16,8 +16,6 @@ function materio_content_types_taxonomy_default_vocabularies() {
       'hierarchy' => 0,
       'module' => 'taxonomy',
       'weight' => -8,
-      'language' => 'und',
-      'i18n_mode' => 0,
     ),
     'onthologie' => array(
       'name' => 'Ontologie',
@@ -26,8 +24,6 @@ function materio_content_types_taxonomy_default_vocabularies() {
       'hierarchy' => 0,
       'module' => 'taxonomy',
       'weight' => -10,
-      'language' => 'und',
-      'i18n_mode' => 1,
     ),
     'tag_libres' => array(
       'name' => 'Tag libres',
@@ -36,8 +32,6 @@ function materio_content_types_taxonomy_default_vocabularies() {
       'hierarchy' => 0,
       'module' => 'taxonomy',
       'weight' => -9,
-      'language' => 'und',
-      'i18n_mode' => 1,
     ),
   );
 }

sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc

@@ -8,7 +8,7 @@
  * Implements hook_field_group_info().
  */
 function materio_content_types_field_group_info() {
-  $export = array();
+  $field_groups = array();
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -41,7 +41,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_4|node|materiau|cardbig'] = $field_group;
+  $field_groups['group_4|node|materiau|cardbig'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -71,7 +71,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'closed',
     ),
   );
-  $export['group_base|node|breve|form'] = $field_group;
+  $field_groups['group_base|node|breve|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -101,7 +101,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'closed',
     ),
   );
-  $export['group_base|node|materiau|form'] = $field_group;
+  $field_groups['group_base|node|materiau|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -130,7 +130,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'collapsible',
     ),
   );
-  $export['group_contact_ope|node|materiau|form'] = $field_group;
+  $field_groups['group_contact_ope|node|materiau|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -163,7 +163,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_content_wrapper|node|page|homeblock'] = $field_group;
+  $field_groups['group_content_wrapper|node|page|homeblock'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -196,7 +196,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_content|node|page|homeblock'] = $field_group;
+  $field_groups['group_content|node|page|homeblock'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -223,7 +223,7 @@ function materio_content_types_field_group_info() {
       ),
     ),
   );
-  $export['group_fichiers|node|materiau|form'] = $field_group;
+  $field_groups['group_fichiers|node|materiau|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -256,7 +256,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_head_right|node|materiau|print'] = $field_group;
+  $field_groups['group_head_right|node|materiau|print'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -288,7 +288,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_header|node|breve|bookmark'] = $field_group;
+  $field_groups['group_header|node|breve|bookmark'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -321,7 +321,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_header|node|breve|cardbig'] = $field_group;
+  $field_groups['group_header|node|breve|cardbig'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -354,7 +354,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_header|node|breve|cardfull'] = $field_group;
+  $field_groups['group_header|node|breve|cardfull'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -387,7 +387,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_header|node|breve|cardmedium'] = $field_group;
+  $field_groups['group_header|node|breve|cardmedium'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -420,7 +420,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_header|node|breve|cardsmall'] = $field_group;
+  $field_groups['group_header|node|breve|cardsmall'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -454,7 +454,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_header|node|materiau|bookmark'] = $field_group;
+  $field_groups['group_header|node|materiau|bookmark'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -489,7 +489,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_header|node|materiau|cardbig'] = $field_group;
+  $field_groups['group_header|node|materiau|cardbig'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -524,7 +524,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_header|node|materiau|cardfull'] = $field_group;
+  $field_groups['group_header|node|materiau|cardfull'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -559,7 +559,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_header|node|materiau|cardmedium'] = $field_group;
+  $field_groups['group_header|node|materiau|cardmedium'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -594,7 +594,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_header|node|materiau|cardsmall'] = $field_group;
+  $field_groups['group_header|node|materiau|cardsmall'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -621,7 +621,7 @@ function materio_content_types_field_group_info() {
       ),
     ),
   );
-  $export['group_htabs|node|breve|form'] = $field_group;
+  $field_groups['group_htabs|node|breve|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -650,7 +650,7 @@ function materio_content_types_field_group_info() {
       ),
     ),
   );
-  $export['group_htabs|node|materiau|form'] = $field_group;
+  $field_groups['group_htabs|node|materiau|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -682,7 +682,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_images|node|breve|bookmark'] = $field_group;
+  $field_groups['group_images|node|breve|bookmark'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -714,7 +714,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_images|node|breve|cardbig'] = $field_group;
+  $field_groups['group_images|node|breve|cardbig'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -746,7 +746,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_images|node|breve|cardfull'] = $field_group;
+  $field_groups['group_images|node|breve|cardfull'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -778,7 +778,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_images|node|breve|cardmedium'] = $field_group;
+  $field_groups['group_images|node|breve|cardmedium'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -810,7 +810,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_images|node|breve|cardsmall'] = $field_group;
+  $field_groups['group_images|node|breve|cardsmall'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -842,7 +842,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_images|node|materiau|bookmark'] = $field_group;
+  $field_groups['group_images|node|materiau|bookmark'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -874,7 +874,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_images|node|materiau|cardbig'] = $field_group;
+  $field_groups['group_images|node|materiau|cardbig'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -906,7 +906,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_images|node|materiau|cardfull'] = $field_group;
+  $field_groups['group_images|node|materiau|cardfull'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -938,7 +938,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_images|node|materiau|cardmedium'] = $field_group;
+  $field_groups['group_images|node|materiau|cardmedium'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -970,7 +970,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_images|node|materiau|cardsmall'] = $field_group;
+  $field_groups['group_images|node|materiau|cardsmall'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -998,7 +998,7 @@ function materio_content_types_field_group_info() {
       ),
     ),
   );
-  $export['group_media|node|materiau|form'] = $field_group;
+  $field_groups['group_media|node|materiau|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1026,7 +1026,7 @@ function materio_content_types_field_group_info() {
       ),
     ),
   );
-  $export['group_referencement|node|breve|form'] = $field_group;
+  $field_groups['group_referencement|node|breve|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1055,7 +1055,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_referencement|node|materiau|form'] = $field_group;
+  $field_groups['group_referencement|node|materiau|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1088,7 +1088,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side1|node|breve|cardbig'] = $field_group;
+  $field_groups['group_side1|node|breve|cardbig'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1120,7 +1120,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side1|node|breve|cardmedium'] = $field_group;
+  $field_groups['group_side1|node|breve|cardmedium'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1153,7 +1153,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side1|node|materiau|cardbig'] = $field_group;
+  $field_groups['group_side1|node|materiau|cardbig'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1185,7 +1185,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side1|node|materiau|cardmedium'] = $field_group;
+  $field_groups['group_side1|node|materiau|cardmedium'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1217,7 +1217,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side2|node|breve|cardbig'] = $field_group;
+  $field_groups['group_side2|node|breve|cardbig'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1249,7 +1249,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side2|node|breve|cardmedium'] = $field_group;
+  $field_groups['group_side2|node|breve|cardmedium'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1281,7 +1281,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side2|node|materiau|cardbig'] = $field_group;
+  $field_groups['group_side2|node|materiau|cardbig'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1313,7 +1313,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side2|node|materiau|cardmedium'] = $field_group;
+  $field_groups['group_side2|node|materiau|cardmedium'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1344,7 +1344,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side3|node|breve|cardbig'] = $field_group;
+  $field_groups['group_side3|node|breve|cardbig'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1375,7 +1375,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side3|node|breve|cardmedium'] = $field_group;
+  $field_groups['group_side3|node|breve|cardmedium'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1406,7 +1406,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side3|node|materiau|cardbig'] = $field_group;
+  $field_groups['group_side3|node|materiau|cardbig'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1437,7 +1437,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side3|node|materiau|cardmedium'] = $field_group;
+  $field_groups['group_side3|node|materiau|cardmedium'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1470,7 +1470,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side4|node|breve|cardbig'] = $field_group;
+  $field_groups['group_side4|node|breve|cardbig'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1503,7 +1503,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side4|node|breve|cardmedium'] = $field_group;
+  $field_groups['group_side4|node|breve|cardmedium'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1536,7 +1536,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side_4|node|materiau|cardmedium'] = $field_group;
+  $field_groups['group_side_4|node|materiau|cardmedium'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1569,7 +1569,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side_5|node|materiau|cardbig'] = $field_group;
+  $field_groups['group_side_5|node|materiau|cardbig'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1602,7 +1602,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side_5|node|materiau|cardmedium'] = $field_group;
+  $field_groups['group_side_5|node|materiau|cardmedium'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1634,7 +1634,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side_left|node|breve|cardfull'] = $field_group;
+  $field_groups['group_side_left|node|breve|cardfull'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1666,7 +1666,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side_left|node|materiau|cardfull'] = $field_group;
+  $field_groups['group_side_left|node|materiau|cardfull'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1700,7 +1700,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side_left|node|materiau|print'] = $field_group;
+  $field_groups['group_side_left|node|materiau|print'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1735,7 +1735,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side_right|node|breve|cardfull'] = $field_group;
+  $field_groups['group_side_right|node|breve|cardfull'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1772,7 +1772,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side_right|node|materiau|cardfull'] = $field_group;
+  $field_groups['group_side_right|node|materiau|cardfull'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1804,7 +1804,7 @@ function materio_content_types_field_group_info() {
       'formatter' => 'open',
     ),
   );
-  $export['group_side_right|node|materiau|print'] = $field_group;
+  $field_groups['group_side_right|node|materiau|print'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -1833,7 +1833,30 @@ function materio_content_types_field_group_info() {
       'formatter' => 'closed',
     ),
   );
-  $export['group_upload|node|breve|form'] = $field_group;
+  $field_groups['group_upload|node|breve|form'] = $field_group;
 
-  return $export;
+  // Translatables
+  // Included for use with string extractors like potx.
+  t('Companies');
+  t('Contenus');
+  t('Fichiers');
+  t('Header');
+  t('Médias');
+  t('Référencement');
+  t('Side left');
+  t('content');
+  t('content-wrapper');
+  t('head right');
+  t('header');
+  t('htabs');
+  t('images');
+  t('side 1');
+  t('side 2');
+  t('side 3');
+  t('side 4');
+  t('side 5');
+  t('side left');
+  t('side right');
+
+  return $field_groups;
 }

sites/all/modules/features/materio_content_types/materio_content_types.info

@@ -181,6 +181,7 @@ features[field_instance][] = taxonomy_term-company-synonyms_synonym
 features[field_instance][] = taxonomy_term-onthologie-field_used_on_advanced_search
 features[field_instance][] = taxonomy_term-onthologie-name_field
 features[field_instance][] = taxonomy_term-onthologie-synonyms_synonym
+features[field_instance][] = taxonomy_term-tag_libres-name_field
 features[field_instance][] = taxonomy_term-tag_libres-synonyms_synonym
 features[image][] = card-big
 features[image][] = card-full

sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc

@@ -226,12 +226,44 @@ function materio_content_types_strongarm() {
             'weight' => '11',
             'visible' => FALSE,
           ),
+          'cardsmall' => array(
+            'weight' => '-99',
+            'visible' => FALSE,
+          ),
+          'cardmedium' => array(
+            'weight' => '-99',
+            'visible' => TRUE,
+          ),
+          'cardbig' => array(
+            'weight' => '-99',
+            'visible' => TRUE,
+          ),
+          'cardfull' => array(
+            'weight' => '-99',
+            'visible' => TRUE,
+          ),
         ),
         'workflow' => array(
           'default' => array(
             'weight' => '7',
             'visible' => FALSE,
           ),
+          'cardsmall' => array(
+            'weight' => '99',
+            'visible' => FALSE,
+          ),
+          'cardmedium' => array(
+            'weight' => '99',
+            'visible' => TRUE,
+          ),
+          'cardbig' => array(
+            'weight' => '99',
+            'visible' => TRUE,
+          ),
+          'cardfull' => array(
+            'weight' => '99',
+            'visible' => TRUE,
+          ),
         ),
       ),
     ),

sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc

@@ -50,7 +50,7 @@ function materio_content_types_views_default_views() {
     'title' => 'title',
   );
   $handler->display->display_options['row_options']['hide_empty'] = TRUE;
-  /* Field: Content: Référence Materio */
+  /* Champ: Contenu : Référence Materio */
   $handler->display->display_options['fields']['field_reference_materio']['id'] = 'field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['field'] = 'field_reference_materio';
@@ -58,7 +58,7 @@ function materio_content_types_views_default_views() {
   $handler->display->display_options['fields']['field_reference_materio']['alter']['text'] = '[field_reference_materio] ';
   $handler->display->display_options['fields']['field_reference_materio']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['field_reference_materio']['hide_empty'] = TRUE;
-  /* Field: Content: Title */
+  /* Champ: Contenu : Titre */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
@@ -68,19 +68,19 @@ function materio_content_types_views_default_views() {
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['title']['link_to_node'] = FALSE;
-  /* Sort criterion: Content: Post date */
+  /* Critère de tri: Contenu : Date de publication */
   $handler->display->display_options['sorts']['created']['id'] = 'created';
   $handler->display->display_options['sorts']['created']['table'] = 'node';
   $handler->display->display_options['sorts']['created']['field'] = 'created';
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
-  /* Filter criterion: Content: Published */
+  /* Critère de filtrage: Contenu : Publié */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Filter criterion: Content: Type */
+  /* Critère de filtrage: Contenu : Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
@@ -130,7 +130,6 @@ function materio_content_types_views_default_views() {
     t('[field_reference_materio] '),
     t('[field_reference_materio][title]'),
     t('Entity Reference'),
-    t('more'),
   );
   $export['entity_reference_materiaux_breves'] = $view;
 

sites/all/modules/features/materio_home_v2/materio_home_v2.features.menu_custom.inc

@@ -31,6 +31,5 @@ function materio_home_v2_menu_default_menu_custom() {
   t('Menu Home Member');
   t('Menu home v2');
 
-
   return $menus;
 }

sites/all/modules/features/materio_home_v2/materio_home_v2.features.menu_links.inc

@@ -10,7 +10,7 @@
 function materio_home_v2_menu_default_menu_links() {
   $menu_links = array();
 
-  // Exported menu link: menu-home-v2_access-to-the-online-database:node/13052
+  // Exported menu link: menu-home-v2_access-to-the-online-database:node/13052.
   $menu_links['menu-home-v2_access-to-the-online-database:node/13052'] = array(
     'menu_name' => 'menu-home-v2',
     'link_path' => 'node/13052',
@@ -40,7 +40,7 @@ function materio_home_v2_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: menu-home-v2_actualit:actuality
+  // Exported menu link: menu-home-v2_actualit:actuality.
   $menu_links['menu-home-v2_actualit:actuality'] = array(
     'menu_name' => 'menu-home-v2',
     'link_path' => 'actuality',
@@ -70,7 +70,7 @@ function materio_home_v2_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: menu-home-v2_le-showroom:node/13051
+  // Exported menu link: menu-home-v2_le-showroom:node/13051.
   $menu_links['menu-home-v2_le-showroom:node/13051'] = array(
     'menu_name' => 'menu-home-v2',
     'link_path' => 'node/13051',
@@ -100,7 +100,7 @@ function materio_home_v2_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: menu-home-v2_les-formations:node/13053
+  // Exported menu link: menu-home-v2_les-formations:node/13053.
   $menu_links['menu-home-v2_les-formations:node/13053'] = array(
     'menu_name' => 'menu-home-v2',
     'link_path' => 'node/13053',
@@ -130,7 +130,7 @@ function materio_home_v2_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: menu-home-v2_les-services-sur-mesure:node/13054
+  // Exported menu link: menu-home-v2_les-services-sur-mesure:node/13054.
   $menu_links['menu-home-v2_les-services-sur-mesure:node/13054'] = array(
     'menu_name' => 'menu-home-v2',
     'link_path' => 'node/13054',
@@ -160,7 +160,7 @@ function materio_home_v2_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: menu-menu-home-member_access-to-the-online-database:actuality
+  // Exported menu link: menu-menu-home-member_access-to-the-online-database:actuality.
   $menu_links['menu-menu-home-member_access-to-the-online-database:actuality'] = array(
     'menu_name' => 'menu-menu-home-member',
     'link_path' => 'actuality',

sites/all/modules/features/materio_home_v2/materio_home_v2.pages_default.inc

@@ -404,7 +404,7 @@ function materio_home_v2_default_page_manager_pages() {
   $display->title_pane = '0';
   $handler->conf['display'] = $display;
   $page->default_handlers[$handler->name] = $handler;
-  $pages['home_v2'] = $page;
+  $pages[''] = $page;
 
   return $pages;
 

sites/all/modules/features/materio_home_v2/materio_home_v2.views_default.inc

@@ -22,7 +22,7 @@ function materio_home_v2_views_default_views() {
 
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
-  $handler->display->display_options['title'] = 'News';
+  $handler->display->display_options['title'] = 'Brèves';
   $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['use_more_text'] = 'plus';
   $handler->display->display_options['access']['type'] = 'perm';
@@ -38,33 +38,33 @@ function materio_home_v2_views_default_views() {
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['row_plugin'] = 'entity';
   $handler->display->display_options['row_options']['view_mode'] = 'cardbig';
-  /* Field: Content: Title */
+  /* Champ: Contenu : Titre */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
   $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
-  /* Sort criterion: Content: Post date */
+  /* Critère de tri: Contenu : Date de publication */
   $handler->display->display_options['sorts']['created']['id'] = 'created';
   $handler->display->display_options['sorts']['created']['table'] = 'node';
   $handler->display->display_options['sorts']['created']['field'] = 'created';
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
-  /* Filter criterion: Content: Published */
+  /* Critère de filtrage: Contenu : Publié */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Filter criterion: Content: Type */
+  /* Critère de filtrage: Contenu : Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
     'breve' => 'breve',
   );
-  /* Filter criterion: Workflow: Current state */
+  /* Critère de filtrage: Processus : État actuel */
   $handler->display->display_options['filters']['sid']['id'] = 'sid';
   $handler->display->display_options['filters']['sid']['table'] = 'workflow_node';
   $handler->display->display_options['filters']['sid']['field'] = 'sid';
@@ -104,28 +104,28 @@ function materio_home_v2_views_default_views() {
   $handler->display->display_options['defaults']['row_options'] = FALSE;
   $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
-  /* Filter criterion: Content: Published */
+  /* Critère de filtrage: Contenu : Publié */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Filter criterion: Content: Type */
+  /* Critère de filtrage: Contenu : Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
     'simplenews' => 'simplenews',
   );
-  /* Filter criterion: Workflow: Current state */
+  /* Critère de filtrage: Processus : État actuel */
   $handler->display->display_options['filters']['sid']['id'] = 'sid';
   $handler->display->display_options['filters']['sid']['table'] = 'workflow_node';
   $handler->display->display_options['filters']['sid']['field'] = 'sid';
   $handler->display->display_options['filters']['sid']['value'] = array(
     3 => '3',
   );
-  /* Filter criterion: Content: Newsletter category (field_simplenews_term) */
+  /* Critère de filtrage: Contenu : Newsletter category (field_simplenews_term) */
   $handler->display->display_options['filters']['field_simplenews_term_tid']['id'] = 'field_simplenews_term_tid';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['table'] = 'field_data_field_simplenews_term';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['field'] = 'field_simplenews_term_tid';
@@ -134,7 +134,7 @@ function materio_home_v2_views_default_views() {
   );
   $handler->display->display_options['filters']['field_simplenews_term_tid']['type'] = 'select';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['vocabulary'] = 'newsletter';
-  /* Filter criterion: Simplenews issue: Sent status */
+  /* Critère de filtrage: Parution de lettre d'information : État des envois */
   $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
   $handler->display->display_options['filters']['status_1']['table'] = 'simplenews_newsletter';
   $handler->display->display_options['filters']['status_1']['field'] = 'status';
@@ -170,28 +170,28 @@ function materio_home_v2_views_default_views() {
   $handler->display->display_options['defaults']['row_options'] = FALSE;
   $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
-  /* Filter criterion: Content: Published */
+  /* Critère de filtrage: Contenu : Publié */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Filter criterion: Content: Type */
+  /* Critère de filtrage: Contenu : Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
     'simplenews' => 'simplenews',
   );
-  /* Filter criterion: Workflow: Current state */
+  /* Critère de filtrage: Processus : État actuel */
   $handler->display->display_options['filters']['sid']['id'] = 'sid';
   $handler->display->display_options['filters']['sid']['table'] = 'workflow_node';
   $handler->display->display_options['filters']['sid']['field'] = 'sid';
   $handler->display->display_options['filters']['sid']['value'] = array(
     3 => '3',
   );
-  /* Filter criterion: Content: Newsletter category (field_simplenews_term) */
+  /* Critère de filtrage: Contenu : Newsletter category (field_simplenews_term) */
   $handler->display->display_options['filters']['field_simplenews_term_tid']['id'] = 'field_simplenews_term_tid';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['table'] = 'field_data_field_simplenews_term';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['field'] = 'field_simplenews_term_tid';
@@ -200,14 +200,14 @@ function materio_home_v2_views_default_views() {
   );
   $handler->display->display_options['filters']['field_simplenews_term_tid']['type'] = 'select';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['vocabulary'] = 'newsletter';
-  /* Filter criterion: Simplenews issue: Sent status */
+  /* Critère de filtrage: Parution de lettre d'information : État des envois */
   $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
   $handler->display->display_options['filters']['status_1']['table'] = 'simplenews_newsletter';
   $handler->display->display_options['filters']['status_1']['field'] = 'status';
   $handler->display->display_options['filters']['status_1']['value'] = array(
     2 => '2',
   );
-  /* Filter criterion: Content: Visible sur la home (field_visible_sur_la_home) */
+  /* Critère de filtrage: Contenu : Visible sur la home (field_visible_sur_la_home) */
   $handler->display->display_options['filters']['field_visible_sur_la_home_value']['id'] = 'field_visible_sur_la_home_value';
   $handler->display->display_options['filters']['field_visible_sur_la_home_value']['table'] = 'field_data_field_visible_sur_la_home';
   $handler->display->display_options['filters']['field_visible_sur_la_home_value']['field'] = 'field_visible_sur_la_home_value';
@@ -227,14 +227,14 @@ function materio_home_v2_views_default_views() {
   $handler->display->display_options['allow']['fields_override'] = 0;
   $translatables['news_home_v2'] = array(
     t('Master'),
-    t('News'),
+    t('Brèves'),
     t('plus'),
     t('Appliquer'),
     t('Réinitialiser'),
     t('Trier par'),
     t('Asc'),
     t('Desc'),
-    t('more'),
+    t('News'),
     t('home v2'),
     t('daily'),
     t('Daily materiO\''),
@@ -271,37 +271,37 @@ function materio_home_v2_views_default_views() {
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['row_plugin'] = 'entity';
   $handler->display->display_options['row_options']['view_mode'] = 'homeblock';
-  /* Field: Content: Title */
+  /* Champ: Contenu : Titre */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
   $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
-  /* Sort criterion: Content: weight (field_weight) */
+  /* Critère de tri: Contenu : weight (field_weight) */
   $handler->display->display_options['sorts']['field_weight_value']['id'] = 'field_weight_value';
   $handler->display->display_options['sorts']['field_weight_value']['table'] = 'field_data_field_weight';
   $handler->display->display_options['sorts']['field_weight_value']['field'] = 'field_weight_value';
-  /* Sort criterion: Content: Post date */
+  /* Critère de tri: Contenu : Date de publication */
   $handler->display->display_options['sorts']['created']['id'] = 'created';
   $handler->display->display_options['sorts']['created']['table'] = 'node';
   $handler->display->display_options['sorts']['created']['field'] = 'created';
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
-  /* Filter criterion: Content: Published */
+  /* Critère de filtrage: Contenu : Publié */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Filter criterion: Content: Type */
+  /* Critère de filtrage: Contenu : Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
     'publication' => 'publication',
   );
-  /* Filter criterion: Workflow: Current state */
+  /* Critère de filtrage: Processus : État actuel */
   $handler->display->display_options['filters']['sid']['id'] = 'sid';
   $handler->display->display_options['filters']['sid']['table'] = 'workflow_node';
   $handler->display->display_options['filters']['sid']['field'] = 'sid';
@@ -323,7 +323,6 @@ function materio_home_v2_views_default_views() {
     t('Trier par'),
     t('Asc'),
     t('Desc'),
-    t('more'),
     t('Home v2'),
   );
   $export['publication_home_v2'] = $view;

sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.field_base.inc

@@ -10,7 +10,7 @@
 function materio_subscriptions_field_default_field_bases() {
   $field_bases = array();
 
-  // Exported field_base: 'body'
+  // Exported field_base: 'body'.
   $field_bases['body'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -37,7 +37,7 @@ function materio_subscriptions_field_default_field_bases() {
     'type' => 'text_with_summary',
   );
 
-  // Exported field_base: 'synonyms_synonym'
+  // Exported field_base: 'synonyms_synonym'.
   $field_bases['synonyms_synonym'] = array(
     'active' => 1,
     'cardinality' => -1,
@@ -63,7 +63,7 @@ function materio_subscriptions_field_default_field_bases() {
     'type' => 'text',
   );
 
-  // Exported field_base: 'taxonomy_catalog'
+  // Exported field_base: 'taxonomy_catalog'.
   $field_bases['taxonomy_catalog'] = array(
     'active' => 1,
     'cardinality' => -1,
@@ -85,13 +85,13 @@ function materio_subscriptions_field_default_field_bases() {
         ),
       ),
       'entity_translation_sync' => FALSE,
-      'options_list_callback' => 'i18n_taxonomy_allowed_values',
+      'options_list_callback' => NULL,
     ),
     'translatable' => 0,
     'type' => 'taxonomy_term_reference',
   );
 
-  // Exported field_base: 'uc_catalog_image'
+  // Exported field_base: 'uc_catalog_image'.
   $field_bases['uc_catalog_image'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -116,7 +116,7 @@ function materio_subscriptions_field_default_field_bases() {
     'type' => 'image',
   );
 
-  // Exported field_base: 'uc_product_image'
+  // Exported field_base: 'uc_product_image'.
   $field_bases['uc_product_image'] = array(
     'active' => 1,
     'cardinality' => -1,

sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.field_instance.inc

@@ -10,7 +10,7 @@
 function materio_subscriptions_field_default_field_instances() {
   $field_instances = array();
 
-  // Exported field_instance: 'node-product-body'
+  // Exported field_instance: 'node-product-body'.
   $field_instances['node-product-body'] = array(
     'bundle' => 'product',
     'default_value' => NULL,
@@ -91,7 +91,7 @@ function materio_subscriptions_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-product-taxonomy_catalog'
+  // Exported field_instance: 'node-product-taxonomy_catalog'.
   $field_instances['node-product-taxonomy_catalog'] = array(
     'bundle' => 'product',
     'default_value' => NULL,
@@ -130,9 +130,9 @@ function materio_subscriptions_field_default_field_instances() {
       ),
       'default' => array(
         'label' => 'above',
-        'module' => 'i18n_taxonomy',
+        'module' => 'taxonomy',
         'settings' => array(),
-        'type' => 'i18n_taxonomy_term_reference_link',
+        'type' => 'taxonomy_term_reference_link',
         'weight' => 2,
       ),
       'homeblock' => array(
@@ -172,7 +172,7 @@ function materio_subscriptions_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-product-uc_product_image'
+  // Exported field_instance: 'node-product-uc_product_image'.
   $field_instances['node-product-uc_product_image'] = array(
     'bundle' => 'product',
     'deleted' => 0,
@@ -267,7 +267,7 @@ function materio_subscriptions_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'taxonomy_term-catalog-synonyms_synonym'
+  // Exported field_instance: 'taxonomy_term-catalog-synonyms_synonym'.
   $field_instances['taxonomy_term-catalog-synonyms_synonym'] = array(
     'bundle' => 'catalog',
     'default_value' => NULL,
@@ -301,7 +301,7 @@ function materio_subscriptions_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'taxonomy_term-catalog-uc_catalog_image'
+  // Exported field_instance: 'taxonomy_term-catalog-uc_catalog_image'.
   $field_instances['taxonomy_term-catalog-uc_catalog_image'] = array(
     'bundle' => 'catalog',
     'deleted' => 0,

sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.taxonomy.inc

@@ -16,8 +16,6 @@ function materio_subscriptions_taxonomy_default_vocabularies() {
       'hierarchy' => 1,
       'module' => 'uc_catalog',
       'weight' => 0,
-      'language' => 'und',
-      'i18n_mode' => 0,
     ),
   );
 }

sites/all/modules/features/materio_subscriptions/materio_subscriptions.strongarm.inc

@@ -1402,14 +1402,14 @@ For your convenience, you are already logged in with your newly created account.
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'uc_store_postal_code';
-  $strongarm->value = '75012';
+  $strongarm->value = '75009';
   $export['uc_store_postal_code'] = $strongarm;
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'uc_store_street1';
-  $strongarm->value = '74 rue du faubourg saint antoine';
+  $strongarm->value = '8, rue Chaptal';
   $export['uc_store_street1'] = $strongarm;
 
   $strongarm = new stdClass();

sites/all/modules/features/materio_user_profiles/materio_user_profiles.features.field_base.inc

@@ -10,7 +10,7 @@
 function materio_user_profiles_field_default_field_bases() {
   $field_bases = array();
 
-  // Exported field_base: 'field_activity_sector'
+  // Exported field_base: 'field_activity_sector'.
   $field_bases['field_activity_sector'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -36,7 +36,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_administrative_email'
+  // Exported field_base: 'field_administrative_email'.
   $field_bases['field_administrative_email'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -57,7 +57,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'email',
   );
 
-  // Exported field_base: 'field_adresse'
+  // Exported field_base: 'field_adresse'.
   $field_bases['field_adresse'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -88,7 +88,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'addressfield',
   );
 
-  // Exported field_base: 'field_company'
+  // Exported field_base: 'field_company'.
   $field_bases['field_company'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -113,7 +113,7 @@ function materio_user_profiles_field_default_field_bases() {
         ),
       ),
       'entity_translation_sync' => FALSE,
-      'options_list_callback' => 'i18n_taxonomy_allowed_values',
+      'options_list_callback' => NULL,
       'profile2_private' => FALSE,
       'user_role_field' => array(
         1 => 0,
@@ -129,7 +129,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'taxonomy_term_reference',
   );
 
-  // Exported field_base: 'field_employee'
+  // Exported field_base: 'field_employee'.
   $field_bases['field_employee'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -160,7 +160,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'number_integer',
   );
 
-  // Exported field_base: 'field_first_name'
+  // Exported field_base: 'field_first_name'.
   $field_bases['field_first_name'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -196,7 +196,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_memo'
+  // Exported field_base: 'field_memo'.
   $field_bases['field_memo'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -221,7 +221,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'text_long',
   );
 
-  // Exported field_base: 'field_naf'
+  // Exported field_base: 'field_naf'.
   $field_bases['field_naf'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -257,7 +257,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_name'
+  // Exported field_base: 'field_name'.
   $field_bases['field_name'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -293,7 +293,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_organization'
+  // Exported field_base: 'field_organization'.
   $field_bases['field_organization'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -329,7 +329,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_private_email'
+  // Exported field_base: 'field_private_email'.
   $field_bases['field_private_email'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -350,7 +350,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'email',
   );
 
-  // Exported field_base: 'field_private_name'
+  // Exported field_base: 'field_private_name'.
   $field_bases['field_private_name'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -373,7 +373,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_private_name_title'
+  // Exported field_base: 'field_private_name_title'.
   $field_bases['field_private_name_title'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -416,7 +416,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'list_text',
   );
 
-  // Exported field_base: 'field_private_phone'
+  // Exported field_base: 'field_private_phone'.
   $field_bases['field_private_phone'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -448,7 +448,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'phone_number',
   );
 
-  // Exported field_base: 'field_private_quality'
+  // Exported field_base: 'field_private_quality'.
   $field_bases['field_private_quality'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -484,7 +484,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_service'
+  // Exported field_base: 'field_service'.
   $field_bases['field_service'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -520,7 +520,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_siret'
+  // Exported field_base: 'field_siret'.
   $field_bases['field_siret'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -556,7 +556,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_user_website'
+  // Exported field_base: 'field_user_website'.
   $field_bases['field_user_website'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -600,7 +600,7 @@ function materio_user_profiles_field_default_field_bases() {
     'type' => 'link_field',
   );
 
-  // Exported field_base: 'field_vat_number_intra_ce'
+  // Exported field_base: 'field_vat_number_intra_ce'.
   $field_bases['field_vat_number_intra_ce'] = array(
     'active' => 1,
     'cardinality' => 1,

sites/all/modules/features/materio_user_profiles/materio_user_profiles.features.field_instance.inc

@@ -10,7 +10,7 @@
 function materio_user_profiles_field_default_field_instances() {
   $field_instances = array();
 
-  // Exported field_instance: 'profile2-adherent-field_activity_sector'
+  // Exported field_instance: 'profile2-adherent-field_activity_sector'.
   $field_instances['profile2-adherent-field_activity_sector'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -45,7 +45,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_administrative_email'
+  // Exported field_instance: 'profile2-adherent-field_administrative_email'.
   $field_instances['profile2-adherent-field_administrative_email'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -79,7 +79,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_adresse'
+  // Exported field_instance: 'profile2-adherent-field_adresse'.
   $field_instances['profile2-adherent-field_adresse'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -126,7 +126,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_employee'
+  // Exported field_instance: 'profile2-adherent-field_employee'.
   $field_instances['profile2-adherent-field_employee'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -167,7 +167,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_first_name'
+  // Exported field_instance: 'profile2-adherent-field_first_name'.
   $field_instances['profile2-adherent-field_first_name'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -202,7 +202,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_naf'
+  // Exported field_instance: 'profile2-adherent-field_naf'.
   $field_instances['profile2-adherent-field_naf'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -237,7 +237,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_name'
+  // Exported field_instance: 'profile2-adherent-field_name'.
   $field_instances['profile2-adherent-field_name'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -272,7 +272,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_organization'
+  // Exported field_instance: 'profile2-adherent-field_organization'.
   $field_instances['profile2-adherent-field_organization'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -307,7 +307,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_private_name_title'
+  // Exported field_instance: 'profile2-adherent-field_private_name_title'.
   $field_instances['profile2-adherent-field_private_name_title'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -341,7 +341,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_private_phone'
+  // Exported field_instance: 'profile2-adherent-field_private_phone'.
   $field_instances['profile2-adherent-field_private_phone'] = array(
     'bundle' => 'adherent',
     'deleted' => 0,
@@ -616,7 +616,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_private_quality'
+  // Exported field_instance: 'profile2-adherent-field_private_quality'.
   $field_instances['profile2-adherent-field_private_quality'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -651,7 +651,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_service'
+  // Exported field_instance: 'profile2-adherent-field_service'.
   $field_instances['profile2-adherent-field_service'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -686,7 +686,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_siret'
+  // Exported field_instance: 'profile2-adherent-field_siret'.
   $field_instances['profile2-adherent-field_siret'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -721,7 +721,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_user_website'
+  // Exported field_instance: 'profile2-adherent-field_user_website'.
   $field_instances['profile2-adherent-field_user_website'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -772,7 +772,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-adherent-field_vat_number_intra_ce'
+  // Exported field_instance: 'profile2-adherent-field_vat_number_intra_ce'.
   $field_instances['profile2-adherent-field_vat_number_intra_ce'] = array(
     'bundle' => 'adherent',
     'default_value' => NULL,
@@ -807,7 +807,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-contact_operationnel-field_memo'
+  // Exported field_instance: 'profile2-contact_operationnel-field_memo'.
   $field_instances['profile2-contact_operationnel-field_memo'] = array(
     'bundle' => 'contact_operationnel',
     'default_value' => NULL,
@@ -843,7 +843,7 @@ function materio_user_profiles_field_default_field_instances() {
   );
 
   // Exported field_instance:
-  // 'profile2-contact_operationnel-field_private_email'
+  // 'profile2-contact_operationnel-field_private_email'.
   $field_instances['profile2-contact_operationnel-field_private_email'] = array(
     'bundle' => 'contact_operationnel',
     'default_value' => NULL,
@@ -877,7 +877,8 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'profile2-contact_operationnel-field_private_name'
+  // Exported field_instance:
+  // 'profile2-contact_operationnel-field_private_name'.
   $field_instances['profile2-contact_operationnel-field_private_name'] = array(
     'bundle' => 'contact_operationnel',
     'default_value' => NULL,
@@ -913,7 +914,7 @@ function materio_user_profiles_field_default_field_instances() {
   );
 
   // Exported field_instance:
-  // 'profile2-contact_operationnel-field_private_name_title'
+  // 'profile2-contact_operationnel-field_private_name_title'.
   $field_instances['profile2-contact_operationnel-field_private_name_title'] = array(
     'bundle' => 'contact_operationnel',
     'default_value' => NULL,
@@ -948,7 +949,7 @@ function materio_user_profiles_field_default_field_instances() {
   );
 
   // Exported field_instance:
-  // 'profile2-contact_operationnel-field_private_phone'
+  // 'profile2-contact_operationnel-field_private_phone'.
   $field_instances['profile2-contact_operationnel-field_private_phone'] = array(
     'bundle' => 'contact_operationnel',
     'deleted' => 0,
@@ -1224,7 +1225,7 @@ function materio_user_profiles_field_default_field_instances() {
   );
 
   // Exported field_instance:
-  // 'profile2-contact_operationnel-field_private_quality'
+  // 'profile2-contact_operationnel-field_private_quality'.
   $field_instances['profile2-contact_operationnel-field_private_quality'] = array(
     'bundle' => 'contact_operationnel',
     'default_value' => NULL,
@@ -1259,7 +1260,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'user-user-field_company'
+  // Exported field_instance: 'user-user-field_company'.
   $field_instances['user-user-field_company'] = array(
     'bundle' => 'user',
     'default_value' => NULL,
@@ -1268,9 +1269,9 @@ function materio_user_profiles_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'i18n_taxonomy',
+        'module' => 'taxonomy',
         'settings' => array(),
-        'type' => 'i18n_taxonomy_term_reference_link',
+        'type' => 'taxonomy_term_reference_link',
         'weight' => 1,
       ),
     ),
@@ -1295,7 +1296,7 @@ function materio_user_profiles_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'user-user-field_memo'
+  // Exported field_instance: 'user-user-field_memo'.
   $field_instances['user-user-field_memo'] = array(
     'bundle' => 'user',
     'default_value' => NULL,
@@ -1326,7 +1327,7 @@ function materio_user_profiles_field_default_field_instances() {
         'rows' => 10,
       ),
       'type' => 'text_textarea',
-      'weight' => 7,
+      'weight' => 8,
     ),
   );