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 --- .../hook/bug/edit-after_comment_textarea.html.tmpl | 22 +++++---------------- .../default/hook/bug/format_comment-type.txt.tmpl | 22 +++++---------------- .../user-error-auth_failure_action.html.tmpl | 22 +++++---------------- .../hook/global/user-error-errors.html.tmpl | 22 +++++---------------- .../hook/list/edit-multiple-after_groups.html.tmpl | 23 +++++----------------- 5 files changed, 25 insertions(+), 86 deletions(-) (limited to 'extensions/OldBugMove/template/en/default/hook') diff --git a/extensions/OldBugMove/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl b/extensions/OldBugMove/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl index 0a7a4fa27..1490f08ad 100644 --- a/extensions/OldBugMove/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl +++ b/extensions/OldBugMove/template/en/default/hook/bug/edit-after_comment_textarea.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 Bug Tracking System. - # - # The Initial Developer of the Original Code is Everything Solved, Inc. - # Portions created by the Initial Developer are Copyright (C) 2010 - # the Initial Developer. All Rights Reserved. - # - # Contributor(s): - # Max Kanat-Alexander + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] [% IF oldbugmove_user_is_mover(user) AND bug.resolution != 'MOVED' %] diff --git a/extensions/OldBugMove/template/en/default/hook/bug/format_comment-type.txt.tmpl b/extensions/OldBugMove/template/en/default/hook/bug/format_comment-type.txt.tmpl index 1ce8e369d..afe03af65 100644 --- a/extensions/OldBugMove/template/en/default/hook/bug/format_comment-type.txt.tmpl +++ b/extensions/OldBugMove/template/en/default/hook/bug/format_comment-type.txt.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 Bug Tracking System. - # - # The Initial Developer of the Original Code is Everything Solved, Inc. - # Portions created by the Initial Developer are Copyright (C) 2010 - # the Initial Developer. All Rights Reserved. - # - # Contributor(s): - # Max Kanat-Alexander + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] [% IF comment.type == constants.CMT_MOVED_TO %] diff --git a/extensions/OldBugMove/template/en/default/hook/global/user-error-auth_failure_action.html.tmpl b/extensions/OldBugMove/template/en/default/hook/global/user-error-auth_failure_action.html.tmpl index 58500976b..1966a1aa1 100644 --- a/extensions/OldBugMove/template/en/default/hook/global/user-error-auth_failure_action.html.tmpl +++ b/extensions/OldBugMove/template/en/default/hook/global/user-error-auth_failure_action.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 Bug Tracking System. - # - # The Initial Developer of the Original Code is Everything Solved, Inc. - # Portions created by the Initial Developer are Copyright (C) 2010 - # the Initial Developer. All Rights Reserved. - # - # Contributor(s): - # Max Kanat-Alexander + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] [% IF action == "move" %] diff --git a/extensions/OldBugMove/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/OldBugMove/template/en/default/hook/global/user-error-errors.html.tmpl index 935117780..d45026b41 100644 --- a/extensions/OldBugMove/template/en/default/hook/global/user-error-errors.html.tmpl +++ b/extensions/OldBugMove/template/en/default/hook/global/user-error-errors.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 Bug Tracking System. - # - # The Initial Developer of the Original Code is Everything Solved, Inc. - # Portions created by the Initial Developer are Copyright (C) 2010 - # the Initial Developer. All Rights Reserved. - # - # Contributor(s): - # Max Kanat-Alexander + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] [% IF error == "oldbugmove_no_delete_moved" %] diff --git a/extensions/OldBugMove/template/en/default/hook/list/edit-multiple-after_groups.html.tmpl b/extensions/OldBugMove/template/en/default/hook/list/edit-multiple-after_groups.html.tmpl index 10e6f73b3..a5380da97 100644 --- a/extensions/OldBugMove/template/en/default/hook/list/edit-multiple-after_groups.html.tmpl +++ b/extensions/OldBugMove/template/en/default/hook/list/edit-multiple-after_groups.html.tmpl @@ -1,22 +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 Bug Tracking System. - # - # The Initial Developer of the Original Code is Everything Solved, Inc. - # Portions created by the Initial Developer are Copyright (C) 2010 - # the Initial Developer. All Rights Reserved. - # - # Contributor(s): - # Max Kanat-Alexander - # Frédéric Buclin + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] [% IF oldbugmove_user_is_mover(user) %] -- cgit v1.2.3-24-g4f1b