From 098b4978c66677789a11b10add07b30d664537de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Datt=C3=A9e?= <david.dattee@smile.fr>
Date: Tue, 20 Dec 2016 15:37:37 +0100
Subject: [PATCH 1/3] Updating trans_email resource name

The resource name for trans_email resource is inconsistent with the resource declared in config module.
Therefore enabling role to access the resource does not allow the role to access the menu
---
 app/code/Magento/Backend/etc/adminhtml/system.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 7595846f4e530..ac4ba50d74be9 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -33,7 +33,7 @@
             <class>separator-top</class>
             <label>Store Email Addresses</label>
             <tab>general</tab>
-            <resource>Magento_Backend::trans_email</resource>
+            <resource>Magento_Config::trans_email</resource>
             <group id="ident_custom1" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Custom Email 1</label>
                 <field id="email" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">

From d764c62f7a1575f4aa00e89bac010db7a4f97757 Mon Sep 17 00:00:00 2001
From: dadat <david.dattee@smile.fr>
Date: Tue, 20 Dec 2016 15:50:44 +0100
Subject: [PATCH 2/3] Roll back on other modification

---
 lib/internal/Magento/Framework/Translate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
index 79fcdce2499ab..00805390fb8ba 100644
--- a/lib/internal/Magento/Framework/Translate.php
+++ b/lib/internal/Magento/Framework/Translate.php
@@ -182,8 +182,8 @@ public function loadData($area = null, $forceReload = false)
         $this->_data = [];
 
         $this->_loadModuleTranslation();
-        $this->_loadPackTranslation();
         $this->_loadThemeTranslation();
+        $this->_loadPackTranslation();
         $this->_loadDbTranslation();
 
         if (!$forceReload) {

From 097fcfa50eba0f3bfaebaeeee10659aca7d12e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Datt=C3=A9e?= <david.dattee@smile.fr>
Date: Tue, 4 Apr 2017 11:51:37 +0200
Subject: [PATCH 3/3] Rollback on other modification

---
 lib/internal/Magento/Framework/Translate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
index 00805390fb8ba..79fcdce2499ab 100644
--- a/lib/internal/Magento/Framework/Translate.php
+++ b/lib/internal/Magento/Framework/Translate.php
@@ -182,8 +182,8 @@ public function loadData($area = null, $forceReload = false)
         $this->_data = [];
 
         $this->_loadModuleTranslation();
-        $this->_loadThemeTranslation();
         $this->_loadPackTranslation();
+        $this->_loadThemeTranslation();
         $this->_loadDbTranslation();
 
         if (!$forceReload) {