Merge branch 'yogesh-patch-6' of https://github.com/Yogeshks/magento2 into yogesh-patch-6

Author: yogeshsuhagiya

app/code/Magento/Braintree/etc/acl.xml

@@ -11,7 +11,7 @@
             <resource id="Magento_Backend::admin">
                 <resource id="Magento_Reports::report">
                     <resource id="Magento_Reports::salesroot">
-                        <resource id="Magento_Braintree::settlement_report" title="Braintree Settlement" sortOrder="80" />
+                        <resource id="Magento_Braintree::settlement_report" title="Braintree Settlement" translate="title" sortOrder="80" />
                     </resource>
                 </resource>
             </resource>

app/code/Magento/Braintree/i18n/en_US.csv

@@ -190,4 +190,5 @@ Currency,Currency
 "Partial settlements are not supported by this processor.","Partial settlements are not supported by this processor."
 "Transaction can not be voided if status of a PayPal partial settlement child transaction is settlement_pending.","Transaction can not be voided if status of a PayPal partial settlement child transaction is settlement_pending."
 "Too many concurrent attempts to refund this transaction. Try again later.","Too many concurrent attempts to refund this transaction. Try again later."
-"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
+"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
+"Braintree Settlement","Braintree Settlement"

app/code/Magento/TaxImportExport/etc/acl.xml

@@ -11,7 +11,7 @@
             <resource id="Magento_Backend::admin">
                 <resource id="Magento_Backend::system">
                     <resource id="Magento_Backend::convert">
-                        <resource id="Magento_TaxImportExport::import_export" title="Import/Export Tax Rates" sortOrder="30" />
+                        <resource id="Magento_TaxImportExport::import_export" title="Import/Export Tax Rates" translate="title" sortOrder="30" />
                     </resource>
                 </resource>
             </resource>

app/code/Magento/TaxImportExport/i18n/en_US.csv

@@ -17,3 +17,4 @@ Rate,Rate
 "Export Tax Rates","Export Tax Rates"
 CSV,CSV
 "Excel XML","Excel XML"
+"Import/Export Tax Rates","Import/Export Tax Rates"