Merge pull request #825 from magento-south/MAGETWO-63201

Bug: - MAGETWO-63201 [Backport] - Copyright Year Update 2017 - for 2.1
magento · Feb 10, 2017 · 519e6aa · 519e6aa
2 parents eaefa2d + 934e277
commit 519e6aa
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
@@ -232,7 +232,7 @@ password,password
 "Reload Data","Reload Data"
 "Browse Files...","Browse Files..."
 Magento,Magento
-"Copyright&copy; %1 Magento Commerce Inc. All rights reserved.","Copyright&copy; %1 Magento Commerce Inc. All rights reserved."
+"Copyright &copy; %1 Magento, Inc. All rights reserved.","Copyright &copy; %1 Magento, Inc. All rights reserved."
 "ver. %1","ver. %1"
 "Magento Admin Panel","Magento Admin Panel"
 "Account Setting","Account Setting"

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
@@ -8,4 +8,4 @@
 
 ?>
 <a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
-<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>
+<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento, Inc. All rights reserved.', date('Y')) ?>
diff --git a/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml b/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
@@ -9,7 +9,7 @@
  *
  * The original name of this file, as part of the swagger-ui package, was dist/index.html.
  *
- * Modified by Magento, Modifications Copyright © 2016 Magento.
+ * Modified by Magento, Modifications Copyright © 2013-2017 Magento, Inc.
  */
 
 /** @var \Magento\Framework\View\Element\Template $block */

diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/style.css b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/style.css
@@ -1,4 +1,4 @@
-/* Modified by Magento, Modifications Copyright © 2016 Magento. */
+/* Modified by Magento, Modifications Copyright © 2013-2017 Magento, Inc. */
 .swagger-section #header a#logo {
   font-size: 1.5em;
   font-weight: bold;

diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/marked.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/marked.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
  * https://github.com/chjj/marked
  *
- * Modified by Magento, Modifications Copyright © 2016 Magento.
+ * Modified by Magento, Modifications Copyright © 2013-2017 Magento, Inc.
  */
 
 ;(function() {

diff --git a/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui.js b/app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui.js
@@ -6,7 +6,7 @@
  *
  * The original name of this file, as part of the swagger-ui package, was dist/index.html.
  *
- * Modified by Magento, Modifications Copyright © 2016 Magento.
+ * Modified by Magento, Modifications Copyright © 2013-2017 Magento, Inc.
  */
 (function(){this["Handlebars"] = this["Handlebars"] || {};
     this["Handlebars"]["templates"] = this["Handlebars"]["templates"] || {};

diff --git a/app/code/Magento/Theme/etc/config.xml b/app/code/Magento/Theme/etc/config.xml
@@ -48,7 +48,7 @@ Disallow: /*SID=
                 <welcome>Default welcome msg!</welcome>
             </header>
             <footer translate="copyright">
-                <copyright>Copyright &#169; 2013-2017 Magento, Inc. All rights reserved.</copyright>
+                <copyright>Copyright &#169; 2017 Magento, Inc. All rights reserved.</copyright>
             </footer>
         </design>
         <theme>

diff --git a/app/code/Magento/Theme/i18n/en_US.csv b/app/code/Magento/Theme/i18n/en_US.csv
@@ -135,7 +135,7 @@ Configuration,Configuration
 "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."
 "Default Description","Default Description"
 "Default welcome msg!","Default welcome msg!"
-"Copyright © 2013-2017 Magento, Inc. All rights reserved.","Copyright © 2013-2017 Magento, Inc. All rights reserved."
+"Copyright © 2017 Magento, Inc. All rights reserved.","Copyright © 2017 Magento, Inc. All rights reserved."
 "Design Config Grid","Design Config Grid"
 "Rebuild design config grid index","Rebuild design config grid index"
 "Admin empty","Admin empty"