Skip to content

Commit 748fbe5

Browse files
Merge pull request #824 from magento-south/MAGETWO-63202
Bug - P1 Bug: - MAGETWO-63202 [Backport] - Copyright Year Update 2017 - for 2.0
2 parents e59cdf4 + 6d659c5 commit 748fbe5

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ password,password
361361
"Shipping Amount","Shipping Amount"
362362
"Tax Amount","Tax Amount"
363363
"Browse Files...","Browse Files..."
364-
"Copyright© %1 Magento Commerce Inc. All rights reserved.","Copyright© %1 Magento Commerce Inc. All rights reserved."
364+
"Copyright © %1 Magento, Inc. All rights reserved.","Copyright © %1 Magento, Inc. All rights reserved."
365365
"Magento ver. %1","Magento ver. %1"
366366
"Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
367367
"Account Setting","Account Setting"

app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88

99
?>
1010
<a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
11-
<?php /* @escapeNotVerified */ echo __('Copyright&copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>
11+
<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento, Inc. All rights reserved.', date('Y')) ?>

app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Modified by Magento, Modifications Copyright © 2016 Magento. */
1+
/* Modified by Magento, Modifications Copyright © 2013-2017 Magento, Inc. */
22
.swagger-section #header a#logo {
33
font-size: 1.5em;
44
font-weight: bold;

app/code/Magento/Theme/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Disallow: /*SID=
4747
<welcome>Default welcome msg!</welcome>
4848
</header>
4949
<footer translate="copyright">
50-
<copyright>Copyright &#169; 2015 Magento. All rights reserved.</copyright>
50+
<copyright>Copyright &#169; 2017 Magento, Inc. All rights reserved.</copyright>
5151
</footer>
5252
</design>
5353
<theme>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Copyright,Copyright
129129
"Miscellaneous HTML","Miscellaneous HTML"
130130
"This will be displayed just before body closing tag.","This will be displayed just before body closing tag."
131131
"Default welcome msg!","Default welcome msg!"
132-
"&copy; 2015 Magento Demo Store. All Rights Reserved.","&copy; 2015 Magento Demo Store. All Rights Reserved."
132+
"Copyright © 2017 Magento, Inc. All rights reserved.","Copyright © 2017 Magento, Inc. All rights reserved."
133133
"1 column","1 column"
134134
"2 columns with left bar","2 columns with left bar"
135135
"2 columns with right bar","2 columns with right bar"

0 commit comments

Comments
 (0)