Bug 680131: Replace the MPL 1.1 license by the MPL 2.0 one in all files, and add it to files which miss one

r=kiko r=mkanat r=mrbball a=LpSolit

5 files changed, 29 insertions, 59 deletions

diff --git a/extensions/Example/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl b/extensions/Example/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl
index 83801540a..202dd1e1a 100644
--- a/extensions/Example/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl
+++ b/extensions/Example/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl
@@ -1,21 +1,9 @@
-[%#
-  # The contents of this file are subject to the Mozilla Public
-  # License Version 1.1 (the "License"); you may not use this file
-  # except in compliance with the License. You may obtain a copy of
-  # the License at http://www.mozilla.org/MPL/
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
   #
-  # Software distributed under the License is distributed on an "AS
-  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  # implied. See the License for the specific language governing
-  # rights and limitations under the License.
-  #
-  # The Original Code is the Bugzilla Example Plugin.
-  #
-  # The Initial Developer of the Original Code is Frédéric Buclin.
-  # Portions created by the Initial Developer are Copyright (C) 2010
-  # the Initial Developer. All Rights Reserved.
-  #
-  # Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
   #%]
 
 [% tabs = tabs.import([{ name => "my_tab", label => "Example Custom Preferences",
diff --git a/extensions/Example/template/en/default/hook/admin/params/editparams-current_panel.html.tmpl b/extensions/Example/template/en/default/hook/admin/params/editparams-current_panel.html.tmpl
index a12848087..42826e914 100644
--- a/extensions/Example/template/en/default/hook/admin/params/editparams-current_panel.html.tmpl
+++ b/extensions/Example/template/en/default/hook/admin/params/editparams-current_panel.html.tmpl
@@ -1,21 +1,9 @@
-[%# The contents of this file are subject to the Mozilla Public
-  # License Version 1.1 (the "License"); you may not use this file
-  # except in compliance with the License. You may obtain a copy of
-  # the License at http://www.mozilla.org/MPL/
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
   #
-  # Software distributed under the License is distributed on an "AS
-  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  # implied. See the License for the specific language governing
-  # rights and limitations under the License.
-  #
-  # The Original Code is the Example Bugzilla Extension.
-  #
-  # The Initial Developer of the Original Code is Ali Ustek
-  # Portions created by the Initial Developer are Copyright (C) 2011 the
-  # Initial Developer. All Rights Reserved.
-  #
-  # Contributor(s):
-  #   Ali Ustek <aliustek@gmail.com>
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
   #%]
 
 [% IF panel.name == "auth" %]
diff --git a/extensions/Example/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl b/extensions/Example/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl
index 639752ed5..9cc455185 100644
--- a/extensions/Example/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl
+++ b/extensions/Example/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl
@@ -1,22 +1,9 @@
-[%# -*- Mode: perl; indent-tabs-mode: nil -*-
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
   #
-  # The contents of this file are subject to the Mozilla Public
-  # License Version 1.1 (the "License"); you may not use this file
-  # except in compliance with the License. You may obtain a copy of
-  # the License at http://www.mozilla.org/MPL/
-  #
-  # Software distributed under the License is distributed on an "AS
-  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  # implied. See the License for the specific language governing
-  # rights and limitations under the License.
-  #
-  # The Original Code is the Bugzilla Example Plugin.
-  #
-  # The Initial Developer of the Original Code is ITA Software
-  # Portions created by the Initial Developer are Copyright (C) 2009
-  # the Initial Developer. All Rights Reserved.
-  #
-  # Contributor(s): Bradley Baetz <bbaetz@everythingsolved.com>
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
   #%]
 
 [% IF    san_tag == "example_check_au_user" %]
diff --git a/extensions/Example/template/en/default/hook/global/setting-descs-settings.none.tmpl b/extensions/Example/template/en/default/hook/global/setting-descs-settings.none.tmpl
index 9dc5fc767..7077f2690 100644
--- a/extensions/Example/template/en/default/hook/global/setting-descs-settings.none.tmpl
+++ b/extensions/Example/template/en/default/hook/global/setting-descs-settings.none.tmpl
@@ -1,6 +1,14 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
 [% 
     setting_descs.product_chooser = "Product chooser to use when entering $terms.bugs",
     setting_descs.pretty = "Pretty chooser with common products and icons",
     setting_descs.full   = "Full chooser with all products",
     setting_descs.small  = "Product chooser for mobile devices",
-%]
\ No newline at end of file
+%]
diff --git a/extensions/Example/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/Example/template/en/default/hook/global/user-error-errors.html.tmpl
index 50d20a9f2..33c77e44d 100644
--- a/extensions/Example/template/en/default/hook/global/user-error-errors.html.tmpl
+++ b/extensions/Example/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -1,10 +1,9 @@
-[%# Note that error messages should generally be indented four spaces, like
-  # below, because when Bugzilla translates an error message into plain
-  # text, it takes four spaces off the beginning of the lines. 
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
   #
-  # Note also that I prefixed my error name with "example", the name of my
-  # extension, so that I wouldn't conflict with other error names in
-  # Bugzilla or other extensions.
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
   #%]
 [% IF error == "example_my_error" %]
    [% title = "Example Error Title" %]