Skip to content

Commit 519e6aa

Browse files
Merge pull request #825 from magento-south/MAGETWO-63201
Bug: - MAGETWO-63201 [Backport] - Copyright Year Update 2017 - for 2.1
2 parents eaefa2d + 934e277 commit 519e6aa

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ password,password
232232
"Reload Data","Reload Data"
233233
"Browse Files...","Browse Files..."
234234
Magento,Magento
235-
"Copyright© %1 Magento Commerce Inc. All rights reserved.","Copyright© %1 Magento Commerce Inc. All rights reserved."
235+
"Copyright © %1 Magento, Inc. All rights reserved.","Copyright © %1 Magento, Inc. All rights reserved."
236236
"ver. %1","ver. %1"
237237
"Magento Admin Panel","Magento Admin Panel"
238238
"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/templates/swagger-ui/index.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
* The original name of this file, as part of the swagger-ui package, was dist/index.html.
1111
*
12-
* Modified by Magento, Modifications Copyright © 2016 Magento.
12+
* Modified by Magento, Modifications Copyright © 2013-2017 Magento, Inc.
1313
*/
1414

1515
/** @var \Magento\Framework\View\Element\Template $block */

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/Swagger/view/frontend/web/swagger-ui/js/lib/marked.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
44
* https://github.com/chjj/marked
55
*
6-
* Modified by Magento, Modifications Copyright © 2016 Magento.
6+
* Modified by Magento, Modifications Copyright © 2013-2017 Magento, Inc.
77
*/
88

99
;(function() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* The original name of this file, as part of the swagger-ui package, was dist/index.html.
88
*
9-
* Modified by Magento, Modifications Copyright © 2016 Magento.
9+
* Modified by Magento, Modifications Copyright © 2013-2017 Magento, Inc.
1010
*/
1111
(function(){this["Handlebars"] = this["Handlebars"] || {};
1212
this["Handlebars"]["templates"] = this["Handlebars"]["templates"] || {};

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Configuration,Configuration
135135
"This action will delete your custom instructions and reset robots.txt file to system's default settings.","This action will delete your custom instructions and reset robots.txt file to system's default settings."
136136
"Default Description","Default Description"
137137
"Default welcome msg!","Default welcome msg!"
138-
"Copyright © 2013-2017 Magento, Inc. All rights reserved.","Copyright © 2013-2017 Magento, Inc. All rights reserved."
138+
"Copyright © 2017 Magento, Inc. All rights reserved.","Copyright © 2017 Magento, Inc. All rights reserved."
139139
"Design Config Grid","Design Config Grid"
140140
"Rebuild design config grid index","Rebuild design config grid index"
141141
"Admin empty","Admin empty"

0 commit comments

Comments
 (0)