From fe2a998bfe82513f5ab5a8dc9d373d57c9c68ec5 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Wed, 11 Jan 2012 23:41:51 +0100 Subject: 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 --- .../en/default/hook/global/setting-descs-settings.none.tmpl | 10 +++++++++- .../en/default/hook/global/user-error-errors.html.tmpl | 11 +++++------ 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'extensions/Example/template/en/default/hook/global') 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" %] -- cgit v1.2.3-24-g4f1b