Merge branch 'translators' into showroom

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

@@ -14,10 +14,6 @@ function materio_administration_user_default_permissions() {
   $permissions['access admin theme'] = array(
     'name' => 'access admin theme',
     'roles' => array(
-      'Showroom' => 'Showroom',
-      'Translator CN' => 'Translator CN',
-      'Translator EN' => 'Translator EN',
-      'Translator FR' => 'Translator FR',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -28,10 +24,6 @@ function materio_administration_user_default_permissions() {
   $permissions['access administration menu'] = array(
     'name' => 'access administration menu',
     'roles' => array(
-      'Showroom' => 'Showroom',
-      'Translator CN' => 'Translator CN',
-      'Translator EN' => 'Translator EN',
-      'Translator FR' => 'Translator FR',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -317,9 +309,6 @@ function materio_administration_user_default_permissions() {
       'Premium' => 'Premium',
       'Showroom' => 'Showroom',
       'Student' => 'Student',
-      'Translator CN' => 'Translator CN',
-      'Translator EN' => 'Translator EN',
-      'Translator FR' => 'Translator FR',
       'Unverified' => 'Unverified',
       'Utilisateur' => 'Utilisateur',
       'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',
@@ -408,7 +397,6 @@ function materio_administration_user_default_permissions() {
     'name' => 'subscribe to simplenews category 6374',
     'roles' => array(
       'Adhérent' => 'Adhérent',
-      'Showroom' => 'Showroom',
       'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',
       'administrator' => 'administrator',
       'root' => 'root',
@@ -426,7 +414,6 @@ function materio_administration_user_default_permissions() {
     ),
     'module' => 'materio_user',
   );
-
   // Exported permission: 'toggle field translatability'.
   $permissions['toggle field translatability'] = array(
     'name' => 'toggle field translatability',
@@ -450,9 +437,6 @@ function materio_administration_user_default_permissions() {
   $permissions['translate any entity'] = array(
     'name' => 'translate any entity',
     'roles' => array(
-      'Translator CN' => 'Translator CN',
-      'Translator EN' => 'Translator EN',
-      'Translator FR' => 'Translator FR',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -463,10 +447,6 @@ function materio_administration_user_default_permissions() {
   $permissions['translate content'] = array(
     'name' => 'translate content',
     'roles' => array(
-      'Showroom' => 'Showroom',
-      'Translator CN' => 'Translator CN',
-      'Translator EN' => 'Translator EN',
-      'Translator FR' => 'Translator FR',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -477,9 +457,6 @@ function materio_administration_user_default_permissions() {
   $permissions['translate node entities'] = array(
     'name' => 'translate node entities',
     'roles' => array(
-      'Translator CN' => 'Translator CN',
-      'Translator EN' => 'Translator EN',
-      'Translator FR' => 'Translator FR',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -490,9 +467,6 @@ function materio_administration_user_default_permissions() {
   $permissions['translate taxonomy_term entities'] = array(
     'name' => 'translate taxonomy_term entities',
     'roles' => array(
-      'Translator CN' => 'Translator CN',
-      'Translator EN' => 'Translator EN',
-      'Translator FR' => 'Translator FR',
       'administrator' => 'administrator',
       'root' => 'root',
     ),

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

@@ -42,25 +42,67 @@ features[ctools][] = views:views_default:3.0
 features[elysia_cron][] = workflow_cron
 features[features_api][] = api:2
 features[menu_custom][] = navigation
+features[menu_links][] = navigation_:materio_search_api_ajax/actuality
+features[menu_links][] = navigation_:print/print
+features[menu_links][] = navigation_add-content:node/add
 features[menu_links][] = navigation_add-user:admin/people/create
 features[menu_links][] = navigation_adhsions:node/11186/webform-results
+features[menu_links][] = navigation_ajouter-un-tag-libre:http://dev.materio.com/fr/admin/structure/taxonomy/tag_libres/add
+features[menu_links][] = navigation_breve:node/add/breve
+features[menu_links][] = navigation_companies:admin/content/companies
 features[menu_links][] = navigation_company:admin/structure/taxonomy_manager/voc/company
+features[menu_links][] = navigation_company:node/add/company
 features[menu_links][] = navigation_compose-tips:filter/tips
+features[menu_links][] = navigation_content-types:admin/config/regional/translate/table/nodetype
 features[menu_links][] = navigation_customers:http://www.materio.com/fr/admin/store/customers
+features[menu_links][] = navigation_didactique:node/add/didactique
+features[menu_links][] = navigation_duplicate-mails:admin/users/duplicatemails
+features[menu_links][] = navigation_duplicates:admin/config/content/remove_duplicates
+features[menu_links][] = navigation_faq:node/add/faq
 features[menu_links][] = navigation_feedback:admin/reports/feedback
 features[menu_links][] = navigation_formulaires-dadhsion:http://www.materio.com/fr/node/11186/webform-results
 features[menu_links][] = navigation_frequently-asked-questions:faq-page
+features[menu_links][] = navigation_gratuits:admin/users/gratuits
+features[menu_links][] = navigation_industriels:admin/industriels
+features[menu_links][] = navigation_industriels:admin/users/industriels
 features[menu_links][] = navigation_ip-address-tracking:admin/reports/ip_tracking
+features[menu_links][] = navigation_log-out:user/logout
+features[menu_links][] = navigation_looping-embed-video:node/add/looping-embed-video
 features[menu_links][] = navigation_mandrill:admin/reports/mandrill
+features[menu_links][] = navigation_materiau:node/add/materiau
+features[menu_links][] = navigation_materio-newsletter:node/add/simplenews/6274
+features[menu_links][] = navigation_members:admin/users/members
+features[menu_links][] = navigation_menus:admin/config/regional/translate/table/menu
+features[menu_links][] = navigation_merge-duplicates:admin/structure/taxonomy/tag_libres/merge/duplicates
 features[menu_links][] = navigation_my-sessions:mysessions
+features[menu_links][] = navigation_newletters:admin/content/simplenews
 features[menu_links][] = navigation_node-export-import:node/add/node_export
+features[menu_links][] = navigation_onthologie:admin/structure/taxonomy/onthologie
 features[menu_links][] = navigation_onthologie:admin/structure/taxonomy_manager/voc/onthologie
 features[menu_links][] = navigation_orders:admin/store/orders/view
+features[menu_links][] = navigation_page:node/add/page
+features[menu_links][] = navigation_pages--didactique--faq:admin/content/pages
+features[menu_links][] = navigation_panneau:node/add/panel
+features[menu_links][] = navigation_produit:node/add/product
+features[menu_links][] = navigation_publication:node/add/publication
 features[menu_links][] = navigation_reports:admin/store/reports
 features[menu_links][] = navigation_shopping-cart:cart
+features[menu_links][] = navigation_simplenews-newsletter:node/add/simplenews
+features[menu_links][] = navigation_store:/admin/store
+features[menu_links][] = navigation_strings-search:admin/config/regional/translate/translate
+features[menu_links][] = navigation_students:admin/students
+features[menu_links][] = navigation_students:admin/users/students
 features[menu_links][] = navigation_subscriptions-newsletter:admin/people/simplenews
+features[menu_links][] = navigation_tag-libres:admin/structure/taxonomy/tag_libres
 features[menu_links][] = navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres
+features[menu_links][] = navigation_taxonomy-manager:admin/structure/taxonomy_manager/voc
+features[menu_links][] = navigation_taxonomy:admin/config/regional/translate/table/taxonomy
+features[menu_links][] = navigation_taxonomy:admin/structure/taxonomie/admin-taxo
+features[menu_links][] = navigation_test:node/add/simplenews/6585
 features[menu_links][] = navigation_user-account:user
+features[menu_links][] = navigation_users:/admin/users?rid=6
+features[menu_links][] = navigation_webform:node/add/webform
+features[menu_links][] = navigation_ze-daily-materio039:node/add/simplenews/6374
 features[user_permission][] = access admin theme
 features[user_permission][] = access administration menu
 features[user_permission][] = access workflow summary views
@@ -99,8 +141,6 @@ features[user_permission][] = send newsletter
 features[user_permission][] = show workflow state form
 features[user_permission][] = subscribe to newsletters
 features[user_permission][] = subscribe to simplenews category 6274
-features[user_permission][] = subscribe to simplenews category 6374
-features[user_permission][] = subscribe to simplenews category 6585
 features[user_permission][] = toggle field translatability
 features[user_permission][] = translate admin strings
 features[user_permission][] = translate any entity