Skip to content

Commit 90dd3a2

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-36131' into PR
2 parents 618cc16 + 91061e6 commit 90dd3a2

File tree

114 files changed

+173
-161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+173
-161
lines changed

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,15 @@
180180
<group id="translate_inline" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
181181
<label>Translate Inline</label>
182182
<field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
183-
<label>Enabled for Frontend</label>
183+
<label>Enabled for Storefront</label>
184184
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
185185
<backend_model>Magento\Config\Model\Config\Backend\Translate</backend_model>
186186
</field>
187187
<field id="active_admin" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
188188
<label>Enabled for Admin</label>
189189
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
190190
<backend_model>Magento\Config\Model\Config\Backend\Translate</backend_model>
191-
<comment>Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.</comment>
191+
<comment>Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.</comment>
192192
</field>
193193
</group>
194194
<group id="js" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -509,10 +509,10 @@
509509
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
510510
</field>
511511
<field id="use_in_frontend" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
512-
<label>Use Secure URLs in Frontend</label>
512+
<label>Use Secure URLs on Storefront</label>
513513
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
514514
<backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
515-
<comment>Enter https protocol to use Secure URLs in Frontend.</comment>
515+
<comment>Enter https protocol to use Secure URLs on Storefront.</comment>
516516
</field>
517517
<field id="use_in_adminhtml" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
518518
<label>Use Secure URLs in Admin</label>
@@ -552,7 +552,7 @@
552552
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
553553
</field>
554554
<field id="use_frontend_sid" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
555-
<label>Use SID on Frontend</label>
555+
<label>Use SID on Storefront</label>
556556
<comment>Allows customers to stay logged in when switching between different stores.</comment>
557557
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
558558
</field>

‎app/code/Magento/Captcha/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<group id="captcha" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
8383
<label>CAPTCHA</label>
8484
<field id="enable" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
85-
<label>Enable CAPTCHA on Frontend</label>
85+
<label>Enable CAPTCHA on Storefront</label>
8686
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
8787
</field>
8888
<field id="font" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0">

‎app/code/Magento/Catalog/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</field>
3636
</group>
3737
<group id="frontend" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
38-
<label>Frontend</label>
38+
<label>Storefront</label>
3939
<field id="list_mode" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
4040
<label>List Mode</label>
4141
<source_model>Magento\Catalog\Model\Config\Source\ListMode</source_model>

‎app/code/Magento/CatalogInventory/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<validate>validate-number</validate>
3333
</field>
3434
<field id="display_product_stock_status" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
35-
<label>Display products availability in stock in the frontend</label>
35+
<label>Display products availability in stock on Storefront.</label>
3636
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
3737
</field>
3838
</group>

‎app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function execute()
8686
return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl($cartUrl));
8787
}
8888
} catch (\Exception $e) {
89-
$this->messageManager->addException($e, __('We can\'t update the item.'));
89+
$this->messageManager->addException($e, __('We can\'t update the item right now.'));
9090
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
9191
return $this->_goBack();
9292
}

‎app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/available.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<?php /** @var $block \Magento\Checkout\Block\Onepage\Shipping\Method\Available */ ?>
1515
<?php $_shippingRateGroups = $block->getShippingRates(); ?>
1616
<?php if (!$_shippingRateGroups): ?>
17-
<p><?php echo __('Sorry, no quotes are available for this order.') ?></p>
17+
<p><?php echo __('Sorry, no quotes are available for this order right now.') ?></p>
1818
<?php else: ?>
1919
<dl class="items methods-shipping">
2020
<?php $shippingCodePrice = []; ?>

‎app/code/Magento/Checkout/view/frontend/web/template/shipping-method.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ <h2 data-bind="text: $t('Shipping Method')"></h2>
1616
aria-hidden="false"
1717
data-bind="fadeVisible: isVisible() && quoteHasShippingAddress()">
1818
<!-- ko if: rates().length == 0 -->
19-
<!-- ko text: $t('Sorry, no quotes are available for this order.')--><!-- /ko -->
19+
<!-- ko text: $t('Sorry, no quotes are available for this order right now.')--><!-- /ko -->
2020
<!-- /ko -->
2121
<!-- ko if: rates().length -->
2222
<form class="form methods-shipping" id="co-shipping-method-form" data-bind="submit: setShippingMethod" novalidate="novalidate">

‎app/code/Magento/Cms/Setup/InstallData.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
107107
<div class="message info">
108108
<span>
109109
Please replace this text with you Privacy Policy.
110-
Please add any additional cookies your website uses below (e.g., Google Analytics)
110+
Please add any additional cookies your website uses below (e.g. Google Analytics).
111111
</span>
112112
</div>
113113
<p>
@@ -258,7 +258,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
258258
</tr>
259259
<tr>
260260
<th>FRONTEND</th>
261-
<td>You sesssion ID on the server.</td>
261+
<td>Your session ID on the server.</td>
262262
</tr>
263263
<tr>
264264
<th>GUEST-VIEW</th>

‎app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ protected function _prepareColumns()
111111

112112
$this->addColumn(
113113
'created_at',
114-
['header' => __('Purchase Date'), 'index' => 'created_at', 'type' => 'datetime']
114+
['header' => __('Purchased'), 'index' => 'created_at', 'type' => 'datetime']
115115
);
116116

117117
$this->addColumn('billing_name', ['header' => __('Bill-to Name'), 'index' => 'billing_name']);

‎app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Orders.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ protected function _prepareColumns()
9595

9696
$this->addColumn(
9797
'created_at',
98-
['header' => __('Purchase Date'), 'index' => 'created_at', 'type' => 'datetime']
98+
['header' => __('Purchased'), 'index' => 'created_at', 'type' => 'datetime']
9999
);
100100

101101
$this->addColumn('billing_name', ['header' => __('Bill-to Name'), 'index' => 'billing_name']);

0 commit comments

Comments
 (0)