Skip to content

Commit 8a32c28

Browse files
Merge pull request #17525 to #17521
2 parents d2a514d + 23a27b6 commit 8a32c28

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<resource id="Magento_Backend::admin">
1212
<resource id="Magento_Reports::report">
1313
<resource id="Magento_Reports::salesroot">
14-
<resource id="Magento_Braintree::settlement_report" title="Braintree Settlement" sortOrder="80" />
14+
<resource id="Magento_Braintree::settlement_report" title="Braintree Settlement" translate="title" sortOrder="80" />
1515
</resource>
1616
</resource>
1717
</resource>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,4 +190,5 @@ Currency,Currency
190190
"Partial settlements are not supported by this processor.","Partial settlements are not supported by this processor."
191191
"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."
192192
"Too many concurrent attempts to refund this transaction. Try again later.","Too many concurrent attempts to refund this transaction. Try again later."
193-
"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
193+
"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
194+
"Braintree Settlement","Braintree Settlement"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<resource id="Magento_Backend::admin">
1212
<resource id="Magento_Backend::system">
1313
<resource id="Magento_Backend::convert">
14-
<resource id="Magento_TaxImportExport::import_export" title="Import/Export Tax Rates" sortOrder="30" />
14+
<resource id="Magento_TaxImportExport::import_export" title="Import/Export Tax Rates" translate="title" sortOrder="30" />
1515
</resource>
1616
</resource>
1717
</resource>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ Rate,Rate
1717
"Export Tax Rates","Export Tax Rates"
1818
CSV,CSV
1919
"Excel XML","Excel XML"
20+
"Import/Export Tax Rates","Import/Export Tax Rates"

0 commit comments

Comments
 (0)