From 8a300d7d7986f8d4012033fc34fb5b4e3f5c954d Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@figureslibres.io>
Date: Sun, 26 Feb 2017 16:04:36 +0100
Subject: [PATCH] updated features

---
 .../modules/features/admin/admin.features.inc | 10 +--
 .../admin/admin.features.menu_links.inc       | 10 +--
 .../features/admin/admin.views_default.inc    | 65 ++++++++++---------
 .../features/clameurs/clameurs.features.inc   | 11 ----
 4 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/sites/all/modules/features/admin/admin.features.inc b/sites/all/modules/features/admin/admin.features.inc
index 4aea70a4..0b16f967 100644
--- a/sites/all/modules/features/admin/admin.features.inc
+++ b/sites/all/modules/features/admin/admin.features.inc
@@ -43,11 +43,11 @@ function admin_default_Workflow() {
     "label" : "Publication",
     "typeMap" : [ "documentair", "episode", "page", "thematique" ],
     "system_roles" : {
-      "-1" : "(auteur)",
-      "1" : "utilisateur anonyme",
-      "2" : "utilisateur authentifi\\u00e9",
-      "3" : "administrateur",
-      "4" : "racine"
+      "-1" : "(author)",
+      "1" : "anonymous user",
+      "2" : "authenticated user",
+      "3" : "administrator",
+      "4" : "root"
     }
   }');
 
