diff --git a/sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.features.user_permission.inc b/sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.features.user_permission.inc
index 2c3e6534..8e2e6deb 100644
--- a/sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.features.user_permission.inc
+++ b/sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.features.user_permission.inc
@@ -81,49 +81,63 @@ function frequently_asked_questions_user_default_permissions() {
   // Exported permission: 'enter faq revision log entry'.
   $permissions['enter faq revision log entry'] = array(
     'name' => 'enter faq revision log entry',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 
   // Exported permission: 'override faq authored by option'.
   $permissions['override faq authored by option'] = array(
     'name' => 'override faq authored by option',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 
   // Exported permission: 'override faq authored on option'.
   $permissions['override faq authored on option'] = array(
     'name' => 'override faq authored on option',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 
   // Exported permission: 'override faq promote to front page option'.
   $permissions['override faq promote to front page option'] = array(
     'name' => 'override faq promote to front page option',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 
   // Exported permission: 'override faq published option'.
   $permissions['override faq published option'] = array(
     'name' => 'override faq published option',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 
   // Exported permission: 'override faq revision option'.
   $permissions['override faq revision option'] = array(
     'name' => 'override faq revision option',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 
   // Exported permission: 'override faq sticky option'.
   $permissions['override faq sticky option'] = array(
     'name' => 'override faq sticky option',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 
diff --git a/sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.info b/sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.info
index dee78584..6b57f4ff 100644
--- a/sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.info
+++ b/sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.info
@@ -54,4 +54,5 @@ features[variable][] = faq_title
 features[variable][] = faq_use_categories
 features[variable][] = faq_use_teaser
 features[variable][] = nodeformscols_field_placements_faq_default
+features[variable][] = pathauto_taxonomy_term_faq_categories_pattern
 project path = sites/all/modules/features
diff --git a/sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.strongarm.inc b/sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.strongarm.inc
index 9bbda53d..0dc6ae42 100644
--- a/sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.strongarm.inc
+++ b/sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.strongarm.inc
@@ -266,5 +266,12 @@ function frequently_asked_questions_strongarm() {
   );
   $export['nodeformscols_field_placements_faq_default'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_taxonomy_term_faq_categories_pattern';
+  $strongarm->value = '';
+  $export['pathauto_taxonomy_term_faq_categories_pattern'] = $strongarm;
+
   return $export;
 }
diff --git a/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc b/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc
index 2ca9fb2a..a82f2042 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc
+++ b/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc
@@ -56,22 +56,22 @@ function materio_administration_menu_default_menu_links() {
   $menu_links['navigation_company:admin/structure/taxonomy_manager/voc/company'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/structure/taxonomy_manager/voc/company',
-    'router_path' => 'admin/structure/taxonomy_manager/voc/%',
+    'router_path' => 'admin/structure',
     'link_title' => 'Company',
     'options' => array(
       'attributes' => array(),
       'identifier' => 'navigation_company:admin/structure/taxonomy_manager/voc/company',
     ),
     'module' => 'menu',
-    'hidden' => 0,
+    'hidden' => 1,
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
     'weight' => 9,
-    'customized' => 0,
+    'customized' => 1,
     'language' => 'und',
-    'menu_links_customized' => 0,
-    'parent_identifier' => 'navigation_taxonomy:admin/structure/taxonomy_manager/voc',
+    'menu_links_customized' => 1,
+    'parent_identifier' => 'navigation_taxonomy-manager:admin/structure/taxonomy_manager/voc',
   );
   // Exported menu link: navigation_compose-tips:filter/tips
   $menu_links['navigation_compose-tips:filter/tips'] = array(
@@ -211,7 +211,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => 0,
+    'weight' => -37,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -256,28 +256,28 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_ajouter-du-contenu:node/add',
+    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // 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',
-    'router_path' => 'admin/structure/taxonomy_manager/voc/%',
+    'router_path' => 'admin/structure',
     'link_title' => 'Onthologie',
     'options' => array(
       'attributes' => array(),
       'identifier' => 'navigation_onthologie:admin/structure/taxonomy_manager/voc/onthologie',
     ),
     'module' => 'menu',
-    'hidden' => 0,
+    'hidden' => 1,
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
     'weight' => 0,
-    'customized' => 0,
+    'customized' => 1,
     'language' => 'und',
-    'menu_links_customized' => 0,
-    'parent_identifier' => 'navigation_taxonomy:admin/structure/taxonomy_manager/voc',
+    'menu_links_customized' => 1,
+    'parent_identifier' => 'navigation_taxonomy-manager:admin/structure/taxonomy_manager/voc',
   );
   // Exported menu link: navigation_orders:admin/store/orders/view
   $menu_links['navigation_orders:admin/store/orders/view'] = array(
@@ -358,7 +358,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 1,
     'has_children' => 1,
     'expanded' => 0,
-    'weight' => 0,
+    'weight' => -36,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -388,42 +388,22 @@ function materio_administration_menu_default_menu_links() {
   $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',
-    'router_path' => 'admin/structure/taxonomy_manager/voc/%',
+    'router_path' => 'admin/structure',
     'link_title' => 'Tag Libres',
     'options' => array(
       'attributes' => array(),
       'identifier' => 'navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres',
     ),
     'module' => 'menu',
-    'hidden' => 0,
+    'hidden' => 1,
     'external' => 0,
-    'has_children' => 1,
+    'has_children' => 0,
     'expanded' => 0,
     'weight' => 8,
-    'customized' => 0,
-    'language' => 'und',
-    'menu_links_customized' => 0,
-    'parent_identifier' => 'navigation_taxonomy:admin/structure/taxonomy_manager/voc',
-  );
-  // Exported menu link: navigation_taxonomy:admin/structure/taxonomy_manager/voc
-  $menu_links['navigation_taxonomy:admin/structure/taxonomy_manager/voc'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'admin/structure/taxonomy_manager/voc',
-    'router_path' => 'admin/structure/taxonomy_manager/voc',
-    'link_title' => 'Taxonomy',
-    'options' => array(
-      'attributes' => array(),
-      'identifier' => 'navigation_taxonomy:admin/structure/taxonomy_manager/voc',
-    ),
-    'module' => 'menu',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 1,
-    'expanded' => 0,
-    'weight' => -47,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
+    'parent_identifier' => 'navigation_taxonomy-manager:admin/structure/taxonomy_manager/voc',
   );
   // Exported menu link: navigation_user-account:user
   $menu_links['navigation_user-account:user'] = array(
@@ -486,6 +466,7 @@ function materio_administration_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
+
   // Translatables
   // Included for use with string extractors like potx.
   t('Add user');
@@ -506,11 +487,9 @@ function materio_administration_menu_default_menu_links() {
   t('Store');
   t('Subscriptions newsletter');
   t('Tag Libres');
-  t('Taxonomy');
   t('User account');
   t('Users');
   t('customers');
 
-
   return $menu_links;
 }
diff --git a/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc b/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
index 15e7e5c8..9b91d5e5 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
+++ b/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
@@ -186,7 +186,9 @@ function materio_administration_user_default_permissions() {
   // Exported permission: 'show workflow state form'.
   $permissions['show workflow state form'] = array(
     'name' => 'show workflow state form',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'workflow',
   );
 
diff --git a/sites/all/modules/features/materio_administration/materio_administration.info b/sites/all/modules/features/materio_administration/materio_administration.info
index 99838112..9f141bbf 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.info
+++ b/sites/all/modules/features/materio_administration/materio_administration.info
@@ -17,6 +17,8 @@ dependencies[] = menu
 dependencies[] = role_delegation
 dependencies[] = simplenews
 dependencies[] = strongarm
+dependencies[] = taxonomy_csv
+dependencies[] = taxonomy_wrangler
 dependencies[] = title
 dependencies[] = views
 dependencies[] = views_bulk_operations
@@ -51,7 +53,6 @@ features[menu_links][] = navigation_shopping-cart:cart
 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_taxonomy:admin/structure/taxonomy_manager/voc
 features[menu_links][] = navigation_user-account:user
 features[menu_links][] = navigation_users:admin/people
 features[menu_links][] = navigation_users:admin/users
diff --git a/sites/all/modules/features/materio_administration/materio_administration.views_default.inc b/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
index eeb2324c..56eee5a6 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
+++ b/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
@@ -95,45 +95,45 @@ function materio_administration_views_default_views() {
       'separator' => '',
     ),
   );
-  /* Relation: Révision de contenu : Utilisateur */
+  /* Relationship: Content revision: User */
   $handler->display->display_options['relationships']['uid']['id'] = 'uid';
   $handler->display->display_options['relationships']['uid']['table'] = 'node_revision';
   $handler->display->display_options['relationships']['uid']['field'] = 'uid';
   $handler->display->display_options['relationships']['uid']['label'] = 'Utilisateur';
   $handler->display->display_options['relationships']['uid']['required'] = TRUE;
-  /* Relation: Contenu : Termes de taxonomie du nœud */
+  /* Relationship: Content: Taxonomy terms on node */
   $handler->display->display_options['relationships']['term_node_tid']['id'] = 'term_node_tid';
   $handler->display->display_options['relationships']['term_node_tid']['table'] = 'node';
   $handler->display->display_options['relationships']['term_node_tid']['field'] = 'term_node_tid';
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
-  /* Champ: Contenu : Type */
+  /* Field: Content: Type */
   $handler->display->display_options['fields']['type']['id'] = 'type';
   $handler->display->display_options['fields']['type']['table'] = 'node';
   $handler->display->display_options['fields']['type']['field'] = 'type';
-  /* Champ: Contenu : Publié */
+  /* Field: Content: Published */
   $handler->display->display_options['fields']['status']['id'] = 'status';
   $handler->display->display_options['fields']['status']['table'] = 'node';
   $handler->display->display_options['fields']['status']['field'] = 'status';
   $handler->display->display_options['fields']['status']['not'] = 0;
-  /* Champ: Contenu : Date de mise à jour */
+  /* Field: Content: Updated date */
   $handler->display->display_options['fields']['changed']['id'] = 'changed';
   $handler->display->display_options['fields']['changed']['table'] = 'node';
   $handler->display->display_options['fields']['changed']['field'] = 'changed';
   $handler->display->display_options['fields']['changed']['label'] = 'Mis à jour';
-  /* Champ: Contenu : Lien de modification */
+  /* Field: Content: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['label'] = '';
-  /* Champ: Contenu : Lien de suppression */
+  /* Field: Content: Delete link */
   $handler->display->display_options['fields']['delete_node']['id'] = 'delete_node';
   $handler->display->display_options['fields']['delete_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['delete_node']['field'] = 'delete_node';
   $handler->display->display_options['fields']['delete_node']['label'] = '';
-  /* Critère de tri: Contenu : Date de publication */
+  /* Sort criterion: Content: Post date */
   $handler->display->display_options['sorts']['created']['id'] = 'created';
   $handler->display->display_options['sorts']['created']['table'] = 'node';
   $handler->display->display_options['sorts']['created']['field'] = 'created';
@@ -142,7 +142,7 @@ function materio_administration_views_default_views() {
     1 => 'AND',
     2 => 'AND',
   );
-  /* Critère de filtrage: Contenu : Titre */
+  /* Filter criterion: Content: Title */
   $handler->display->display_options['filters']['title']['id'] = 'title';
   $handler->display->display_options['filters']['title']['table'] = 'node';
   $handler->display->display_options['filters']['title']['field'] = 'title';
@@ -153,7 +153,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['title']['expose']['label'] = 'Titre';
   $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
   $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: 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';
@@ -165,7 +165,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['type']['expose']['operator'] = 'type_op';
   $handler->display->display_options['filters']['type']['expose']['identifier'] = 'type';
   $handler->display->display_options['filters']['type']['expose']['remember'] = TRUE;
-  /* Critère de filtrage: Utilisateur : Nom */
+  /* Filter criterion: User: Name */
   $handler->display->display_options['filters']['uid']['id'] = 'uid';
   $handler->display->display_options['filters']['uid']['table'] = 'users';
   $handler->display->display_options['filters']['uid']['field'] = 'uid';
@@ -177,7 +177,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['uid']['expose']['label'] = 'Auteur';
   $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
   $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'name';
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
@@ -187,7 +187,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['status']['expose']['label'] = 'Publié';
   $handler->display->display_options['filters']['status']['expose']['identifier'] = 'status';
   $handler->display->display_options['filters']['status']['expose']['remember'] = TRUE;
-  /* Critère de filtrage: Terme de taxonomie : Vocabulaire */
+  /* Filter criterion: Taxonomy term: Vocabulary */
   $handler->display->display_options['filters']['vid']['id'] = 'vid';
   $handler->display->display_options['filters']['vid']['table'] = 'taxonomy_term_data';
   $handler->display->display_options['filters']['vid']['field'] = 'vid';
@@ -219,12 +219,14 @@ function materio_administration_views_default_views() {
     t('suivant ›'),
     t('dernier »'),
     t('Utilisateur'),
-    t('terme'),
-    t('Titre'),
+    t('term'),
+    t('Title'),
     t('Type'),
-    t('Publié'),
+    t('Published'),
     t('Mis à jour'),
+    t('Titre'),
     t('Auteur'),
+    t('Publié'),
     t('Vocabulaire'),
     t('System'),
   );
@@ -404,16 +406,16 @@ function materio_administration_views_default_views() {
     ),
   );
   $handler->display->display_options['style_options']['override'] = FALSE;
-  /* Entête: Global : Résumé des résultats */
+  /* Header: Global: Result summary */
   $handler->display->display_options['header']['result']['id'] = 'result';
   $handler->display->display_options['header']['result']['table'] = 'views';
   $handler->display->display_options['header']['result']['field'] = 'result';
   $handler->display->display_options['header']['result']['label'] = 'Résumé';
-  /* Champ: Contenu : Type */
+  /* Field: Content: Type */
   $handler->display->display_options['fields']['type']['id'] = 'type';
   $handler->display->display_options['fields']['type']['table'] = 'node';
   $handler->display->display_options['fields']['type']['field'] = 'type';
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
@@ -422,69 +424,69 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['element_type'] = 'strong';
   $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
-  /* Champ: Contenu : Référence Materio */
+  /* Field: Content: 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';
-  /* Champ: Contenu : Lien de modification */
+  /* Field: Content: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
-  /* Champ: Contenu : Manufacturer */
+  /* Field: Content: Manufacturer */
   $handler->display->display_options['fields']['field_company_fab']['id'] = 'field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['table'] = 'field_data_field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['field'] = 'field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['label'] = 'Fabricants / Distributeurs';
   $handler->display->display_options['fields']['field_company_fab']['delta_offset'] = '0';
-  /* Champ: Contenu : Distributor */
+  /* Field: Content: Distributor */
   $handler->display->display_options['fields']['field_company_distrib']['id'] = 'field_company_distrib';
   $handler->display->display_options['fields']['field_company_distrib']['table'] = 'field_data_field_company_distrib';
   $handler->display->display_options['fields']['field_company_distrib']['field'] = 'field_company_distrib';
   $handler->display->display_options['fields']['field_company_distrib']['delta_offset'] = '0';
-  /* Champ: Contenu : Langue */
+  /* Field: Content: Language */
   $handler->display->display_options['fields']['language']['id'] = 'language';
   $handler->display->display_options['fields']['language']['table'] = 'node';
   $handler->display->display_options['fields']['language']['field'] = 'language';
-  /* Champ: Traduction du contenu : Lien de traduction */
+  /* Field: Content translation: Translate link */
   $handler->display->display_options['fields']['translate_node']['id'] = 'translate_node';
   $handler->display->display_options['fields']['translate_node']['table'] = 'node';
   $handler->display->display_options['fields']['translate_node']['field'] = 'translate_node';
   $handler->display->display_options['fields']['translate_node']['alter']['text'] = '<span class="button">[translate_node]</span>';
-  /* Champ: Traduction du contenu : Statut de la traduction */
+  /* Field: Content translation: Translation status */
   $handler->display->display_options['fields']['translate']['id'] = 'translate';
   $handler->display->display_options['fields']['translate']['table'] = 'node';
   $handler->display->display_options['fields']['translate']['field'] = 'translate';
   $handler->display->display_options['fields']['translate']['exclude'] = TRUE;
   $handler->display->display_options['fields']['translate']['not'] = 0;
-  /* Champ: Processus : État actuel */
+  /* Field: Workflow: Current state */
   $handler->display->display_options['fields']['sid']['id'] = 'sid';
   $handler->display->display_options['fields']['sid']['table'] = 'workflow_node';
   $handler->display->display_options['fields']['sid']['field'] = 'sid';
-  /* Champ: Contenu : Date de mise à jour */
+  /* Field: Content: Updated date */
   $handler->display->display_options['fields']['changed']['id'] = 'changed';
   $handler->display->display_options['fields']['changed']['table'] = 'node';
   $handler->display->display_options['fields']['changed']['field'] = 'changed';
   $handler->display->display_options['fields']['changed']['date_format'] = 'short';
-  /* Champ: Champ : Mémo */
+  /* Field: Field: Mémo */
   $handler->display->display_options['fields']['field_memo']['id'] = 'field_memo';
   $handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo';
   $handler->display->display_options['fields']['field_memo']['field'] = 'field_memo';
   $handler->display->display_options['fields']['field_memo']['alter']['nl2br'] = TRUE;
-  /* Champ: Contenu : Lien de suppression */
+  /* Field: Content: Delete link */
   $handler->display->display_options['fields']['delete_node']['id'] = 'delete_node';
   $handler->display->display_options['fields']['delete_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['delete_node']['field'] = 'delete_node';
   $handler->display->display_options['fields']['delete_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['delete_node']['alter']['text'] = '<span class="node-delete">[delete_node]</span>';
-  /* Critère de tri: Contenu : Date de mise à jour */
+  /* Sort criterion: Content: Updated date */
   $handler->display->display_options['sorts']['changed']['id'] = 'changed';
   $handler->display->display_options['sorts']['changed']['table'] = 'node';
   $handler->display->display_options['sorts']['changed']['field'] = 'changed';
   $handler->display->display_options['sorts']['changed']['order'] = 'DESC';
   $handler->display->display_options['sorts']['changed']['granularity'] = 'minute';
-  /* Critère de filtrage: Contenu : Titre */
+  /* Filter criterion: Content: Title */
   $handler->display->display_options['filters']['title']['id'] = 'title';
   $handler->display->display_options['filters']['title']['table'] = 'node';
   $handler->display->display_options['filters']['title']['field'] = 'title';
@@ -496,7 +498,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
   $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
   $handler->display->display_options['filters']['title']['expose']['remember'] = TRUE;
-  /* Critère de filtrage: Processus : État actuel */
+  /* Filter criterion: Workflow: Current state */
   $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';
@@ -507,7 +509,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['sid']['expose']['operator'] = 'sid_op';
   $handler->display->display_options['filters']['sid']['expose']['identifier'] = 'sid';
   $handler->display->display_options['filters']['sid']['expose']['remember'] = TRUE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: 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';
@@ -524,7 +526,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['type']['expose']['identifier'] = 'type';
   $handler->display->display_options['filters']['type']['expose']['remember'] = TRUE;
   $handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE;
-  /* Critère de filtrage: Champ : Mémo (field_memo) */
+  /* Filter criterion: Field: Mémo (field_memo) */
   $handler->display->display_options['filters']['field_memo_value']['id'] = 'field_memo_value';
   $handler->display->display_options['filters']['field_memo_value']['table'] = 'field_data_field_memo';
   $handler->display->display_options['filters']['field_memo_value']['field'] = 'field_memo_value';
@@ -572,19 +574,19 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['pager']['options']['items_per_page'] = '10';
   $handler->display->display_options['pager']['options']['offset'] = '0';
   $handler->display->display_options['defaults']['fields'] = FALSE;
-  /* Champ: Contenu : Type */
+  /* Field: Content: Type */
   $handler->display->display_options['fields']['type']['id'] = 'type';
   $handler->display->display_options['fields']['type']['table'] = 'node';
   $handler->display->display_options['fields']['type']['field'] = 'type';
   $handler->display->display_options['fields']['type']['hide_alter_empty'] = FALSE;
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $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']['alter']['word_boundary'] = FALSE;
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
-  /* Champ: Contenu : Lien de modification */
+  /* Field: Content: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
@@ -592,20 +594,20 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
   $handler->display->display_options['fields']['edit_node']['hide_alter_empty'] = FALSE;
-  /* Champ: Contenu : Publié */
+  /* Field: Content: Published */
   $handler->display->display_options['fields']['status']['id'] = 'status';
   $handler->display->display_options['fields']['status']['table'] = 'node';
   $handler->display->display_options['fields']['status']['field'] = 'status';
   $handler->display->display_options['fields']['status']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['status']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['status']['not'] = 0;
-  /* Champ: Contenu : Langue */
+  /* Field: Content: Language */
   $handler->display->display_options['fields']['language']['id'] = 'language';
   $handler->display->display_options['fields']['language']['table'] = 'node';
   $handler->display->display_options['fields']['language']['field'] = 'language';
   $handler->display->display_options['fields']['language']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['language']['hide_alter_empty'] = FALSE;
-  /* Champ: Traduction du contenu : Lien de traduction */
+  /* Field: Content translation: Translate link */
   $handler->display->display_options['fields']['translate_node']['id'] = 'translate_node';
   $handler->display->display_options['fields']['translate_node']['table'] = 'node';
   $handler->display->display_options['fields']['translate_node']['field'] = 'translate_node';
@@ -771,7 +773,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['defaults']['row_plugin'] = FALSE;
   $handler->display->display_options['defaults']['row_options'] = FALSE;
   $handler->display->display_options['defaults']['fields'] = FALSE;
-  /* Champ: Opérations en masse : Contenu */
+  /* Field: Bulk operations: Content */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
@@ -782,13 +784,6 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0;
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array(
-    'action::system_message_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
     'action::workflow_select_given_state_action' => array(
       'selected' => 1,
       'skip_confirmation' => 0,
@@ -796,137 +791,8 @@ function materio_administration_views_default_views() {
       'label' => '',
       'postpone_processing' => 0,
     ),
-    'action::workflow_select_next_state_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_assign_owner_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_unpublish_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_unpublish_by_keyword_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_save_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::system_send_email_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_script_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_modify_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'settings' => array(
-        'show_all_tokens' => 1,
-        'display_values' => array(
-          'breve::field_memo' => 'breve::field_memo',
-          'company::field_memo' => 'company::field_memo',
-          'materiau::field_memo' => 'materiau::field_memo',
-        ),
-      ),
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_argument_selector_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'settings' => array(
-        'url' => '',
-      ),
-    ),
-    'action::node_promote_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_publish_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::system_goto_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_unpromote_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_make_unsticky_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_delete_item' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::pathauto_node_update_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_make_sticky_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
   );
-  /* Champ: Contenu : Image */
+  /* Field: Content: Image */
   $handler->display->display_options['fields']['field_materiau_image']['id'] = 'field_materiau_image';
   $handler->display->display_options['fields']['field_materiau_image']['table'] = 'field_data_field_materiau_image';
   $handler->display->display_options['fields']['field_materiau_image']['field'] = 'field_materiau_image';
@@ -937,7 +803,7 @@ function materio_administration_views_default_views() {
   );
   $handler->display->display_options['fields']['field_materiau_image']['delta_limit'] = '1';
   $handler->display->display_options['fields']['field_materiau_image']['delta_offset'] = '0';
-  /* Champ: Contenu : Image */
+  /* Field: Content: Image */
   $handler->display->display_options['fields']['field_visuel']['id'] = 'field_visuel';
   $handler->display->display_options['fields']['field_visuel']['table'] = 'field_data_field_visuel';
   $handler->display->display_options['fields']['field_visuel']['field'] = 'field_visuel';
@@ -948,27 +814,27 @@ function materio_administration_views_default_views() {
   );
   $handler->display->display_options['fields']['field_visuel']['delta_limit'] = '1';
   $handler->display->display_options['fields']['field_visuel']['delta_offset'] = '0';
-  /* Champ: Contenu : Type */
+  /* Field: Content: Type */
   $handler->display->display_options['fields']['type']['id'] = 'type';
   $handler->display->display_options['fields']['type']['table'] = 'node';
   $handler->display->display_options['fields']['type']['field'] = 'type';
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Titre */
   $handler->display->display_options['fields']['title_field']['id'] = 'title_field';
   $handler->display->display_options['fields']['title_field']['table'] = 'field_data_title_field';
   $handler->display->display_options['fields']['title_field']['field'] = 'title_field';
   $handler->display->display_options['fields']['title_field']['element_type'] = 'strong';
   $handler->display->display_options['fields']['title_field']['link_to_entity'] = 1;
-  /* Champ: Contenu : Référence Materio */
+  /* Field: Content: 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';
-  /* Champ: Contenu : Lien de modification */
+  /* Field: Content: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
-  /* Champ: Contenu : Manufacturer */
+  /* Field: Content: Manufacturer */
   $handler->display->display_options['fields']['field_company_fab']['id'] = 'field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['table'] = 'field_data_field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['field'] = 'field_company_fab';
@@ -977,7 +843,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_company_fab']['alter']['text'] = 'Fab :<br/>
 [field_company_fab] ';
   $handler->display->display_options['fields']['field_company_fab']['delta_offset'] = '0';
-  /* Champ: Contenu : Distributor */
+  /* Field: Content: Distributor */
   $handler->display->display_options['fields']['field_company_distrib']['id'] = 'field_company_distrib';
   $handler->display->display_options['fields']['field_company_distrib']['table'] = 'field_data_field_company_distrib';
   $handler->display->display_options['fields']['field_company_distrib']['field'] = 'field_company_distrib';
@@ -985,7 +851,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_company_distrib']['alter']['text'] = 'Distrib : <br />
 [field_company_distrib]';
   $handler->display->display_options['fields']['field_company_distrib']['delta_offset'] = '0';
-  /* Champ: Contenu : Onthologie */
+  /* Field: Content: Onthologie */
   $handler->display->display_options['fields']['field_onthologie']['id'] = 'field_onthologie';
   $handler->display->display_options['fields']['field_onthologie']['table'] = 'field_data_field_onthologie';
   $handler->display->display_options['fields']['field_onthologie']['field'] = 'field_onthologie';
@@ -993,7 +859,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_onthologie']['delta_limit'] = '5';
   $handler->display->display_options['fields']['field_onthologie']['delta_offset'] = '0';
   $handler->display->display_options['fields']['field_onthologie']['multi_type'] = 'ol';
-  /* Champ: Contenu : Tags libres */
+  /* Field: Content: Tags libres */
   $handler->display->display_options['fields']['field_tags_libres']['id'] = 'field_tags_libres';
   $handler->display->display_options['fields']['field_tags_libres']['table'] = 'field_data_field_tags_libres';
   $handler->display->display_options['fields']['field_tags_libres']['field'] = 'field_tags_libres';
@@ -1001,7 +867,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_tags_libres']['delta_limit'] = '4';
   $handler->display->display_options['fields']['field_tags_libres']['delta_offset'] = '0';
   $handler->display->display_options['fields']['field_tags_libres']['multi_type'] = 'ul';
-  /* Champ: Contenu : Materiau(x) lié(s) */
+  /* Field: Content: Materiau(x) lié(s) */
   $handler->display->display_options['fields']['field_materiau_ref']['id'] = 'field_materiau_ref';
   $handler->display->display_options['fields']['field_materiau_ref']['table'] = 'field_data_field_materiau_ref';
   $handler->display->display_options['fields']['field_materiau_ref']['field'] = 'field_materiau_ref';
@@ -1012,7 +878,7 @@ function materio_administration_views_default_views() {
     'link' => 1,
   );
   $handler->display->display_options['fields']['field_materiau_ref']['delta_offset'] = '0';
-  /* Champ: Contenu : Brève(s) liée(s) */
+  /* Field: Content: Brève(s) liée(s) */
   $handler->display->display_options['fields']['field_breve_ref']['id'] = 'field_breve_ref';
   $handler->display->display_options['fields']['field_breve_ref']['table'] = 'field_data_field_breve_ref';
   $handler->display->display_options['fields']['field_breve_ref']['field'] = 'field_breve_ref';
@@ -1022,7 +888,7 @@ function materio_administration_views_default_views() {
     'link' => 1,
   );
   $handler->display->display_options['fields']['field_breve_ref']['delta_offset'] = '0';
-  /* Champ: Champ : Mémo */
+  /* Field: Field: Mémo */
   $handler->display->display_options['fields']['field_memo']['id'] = 'field_memo';
   $handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo';
   $handler->display->display_options['fields']['field_memo']['field'] = 'field_memo';
@@ -1030,21 +896,21 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_memo']['alter']['max_length'] = '300';
   $handler->display->display_options['fields']['field_memo']['alter']['strip_tags'] = TRUE;
   $handler->display->display_options['fields']['field_memo']['alter']['trim'] = TRUE;
-  /* Champ: Contenu : Fichiers joints */
+  /* Field: Content: Fichiers joints */
   $handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments';
   $handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_attachments']['delta_offset'] = '0';
-  /* Champ: Contenu : Localisation */
+  /* Field: Content: Localisation */
   $handler->display->display_options['fields']['field_localisation']['id'] = 'field_localisation';
   $handler->display->display_options['fields']['field_localisation']['table'] = 'field_data_field_localisation';
   $handler->display->display_options['fields']['field_localisation']['field'] = 'field_localisation';
-  /* Champ: Processus : État actuel */
+  /* Field: Workflow: Current state */
   $handler->display->display_options['fields']['sid']['id'] = 'sid';
   $handler->display->display_options['fields']['sid']['table'] = 'workflow_node';
   $handler->display->display_options['fields']['sid']['field'] = 'sid';
-  /* Champ: Contenu : Lien de suppression */
+  /* Field: Content: Delete link */
   $handler->display->display_options['fields']['delete_node']['id'] = 'delete_node';
   $handler->display->display_options['fields']['delete_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['delete_node']['field'] = 'delete_node';
@@ -1052,7 +918,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['delete_node']['alter']['text'] = '<span class="node-delete">[delete_node]</span>';
   $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
   $handler->display->display_options['filters']['type_1']['table'] = 'node';
   $handler->display->display_options['filters']['type_1']['field'] = 'type';
@@ -1069,7 +935,7 @@ function materio_administration_views_default_views() {
     'looping_embed_video' => 'looping_embed_video',
   );
   $handler->display->display_options['filters']['type_1']['group'] = 1;
-  /* Critère de filtrage: Contenu : Titre */
+  /* Filter criterion: Content: Title */
   $handler->display->display_options['filters']['title']['id'] = 'title';
   $handler->display->display_options['filters']['title']['table'] = 'node';
   $handler->display->display_options['filters']['title']['field'] = 'title';
@@ -1081,7 +947,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
   $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
   $handler->display->display_options['filters']['title']['expose']['remember'] = TRUE;
-  /* Critère de filtrage: Champ : Mémo (field_memo) */
+  /* Filter criterion: Field: Mémo (field_memo) */
   $handler->display->display_options['filters']['field_memo_value']['id'] = 'field_memo_value';
   $handler->display->display_options['filters']['field_memo_value']['table'] = 'field_data_field_memo';
   $handler->display->display_options['filters']['field_memo_value']['field'] = 'field_memo_value';
@@ -1092,7 +958,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['field_memo_value']['expose']['label'] = 'Mémo contient';
   $handler->display->display_options['filters']['field_memo_value']['expose']['operator'] = 'field_memo_value_op';
   $handler->display->display_options['filters']['field_memo_value']['expose']['identifier'] = 'field_memo_value';
-  /* Critère de filtrage: Processus : État actuel */
+  /* Filter criterion: Workflow: Current state */
   $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';
@@ -1103,7 +969,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['sid']['expose']['operator'] = 'sid_op';
   $handler->display->display_options['filters']['sid']['expose']['identifier'] = 'sid';
   $handler->display->display_options['filters']['sid']['expose']['remember'] = TRUE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: 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';
@@ -1131,7 +997,7 @@ function materio_administration_views_default_views() {
     4 => 0,
   );
   $handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE;
-  /* Critère de filtrage: Contenu : Famille (field_famille) */
+  /* Filter criterion: Content: Famille (field_famille) */
   $handler->display->display_options['filters']['field_famille_value']['id'] = 'field_famille_value';
   $handler->display->display_options['filters']['field_famille_value']['table'] = 'field_data_field_famille';
   $handler->display->display_options['filters']['field_famille_value']['field'] = 'field_famille_value';
@@ -1142,7 +1008,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['field_famille_value']['expose']['operator'] = 'field_famille_value_op';
   $handler->display->display_options['filters']['field_famille_value']['expose']['identifier'] = 'field_famille_value';
   $handler->display->display_options['filters']['field_famille_value']['expose']['remember'] = TRUE;
-  /* Critère de filtrage: Contenu : Référence Materio (field_reference_materio) */
+  /* Filter criterion: Content: Référence Materio (field_reference_materio) */
   $handler->display->display_options['filters']['field_reference_materio_value']['id'] = 'field_reference_materio_value';
   $handler->display->display_options['filters']['field_reference_materio_value']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['filters']['field_reference_materio_value']['field'] = 'field_reference_materio_value';
@@ -1153,7 +1019,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['field_reference_materio_value']['expose']['label'] = 'Référence';
   $handler->display->display_options['filters']['field_reference_materio_value']['expose']['operator'] = 'field_reference_materio_value_op';
   $handler->display->display_options['filters']['field_reference_materio_value']['expose']['identifier'] = 'field_reference_materio_value';
-  /* Critère de filtrage: Contenu : Localisation (field_localisation) */
+  /* Filter criterion: Content: Localisation (field_localisation) */
   $handler->display->display_options['filters']['field_localisation_value']['id'] = 'field_localisation_value';
   $handler->display->display_options['filters']['field_localisation_value']['table'] = 'field_data_field_localisation';
   $handler->display->display_options['filters']['field_localisation_value']['field'] = 'field_localisation_value';
@@ -1177,7 +1043,7 @@ function materio_administration_views_default_views() {
     3 => 0,
     4 => 0,
   );
-  /* Critère de filtrage: Contenu : Possède un terme de la taxonomie */
+  /* Filter criterion: Content: Has taxonomy term */
   $handler->display->display_options['filters']['tid']['id'] = 'tid';
   $handler->display->display_options['filters']['tid']['table'] = 'taxonomy_index';
   $handler->display->display_options['filters']['tid']['field'] = 'tid';
@@ -1202,7 +1068,7 @@ function materio_administration_views_default_views() {
   );
   $handler->display->display_options['filters']['tid']['reduce_duplicates'] = TRUE;
   $handler->display->display_options['filters']['tid']['vocabulary'] = 'onthologie';
-  /* Critère de filtrage: Contenu : Possède un terme de la taxonomie */
+  /* Filter criterion: Content: Has taxonomy term */
   $handler->display->display_options['filters']['tid_1']['id'] = 'tid_1';
   $handler->display->display_options['filters']['tid_1']['table'] = 'taxonomy_index';
   $handler->display->display_options['filters']['tid_1']['field'] = 'tid';
@@ -1223,7 +1089,7 @@ function materio_administration_views_default_views() {
     4 => 0,
   );
   $handler->display->display_options['filters']['tid_1']['vocabulary'] = 'tag_libres';
-  /* Critère de filtrage: Contenu : Possède un terme de la taxonomie */
+  /* Filter criterion: Content: Has taxonomy term */
   $handler->display->display_options['filters']['tid_2']['id'] = 'tid_2';
   $handler->display->display_options['filters']['tid_2']['table'] = 'taxonomy_index';
   $handler->display->display_options['filters']['tid_2']['field'] = 'tid';
@@ -1244,7 +1110,7 @@ function materio_administration_views_default_views() {
     4 => 0,
   );
   $handler->display->display_options['filters']['tid_2']['vocabulary'] = 'company';
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
@@ -1282,7 +1148,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['pager']['options']['tags']['last'] = 'dernier »';
   $handler->display->display_options['defaults']['relationships'] = FALSE;
   $handler->display->display_options['defaults']['fields'] = FALSE;
-  /* Champ: Opérations en masse : Contenu */
+  /* Field: Bulk operations: Content */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
@@ -1291,13 +1157,6 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0;
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array(
-    'action::system_message_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
     'action::workflow_select_given_state_action' => array(
       'selected' => 1,
       'skip_confirmation' => 0,
@@ -1305,137 +1164,8 @@ function materio_administration_views_default_views() {
       'label' => '',
       'postpone_processing' => 0,
     ),
-    'action::workflow_select_next_state_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_assign_owner_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_unpublish_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_unpublish_by_keyword_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_save_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::system_send_email_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_script_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_modify_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'settings' => array(
-        'show_all_tokens' => 1,
-        'display_values' => array(
-          'breve::field_memo' => 'breve::field_memo',
-          'company::field_memo' => 'company::field_memo',
-          'materiau::field_memo' => 'materiau::field_memo',
-        ),
-      ),
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_argument_selector_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'settings' => array(
-        'url' => '',
-      ),
-    ),
-    'action::node_promote_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_publish_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::system_goto_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_unpromote_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_make_unsticky_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_delete_item' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::pathauto_node_update_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_make_sticky_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
   );
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
@@ -1444,19 +1174,19 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['element_type'] = 'strong';
   $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
-  /* Champ: Contenu : Date de publication */
+  /* Field: Content: Post date */
   $handler->display->display_options['fields']['created']['id'] = 'created';
   $handler->display->display_options['fields']['created']['table'] = 'node';
   $handler->display->display_options['fields']['created']['field'] = 'created';
   $handler->display->display_options['fields']['created']['date_format'] = 'custom';
   $handler->display->display_options['fields']['created']['custom_date_format'] = 'Y/m/d';
-  /* Champ: Contenu : Lien de modification */
+  /* Field: Content: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
-  /* Champ: Contenu : Adresse */
+  /* Field: Content: Adresse */
   $handler->display->display_options['fields']['field_public_address']['id'] = 'field_public_address';
   $handler->display->display_options['fields']['field_public_address']['table'] = 'field_data_field_public_address';
   $handler->display->display_options['fields']['field_public_address']['field'] = 'field_public_address';
@@ -1467,58 +1197,58 @@ function materio_administration_views_default_views() {
       'address' => 'address',
     ),
   );
-  /* Champ: Contenu : Phone */
+  /* Field: Content: Phone */
   $handler->display->display_options['fields']['field_public_phone']['id'] = 'field_public_phone';
   $handler->display->display_options['fields']['field_public_phone']['table'] = 'field_data_field_public_phone';
   $handler->display->display_options['fields']['field_public_phone']['field'] = 'field_public_phone';
   $handler->display->display_options['fields']['field_public_phone']['label'] = 'Téléphone';
   $handler->display->display_options['fields']['field_public_phone']['click_sort_column'] = 'number';
   $handler->display->display_options['fields']['field_public_phone']['delta_offset'] = '0';
-  /* Champ: Contenu : Langue */
+  /* Field: Content: Language */
   $handler->display->display_options['fields']['language']['id'] = 'language';
   $handler->display->display_options['fields']['language']['table'] = 'node';
   $handler->display->display_options['fields']['language']['field'] = 'language';
-  /* Champ: Traduction du contenu : Lien de traduction */
+  /* Field: Content translation: Translate link */
   $handler->display->display_options['fields']['translate_node']['id'] = 'translate_node';
   $handler->display->display_options['fields']['translate_node']['table'] = 'node';
   $handler->display->display_options['fields']['translate_node']['field'] = 'translate_node';
   $handler->display->display_options['fields']['translate_node']['alter']['text'] = '<span class="button">[translate_node]</span>';
-  /* Champ: Traduction du contenu : Statut de la traduction */
+  /* Field: Content translation: Translation status */
   $handler->display->display_options['fields']['translate']['id'] = 'translate';
   $handler->display->display_options['fields']['translate']['table'] = 'node';
   $handler->display->display_options['fields']['translate']['field'] = 'translate';
   $handler->display->display_options['fields']['translate']['exclude'] = TRUE;
   $handler->display->display_options['fields']['translate']['not'] = 0;
-  /* Champ: Contenu : website */
+  /* Field: Content: website */
   $handler->display->display_options['fields']['field_website']['id'] = 'field_website';
   $handler->display->display_options['fields']['field_website']['table'] = 'field_data_field_website';
   $handler->display->display_options['fields']['field_website']['field'] = 'field_website';
   $handler->display->display_options['fields']['field_website']['click_sort_column'] = 'url';
-  /* Champ: Contenu : Email */
+  /* Field: Content: Email */
   $handler->display->display_options['fields']['field_public_email']['id'] = 'field_public_email';
   $handler->display->display_options['fields']['field_public_email']['table'] = 'field_data_field_public_email';
   $handler->display->display_options['fields']['field_public_email']['field'] = 'field_public_email';
   $handler->display->display_options['fields']['field_public_email']['label'] = 'Courriel';
-  /* Champ: Contenu : Note */
+  /* Field: Content: Note */
   $handler->display->display_options['fields']['field_note']['id'] = 'field_note';
   $handler->display->display_options['fields']['field_note']['table'] = 'field_data_field_note';
   $handler->display->display_options['fields']['field_note']['field'] = 'field_note';
-  /* Champ: Contenu : Fichiers joints */
+  /* Field: Content: Fichiers joints */
   $handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments';
   $handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_attachments']['delta_offset'] = '0';
-  /* Champ: Champ : Mémo */
+  /* Field: Field: Mémo */
   $handler->display->display_options['fields']['field_memo']['id'] = 'field_memo';
   $handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo';
   $handler->display->display_options['fields']['field_memo']['field'] = 'field_memo';
   $handler->display->display_options['fields']['field_memo']['alter']['nl2br'] = TRUE;
-  /* Champ: Processus : État actuel */
+  /* Field: Workflow: Current state */
   $handler->display->display_options['fields']['sid']['id'] = 'sid';
   $handler->display->display_options['fields']['sid']['table'] = 'workflow_node';
   $handler->display->display_options['fields']['sid']['field'] = 'sid';
-  /* Champ: Contenu : Lien de suppression */
+  /* Field: Content: Delete link */
   $handler->display->display_options['fields']['delete_node']['id'] = 'delete_node';
   $handler->display->display_options['fields']['delete_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['delete_node']['field'] = 'delete_node';
@@ -1526,7 +1256,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['delete_node']['alter']['text'] = '<span class="node-delete">[delete_node]</span>';
   $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
-  /* Critère de filtrage: Contenu : Titre */
+  /* Filter criterion: Content: Title */
   $handler->display->display_options['filters']['title']['id'] = 'title';
   $handler->display->display_options['filters']['title']['table'] = 'node';
   $handler->display->display_options['filters']['title']['field'] = 'title';
@@ -1538,7 +1268,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
   $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
   $handler->display->display_options['filters']['title']['expose']['remember'] = TRUE;
-  /* Critère de filtrage: Processus : État actuel */
+  /* Filter criterion: Workflow: Current state */
   $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';
@@ -1549,7 +1279,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['sid']['expose']['operator'] = 'sid_op';
   $handler->display->display_options['filters']['sid']['expose']['identifier'] = 'sid';
   $handler->display->display_options['filters']['sid']['expose']['remember'] = TRUE;
-  /* Critère de filtrage: Champ : Mémo (field_memo) */
+  /* Filter criterion: Field: Mémo (field_memo) */
   $handler->display->display_options['filters']['field_memo_value']['id'] = 'field_memo_value';
   $handler->display->display_options['filters']['field_memo_value']['table'] = 'field_data_field_memo';
   $handler->display->display_options['filters']['field_memo_value']['field'] = 'field_memo_value';
@@ -1560,7 +1290,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['field_memo_value']['expose']['label'] = 'Mémo contient';
   $handler->display->display_options['filters']['field_memo_value']['expose']['operator'] = 'field_memo_value_op';
   $handler->display->display_options['filters']['field_memo_value']['expose']['identifier'] = 'field_memo_value';
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type_2']['id'] = 'type_2';
   $handler->display->display_options['filters']['type_2']['table'] = 'node';
   $handler->display->display_options['filters']['type_2']['field'] = 'type';
@@ -1578,7 +1308,7 @@ function materio_administration_views_default_views() {
     'looping_embed_video' => 'looping_embed_video',
   );
   $handler->display->display_options['filters']['type_2']['group'] = 1;
-  /* Critère de filtrage: Contenu : Adresse - Code postal */
+  /* Filter criterion: Content: Adresse - Postal code */
   $handler->display->display_options['filters']['field_public_address_postal_code']['id'] = 'field_public_address_postal_code';
   $handler->display->display_options['filters']['field_public_address_postal_code']['table'] = 'field_data_field_public_address';
   $handler->display->display_options['filters']['field_public_address_postal_code']['field'] = 'field_public_address_postal_code';
@@ -1601,7 +1331,7 @@ function materio_administration_views_default_views() {
     3 => 0,
     4 => 0,
   );
-  /* Critère de filtrage: Contenu : Adresse - Localité (c&#039;est-à-dire Ville) */
+  /* Filter criterion: Content: Adresse - Locality (i.e. City) */
   $handler->display->display_options['filters']['field_public_address_locality']['id'] = 'field_public_address_locality';
   $handler->display->display_options['filters']['field_public_address_locality']['table'] = 'field_data_field_public_address';
   $handler->display->display_options['filters']['field_public_address_locality']['field'] = 'field_public_address_locality';
@@ -1653,7 +1383,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['pager']['options']['tags']['next'] = 'suivant ›';
   $handler->display->display_options['pager']['options']['tags']['last'] = 'dernier »';
   $handler->display->display_options['defaults']['fields'] = FALSE;
-  /* Champ: Opérations en masse : Contenu */
+  /* Field: Bulk operations: Content */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
@@ -1664,13 +1394,6 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0;
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array(
-    'action::system_message_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
     'action::workflow_select_given_state_action' => array(
       'selected' => 1,
       'skip_confirmation' => 0,
@@ -1678,141 +1401,12 @@ function materio_administration_views_default_views() {
       'label' => '',
       'postpone_processing' => 0,
     ),
-    'action::workflow_select_next_state_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_assign_owner_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_unpublish_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_unpublish_by_keyword_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_save_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::system_send_email_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_script_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_modify_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'settings' => array(
-        'show_all_tokens' => 1,
-        'display_values' => array(
-          'breve::field_memo' => 'breve::field_memo',
-          'company::field_memo' => 'company::field_memo',
-          'materiau::field_memo' => 'materiau::field_memo',
-        ),
-      ),
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_argument_selector_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'settings' => array(
-        'url' => '',
-      ),
-    ),
-    'action::node_promote_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_publish_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::system_goto_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_unpromote_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_make_unsticky_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_delete_item' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::pathauto_node_update_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::node_make_sticky_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
   );
-  /* Champ: Contenu : Type */
+  /* Field: Content: Type */
   $handler->display->display_options['fields']['type']['id'] = 'type';
   $handler->display->display_options['fields']['type']['table'] = 'node';
   $handler->display->display_options['fields']['type']['field'] = 'type';
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
@@ -1821,13 +1415,13 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['element_type'] = 'strong';
   $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
-  /* Champ: Contenu : Lien de modification */
+  /* Field: Content: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
-  /* Champ: Champ : Mémo */
+  /* Field: Field: Mémo */
   $handler->display->display_options['fields']['field_memo']['id'] = 'field_memo';
   $handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo';
   $handler->display->display_options['fields']['field_memo']['field'] = 'field_memo';
@@ -1835,21 +1429,21 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_memo']['alter']['max_length'] = '300';
   $handler->display->display_options['fields']['field_memo']['alter']['strip_tags'] = TRUE;
   $handler->display->display_options['fields']['field_memo']['alter']['trim'] = TRUE;
-  /* Champ: Contenu : Fichiers joints */
+  /* Field: Content: Fichiers joints */
   $handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments';
   $handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_attachments']['delta_offset'] = '0';
-  /* Champ: Contenu : Localisation */
+  /* Field: Content: Localisation */
   $handler->display->display_options['fields']['field_localisation']['id'] = 'field_localisation';
   $handler->display->display_options['fields']['field_localisation']['table'] = 'field_data_field_localisation';
   $handler->display->display_options['fields']['field_localisation']['field'] = 'field_localisation';
-  /* Champ: Processus : État actuel */
+  /* Field: Workflow: Current state */
   $handler->display->display_options['fields']['sid']['id'] = 'sid';
   $handler->display->display_options['fields']['sid']['table'] = 'workflow_node';
   $handler->display->display_options['fields']['sid']['field'] = 'sid';
-  /* Champ: Contenu : Lien de suppression */
+  /* Field: Content: Delete link */
   $handler->display->display_options['fields']['delete_node']['id'] = 'delete_node';
   $handler->display->display_options['fields']['delete_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['delete_node']['field'] = 'delete_node';
@@ -1857,7 +1451,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['delete_node']['alter']['text'] = '<span class="node-delete">[delete_node]</span>';
   $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
   $handler->display->display_options['filters']['type_1']['table'] = 'node';
   $handler->display->display_options['filters']['type_1']['field'] = 'type';
@@ -1872,7 +1466,7 @@ function materio_administration_views_default_views() {
     'webform' => 'webform',
   );
   $handler->display->display_options['filters']['type_1']['group'] = 1;
-  /* Critère de filtrage: Contenu : Titre */
+  /* Filter criterion: Content: Title */
   $handler->display->display_options['filters']['title']['id'] = 'title';
   $handler->display->display_options['filters']['title']['table'] = 'node';
   $handler->display->display_options['filters']['title']['field'] = 'title';
@@ -1884,7 +1478,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
   $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
   $handler->display->display_options['filters']['title']['expose']['remember'] = TRUE;
-  /* Critère de filtrage: Champ : Mémo (field_memo) */
+  /* Filter criterion: Field: Mémo (field_memo) */
   $handler->display->display_options['filters']['field_memo_value']['id'] = 'field_memo_value';
   $handler->display->display_options['filters']['field_memo_value']['table'] = 'field_data_field_memo';
   $handler->display->display_options['filters']['field_memo_value']['field'] = 'field_memo_value';
@@ -1895,7 +1489,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['field_memo_value']['expose']['label'] = 'Mémo contient';
   $handler->display->display_options['filters']['field_memo_value']['expose']['operator'] = 'field_memo_value_op';
   $handler->display->display_options['filters']['field_memo_value']['expose']['identifier'] = 'field_memo_value';
-  /* Critère de filtrage: Processus : État actuel */
+  /* Filter criterion: Workflow: Current state */
   $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';
@@ -1906,7 +1500,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['sid']['expose']['operator'] = 'sid_op';
   $handler->display->display_options['filters']['sid']['expose']['identifier'] = 'sid';
   $handler->display->display_options['filters']['sid']['expose']['remember'] = TRUE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: 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';
@@ -1937,7 +1531,7 @@ function materio_administration_views_default_views() {
     4 => 0,
   );
   $handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE;
-  /* Critère de filtrage: Contenu : Référence Materio (field_reference_materio) */
+  /* Filter criterion: Content: Référence Materio (field_reference_materio) */
   $handler->display->display_options['filters']['field_reference_materio_value']['id'] = 'field_reference_materio_value';
   $handler->display->display_options['filters']['field_reference_materio_value']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['filters']['field_reference_materio_value']['field'] = 'field_reference_materio_value';
@@ -1979,34 +1573,36 @@ function materio_administration_views_default_views() {
     t('Type'),
     t('Title / Name'),
     t('Référence Materio'),
-    t('Lien de modification'),
+    t('Edit link'),
     t('<span class="node-edit">[edit_node]</span>'),
     t('Fabricants / Distributeurs'),
     t('Distributor'),
-    t('Langue'),
-    t('Lien de traduction'),
+    t('Language'),
+    t('Translate link'),
     t('<span class="button">[translate_node]</span>'),
-    t('Statut de la traduction'),
-    t('État actuel'),
-    t('Date de mise à jour'),
+    t('Translation status'),
+    t('Current state'),
+    t('Updated date'),
     t('Mémo'),
-    t('Lien de suppression'),
+    t('Delete link'),
     t('<span class="node-delete">[delete_node]</span>'),
     t('Le titre contient'),
     t('Processus'),
     t('Type de contenu'),
     t('Mémo contient'),
     t('Page : all'),
+    t('more'),
     t('Block'),
     t('Recent Content'),
-    t('Titre'),
+    t('Title'),
     t('Modifier'),
-    t('Publié'),
+    t('Published'),
     t('Traduire'),
     t('Page : materiaux'),
     t('Materiaux/brèves'),
-    t('- Choisir une opération -'),
+    t('- Choose an operation -'),
     t('Image'),
+    t('Titre'),
     t('Fabricants/Distributeurs'),
     t('Fab :<br/>
 [field_company_fab] '),
@@ -2029,7 +1625,8 @@ function materio_administration_views_default_views() {
     t('Société'),
     t('Page : companies'),
     t('Companies'),
-    t('Date de publication'),
+    t('Content'),
+    t('Post date'),
     t('Adresse'),
     t('Téléphone'),
     t('website'),
@@ -2290,71 +1887,37 @@ function materio_administration_views_default_views() {
       'empty_column' => 0,
     ),
   );
-  /* Entête: Global : Résumé des résultats */
+  /* Header: Global: Result summary */
   $handler->display->display_options['header']['result']['id'] = 'result';
   $handler->display->display_options['header']['result']['table'] = 'views';
   $handler->display->display_options['header']['result']['field'] = 'result';
   $handler->display->display_options['header']['result']['label'] = 'Résumé';
-  /* Relation: Utilisateur : Profil */
+  /* Relationship: User: Profile */
   $handler->display->display_options['relationships']['profile']['id'] = 'profile';
   $handler->display->display_options['relationships']['profile']['table'] = 'users';
   $handler->display->display_options['relationships']['profile']['field'] = 'profile';
   $handler->display->display_options['relationships']['profile']['bundle_types'] = array(
     'adherent' => 'adherent',
   );
-  /* Champ: Opérations en masse : Utilisateur */
+  /* Field: Bulk operations: User */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'users';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
+  $handler->display->display_options['fields']['views_bulk_operations']['label'] = 'Utilisateur';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['enable_select_all_pages'] = 1;
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0;
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array(
-    'action::user_block_user_action' => array(
+    'action::views_bulk_operations_user_cancel_action' => array(
       'selected' => 1,
       'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
     ),
-    'action::role_delegation_delegate_roles_action' => array(
-      'selected' => 0,
-      'postpone_processing' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-    ),
-    'action::system_send_email_action' => array(
-      'selected' => 0,
-      'postpone_processing' => 1,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-    ),
-    'action::views_bulk_operations_script_action' => array(
-      'selected' => 0,
-      'postpone_processing' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-    ),
-    'action::flag_user_action' => array(
-      'selected' => 0,
-      'postpone_processing' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-    ),
-    'action::pathauto_user_update_action' => array(
-      'selected' => 0,
-      'postpone_processing' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-    ),
-    'action::views_bulk_operations_user_roles_action' => array(
-      'selected' => 0,
+    'action::user_block_user_action' => array(
+      'selected' => 1,
       'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
@@ -2374,31 +1937,8 @@ function materio_administration_views_default_views() {
         ),
       ),
     ),
-    'action::views_bulk_operations_argument_selector_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'settings' => array(
-        'url' => '',
-      ),
-    ),
-    'action::mimemail_send_email_action' => array(
-      'selected' => 0,
-      'postpone_processing' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-    ),
-    'action::views_bulk_operations_delete_item' => array(
-      'selected' => 1,
-      'postpone_processing' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-    ),
   );
-  /* Champ: Utilisateur : Uid */
+  /* Field: User: Uid */
   $handler->display->display_options['fields']['uid']['id'] = 'uid';
   $handler->display->display_options['fields']['uid']['table'] = 'users';
   $handler->display->display_options['fields']['uid']['field'] = 'uid';
@@ -2406,19 +1946,19 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['uid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
-  /* Champ: Profil : Titre */
+  /* Field: Profile: Titre */
   $handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile';
-  /* Champ: Profil : First name */
+  /* Field: Profile: First name */
   $handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
   $handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom';
   $handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE;
-  /* Champ: Profil : Name */
+  /* Field: Profile: Name */
   $handler->display->display_options['fields']['field_name']['id'] = 'field_name';
   $handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name';
   $handler->display->display_options['fields']['field_name']['field'] = 'field_name';
@@ -2426,21 +1966,21 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_name']['label'] = 'Nom';
   $handler->display->display_options['fields']['field_name']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['field_name']['alter']['text'] = '[field_first_name] [field_name]';
-  /* Champ: Utilisateur : Courriel */
+  /* Field: User: E-mail */
   $handler->display->display_options['fields']['mail']['id'] = 'mail';
   $handler->display->display_options['fields']['mail']['table'] = 'users';
   $handler->display->display_options['fields']['mail']['field'] = 'mail';
-  /* Champ: Utilisateur : Lien de modification */
+  /* Field: User: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['table'] = 'users';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
-  /* Champ: Utilisateur : Rôles */
+  /* Field: User: Roles */
   $handler->display->display_options['fields']['rid']['id'] = 'rid';
   $handler->display->display_options['fields']['rid']['table'] = 'users_roles';
   $handler->display->display_options['fields']['rid']['field'] = 'rid';
-  /* Champ: Utilisateur : Ubercart Role expiration date/time */
+  /* Field: User: Ubercart Role expiration date/time */
   $handler->display->display_options['fields']['expiration']['id'] = 'expiration';
   $handler->display->display_options['fields']['expiration']['table'] = 'uc_roles_expirations';
   $handler->display->display_options['fields']['expiration']['field'] = 'expiration';
@@ -2448,18 +1988,18 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['expiration']['date_format'] = 'custom';
   $handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d';
   $handler->display->display_options['fields']['expiration']['second_date_format'] = 'long';
-  /* Champ: Utilisateur : Company */
+  /* Field: User: Company */
   $handler->display->display_options['fields']['field_company']['id'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
   $handler->display->display_options['fields']['field_company']['field'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['label'] = 'Société';
-  /* Champ: Profil : Organization */
+  /* Field: Profile: Organization */
   $handler->display->display_options['fields']['field_organization']['id'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['table'] = 'field_data_field_organization';
   $handler->display->display_options['fields']['field_organization']['field'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_organization']['label'] = 'Organisation';
-  /* Champ: Profil : service */
+  /* Field: Profile: service */
   $handler->display->display_options['fields']['field_service']['id'] = 'field_service';
   $handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
   $handler->display->display_options['fields']['field_service']['field'] = 'field_service';
@@ -2468,7 +2008,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]';
   $handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE;
-  /* Champ: Profil : Qualité */
+  /* Field: Profile: Qualité */
   $handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality';
@@ -2477,7 +2017,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]';
   $handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE;
-  /* Champ: Profil : SIRET */
+  /* Field: Profile: SIRET */
   $handler->display->display_options['fields']['field_siret']['id'] = 'field_siret';
   $handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret';
   $handler->display->display_options['fields']['field_siret']['field'] = 'field_siret';
@@ -2485,7 +2025,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]';
   $handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE;
-  /* Champ: Profil : Employee */
+  /* Field: Profile: Employee */
   $handler->display->display_options['fields']['field_employee']['id'] = 'field_employee';
   $handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee';
   $handler->display->display_options['fields']['field_employee']['field'] = 'field_employee';
@@ -2499,14 +2039,14 @@ function materio_administration_views_default_views() {
     'thousand_separator' => ' ',
     'prefix_suffix' => 1,
   );
-  /* Champ: Profil : Website */
+  /* Field: Profile: Website */
   $handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website';
   $handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet';
   $handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url';
-  /* Champ: Profil : Adresse */
+  /* Field: Profile: Adresse */
   $handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse';
   $handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse';
   $handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse';
@@ -2518,7 +2058,7 @@ function materio_administration_views_default_views() {
       'address' => 'address',
     ),
   );
-  /* Champ: Profil : Phone */
+  /* Field: Profile: Phone */
   $handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone';
@@ -2526,7 +2066,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_private_phone']['label'] = 'Téléphone';
   $handler->display->display_options['fields']['field_private_phone']['click_sort_column'] = 'number';
   $handler->display->display_options['fields']['field_private_phone']['delta_offset'] = '0';
-  /* Champ: Global : PHP */
+  /* Field: Global: PHP */
   $handler->display->display_options['fields']['php_2']['id'] = 'php_2';
   $handler->display->display_options['fields']['php_2']['table'] = 'views';
   $handler->display->display_options['fields']['php_2']['field'] = 'php';
@@ -2544,44 +2084,44 @@ print implode($value, \'<br>\');
 ?>';
   $handler->display->display_options['fields']['php_2']['use_php_click_sortable'] = '0';
   $handler->display->display_options['fields']['php_2']['php_click_sortable'] = '';
-  /* Champ: Champ : Mémo */
+  /* Field: Field: Mémo */
   $handler->display->display_options['fields']['field_memo']['id'] = 'field_memo';
   $handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo';
   $handler->display->display_options['fields']['field_memo']['field'] = 'field_memo';
   $handler->display->display_options['fields']['field_memo']['alter']['nl2br'] = TRUE;
-  /* Champ: Utilisateur : Date de création */
+  /* Field: User: Created date */
   $handler->display->display_options['fields']['created']['id'] = 'created';
   $handler->display->display_options['fields']['created']['table'] = 'users';
   $handler->display->display_options['fields']['created']['field'] = 'created';
   $handler->display->display_options['fields']['created']['date_format'] = 'custom';
   $handler->display->display_options['fields']['created']['custom_date_format'] = 'Y-m-d h:m';
-  /* Champ: Utilisateur : Dernier accès */
+  /* Field: User: Last access */
   $handler->display->display_options['fields']['access']['id'] = 'access';
   $handler->display->display_options['fields']['access']['table'] = 'users';
   $handler->display->display_options['fields']['access']['field'] = 'access';
   $handler->display->display_options['fields']['access']['date_format'] = 'custom';
   $handler->display->display_options['fields']['access']['custom_date_format'] = 'Y-m-d h:m';
-  /* Champ: Utilisateur : Langue */
+  /* Field: User: Language */
   $handler->display->display_options['fields']['language']['id'] = 'language';
   $handler->display->display_options['fields']['language']['table'] = 'users';
   $handler->display->display_options['fields']['language']['field'] = 'language';
   $handler->display->display_options['fields']['language']['link_to_user'] = FALSE;
-  /* Champ: Utilisateur : Actif */
+  /* Field: User: Active */
   $handler->display->display_options['fields']['status']['id'] = 'status';
   $handler->display->display_options['fields']['status']['table'] = 'users';
   $handler->display->display_options['fields']['status']['field'] = 'status';
-  /* Champ: User Stats : Valeur */
+  /* Field: User Stats: Value */
   $handler->display->display_options['fields']['value']['id'] = 'value';
   $handler->display->display_options['fields']['value']['table'] = 'user_stats_values';
   $handler->display->display_options['fields']['value']['field'] = 'value';
   $handler->display->display_options['fields']['value']['label'] = 'Login count (?)';
   $handler->display->display_options['fields']['value']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['value']['empty_zero'] = TRUE;
-  /* Champ: Global : Envoyer le courriel */
+  /* Field: Global: Send e-mail */
   $handler->display->display_options['fields']['views_send']['id'] = 'views_send';
   $handler->display->display_options['fields']['views_send']['table'] = 'views';
   $handler->display->display_options['fields']['views_send']['field'] = 'views_send';
-  /* Champ: Global : PHP */
+  /* Field: Global: PHP */
   $handler->display->display_options['fields']['php_1']['id'] = 'php_1';
   $handler->display->display_options['fields']['php_1']['table'] = 'views';
   $handler->display->display_options['fields']['php_1']['field'] = 'php';
@@ -2594,7 +2134,7 @@ print user_pass_reset_url($account);
 ?>';
   $handler->display->display_options['fields']['php_1']['use_php_click_sortable'] = '0';
   $handler->display->display_options['fields']['php_1']['php_click_sortable'] = '';
-  /* Critère de filtrage: Utilisateur : Actif */
+  /* Filter criterion: User: Active */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'users';
   $handler->display->display_options['filters']['status']['field'] = 'status';
@@ -2606,7 +2146,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['status']['expose']['operator'] = 'status_op';
   $handler->display->display_options['filters']['status']['expose']['identifier'] = 'status';
   $handler->display->display_options['filters']['status']['expose']['remember'] = TRUE;
-  /* Critère de filtrage: Utilisateur : Rôles */
+  /* Filter criterion: User: Roles */
   $handler->display->display_options['filters']['rid']['id'] = 'rid';
   $handler->display->display_options['filters']['rid']['table'] = 'users_roles';
   $handler->display->display_options['filters']['rid']['field'] = 'rid';
@@ -2639,7 +2179,7 @@ print user_pass_reset_url($account);
     4 => 0,
   );
   $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
-  /* Critère de filtrage: Utilisateur : Company (field_company) */
+  /* Filter criterion: User: Company (field_company) */
   $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
   $handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -2651,7 +2191,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op';
   $handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company';
-  /* Critère de filtrage: Profil : Organization (field_organization) */
+  /* Filter criterion: Profile: Organization (field_organization) */
   $handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value';
   $handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization';
   $handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value';
@@ -2674,7 +2214,7 @@ print user_pass_reset_url($account);
     3 => 0,
     4 => 0,
   );
-  /* Critère de filtrage: Champ : Mémo (field_memo) */
+  /* Filter criterion: Field: Mémo (field_memo) */
   $handler->display->display_options['filters']['field_memo_value']['id'] = 'field_memo_value';
   $handler->display->display_options['filters']['field_memo_value']['table'] = 'field_data_field_memo';
   $handler->display->display_options['filters']['field_memo_value']['field'] = 'field_memo_value';
@@ -2696,7 +2236,7 @@ print user_pass_reset_url($account);
     3 => 0,
     4 => 0,
   );
-  /* Critère de filtrage: Utilisateur : Rôles */
+  /* Filter criterion: User: Roles */
   $handler->display->display_options['filters']['rid_1']['id'] = 'rid_1';
   $handler->display->display_options['filters']['rid_1']['table'] = 'users_roles';
   $handler->display->display_options['filters']['rid_1']['field'] = 'rid';
@@ -2705,7 +2245,7 @@ print user_pass_reset_url($account);
     4 => '4',
   );
   $handler->display->display_options['filters']['rid_1']['group'] = 1;
-  /* Critère de filtrage: Utilisateur : Courriel */
+  /* Filter criterion: User: E-mail */
   $handler->display->display_options['filters']['mail']['id'] = 'mail';
   $handler->display->display_options['filters']['mail']['table'] = 'users';
   $handler->display->display_options['filters']['mail']['field'] = 'mail';
@@ -2725,7 +2265,7 @@ print user_pass_reset_url($account);
     3 => 0,
     4 => 0,
   );
-  /* Critère de filtrage: Utilisateur : Langue */
+  /* Filter criterion: User: Language */
   $handler->display->display_options['filters']['language']['id'] = 'language';
   $handler->display->display_options['filters']['language']['table'] = 'users';
   $handler->display->display_options['filters']['language']['field'] = 'language';
@@ -2750,7 +2290,7 @@ print user_pass_reset_url($account);
     4 => 0,
   );
   $handler->display->display_options['filters']['language']['expose']['reduce'] = TRUE;
-  /* Critère de filtrage: Utilisateur : Courriel */
+  /* Filter criterion: User: E-mail */
   $handler->display->display_options['filters']['mail_1']['id'] = 'mail_1';
   $handler->display->display_options['filters']['mail_1']['table'] = 'users';
   $handler->display->display_options['filters']['mail_1']['field'] = 'mail';
@@ -2790,17 +2330,17 @@ print user_pass_reset_url($account);
     t('dernier »'),
     t('Résumé'),
     t('Displaying @start - @end of @total'),
-    t('Profil'),
+    t('Profile'),
     t('Utilisateur'),
-    t('- Choisir une opération -'),
+    t('- Choose an operation -'),
     t('Titre'),
     t('Prénom'),
     t('Nom'),
     t('[field_first_name] [field_name]'),
-    t('Courriel'),
-    t('Lien de modification'),
+    t('E-mail'),
+    t('Edit link'),
     t('<span class="node-edit">[edit_node]</span>'),
-    t('Rôles'),
+    t('Roles'),
     t('Expiration'),
     t('Société'),
     t('Organisation'),
@@ -2817,17 +2357,22 @@ print user_pass_reset_url($account);
     t('Téléphone'),
     t('Lettres d’information'),
     t('Mémo'),
-    t('Date de création'),
-    t('Dernier accès'),
-    t('Langue'),
-    t('Actif'),
+    t('Created date'),
+    t('Last access'),
+    t('Language'),
+    t('Active'),
     t('Login count (?)'),
     t('.'),
     t(','),
-    t('Envoyer le courriel'),
+    t('Send e-mail'),
     t('One time login'),
+    t('Actif'),
+    t('Rôles'),
     t('Mémo Contient'),
+    t('Courriel'),
+    t('Langue'),
     t('Page'),
+    t('more'),
     t('Data export'),
   );
   $export['admin_peoples'] = $view;
@@ -2867,7 +2412,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['pager']['options']['tags']['next'] = 'suivant ›';
   $handler->display->display_options['pager']['options']['tags']['last'] = 'dernier »';
   $handler->display->display_options['style_plugin'] = 'table';
-  /* Champ: Opérations en masse : Terme de taxonomie */
+  /* Field: Bulk operations: Taxonomy term */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'taxonomy_term_data';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
@@ -2876,56 +2421,6 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0;
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array(
-    'action::system_message_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::system_send_email_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_script_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_modify_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'settings' => array(
-        'show_all_tokens' => 1,
-        'display_values' => array(
-          '_all_' => '_all_',
-        ),
-      ),
-      'postpone_processing' => 0,
-    ),
-    'action::views_bulk_operations_argument_selector_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'settings' => array(
-        'url' => '',
-      ),
-    ),
-    'action::system_goto_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
     'action::views_bulk_operations_delete_item' => array(
       'selected' => 1,
       'skip_confirmation' => 1,
@@ -2933,15 +2428,8 @@ print user_pass_reset_url($account);
       'label' => '',
       'postpone_processing' => 0,
     ),
-    'action::pathauto_taxonomy_term_update_action' => array(
-      'selected' => 0,
-      'skip_confirmation' => 0,
-      'override_label' => 0,
-      'label' => '',
-      'postpone_processing' => 0,
-    ),
   );
-  /* Champ: Terme de taxonomie : Nom */
+  /* Field: Taxonomy term: Name */
   $handler->display->display_options['fields']['name']['id'] = 'name';
   $handler->display->display_options['fields']['name']['table'] = 'taxonomy_term_data';
   $handler->display->display_options['fields']['name']['field'] = 'name';
@@ -2949,7 +2437,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['name']['alter']['word_boundary'] = FALSE;
   $handler->display->display_options['fields']['name']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['name']['link_to_taxonomy'] = TRUE;
-  /* Critère de filtrage: Vocabulaire de taxonomie : Nom système */
+  /* Filter criterion: Taxonomy vocabulary: Machine name */
   $handler->display->display_options['filters']['machine_name']['id'] = 'machine_name';
   $handler->display->display_options['filters']['machine_name']['table'] = 'taxonomy_vocabulary';
   $handler->display->display_options['filters']['machine_name']['field'] = 'machine_name';
@@ -2964,7 +2452,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['machine_name']['expose']['operator'] = 'machine_name_op';
   $handler->display->display_options['filters']['machine_name']['expose']['identifier'] = 'machine_name';
   $handler->display->display_options['filters']['machine_name']['expose']['reduce'] = TRUE;
-  /* Critère de filtrage: Vocabulaire de taxonomie : Nom système */
+  /* Filter criterion: Taxonomy vocabulary: Machine name */
   $handler->display->display_options['filters']['machine_name_1']['id'] = 'machine_name_1';
   $handler->display->display_options['filters']['machine_name_1']['table'] = 'taxonomy_vocabulary';
   $handler->display->display_options['filters']['machine_name_1']['field'] = 'machine_name';
@@ -2994,10 +2482,11 @@ print user_pass_reset_url($account);
     t('‹ précédent'),
     t('suivant ›'),
     t('dernier »'),
-    t('Terme de taxonomie'),
-    t('- Choisir une opération -'),
+    t('Taxonomy term'),
+    t('- Choose an operation -'),
     t('Vocabulaire'),
     t('Page'),
+    t('more'),
   );
   $export['taxonomy_companies_manager'] = $view;
 
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc
index ce94bf1f..cf399a21 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc
+++ b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc
@@ -10,27 +10,6 @@
 function materio_content_types_field_default_field_bases() {
   $field_bases = array();
 
-  // Exported field_base: 'description_field'
-  $field_bases['description_field'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'description_field',
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(
-      'entity_translation_sync' => FALSE,
-    ),
-    'translatable' => 1,
-    'type' => 'text_with_summary',
-  );
-
   // Exported field_base: 'field_attachments'
   $field_bases['field_attachments'] = array(
     'active' => 1,
@@ -778,6 +757,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
         0 => array(
           'vocabulary' => 'tag_libres',
           'parent' => 0,
+          'depth' => '',
         ),
       ),
       'entity_translation_sync' => FALSE,
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc
index 9f51bec6..cd1f07fb 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc
+++ b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc
@@ -628,8 +628,13 @@ function materio_content_types_field_default_field_instances() {
       'module' => 'autocomplete_deluxe',
       'settings' => array(
         'autocomplete_deluxe_path' => 'autocomplete_deluxe/taxonomy',
-        'content_taxonomy_autocomplete_new_terms' => 'allow',
+        'content_taxonomy_autocomplete_new_terms' => 'deny',
+        'delimiter' => '',
+        'limit' => 10,
+        'min_length' => 0,
+        'not_found_message' => 'The term \'@term\' will be added.',
         'size' => 60,
+        'use_synonyms' => 0,
       ),
       'type' => 'autocomplete_deluxe_taxonomy',
       'weight' => 20,
@@ -3542,7 +3547,8 @@ function materio_content_types_field_default_field_instances() {
     'bundle' => 'materiau',
     'default_value' => NULL,
     'deleted' => 0,
-    'description' => '',
+    'description' => '<b>/!\\ Attention</b> VOus ne pouvez pas ajouter de nouveaux tag ici.<br/>
+Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/taxonomy/tag_libres/add"><b>ici</b></a>',
     'display' => array(
       'bookmark' => array(
         'label' => 'above',
@@ -3610,13 +3616,15 @@ function materio_content_types_field_default_field_instances() {
     ),
     'widget' => array(
       'active' => 1,
-      'module' => 'autocomplete_deluxe',
+      'module' => 'synonyms',
       'settings' => array(
-        'autocomplete_deluxe_path' => 'autocomplete_deluxe/taxonomy',
-        'content_taxonomy_autocomplete_new_terms' => 'allow',
+        'auto_creation' => 0,
+        'autocomplete_path' => 'synonyms/autocomplete',
         'size' => 60,
+        'suggest_only_unique' => 0,
+        'suggestion_size' => 10,
       ),
-      'type' => 'autocomplete_deluxe_taxonomy',
+      'type' => 'synonyms_autocomplete',
       'weight' => 23,
     ),
   );
@@ -4676,82 +4684,6 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'taxonomy_term-tag_libres-description_field'
-  $field_instances['taxonomy_term-tag_libres-description_field'] = array(
-    'bundle' => 'tag_libres',
-    'default_value' => NULL,
-    'deleted' => 0,
-    'description' => '',
-    'display' => array(
-      'default' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 2,
-      ),
-    ),
-    'entity_type' => 'taxonomy_term',
-    'field_name' => 'description_field',
-    'label' => 'Description',
-    'required' => FALSE,
-    'settings' => array(
-      'display_summary' => 0,
-      'entity_translation_sync' => FALSE,
-      'hide_label' => array(
-        'entity' => FALSE,
-        'page' => FALSE,
-      ),
-      'text_processing' => 1,
-      'user_register_form' => FALSE,
-    ),
-    'widget' => array(
-      'module' => 'text',
-      'settings' => array(
-        'rows' => 20,
-        'summary_rows' => 5,
-      ),
-      'type' => 'text_textarea_with_summary',
-      'weight' => 1,
-    ),
-  );
-
-  // 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' => TRUE,
-    'settings' => array(
-      'entity_translation_sync' => FALSE,
-      'hide_label' => array(
-        'entity' => FALSE,
-        'page' => FALSE,
-      ),
-      'text_processing' => 0,
-      'user_register_form' => FALSE,
-    ),
-    'widget' => array(
-      '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',
@@ -4789,6 +4721,8 @@ function materio_content_types_field_default_field_instances() {
   // Translatables
   // Included for use with string extractors like potx.
   t('"http://" will be added automaticly.');
+  t('<b>/!\\ Attention</b> VOus ne pouvez pas ajouter de nouveaux tag ici.<br/>
+Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/taxonomy/tag_libres/add"><b>ici</b></a>');
   t('A field replacing node title.');
   t('A field replacing taxonomy term name.');
   t('Adresse');
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.features.taxonomy.inc b/sites/all/modules/features/materio_content_types/materio_content_types.features.taxonomy.inc
index 7c173e46..d6c8f762 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.features.taxonomy.inc
+++ b/sites/all/modules/features/materio_content_types/materio_content_types.features.taxonomy.inc
@@ -23,7 +23,7 @@ function materio_content_types_taxonomy_default_vocabularies() {
       'name' => 'Ontologie',
       'machine_name' => 'onthologie',
       'description' => '',
-      'hierarchy' => 1,
+      'hierarchy' => 0,
       'module' => 'taxonomy',
       'weight' => -10,
       'language' => 'und',
@@ -32,7 +32,7 @@ function materio_content_types_taxonomy_default_vocabularies() {
     'tag_libres' => array(
       'name' => 'Tag libres',
       'machine_name' => 'tag_libres',
-      'description' => '',
+      'description' => 'First create the english tag, then translate it.',
       'hierarchy' => 0,
       'module' => 'taxonomy',
       'weight' => -9,
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc b/sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc
index 32686610..9e470bf2 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc
+++ b/sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc
@@ -272,7 +272,10 @@ function materio_content_types_user_default_permissions() {
   // Exported permission: 'edit field_famille'.
   $permissions['edit field_famille'] = array(
     'name' => 'edit field_famille',
-    'roles' => array(),
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
     'module' => 'field_permissions',
   );
 
@@ -425,7 +428,10 @@ function materio_content_types_user_default_permissions() {
   // Exported permission: 'edit own field_famille'.
   $permissions['edit own field_famille'] = array(
     'name' => 'edit own field_famille',
-    'roles' => array(),
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
     'module' => 'field_permissions',
   );
 
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.info b/sites/all/modules/features/materio_content_types/materio_content_types.info
index 6d0a5d2e..aeaccad5 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.info
+++ b/sites/all/modules/features/materio_content_types/materio_content_types.info
@@ -26,6 +26,7 @@ dependencies[] = options
 dependencies[] = print
 dependencies[] = print_ui
 dependencies[] = strongarm
+dependencies[] = synonyms
 dependencies[] = taxonomy
 dependencies[] = term_reference_tree
 dependencies[] = text
@@ -39,7 +40,6 @@ features[ctools][] = field_group:field_group:1
 features[ctools][] = strongarm:strongarm:1
 features[ctools][] = views:views_default:3.0
 features[features_api][] = api:2
-features[field_base][] = description_field
 features[field_base][] = field_attachments
 features[field_base][] = field_authored_on
 features[field_base][] = field_bandeau
@@ -182,8 +182,6 @@ 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-description_field
-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
@@ -338,6 +336,29 @@ features[variable][] = nodeformscols_field_placements_materiau_default
 features[variable][] = nodeformscols_field_placements_page_default
 features[variable][] = nodeformscols_field_placements_simplenews_default
 features[variable][] = nodeformscols_field_placements_webform_default
+features[variable][] = pathauto_node_breve_en_pattern
+features[variable][] = pathauto_node_breve_fr_pattern
+features[variable][] = pathauto_node_breve_pattern
+features[variable][] = pathauto_node_breve_und_pattern
+features[variable][] = pathauto_node_company_en_pattern
+features[variable][] = pathauto_node_company_fr_pattern
+features[variable][] = pathauto_node_company_pattern
+features[variable][] = pathauto_node_company_und_pattern
+features[variable][] = pathauto_node_materiau_en_pattern
+features[variable][] = pathauto_node_materiau_fr_pattern
+features[variable][] = pathauto_node_materiau_pattern
+features[variable][] = pathauto_node_materiau_und_pattern
+features[variable][] = pathauto_node_page_en_pattern
+features[variable][] = pathauto_node_page_fr_pattern
+features[variable][] = pathauto_node_page_pattern
+features[variable][] = pathauto_node_page_und_pattern
+features[variable][] = pathauto_node_webform_en_pattern
+features[variable][] = pathauto_node_webform_fr_pattern
+features[variable][] = pathauto_node_webform_pattern
+features[variable][] = pathauto_node_webform_und_pattern
+features[variable][] = pathauto_taxonomy_term_company_pattern
+features[variable][] = pathauto_taxonomy_term_onthologie_pattern
+features[variable][] = pathauto_taxonomy_term_tag_libres_pattern
 features[variable][] = print_comments
 features[variable][] = print_css
 features[variable][] = print_footer_options
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc b/sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc
index b0de3cd4..88845091 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc
+++ b/sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc
@@ -1481,6 +1481,167 @@ function materio_content_types_strongarm() {
   $strongarm->value = 0;
   $export['node_submitted_webform'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_breve_en_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_breve_en_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_breve_fr_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_breve_fr_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_breve_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_breve_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_breve_und_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_breve_und_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_company_en_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_company_en_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_company_fr_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_company_fr_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_company_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_company_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_company_und_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_company_und_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_materiau_en_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_materiau_en_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_materiau_fr_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_materiau_fr_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_materiau_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_materiau_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_materiau_und_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_materiau_und_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_page_en_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_page_en_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_page_fr_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_page_fr_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_page_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_page_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_page_und_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_page_und_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_webform_en_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_webform_en_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_webform_fr_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_webform_fr_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_webform_pattern';
+  $strongarm->value = 'form/[node:title]';
+  $export['pathauto_node_webform_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_webform_und_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_webform_und_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_taxonomy_term_company_pattern';
+  $strongarm->value = '';
+  $export['pathauto_taxonomy_term_company_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_taxonomy_term_onthologie_pattern';
+  $strongarm->value = '';
+  $export['pathauto_taxonomy_term_onthologie_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_taxonomy_term_tag_libres_pattern';
+  $strongarm->value = '';
+  $export['pathauto_taxonomy_term_tag_libres_pattern'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc b/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc
index c8dc66db..52546d18 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc
+++ b/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;
-  /* Champ: Contenu : Référence Materio */
+  /* Field: Content: 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;
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $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;
-  /* Critère de tri: Contenu : Date de publication */
+  /* Sort criterion: Content: Post date */
   $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';
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $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;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: 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,6 +130,7 @@ 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;
 
diff --git a/sites/all/modules/features/materio_home_v2/materio_home_v2.features.menu_links.inc b/sites/all/modules/features/materio_home_v2/materio_home_v2.features.menu_links.inc
index 17ca5c3f..50816318 100644
--- a/sites/all/modules/features/materio_home_v2/materio_home_v2.features.menu_links.inc
+++ b/sites/all/modules/features/materio_home_v2/materio_home_v2.features.menu_links.inc
@@ -186,6 +186,7 @@ function materio_home_v2_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
+
   // Translatables
   // Included for use with string extractors like potx.
   t('Access to the online database');
@@ -194,6 +195,5 @@ function materio_home_v2_menu_default_menu_links() {
   t('Les formations');
   t('Les services sur mesure');
 
-
   return $menu_links;
 }
diff --git a/sites/all/modules/features/materio_home_v2/materio_home_v2.views_default.inc b/sites/all/modules/features/materio_home_v2/materio_home_v2.views_default.inc
index cf262c06..a577856a 100644
--- a/sites/all/modules/features/materio_home_v2/materio_home_v2.views_default.inc
+++ b/sites/all/modules/features/materio_home_v2/materio_home_v2.views_default.inc
@@ -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';
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $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;
-  /* Critère de tri: Contenu : Date de publication */
+  /* Sort criterion: Content: Post date */
   $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';
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $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;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: 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',
   );
-  /* Critère de filtrage: Processus : État actuel */
+  /* Filter criterion: Workflow: Current state */
   $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;
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $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;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: 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',
   );
-  /* Critère de filtrage: Processus : État actuel */
+  /* Filter criterion: Workflow: Current state */
   $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',
   );
-  /* Critère de filtrage: Contenu : Newsletter category (field_simplenews_term) */
+  /* Filter criterion: Content: 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';
-  /* Critère de filtrage: Parution de lettre d'information : État des envois */
+  /* Filter criterion: Simplenews issue: Sent status */
   $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;
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $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;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: 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',
   );
-  /* Critère de filtrage: Processus : État actuel */
+  /* Filter criterion: Workflow: Current state */
   $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',
   );
-  /* Critère de filtrage: Contenu : Newsletter category (field_simplenews_term) */
+  /* Filter criterion: Content: 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';
-  /* Critère de filtrage: Parution de lettre d'information : État des envois */
+  /* Filter criterion: Simplenews issue: Sent status */
   $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',
   );
-  /* Critère de filtrage: Contenu : Visible sur la home (field_visible_sur_la_home) */
+  /* Filter criterion: Content: 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';
@@ -234,6 +234,7 @@ function materio_home_v2_views_default_views() {
     t('Trier par'),
     t('Asc'),
     t('Desc'),
+    t('more'),
     t('home v2'),
     t('daily'),
     t('Daily materiO\''),
@@ -270,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';
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $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;
-  /* Critère de tri: Contenu : weight (field_weight) */
+  /* Sort criterion: Content: 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';
-  /* Critère de tri: Contenu : Date de publication */
+  /* Sort criterion: Content: Post date */
   $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';
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $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;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: 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',
   );
-  /* Critère de filtrage: Processus : État actuel */
+  /* Filter criterion: Workflow: Current state */
   $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';
@@ -322,6 +323,7 @@ function materio_home_v2_views_default_views() {
     t('Trier par'),
     t('Asc'),
     t('Desc'),
+    t('more'),
     t('Home v2'),
   );
   $export['publication_home_v2'] = $view;
diff --git a/sites/all/modules/features/materio_publications/materio_publications.features.inc b/sites/all/modules/features/materio_publications/materio_publications.features.inc
index 1280c0d0..3f53218e 100644
--- a/sites/all/modules/features/materio_publications/materio_publications.features.inc
+++ b/sites/all/modules/features/materio_publications/materio_publications.features.inc
@@ -23,7 +23,7 @@ function materio_publications_image_default_styles() {
   $styles['publication-couv'] = array(
     'label' => 'publication-couv',
     'effects' => array(
-      16 => array(
+      15 => array(
         'name' => 'image_scale',
         'data' => array(
           'width' => 480,
diff --git a/sites/all/modules/features/materio_publications/materio_publications.features.user_permission.inc b/sites/all/modules/features/materio_publications/materio_publications.features.user_permission.inc
index c537ad57..f5ebb1f1 100644
--- a/sites/all/modules/features/materio_publications/materio_publications.features.user_permission.inc
+++ b/sites/all/modules/features/materio_publications/materio_publications.features.user_permission.inc
@@ -32,7 +32,9 @@ function materio_publications_user_default_permissions() {
   // Exported permission: 'delete own publication content'.
   $permissions['delete own publication content'] = array(
     'name' => 'delete own publication content',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'node',
   );
 
@@ -49,7 +51,9 @@ function materio_publications_user_default_permissions() {
   // Exported permission: 'edit own publication content'.
   $permissions['edit own publication content'] = array(
     'name' => 'edit own publication content',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'node',
   );
 
diff --git a/sites/all/modules/features/materio_publications/materio_publications.info b/sites/all/modules/features/materio_publications/materio_publications.info
index 88119023..85f36c96 100644
--- a/sites/all/modules/features/materio_publications/materio_publications.info
+++ b/sites/all/modules/features/materio_publications/materio_publications.info
@@ -4,8 +4,8 @@ package = Materio
 dependencies[] = ctools
 dependencies[] = features
 dependencies[] = image
+dependencies[] = list
 dependencies[] = materio_content_types
-dependencies[] = materio_page_title
 dependencies[] = metatag
 dependencies[] = node
 dependencies[] = strongarm
@@ -68,4 +68,5 @@ features[workflow][] = Publication
 features[workflow_access][] = Publication
 features_exclude[dependencies][materio_subscriptions] = materio_subscriptions
 features_exclude[dependencies][options] = options
+features_exclude[dependencies][materio_page_title] = materio_page_title
 project path = sites/all/modules/features
diff --git a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.user_permission.inc b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.user_permission.inc
index ebc262dc..fea6e9dc 100644
--- a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.user_permission.inc
+++ b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.user_permission.inc
@@ -185,7 +185,9 @@ function materio_subscriptions_user_default_permissions() {
   // Exported permission: 'delete payments'.
   $permissions['delete payments'] = array(
     'name' => 'delete payments',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'uc_payment',
   );
 
@@ -219,7 +221,9 @@ function materio_subscriptions_user_default_permissions() {
   // Exported permission: 'manual payments'.
   $permissions['manual payments'] = array(
     'name' => 'manual payments',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'uc_payment',
   );
 
@@ -280,7 +284,10 @@ function materio_subscriptions_user_default_permissions() {
   // Exported permission: 'view payments'.
   $permissions['view payments'] = array(
     'name' => 'view payments',
-    'roles' => array(),
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
     'module' => 'uc_payment',
   );
 
diff --git a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.info b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.info
index 7d3e38cf..5cac6e48 100644
--- a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.info
+++ b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.info
@@ -73,6 +73,7 @@ features[user_role][] = Adhérent
 features[user_role][] = Premium
 features[user_role][] = Utilisateur
 features[variable][] = date_format_uc_store
+features[variable][] = pathauto_taxonomy_term_catalog_pattern
 features[variable][] = uc_add_item_redirect
 features[variable][] = uc_address_fields
 features[variable][] = uc_address_fields_required
diff --git a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.strongarm.inc b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.strongarm.inc
index 88a7143e..8b55998b 100644
--- a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.strongarm.inc
+++ b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.strongarm.inc
@@ -17,6 +17,13 @@ function materio_subscriptions_strongarm() {
   $strongarm->value = 'm/d/Y';
   $export['date_format_uc_store'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_taxonomy_term_catalog_pattern';
+  $strongarm->value = '';
+  $export['pathauto_taxonomy_term_catalog_pattern'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
diff --git a/sites/all/modules/features/materio_user_import/materio_user_import.features.user_permission.inc b/sites/all/modules/features/materio_user_import/materio_user_import.features.user_permission.inc
index 3aef3061..ceb1b1c0 100644
--- a/sites/all/modules/features/materio_user_import/materio_user_import.features.user_permission.inc
+++ b/sites/all/modules/features/materio_user_import/materio_user_import.features.user_permission.inc
@@ -13,7 +13,9 @@ function materio_user_import_user_default_permissions() {
   // Exported permission: 'import users'.
   $permissions['import users'] = array(
     'name' => 'import users',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'user_import',
   );
 
diff --git a/sites/all/modules/gui/materiobasemod/assets/taglibres_en2fr.csv b/sites/all/modules/gui/materiobasemod/assets/taglibres_en2fr.csv
index 8a038cb6..de28bc5b 100644
--- a/sites/all/modules/gui/materiobasemod/assets/taglibres_en2fr.csv
+++ b/sites/all/modules/gui/materiobasemod/assets/taglibres_en2fr.csv
@@ -1140,5 +1140,4 @@ gonflé,gonflé
 boeing,boeing
 crayon,crayon
 fruhstuck7,fruhstuck7
-fruhstuck7,
 fruhstuck8,fruhstuck8
diff --git a/sites/all/modules/gui/materiobasemod/assets/taglibres_fr2en.csv b/sites/all/modules/gui/materiobasemod/assets/taglibres_fr2en.csv
index 96272984..439101bc 100644
--- a/sites/all/modules/gui/materiobasemod/assets/taglibres_fr2en.csv
+++ b/sites/all/modules/gui/materiobasemod/assets/taglibres_fr2en.csv
@@ -1140,5 +1140,4 @@ gonflé,gonflé
 boeing,boeing
 crayon,crayon
 fruhstuck7,fruhstuck7
-,fruhstuck7
 fruhstuck8,fruhstuck8
diff --git a/sites/all/modules/gui/tode/tode.module b/sites/all/modules/gui/tode/tode.module
index 87983f2a..8848e8b1 100644
--- a/sites/all/modules/gui/tode/tode.module
+++ b/sites/all/modules/gui/tode/tode.module
@@ -2,19 +2,19 @@
 /**
  * developed by www.g-u-i.net
  * 2011
- * First time this field will be used, it will create a new term with the value inserted in the textfield, 
- * after that, the term (tid) will always be the same, just update term name by updating the value of the field. 
- * You can keep synchronized a fixe term with a node, 
- * you can set an auto title from this field, The required, 
+ * First time this field will be used, it will create a new term with the value inserted in the textfield,
+ * after that, the term (tid) will always be the same, just update term name by updating the value of the field.
+ * You can keep synchronized a fixe term with a node,
+ * you can set an auto title from this field, The required,
  * number of value at 1 and term_node synch of global field are required
- * 
- * <?php 
+ *
+ * <?php
  * // automatic node titles php snippet for translation
  * $items = field_get_items('node', $node, 'field_tode_program');
  * return t($items[0]['name']);
  * ?>
  *
- * 
+ *
  */
 
 
@@ -22,9 +22,7 @@
 /**
  * Implements hook_views_api().
  */
-/*
-	TODO hook_views_api().
-*/
+// TODO hook_views_api().
 // function tode_views_api() {
 //   return array(
 //     'api' => 3,
@@ -60,7 +58,7 @@ function tode_init() {
  * Implementation of hook_field_widget_info().
  */
 function tode_field_widget_info() {
-	
+
 	return array(
     'tode' => array(
       'label' => t('Tode (create then update one unique term)'),
@@ -87,25 +85,23 @@ function tode_field_widget_info() {
 function tode_field_widget_settings_form($field, $instance){
 	// dsm($instance, 'tode_field_widget_settings_form : $instance');
 	// dsm($field, 'field');
-	
+
 	$widget = $instance['widget'];
   $settings = $widget['settings'];
 
-	
+
 		// '#description' => t('First time this field will be used, it will create a new term with the value inserted in the textfield, after that, the term (tid) will always be the same, just update term name by updating the value of the field. You can keep synchronized a fixe term with a node, you can set an auto title from this field, The required, number of value at 1 and term_node synch of global field are required')
-		 
+
 		$form['maxlength'] = array(
-			'#type' => 'textfield', 
-			'#title' => t('Maximum length of term'), 
+			'#type' => 'textfield',
+			'#title' => t('Maximum length of term'),
 			'#default_value' => $settings['maxlength'],
 			'#element_validate' => array('_tode_widget_settings_maxlength_validate'),
 			'#required' => TRUE,
 			'#description' => t('Defines how many characters can be typed into the text field. For values higher than 255, remember that one term name can not be longer than 255 (would be cutted).'),
 		);
-		
-		/*
-			TODO complete the all flow of this
-		*/
+
+		// TODO complete the all flow of this
 		$form['show_term_form'] = array(
 			'#type' => 'checkbox',
 			'#title' => t('Show taxonomy term edit form ?'),
@@ -123,7 +119,7 @@ function tode_field_widget_settings_form($field, $instance){
 			'#title' => t('Rewrite all term link to theire tode node ?'),
 			'#default_value' => $settings['redirect_term_to_node'],
 		);
-		
+
 		$form['redirect_node_to_term'] = array(
 			'#type' => 'checkbox',
 			'#title' => t('Rewrite all node link to theire term node ?'),
@@ -135,7 +131,7 @@ function tode_field_widget_settings_form($field, $instance){
 			'#title' => t('Show create "tode" on term fields about this tode\'s vocabulary ?'),
 			'#default_value' => $settings['show_create_tode'],
 		);
-		
+
 		return $form;
 }
 
@@ -163,9 +159,9 @@ function _tode_widget_settings_maxlength_validate($element, &$form_state) {
  *
  * Autocomplete_path is not used by text_widget but other widgets can use it
  * (see nodereference and userreference).
- * 
+ *
  * http://drupal.org/node/224333#hook_element_info
- * 
+ *
  */
 #hook_element_info() WHY ??
 /*
@@ -173,7 +169,7 @@ function tode_element_info(){
 	return array(
 	 'tode' => array(
 		 '#input' => TRUE,
-		 '#columns' => array('value'), 
+		 '#columns' => array('value'),
 		 '#delta' => 0,
 		 '#process' => array('tode_element_process'),
 		 ),
@@ -193,14 +189,14 @@ function tode_field_widget_form(&$form, &$form_state, $field, $instance, $langco
 	// dsm($field, '$field');
 	// dsm($instance, '$instance');
 
-	
+
 	if(isset($form_state['node'])){
 		$language = $form_state['node']->language;
 	}else{
 		$language = null;
 	}
 	// dsm($node, '$node');
-	
+
 	if(isset($items[$delta])){
 		$term = taxonomy_term_load($items[$delta]['tid']);
 		// $term = i18n_taxonomy_term_get_translation($term, $node->language); // marche pas avec localized term
@@ -209,17 +205,17 @@ function tode_field_widget_form(&$form, &$form_state, $field, $instance, $langco
 		// dsm($term_parents, '$term_parents');
 		$term_parent = array_pop($term_parents);
 	}
-	
+
 	# no need of $node->translation_source because with node translation (not entity fields translation) tid remains
 	# just have to translate term name on submit
 	// if( !isset($node->id) && isset($node->translation_source) ){
 	// }
-	
+
 	$form['tode_tid'] = array('#type' => 'hidden', '#value' => isset($term) ? $term->tid : 0,'#delta' => $element['#delta'],);
-	
+
 	# parent
 	if( $instance['widget']['settings']['choose_term_parent'] ){
-		// add parent form autocomplete if activated		
+		// add parent form autocomplete if activated
 		$vocabularies = array();
     foreach ($field['settings']['allowed_values'] as $tree)
       if ($vocabulary = taxonomy_vocabulary_machine_name_load($tree['vocabulary']))
@@ -227,9 +223,9 @@ function tode_field_widget_form(&$form, &$form_state, $field, $instance, $langco
 
     $vocabulary = reset($vocabularies);
 		// dsm($vocabulary, '$vocabulary');
-		
+
 		$form['tode_vid'] = array('#type' => 'hidden', '#value' => $vocabulary->vid,'#delta' => $element['#delta'],);
-		
+
 		$form['tode_parent_term'] = array(
 			'#title' => 'Parent ' . $vocabulary->name,
 	    '#type' => 'textfield',
@@ -239,7 +235,7 @@ function tode_field_widget_form(&$form, &$form_state, $field, $instance, $langco
 	    '#maxlength' => 1024,
 	    '#element_validate' => array('tode_parent_autocomplete_validate'),
 	  );
-	
+
 	}else{
 		// if parent selection not enabled set the current parent as hidden input
 		$form['tode_parent_term'] = array(
@@ -248,7 +244,7 @@ function tode_field_widget_form(&$form, &$form_state, $field, $instance, $langco
 			'#delta' => $element['#delta'],
 		);
 	}
-	
+
 	// set element form item
   $element += array(
     '#type' => 'textfield',
@@ -258,12 +254,12 @@ function tode_field_widget_form(&$form, &$form_state, $field, $instance, $langco
     '#element_validate' => array('tode_widget_validate'),
     // '#element_submit' => array('tode_widget_submit'),
   );
-	
+
 
 	# add the term edit form
 	if(isset($term))
 		_tode_add_term_form($form, $term, $instance, $element['#delta']);
-	
+
 	// dsm($form, 'end tode_field_widget_form :: $form');
   return $element;
 }
@@ -273,31 +269,31 @@ function tode_field_widget_form(&$form, &$form_state, $field, $instance, $langco
  * _tode_add_term_form($term)
  *
  * show the complete taxonomy term form if feature is enabled
- * 
+ *
  */
 function _tode_add_term_form(&$form, $term, $instance, $delta){
 	// dsm('- - - - _tode_add_term_form');
 	module_load_include('inc', 'taxonomy', 'taxonomy.admin');
-	
+
 	$term_form = _tode_term_form($term);
 	// dsm($term_form, 'term_form');
-	
+
 	if($term_form){
 
 		unset($term_form['actions']);
 		unset($term_form['#action']);
 		unset($term_form['#method']);
-		
+
 		#unset vid info 'cause is in conflict with the node's vid field
 		unset($term_form['vid']);
-		
+
 		$term_form = _tode_clean_form($term_form);
 
 		$prefix = 'tode_termform_'.$instance['field_name'];
 		$term_form = _tode_prefix_form($term_form, $prefix.'_');
 
 		$visible = $instance['widget']['settings']['show_term_form'];
-				
+
 		$form[$prefix] = array(
 			'#type' => 'fieldset',
 			'#title' => t('Term edit'),
@@ -309,13 +305,13 @@ function _tode_add_term_form(&$form, $term, $instance, $delta){
 			'#prefix' => $visible ? null : '<div style="display:none;">',
 			'#suffix' => $visible ? null : '</div>',
 		);
-				  
+
 		$form[$prefix] += $term_form;
 
 
-		
+
 		// $form['tode_termform'] = array('#type' => 'hidden', '#value' => 'true','#delta' => $delta,);
-		
+
 	}
 
 }
@@ -330,7 +326,7 @@ function tode_parent_autocomplete_validate($element, &$form_state) {
 	// dsm($form_state, '$form_state');
 
 	$value = array();
-  if ($typed_term = $element['#value']) {  
+  if ($typed_term = $element['#value']) {
    	// Translate term names into actual terms.
     // See if the term exists in the chosen vocabulary and return the tid;
     // otherwise, set error.
@@ -342,7 +338,7 @@ function tode_parent_autocomplete_validate($element, &$form_state) {
 		form_error($element, t('Parent term can only be an existing term.'));
     }
   }
-  // 
+  //
 	// dsm('form_set_value');
   form_set_value($element, $value, $form_state);
 }
@@ -356,10 +352,10 @@ function tode_widget_validate($element, &$form_state){
 	// dsm('- - - - tode_widget_validate');
 	// dsm($form_state, 'form_state');
 	// dsm($element, 'element');
-	
+
 	// $node = $form_state['node'];
-	
-	
+
+
  	$value = array();
   if ($typed_term = $element['#value']) {
 		$field = field_widget_field($element, $form_state);
@@ -371,22 +367,22 @@ function tode_widget_validate($element, &$form_state){
         $vocabularies[$vocabulary->vid] = $vocabulary;
       }
     }
-		
+
 		// get the parent term tid or 0 (no parents)
 		$parent_tid = isset($form_state['values']['tode_parent_term']['tid']) ? $form_state['values']['tode_parent_term']['tid'] : 0;
-		
+
 		// See if the term already exists and load the term
     // otherwise, create a new 'autocreate' term for insert.
 		if($tid = $form_state['values']['tode_tid']){
 			$term = taxonomy_term_load($tid);
-			
+
 			$term->name = $typed_term;
 			$term->parent = $parent_tid;
-			
+
 		}else{
 			$vocabulary = reset($vocabularies);
 			$term = (object)array(
-        'tid' => 'autocreate', // autocreate not needed with direct taxonomy_term_save [EDIT] autocreate needed because of the hook_submit insted of hook_validate 
+        'tid' => 'autocreate', // autocreate not needed with direct taxonomy_term_save [EDIT] autocreate needed because of the hook_submit insted of hook_validate
         'vid' => $vocabulary->vid,
         'name' => $typed_term,
         'vocabulary_machine_name' => $vocabulary->machine_name,
@@ -396,13 +392,13 @@ function tode_widget_validate($element, &$form_state){
 			// [EDIT] do not save the term here because it will be save even if node form is not validate
 			// results term without node or mutiple orfan term
 			// moving all process on node submit
-			
+
 		}
-		
+
 		// dsm($term, '$term');
 		$value = (array)$term;
 	}
-	
+
 	// dsm($value, '$value');
   form_set_value($element, $value, $form_state);
 }
@@ -426,47 +422,47 @@ function tode_node_submit($node, $form, &$form_state) {
 	// dsm($form, '$form');
 	// dsm($form_state, '$form_state');
 
-	
+
 	module_load_include('inc', 'taxonomy', 'taxonomy.admin');
 	// module_load_include('inc', 'i18n_string', 'i18n_string.pages');
-	// 
+	//
 	$tode_fields = _tode_get_node_tode_fields_def($node);
 	// dsm($tode_fields, '$tode_fields');
-	
-	
+
+
 	if(!count($tode_fields))
 		return;
-	
+
 	$language = $node->language;
 
 	$default_language = language_default('language');
 	// dsm($default_language, '$default_language');
-	
+
 	foreach ($tode_fields as $field_name => $field) {
 
 		// retreive the prefixed termfom values (hidden or visible)
 		$prefix = 'tode_termform_'.$field_name;
-		
+
 		// if term_form is not available
 		// it meens that we are on the creation of a node
 		// hook_node_presave will handle this case
 		if( !isset($form_state['values'][$prefix]) )
 			continue;
-		
+
 		// else
 		// we are on the update or on the translation (from initial node)
 		// so we can go forward
-		
+
 		// retreive the initial tode_field language
 		$init_language = $form[$field_name]['#language'];
 
 		// retreive the value of term field, to get the typed term name
 		if(isset($form_state['values'][$field_name][$init_language][0])){
-			$tode_field_term_value = $form_state['values'][$field_name][$init_language][0];			
+			$tode_field_term_value = $form_state['values'][$field_name][$init_language][0];
 		}else if(isset($form_state['values'][$field_name][$language][0])){
-			$tode_field_term_value = $form_state['values'][$field_name][$language][0];			
+			$tode_field_term_value = $form_state['values'][$field_name][$language][0];
 		}else if(isset($form_state['values'][$field_name]['und'][0])){
-			$tode_field_term_value = $form_state['values'][$field_name]['und'][0];			
+			$tode_field_term_value = $form_state['values'][$field_name]['und'][0];
 		}else{
 			drupal_set_message('$form_state[values][$field_name][$language][0] is undefined', 'warning');
 			$tode_field_term_value = false;
@@ -483,15 +479,15 @@ function tode_node_submit($node, $form, &$form_state) {
 				$context= array('term',$values['tid'],'name');
 
 				i18n_string_textgroup('taxonomy')->update_translation($context, $language, $tode_field_term_value['name']);
-				
+
 				$tode_field_term_value['name'] = $values['name'];
 			}
 
 
 			$parent_tid = $tode_field_term_value['parent'];
 			$values['parent'] = array($parent_tid => $parent_tid);
-			
-			
+
+
 			// define the form_state for term_form submit
 			$new_term_form_state = array(
 				'build_info'=>array(
@@ -507,11 +503,11 @@ function tode_node_submit($node, $form, &$form_state) {
 
 			// dsm($new_term_form_state, 'form_state');
 			drupal_form_submit('taxonomy_form_term', $new_term_form_state);
-			
+
 		}
-		
+
 	}
-	
+
 }
 
 
@@ -522,24 +518,24 @@ function tode_node_submit($node, $form, &$form_state) {
 function tode_node_presave($node) {
 	// dsm('- - - tode_node_presave');
 	// dsm($node, 'node');
-	
+
 	if(isset($node->nid))
 		return;
-	
+
 	$tode_fields = _tode_get_node_tode_fields_def($node);
-	
+
 	if(!count($tode_fields))
 		return;
-	
+
 	$default_language = language_default('language');
 
-	// purpose of that is to directly atribute the right language to the term	
+	// purpose of that is to directly atribute the right language to the term
 	foreach ($tode_fields as $field_name => $field){
 		$tode_field = $node->$field_name;
 
 		if(!isset($tode_field[$node->language][0]))
 			continue;
-			
+
 		$tode_field_term = $tode_field[$node->language][0]; // on node creation field language is always to und (sure ?)
 
 		// // test the language, if not default language create the term name translation
@@ -547,328 +543,21 @@ function tode_node_presave($node) {
 			$context= array('term',$tode_field_term['tid'],'name');
 			i18n_string_textgroup('taxonomy')->update_translation($context, $node->language, $tode_field_term['name']);
 		}
-		
+
 	}
 }
 
-
-/*
-	TODO  merge two terms when translation is made by selecting a node whiche already exists
-*/
-
-/*
-	TODO create a node when a term is created else where than the node which got the tode
-*/
-
-/**
- * Implements hook_menu().
- */
-function tode_menu() {
-	// dsm('tode_menu');
-	$items = array();
-	
-	$items['tode/%ctools_js/add'] = array(
-	  'title' => 'Tode modal add entity',
-	  'page callback' => 'tode_entity_add',
-	  'page arguments' => array(1,3,4,5),
-		'access callback' => TRUE,
-		'type' => MENU_CALLBACK,
-	);
-	
-	return $items;
-}
-
-function tode_entity_add($js = FALSE, $bundle, $entity, $title = 'Title'){
-	
-  // Fall back if $js is not set.
-  if (!$js) {
-    return drupal_get_form('tode_entity_add_form', $bundle, $entity);
-  }
-
-  ctools_include('modal');
-  ctools_include('ajax');
-  $form_state = array(
-    'title' => t('Create '.$entity),
-    'ajax' => TRUE,
-    'build_info' => array('args' => array('0' => $bundle, '1' => $entity, '2' => $title)),
-  );
-  $output = ctools_modal_form_wrapper('tode_entity_add_form', $form_state);
-
-  if (!empty($form_state['executed'])) {
-    $commands = array();
-    $commands[] = ctools_modal_command_dismiss();
-    print ajax_render($commands);
-    exit;
-  }
-  else {
-    print ajax_render($output);
-    exit;
-  }
-	
-	
-}
-
-function tode_entity_add_form($form, $form_state, $bundle, $entity, $title) {
-	
-	$form = array();
-	$form['title'] = array(
-	  '#type' => 'textfield',
-	  '#title' => t($title),
-	  '#size' => 40,
-	  '#maxlength' => 255,
-	);
-	$form['bundle'] = array(
-	  '#type' => 'hidden',
-	  '#value' => $bundle,
-	);
-	$form['entity'] = array(
-	  '#type' => 'hidden',
-	  '#value' => $entity,
-	);
-	
-	$form['create'] = array(
-	  '#type' => 'submit',
-	  '#value' => t('Create'),
-	);
-	
-	return $form;
-}
-
-function tode_entity_add_form_validate($form, &$form_state){
-
-  if(empty($form_state['values']['title'])){
-    form_set_error('title', 'Title field can\'t be empty!');
-  }
-	
-}
-
-function tode_entity_add_form_submit($form, &$form_state){
-	global $user;
-	// dsm($form_state, '$form_state');
-	$values = $form_state['values'];
-	$bundle_fields = field_info_instances($values['bundle']);
-	// dsm($bundle_fields, '$bundle_fields');
-	
-	$fields = $bundle_fields[$values['entity']];
-	// dsm($fields, '$fields');
-	
-	foreach ($fields as $field_name => $field) {
-		if($field['widget']['type'] == 'tode'){
-			$tode_field = $field;
-			break;
-		}
-	}
-	
-	# get vocabulary
-	$tode_field_infos = field_info_field($field['field_name']);
-	// dsm($tode_field_infos, '$tode_field_infos');
-	$voc_name = $tode_field_infos['settings']['allowed_values'][0]['vocabulary'];
-	$vocabulary = taxonomy_vocabulary_machine_name_load($voc_name);
-	// dsm($vocabulary, '$vocabulary');
-	
-	# create the term
-	$term = new stdClass();
-	$term->name = $values['title'];
-	$term->vid = $vocabulary->vid; // ‘1’ is a vocabulary id you wish this term to assign to
-	// $term->field_custom_field_name[LANGUAGE_NONE][0]['value'] = ‘Some value’; // OPTIONAL. If your term has a custom field attached it can added as simple as this
-	taxonomy_term_save($term); // Finally, save our term
-	// dsm($term, '$term');
-	
-	# create the node
-	//http://www.group42.ca/creating_and_updating_nodes_programmatically_in_drupal_7
-	//http://timonweb.com/how-programmatically-create-nodes-comments-and-taxonomies-drupal-7
-	$node = new stdClass();
-  $node->type = $values['entity'];
-  node_object_prepare($node);
-	$tode_field_name = $tode_field['field_name'];
-	$node = (array)$node +array(
-		"title" => $values['title'],
-		"language" => LANGUAGE_NONE,
-		"uid" => $user->uid,
-		$tode_field_name => array( LANGUAGE_NONE => array(0 => array('tid' => $term->tid))),
-	);
-	
-	
-//	$node->$tode_field_name[$node->language]['tid'] = $term->tid;
-		// $node->$tode_field_name = array( $node->language => array('tid' => $term->tid));
-	
-	// $tode_field_name = $tode_field['field_name'];
-	// $node = (object) array(
-	//   	"type" => $values['entity'],
-	//   // node_object_prepare($node);
-	//  		"title"	=> $values['title'],
-	// 	"language" => LANGUAGE_NONE,
-	// 	"uid" => $user->uid,
-	// 	$tode_field_name => array( LANGUAGE_NONE=>array('tid' => $term->tid)),
-	// );
-	$node = (object)$node;
-	
-	// dsm($node, '$node');
-	node_save($node);
-	// dsm($node, '$node');
-
-	
-	# tag the node with the term
-	
-	# set the tode field to the term tid
-	
-
-}
-
-
-
-function BAD_ONE_tode_entity_add_form($js = FALSE, $bundle, $entity) {
-	// dsm('- - - - tode_entity_add_form');
-	//   dsm($bundle, '$bundle');
-	//   dsm($entity, '$entity');
-	
-	// error_log($js);
-	// error_log($bundle);
-	// error_log($entity);
-	// 
-		
-	global $user;
-
-	//module_load_include('inc', 'node', 'node.pages');
-	ctools_include('node.pages', 'node', '');
-
-	$node = (object) array(
-		'uid' => $user->uid, 
-		'name' => (isset($user->name) ? $user->name : ''), 
-		'type' => $entity, 
-		'language' => LANGUAGE_NONE
-	);
-	
-	$form_id = $entity.'_node_form';
-	
-	if (!$js) {
-		return drupal_get_form($form_id, $node);
-	}
-	
-	ctools_include('modal');
-	ctools_include('ajax');
-	
-	$form_state = array(
-		'title' => t('Add '.$entity),
-		'ajax' => TRUE,
-	);
-	
-	$form_state['build_info']['args'] = array($node);
-
-	$output = ctools_modal_form_wrapper($entity.'_node_form', $form_state);
-
-	if (!empty($form_state['executed'])) {
-		$output = array();
-		$output[] = ctools_modal_command_display( t('Node created'), '<div class="modal-message">'.$entity.' creation successful.</div>'); /** Add success message*/
-	};
-
-	print ajax_render($output);
-	exit;
-}
-
-
-
-/**
- * Implements hook_field_widget_form_alter().
- * 
- * add create entity bundle front of term reference field with tode voc
- */
-function DESACTIVATED_tode_field_widget_form_alter(&$element, &$form_state, $context) {
-	$field = $context['field'];
-	$instance = $context['instance'];
-
-	if($field['type'] == 'taxonomy_term_reference' && ($instance['widget']['type'] == 'taxonomy_autocomplete' || $instance['widget']['type'] == 'autocomplete_deluxe_taxonomy')){
-//		dsm('- - - - - tode_field_widget_form_alter');
-		 // dsm($element, '$element');
-		 // dsm($form_state, '$form_state');
-		 // dsm($context, '$context');
-		// dsm($instance['widget']['type'], '$instance[widget][type]');
-		
-		foreach ($field['settings']['allowed_values'] as $key => $value) {
-				
-			if($tode = _tode_get_voc_tode_field_def($value['vocabulary'])){
-
-				ctools_include('ajax');
-		    ctools_include('modal');
-		    ctools_modal_add_js();
-		
-				// ctools_add_css('tode', 'tode');
-				// drupal_add_css(drupal_get_path('module', 'tode') . "tode.css");
-				// dsm($tode, '$tode');
-				$type_fields = field_info_instances('node');
-
-
-				if(!isset($element['#attributes']["class"]))
-					$element['#attributes']["class"] = array();
-					
-				$element['#attributes']["class"][] = "tode-add-modal";
-				
-				$element['#suffix'] = '';				
-				foreach ($tode['bundles'] as $bundle => $entities) {
-					foreach ($entities as $entity) {
-						$tode_instance = $type_fields[$entity][$tode['field_name']];
-						
-						$btn = ctools_modal_text_button(t('create a new %s', array('%s'=>$entity)), 'tode/nojs/add/'.$bundle.'/'.$entity.'/'.$tode_instance['label'], t('alt'), "button ctools-modal-tode-add-modal") . "\n"; // modal-popup-small
-						// $btn .= ctools_modal_text_button(t('create new test'), 'tode/nojs/add/node/test', t('alt'));
-					// dsm($btn);
-						if($element['#suffix'] == '')
-							$element['#suffix'] = '<div class="tode-add-modal-links">';
-							
-						$element['#suffix'] .= $btn;
-					}
-				}
-			}
-		}
-		
-		if( isset($element['#suffix']) && $element['#suffix'] != '' ){
-			
-  		$throbber = theme('image', array('path' => ctools_image_path('loading_animation.gif', 'modal_forms'), 'alt' => t('Loading...'), 'title' => t('Loading')));
-			$js_settings = array(
-		    'tode-add-modal' => array(
-		      'modalSize' => array(
-		        'type' => 'fixed',
-		        'width' => 500,
-		        'height' => 200,
-		      ),
-		      'modalOptions' => array(
-		        'opacity' => 0.4,
-		        'background' => '#000',
-		      ),
-		      'animation' => 'fadeIn',
-		      // 'modalTheme' => 'ModalFormsPopup',
-		      'throbber' => $throbber,
-		      'closeText' => t('Close'),
-		    ),
-		  );
-			
-		  drupal_add_js($js_settings, 'setting');
-			
-			$element['#prefix'] = '<div class="tode-add-modal-wrapper">';
-			$element['#suffix'] .= '</div></div>';
-		}
-		
-				 // dsm($element, '$element');
-		
-	}
-}
-
-/**
- * Implements hook_taxonomy_term_insert().
- */
-// function tode_taxonomy_term_insert($term) {
-// 	dsm($term, '$term');
-// }
-
-
+// TODO  merge two terms when translation is made by selecting a node whiche already exists
+// TODO create a node when a term is created else where than the node which got the tode
 
 /**
  * Implementation of hook_form_alter().
- * 
+ *
  * node deletion to delete also the tode term
- * 
+ *
  */
 function tode_form_alter(&$form, $form_state, $form_id){
-	// dsm($form_id, 'tode form_alter form_id');	
+	// dsm($form_id, 'tode form_alter form_id');
 	//	TODO block the deletion if tode term has children !! because this will delete them to …
 
 	if($form_id == 'test_node_form'){
@@ -886,7 +575,6 @@ function tode_form_alter(&$form, $form_state, $form_id){
 
 		}
 	}
-
 }
 
 function _tode_node_delete_form_alter(&$form, $form_state){
@@ -898,7 +586,7 @@ function _tode_node_delete_form_alter(&$form, $form_state){
 	#get the fields defenition of node type
 	$tode_fields = _tode_get_node_tode_fields_def($node);
 	// dsm($tode_fields);
-	
+
 	if(count($tode_fields) == 0)
 		return;
 
@@ -923,13 +611,13 @@ function _tode_nodes_delete_form_alter(&$form, $form_state){
 		#get the fields definition of node type
 		$tode_fields = _tode_get_node_tode_fields_def($node);
 		//dsm($tode_fields);
-		
+
 		if(count($tode_fields) == 0)
 			continue;
 
 		foreach ($tode_fields as $field_name => $field)
 			_tode_populate_terms_node_delete($terms, $node->$field_name);
-			
+
 	}
 
 	_tode_node_delete_prepare_form($form, $terms);
@@ -950,9 +638,7 @@ function _tode_populate_terms_node_delete(&$terms, $tode_field){
 function _tode_node_delete_prepare_form(&$form, $terms){
 
 	if(count($terms)){
-		/*
-			TODO add here a checkbox to select terms to delete
-		*/
+		// TODO add here a checkbox to select terms to delete
 		#add some warning in form description
 		$form['description']['#markup'] .= '<br />'.t('this will also delete taxonomy terms : %terms', array('%terms'=>implode(', ', $terms['names'])));
 
@@ -962,16 +648,16 @@ function _tode_node_delete_prepare_form(&$form, $terms){
 
 		$form['#submit'][] = 'tode_delete_submit';
 	}
-	
-	
+
+
 }
 
 function tode_delete_submit($form, &$form_state){
 	$tids = unserialize($form['tode_delete']['#value']);
 	foreach ($tids as $tid)
 		taxonomy_term_delete($tid);
-		
-	$terms = unserialize($form['tode_terms']['#value']);	
+
+	$terms = unserialize($form['tode_terms']['#value']);
 	drupal_set_message(t('Following Taxonomy terms have been deleted : %terms', array('%terms' => implode(', ', $terms) )), 'status');
 }
 
@@ -989,27 +675,27 @@ function tode_url_outbound_alter(&$path, &$options, $original_path) {
 	// 	// dsm($path, '$path');
 	// 	// dsm($options, '$options');
 	// 	// dsm($original_path, '$original_path');
-	// 	
+	//
 	// 	$term = $options['entity'];
-	// 
+	//
 	//   }else{
 	// 	$args = explode('/', $original_path);
 	// 	// dsm($args, 'args');
 	// 	if($args[0] == 'taxonomy' && $args[1] == 'term' && is_numeric($args[2]) ){
-	// 		$term = taxonomy_term_load($args[2]);			
+	// 		$term = taxonomy_term_load($args[2]);
 	// 	}
-	// 
+	//
 	// }
 
 	if (preg_match('/^node\/([0-9]*)$/', $path, $matches)) {
 		$node = node_load($matches[1]);
-	}	
-	
+	}
+
 	# WARNING works only because nodeandtermrelink_url_outbound_alter() is trigered before this (KADIST)
 	if (preg_match('/^taxonomy\/term\/([0-9]*)$/', $path, $matches)) {
 		$term = taxonomy_term_load($matches[1]);
-	}	
-		
+	}
+
 
 	if($node){
 		// dsm($node, 'node');
@@ -1030,7 +716,7 @@ function tode_url_outbound_alter(&$path, &$options, $original_path) {
 					break;
 				}
 			}
-			
+
 		}
 	}
 
@@ -1038,7 +724,7 @@ function tode_url_outbound_alter(&$path, &$options, $original_path) {
 		// dsm($term, '$term : '.$term->name);
 		if($field = _tode_get_voc_tode_field_def($term->vocabulary_machine_name)){
 			// dsm($field, '$field');
-			// $field_settings = field_info_instance_settings($field->type);//field_info_widget_settings($field->field_name); // 
+			// $field_settings = field_info_instance_settings($field->type);//field_info_widget_settings($field->field_name); //
 			// dsm($field_settings, '$field_settings');
 			# TODO add if widget setting; how to get the settings
 			if (isset($field['widget']['settings']['redirect_term_to_node'])  && $field['widget']['settings']['redirect_term_to_node']) {
@@ -1068,7 +754,7 @@ function tode_url_outbound_alter(&$path, &$options, $original_path) {
 					break;
 				}
 			}
-		
+
 		}
 
 	}
@@ -1096,7 +782,7 @@ function tode_field_formatter_settings_form($field, $instance, $view_mode, $form
   $display = $instance['display'][$view_mode];
   $settings = $display['settings'];
   $formatter = $display['type'];
-  
+
   if($formatter == 'tode'){
 	  if($todefield = _tode_get_voc_tode_field_def($field['settings']['allowed_values'][0]['vocabulary'])){
 			$entity_infos = entity_get_info();
@@ -1113,7 +799,7 @@ function tode_field_formatter_settings_form($field, $instance, $view_mode, $form
 		  );
 
 	  }else{
-	  	// TODO:  tell that vocabulary has any tode field  
+	  	// TODO:  tell that vocabulary has any tode field
 	  }
 	}
 
@@ -1151,7 +837,7 @@ function tode_field_formatter_view($entity_type, $entity, $field, $instance, $la
 					foreach ($entitys['node'] as $nid => $n) {
 						$node = node_load($nid);
 						$nodes[$nid] = $node;
-					}	
+					}
 					$element[$delta] = array(
 	          '#theme' => 'tode_node_formatter',
 	          '#item' => $item,
@@ -1168,11 +854,11 @@ function tode_field_formatter_view($entity_type, $entity, $field, $instance, $la
 
 function theme_tode_node_formatter($vars){
 	// dsm($vars, 'theme_tode_node_formatter | vars');
-  print render(entity_view('node', $vars['nodes'], $vars['viewmode']));	
+  print render(entity_view('node', $vars['nodes'], $vars['viewmode']));
 }
 
 /**
- * HELPERS 
+ * HELPERS
  */
 function _tode_clean_form($form, $level = 0){
 	foreach ($form as $key => $value) {
@@ -1180,20 +866,20 @@ function _tode_clean_form($form, $level = 0){
 			if( $level == 0 || $key == "#element_validate")
 				unset($form[$key]);
 		}elseif(is_array($value)){
-			$form[$key] = _tode_clean_form($value, $level+1);			
+			$form[$key] = _tode_clean_form($value, $level+1);
 		}
 	}
 	return $form;
 }
 
 function _tode_prefix_form($form, $prefix = '', $add = TRUE){
-	
+
 	foreach ($form as $key => $value) {
 		if(strpos($key,'#') === false){
 
 			if((isset($value['#type']) && $value['#type'] == 'fieldset') || (!$add && is_array($value)))
 				$value = _tode_prefix_form($value, $prefix, $add);
-				
+
 			if($add){
 				$form[$prefix.$key] = $value;
 				unset($form[$key]);
@@ -1201,21 +887,21 @@ function _tode_prefix_form($form, $prefix = '', $add = TRUE){
 				$form[str_replace($prefix, '', $key)] = $value;
 				unset($form[$key]);
 			}
-			
+
 		}
 	}
-	
+
 	return $form;
 }
 
 /**
  * _tode_term_form($tid)
- * 
+ *
  */
 function _tode_term_form($term){
 	// dsm('_tode_term_form');
 	if ($term) {
-		
+
 		$form_state = array(
 			'build_info'=>array(
 				'args'=>array(0=>$term)
@@ -1226,30 +912,30 @@ function _tode_term_form($term){
 		// function taxonomy_form_term($form, &$form_state, $edit = array(), $vocabulary = NULL) {
 		$term_form = drupal_retrieve_form('taxonomy_form_term', $form_state);
 		drupal_prepare_form('taxonomy_form_term', $term_form, $form_state);
-		
+
 		return $term_form;
 	}else{
 		return false;
 	}
-	
+
 }
 
 /**
  * _tode_trim_options(&$form, $element)
- * 
+ *
  */
 function _tode_trim_options(&$form, $item){
 	foreach ($form[$item] as $field_name => $field) {
 		if(((is_array($field)) && $field['#type'] == 'select') && $field['#multiple']){
 			$options = $field['#options'];
-			for ($i=0; $i < count($options); $i++) { 
-				if(!isset($options[$i]->option)) 
+			for ($i=0; $i < count($options); $i++) {
+				if(!isset($options[$i]->option))
 					continue;
-					
+
 				$op = array();
 				foreach ($options[$i]->option as $key => $value)
 						$op[$key] = strlen($value) > 25 ? substr_replace ($value, ' [...] ', 15, -10) : $value; // affiche 'abc...xyz'
-						
+
 				$options[$i]->option = $op;
 			}
 			$field['#options'] = $options;
@@ -1295,10 +981,10 @@ function _tode_get_voc_tode_field_def($voc_name){
 				if($voc_name == $fieldinfos['settings']['allowed_values'][0]['vocabulary'])
 					return $field;
 			}
-				
-	
+
+
 	return false;
-	
+
 }
 
 function tode_get_nids_from_term($term, $language = false){
@@ -1308,17 +994,14 @@ function tode_get_nids_from_term($term, $language = false){
 		$query = new EntityFieldQuery();
 		$query->entityCondition('entity_type', 'node')
 		->fieldCondition($todefield['field_name'], 'tid', $term->tid);
-		
+
 		if($language)
 			$query->propertyCondition('language', array('und', $language), 'IN');
-			
+
 		$result = $query->execute();
 		if(count($result))
 			return $result;
 	}
-	
+
 	return false;
 }
-
-
-