diff --git a/sites/all/modules/features/admin/admin.features.menu_links.inc b/sites/all/modules/features/admin/admin.features.menu_links.inc
index 5f7a985e..05ad56eb 100644
--- a/sites/all/modules/features/admin/admin.features.menu_links.inc
+++ b/sites/all/modules/features/admin/admin.features.menu_links.inc
@@ -28,7 +28,7 @@ function admin_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_contenu:admin/content/nodes',
+    'parent_identifier' => 'navigation_content:admin/content/nodes',
   );
   // Exported menu link: navigation_compose-tips:filter/tips.
   $menu_links['navigation_compose-tips:filter/tips'] = array(
@@ -111,7 +111,7 @@ function admin_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_log-out:user/logout.
   $menu_links['navigation_log-out:user/logout'] = array(
@@ -179,7 +179,7 @@ function admin_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_pisode:node/add/episode.
   $menu_links['navigation_pisode:node/add/episode'] = array(
@@ -199,7 +199,7 @@ function admin_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_thematique:node/add/thematique.
   $menu_links['navigation_thematique:node/add/thematique'] = array(
@@ -219,7 +219,7 @@ function admin_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_user-account:user.
   $menu_links['navigation_user-account:user'] = array(
diff --git a/sites/all/modules/features/admin/admin.views_default.inc b/sites/all/modules/features/admin/admin.views_default.inc
index b6752a24..77e7a85e 100644
--- a/sites/all/modules/features/admin/admin.views_default.inc
+++ b/sites/all/modules/features/admin/admin.views_default.inc
@@ -165,11 +165,11 @@ function admin_views_default_views() {
     ),
   );
   $handler->display->display_options['style_options']['override'] = FALSE;
-  /* En-tête: Global : Result summary */
+  /* 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';
-  /* 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';
@@ -203,7 +203,7 @@ function admin_views_default_views() {
       'label' => '',
     ),
   );
-  /* Champ: Contenu : Video */
+  /* Field: Content: Video */
   $handler->display->display_options['fields']['field_emvideo']['id'] = 'field_emvideo';
   $handler->display->display_options['fields']['field_emvideo']['table'] = 'field_data_field_emvideo';
   $handler->display->display_options['fields']['field_emvideo']['field'] = 'field_emvideo';
@@ -213,19 +213,19 @@ function admin_views_default_views() {
     'image_style' => 'thumbnail',
     'image_link' => '',
   );
-  /* 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 : Poid */
+  /* Field: Content: Poid */
   $handler->display->display_options['fields']['field_poid']['id'] = 'field_poid';
   $handler->display->display_options['fields']['field_poid']['table'] = 'field_data_field_poid';
   $handler->display->display_options['fields']['field_poid']['field'] = 'field_poid';
@@ -233,7 +233,7 @@ function admin_views_default_views() {
     'thousand_separator' => '',
     'prefix_suffix' => 1,
   );
-  /* 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';
@@ -242,12 +242,12 @@ function admin_views_default_views() {
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
   $handler->display->display_options['fields']['edit_node']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['edit_node']['hide_alter_empty'] = FALSE;
-  /* Champ: Workflow node : Current state ID */
+  /* Field: Workflow node: Current state ID */
   $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';
   $handler->display->display_options['fields']['sid']['label'] = 'Current state';
-  /* Champ: Workflow scheduled : Scheduled state Name */
+  /* Field: Workflow scheduled: Scheduled state Name */
   $handler->display->display_options['fields']['sid_1']['id'] = 'sid_1';
   $handler->display->display_options['fields']['sid_1']['table'] = 'workflow_scheduled_transition';
   $handler->display->display_options['fields']['sid_1']['field'] = 'sid';
@@ -255,7 +255,7 @@ function admin_views_default_views() {
   $handler->display->display_options['fields']['sid_1']['exclude'] = TRUE;
   $handler->display->display_options['fields']['sid_1']['alter']['text'] = '[sid_1] : [scheduled]';
   $handler->display->display_options['fields']['sid_1']['hide_empty'] = TRUE;
-  /* Champ: Workflow scheduled : Scheduled time */
+  /* Field: Workflow scheduled: Scheduled time */
   $handler->display->display_options['fields']['scheduled']['id'] = 'scheduled';
   $handler->display->display_options['fields']['scheduled']['table'] = 'workflow_scheduled_transition';
   $handler->display->display_options['fields']['scheduled']['field'] = 'scheduled';
@@ -266,7 +266,7 @@ function admin_views_default_views() {
   $handler->display->display_options['fields']['scheduled']['date_format'] = 'custom';
   $handler->display->display_options['fields']['scheduled']['custom_date_format'] = 'd/m/Y h:m';
   $handler->display->display_options['fields']['scheduled']['second_date_format'] = 'long';
-  /* Champ: Contenu : Épisodes */
+  /* Field: Content: Épisodes */
   $handler->display->display_options['fields']['field_episodes']['id'] = 'field_episodes';
   $handler->display->display_options['fields']['field_episodes']['table'] = 'field_data_field_episodes';
   $handler->display->display_options['fields']['field_episodes']['field'] = 'field_episodes';
@@ -275,7 +275,7 @@ function admin_views_default_views() {
   );
   $handler->display->display_options['fields']['field_episodes']['delta_offset'] = '0';
   $handler->display->display_options['fields']['field_episodes']['multi_type'] = 'ol';
-  /* Champ: Contenu : éclairages */
+  /* Field: Content: éclairages */
   $handler->display->display_options['fields']['field_eclairages']['id'] = 'field_eclairages';
   $handler->display->display_options['fields']['field_eclairages']['table'] = 'field_data_field_eclairages';
   $handler->display->display_options['fields']['field_eclairages']['field'] = 'field_eclairages';
@@ -284,14 +284,14 @@ function admin_views_default_views() {
   );
   $handler->display->display_options['fields']['field_eclairages']['delta_offset'] = '0';
   $handler->display->display_options['fields']['field_eclairages']['multi_type'] = 'ol';
-  /* Champ: Contenu : Thématique */
+  /* Field: Content: Thématique */
   $handler->display->display_options['fields']['field_thematique']['id'] = 'field_thematique';
   $handler->display->display_options['fields']['field_thematique']['table'] = 'field_data_field_thematique';
   $handler->display->display_options['fields']['field_thematique']['field'] = 'field_thematique';
   $handler->display->display_options['fields']['field_thematique']['settings'] = array(
     'link' => 1,
   );
-  /* 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';
@@ -299,12 +299,12 @@ function admin_views_default_views() {
   $handler->display->display_options['fields']['translate_node']['alter']['text'] = '<span class="button">[translate_node]</span>';
   $handler->display->display_options['fields']['translate_node']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['translate_node']['text'] = 'traduire';
-  /* 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: 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';
@@ -317,7 +317,7 @@ function admin_views_default_views() {
     1 => 'AND',
     2 => 'AND',
   );
-  /* 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';
@@ -341,7 +341,7 @@ function admin_views_default_views() {
     4 => 0,
   );
   $handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE;
-  /* Critère de filtrage: current user can update */
+  /* Filter criterion: current user can update */
   $handler->display->display_options['filters']['php']['id'] = 'php';
   $handler->display->display_options['filters']['php']['table'] = 'views';
   $handler->display->display_options['filters']['php']['field'] = 'php';
@@ -352,7 +352,7 @@ function admin_views_default_views() {
 //dsm($data);
 return !(node_access(\'update\', node_load($data->nid), $user));
 ';
-  /* Critère de filtrage: Workflow node : Current state ID */
+  /* Filter criterion: Workflow node: Current state ID */
   $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';
@@ -402,19 +402,19 @@ return !(node_access(\'update\', node_load($data->nid), $user));
   $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';
@@ -422,20 +422,20 @@ return !(node_access(\'update\', node_load($data->nid), $user));
   $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';
@@ -459,10 +459,10 @@ return !(node_access(\'update\', node_load($data->nid), $user));
     t('suivant ›'),
     t('dernier »'),
     t('Displaying @start - @end of @total'),
-    t('- Choisir une opération -'),
+    t('- Choose an operation -'),
     t('Video'),
     t('Type'),
-    t('Titre'),
+    t('Title'),
     t('Poid'),
     t('<span class="node-edit">[edit_node]</span>'),
     t('Current state'),
@@ -472,19 +472,20 @@ return !(node_access(\'update\', node_load($data->nid), $user));
     t('Épisodes'),
     t('éclairages'),
     t('Thématique'),
-    t('Lien de traduction'),
+    t('Translate link'),
     t('<span class="button">[translate_node]</span>'),
     t('traduire'),
-    t('Date de mise à jour'),
-    t('Lien de suppression'),
+    t('Updated date'),
+    t('Delete link'),
     t('<span class="node-delete">[delete_node]</span>'),
     t('supprimer'),
     t('Page : all'),
+    t('more'),
     t('Block'),
     t('Recent Content'),
     t('Modifier'),
-    t('Publié'),
-    t('Langue'),
+    t('Published'),
+    t('Language'),
     t('Traduire'),
   );
   $export['admin_contents'] = $view;
diff --git a/sites/all/modules/features/clameurs/clameurs.features.inc b/sites/all/modules/features/clameurs/clameurs.features.inc
index 5d07cbd0..b024742c 100644
--- a/sites/all/modules/features/clameurs/clameurs.features.inc
+++ b/sites/all/modules/features/clameurs/clameurs.features.inc
@@ -93,17 +93,6 @@ function clameurs_image_default_styles() {
         ),
         'weight' => -9,
       ),
-      13 => array(
-        'name' => 'canvasactions_file2canvas',
-        'data' => array(
-          'xpos' => 'center',
-          'ypos' => 'center',
-          'alpha' => 90,
-          'scale' => '',
-          'path' => 'sites/all/themes/figureslibres/clameurs/images/video_overlay.png',
-        ),
-        'weight' => -8,
-      ),
     ),
   );