Bug 716552 - upgrade license to MPL 2. r=alqahira.
authorGervase Markham <gerv@gerv.net>
Mon, 26 Mar 2012 14:44:20 +0100
changeset 3420 d2f5fca4b8fbe6ae6f52963bbcf61ca2b026300a
parent 3419 43d400c13b9d485974334f55048b2021a784a817
child 3421 b13aa410b25ad30a5358057693d25422ba383df7
push id338
push usergerv@mozilla.org
push dateMon, 26 Mar 2012 13:44:29 +0000
reviewersalqahira
bugs716552
Bug 716552 - upgrade license to MPL 2. r=alqahira.
IBPalette/src/CaminoViewsFramework_Prefix.pch
IBPalette/src/CaminoViewsInspector.h
IBPalette/src/CaminoViewsInspector.m
IBPalette/src/CaminoViewsPalette.h
IBPalette/src/CaminoViewsPalette.m
IBPalette/src/CaminoViewsPalette_Prefix.pch
feedhandlers/InfoPlist.strings.in
geckochrome/locale/en-US/mozapps/plugins/plugins.dtd
resources/localized/English.lproj/InfoPlist.strings.in
resources/localized/English.lproj/global_locale_appstrings_properties.strings.in
resources/localized/English.lproj/global_locale_config_properties.strings.in
resources/localized/English.lproj/global_locale_css_properties.strings.in
resources/localized/English.lproj/global_locale_dom_dom_properties.strings.in
resources/localized/English.lproj/global_locale_layout_HtmlForm_properties.strings.in
resources/localized/English.lproj/global_locale_layout_MediaDocument_properties.strings.in
resources/localized/English.lproj/global_locale_layout_errors_properties.strings.in
resources/localized/English.lproj/global_locale_layout_xmlparser_properties.strings.in
resources/localized/English.lproj/global_locale_prompts_properties.strings.in
resources/localized/English.lproj/global_locale_svg_svg_properties.strings.in
resources/localized/English.lproj/global_locale_xslt_xslt_properties.strings.in
resources/localized/English.lproj/necko_locale_necko_properties.strings.in
resources/localized/English.lproj/pipnss_locale_pipnss_properties.strings.in
resources/localized/English.lproj/pipnss_locale_security_properties.strings.in
--- a/IBPalette/src/CaminoViewsFramework_Prefix.pch
+++ b/IBPalette/src/CaminoViewsFramework_Prefix.pch
@@ -1,7 +1,11 @@
+// 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/.
+
 //
 // Prefix header for all source files of the 'CaminoViewsFrame' target in the 'CaminoViewsPalette' project
 //
 
 #ifdef __OBJC__
     #import <Cocoa/Cocoa.h>
 #endif
--- a/IBPalette/src/CaminoViewsInspector.h
+++ b/IBPalette/src/CaminoViewsInspector.h
@@ -1,14 +1,16 @@
+// 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/.
+
 //
 //  CaminoViewsInspector.h
 //  CaminoViewsPalette
 //
 //  Created by Simon Fraser on 21/11/05.
-//  Copyright __MyCompanyName__ 2005. All rights reserved.
-//
 
 #import <InterfaceBuilder/InterfaceBuilder.h>
 
 @interface CaminoViewsInspector : IBInspector
 {
 }
 @end
--- a/IBPalette/src/CaminoViewsInspector.m
+++ b/IBPalette/src/CaminoViewsInspector.m
@@ -1,15 +1,17 @@
+// 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/.
+
 //
 //  CaminoViewsInspector.m
 //  CaminoViewsPalette
 //
 //  Created by Simon Fraser on 21/11/05.
-//  Copyright __MyCompanyName__ 2005 . All rights reserved.
-//
 
 #import "CaminoViewsInspector.h"
 #import "CaminoViewsPalette.h"
 
 @implementation CaminoViewsInspector
 
 - (id)init
 {
--- a/IBPalette/src/CaminoViewsPalette.h
+++ b/IBPalette/src/CaminoViewsPalette.h
@@ -1,15 +1,18 @@
+// 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/.
+
 //
 //  CaminoViewsPalette.h
 //  CaminoViewsPalette
 //
 //  Created by Simon Fraser on 21/11/05.
-//  Copyright __MyCompanyName__ 2005 . All rights reserved.
-//
+
 
 #import <InterfaceBuilder/InterfaceBuilder.h>
 
 #import "CHStackView.h"
 #import "AutoSizingTextField.h"
 
 @interface CaminoViewsPalette : IBPalette
 {
--- a/IBPalette/src/CaminoViewsPalette.m
+++ b/IBPalette/src/CaminoViewsPalette.m
@@ -1,16 +1,17 @@
+// 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/.
+
 //
 //  CaminoViewsPalette.m
 //  CaminoViewsPalette
 //
 //  Created by Simon Fraser on 21/11/05.
-//  Copyright __MyCompanyName__ 2005 . All rights reserved.
-//
-
 
 #import "CaminoViewsPalette.h"
 
 @interface NSObject(PrivateAPI)
 + (BOOL)isInInterfaceBuilder;
 @end
 
 @implementation CaminoViewsPalette
--- a/IBPalette/src/CaminoViewsPalette_Prefix.pch
+++ b/IBPalette/src/CaminoViewsPalette_Prefix.pch
@@ -1,8 +1,12 @@
+// 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/.
+
 //
 // Prefix header for all source files of the 'CaminoViewsPalette' target in the 'CaminoViewsPalette' project
 //
 
 #ifdef __OBJC__
     #import <Cocoa/Cocoa.h>
     #import <InterfaceBuilder/InterfaceBuilder.h>
 #endif
--- a/feedhandlers/InfoPlist.strings.in
+++ b/feedhandlers/InfoPlist.strings.in
@@ -1,5 +1,8 @@
+/* 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/. */
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "%FEED_HANDLER_DISPLAY_NAME%";
 CFBundleDisplayName = "%FEED_HANDLER_DISPLAY_NAME%";
 CFBundleGetInfoString = "%FEED_HANDLER_DISPLAY_NAME% 1.0, © 1998-%CM_COPYRIGHT_YEAR% Contributors";
--- a/geckochrome/locale/en-US/mozapps/plugins/plugins.dtd
+++ b/geckochrome/locale/en-US/mozapps/plugins/plugins.dtd
@@ -1,8 +1,12 @@
+<!-- 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/.  -->
+
 <!ENTITY pluginWizard.title                                  "Plugin Finder Service">
 <!ENTITY pluginWizard.firstPage.title                        "Welcome to the &pluginWizard.title;">
 
 <!ENTITY pluginWizard.checkingForPlugins.description.label   "&brandShortName; is now checking for available plugins…">
 
 <!ENTITY pluginWizard.availablePluginsPage.title             "Available Plugin Downloads">
 <!ENTITY pluginWizard.availablePluginsPage.description.label "The following plugins are available:">
 <!ENTITY pluginWizard.availablePluginsPage.continueMsg.label "Press Next to install these plugins.">
--- a/resources/localized/English.lproj/InfoPlist.strings.in
+++ b/resources/localized/English.lproj/InfoPlist.strings.in
@@ -1,8 +1,11 @@
+/* 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/. */
 /* Localized versions of Info.plist keys */
 
 /* The BreakpadVendor string appears in the Crash Reporter.  It is an indirect 
    object in a sentence informing users that a crash report has been generated
    that users can send "to the Camino developers" to help us figure out the
    crash. */
 BreakpadVendor = "the Camino developers";
 CFBundleName = "Camino";
--- a/resources/localized/English.lproj/global_locale_appstrings_properties.strings.in
+++ b/resources/localized/English.lproj/global_locale_appstrings_properties.strings.in
@@ -1,43 +1,11 @@
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 mozilla.org code. */
-/* # */
-/* # The Initial Developer of the Original Code is */
-/* # Netscape Communications Corporation. */
-/* # Portions created by the Initial Developer are Copyright (C) 1998 */
-/* # the Initial Developer. All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either of the GNU General Public License Version 2 or later (the \"GPL\"), */
-/* # or the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 "malformedURI" = "The URL is not valid and cannot be loaded.";
 "fileNotFound" = "The file %S cannot be found. Please check the location and try again.";
 "dnsNotFound" = "%S could not be found. Please check the name and try again.";
 "protocolNotFound" = "%S is not a registered protocol.";
 "connectionFailure" = "The connection was refused when attempting to contact %S.";
 "netInterrupt" = "The connection to %S has terminated unexpectedly. Some data may have been transferred.";
 "netTimeout" = "The operation timed out when attempting to contact %S.";
--- a/resources/localized/English.lproj/global_locale_config_properties.strings.in
+++ b/resources/localized/English.lproj/global_locale_config_properties.strings.in
@@ -1,44 +1,11 @@
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 about:config. */
-/* # */
-/* # The Initial Developer of the Original Code is */
-/* # Neil Rashbrook. */
-/* # Portions created by the Initial Developer are Copyright (C) 2003 */
-/* # the Initial Developer. All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* #   Neil Rashbrook <neil@parkwaycc.co.uk> */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either the GNU General Public License Version 2 or later (the \"GPL\"), or */
-/* # the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 /* # Lock column values */
 "default" = "default";
 "user" = "user set";
 "locked" = "locked";
 
 /* # Type column values */
 "string" = "string";
--- a/resources/localized/English.lproj/global_locale_css_properties.strings.in
+++ b/resources/localized/English.lproj/global_locale_css_properties.strings.in
@@ -1,43 +1,11 @@
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 css.properties. */
-/* # */
-/* # The Initial Developer of the Original Code is Netscape Communications */
-/* # Corporation.  Portions created by the Initial Developer are Copyright */
-/* # (C) 2002 Netscape Communications Corporation.  All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* #   L. David Baron <dbaron@dbaron.org> (original author) */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either the GNU General Public License Version 2 or later (the \"GPL\"), or */
-/* # the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 "MimeNotCss" = "The stylesheet %1$S was not loaded because its MIME type, “%2$S”, is not “text/css”.";
 "MimeNotCssWarn" = "The stylesheet %1$S was loaded as CSS even though its MIME type, “%2$S”, is not “text/css”.";
 
 "PEUnexpEOF2" = "Unexpected end of file while searching for %1$S.";
 "PEParseRuleWSOnly" = "Whitespace-only string given to be parsed as rule.";
 "PEDeclDropped" = "Declaration dropped.";
 "PEDeclSkipped" = "Skipped to next declaration.";
--- a/resources/localized/English.lproj/global_locale_dom_dom_properties.strings.in
+++ b/resources/localized/English.lproj/global_locale_dom_dom_properties.strings.in
@@ -1,45 +1,11 @@
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 mozilla.org code. */
-/* # */
-/* # The Initial Developer of the Original Code is */
-/* # Netscape Communications Corporation. */
-/* # Portions created by the Initial Developer are Copyright (C) 2001 */
-/* # the Initial Developer. All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* #   Mitch <mstoltz@netscape.com> (original author) */
-/* #   Ehsan Akhgari <ehsan.akhgari@gmail.com> */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either of the GNU General Public License Version 2 or later (the \"GPL\"), */
-/* # or the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 "KillScriptTitle" = "Warning: Unresponsive script";
 "KillScriptMessage" = "A script on this page may be busy, or it may have stopped responding. You can stop the script now, or you can continue to see if the script will complete.";
 "KillScriptWithDebugMessage" = "A script on this page may be busy, or it may have stopped responding. You can stop the script now, open the script in the debugger, or let the script continue.";
 "KillScriptLocation" = "Script: %S";
 "StopScriptButton" = "Stop script";
 "DebugScriptButton" = "Debug script";
 "WaitForScriptButton" = "Continue";
--- a/resources/localized/English.lproj/global_locale_layout_HtmlForm_properties.strings.in
+++ b/resources/localized/English.lproj/global_locale_layout_HtmlForm_properties.strings.in
@@ -1,43 +1,11 @@
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 mozilla.org code. */
-/* # */
-/* # The Initial Developer of the Original Code is */
-/* # Netscape Communications Corporation. */
-/* # Portions created by the Initial Developer are Copyright (C) 1998 */
-/* # the Initial Developer. All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either of the GNU General Public License Version 2 or later (the \"GPL\"), */
-/* # or the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 "Reset" = "Reset";
 "Submit" = "Submit Query";
 "Browse" = "Browse…";
 "FileUpload" = "File Upload";
 "IsIndexPrompt" = "This is a searchable index. Enter search keywords:   ";
 "ForgotPostWarning" = "Form contains enctype=%S, but does not contain method=post.  Submitting normally with method=GET and no enctype instead.";
 "ForgotFileEnctypeWarning" = "Form contains a file input, but is missing method=POST and enctype=multipart/form-data on the form.  The file will not be sent.";
--- a/resources/localized/English.lproj/global_locale_layout_MediaDocument_properties.strings.in
+++ b/resources/localized/English.lproj/global_locale_layout_MediaDocument_properties.strings.in
@@ -1,46 +1,11 @@
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 mozilla.org code. */
-/* # */
-/* # The Initial Developer of the Original Code is */
-/* # Netscape Communications Corporation. */
-/* # Portions created by the Initial Developer are Copyright (C) 1998 */
-/* # the Initial Developer. All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* #   Blake Ross <blakeross@telocity.com> (Original Author) */
-/* #   Morten Nilsen <morten@nilsen.com> */
-/* #   Christian Biesinger <cbiesinger@web.de> */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either of the GNU General Public License Version 2 or later (the \"GPL\"), */
-/* # or the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 /* #LOCALIZATION NOTE (ImageTitleWithDimensionsAndFile): first %S is filename, second %S is type, third %S is width and fourth %S is height */
 /* #LOCALIZATION NOTE (ImageTitleWithoutDimensions): first %S is filename, second %S is type */
 /* #LOCALIZATION NOTE (ImageTitleWithDimensions): first %S is type, second %S is width and third %S is height */
 /* #LOCALIZATION NOTE (ImageTitleWithNeitherDimensionsNorFile): first %S is type */
 /* #LOCALIZATION NOTE (MediaTitleWithFile): first %S is filename, second %S is type */
 /* #LOCALIZATION NOTE (MediaTitleWithNoInfo): first %S is type */
 "ImageTitleWithDimensionsAndFile" = "%S (%S Image, %Sx%S pixels)";
--- a/resources/localized/English.lproj/global_locale_layout_errors_properties.strings.in
+++ b/resources/localized/English.lproj/global_locale_layout_errors_properties.strings.in
@@ -1,42 +1,9 @@
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 mozilla.org code. */
-/* # */
-/* # The Initial Developer of the Original Code is */
-/* # Netscape Communications Corporation. */
-/* # Portions created by the Initial Developer are Copyright (C) 2002 */
-/* # the Initial Developer. All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* #   Boris Zbarsky <bzbarsky@mit.edu>  (original author) */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either the GNU General Public License Version 2 or later (the \"GPL\"), or */
-/* # the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 "ImageMapRectBoundsError" = "The “coords” attribute of the <area shape=\"rect\"> tag is not in the “left,top,right,bottom” format.";
 "ImageMapCircleWrongNumberOfCoords" = "The “coords” attribute of the <area shape=\"circle\"> tag is not in the “center-x,center-y,radius” format.";
 "ImageMapCircleNegativeRadius" = "The “coords” attribute of the <area shape=\"circle\"> tag has a negative radius.";
 "ImageMapPolyWrongNumberOfCoords" = "The “coords” attribute of the <area shape=\"poly\"> tag is not in the “x1,y1,x2,y2 …” format.";
 "ImageMapPolyOddNumberOfCoords" = "The “coords” attribute of the <area shape=\"poly\"> tag is missing the last “y” coordinate (the correct format is “x1,y1,x2,y2 …”).";
--- a/resources/localized/English.lproj/global_locale_layout_xmlparser_properties.strings.in
+++ b/resources/localized/English.lproj/global_locale_layout_xmlparser_properties.strings.in
@@ -1,43 +1,11 @@
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 mozilla.org code. */
-/* # */
-/* # The Initial Developer of the Original Code is */
-/* # Netscape Communications Corporation. */
-/* # Portions created by the Initial Developer are Copyright (C) 2001 */
-/* # the Initial Developer. All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either of the GNU General Public License Version 2 or later (the \"GPL\"), */
-/* # or the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 /* # Map Expat error codes to error strings */
 "1" = "out of memory";
 "2" = "syntax error";
 "3" = "no element found";
 "4" = "not well-formed";
 "5" = "unclosed token";
 "6" = "partial character";
--- a/resources/localized/English.lproj/global_locale_prompts_properties.strings.in
+++ b/resources/localized/English.lproj/global_locale_prompts_properties.strings.in
@@ -1,43 +1,11 @@
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 mozilla.org code. */
-/* # */
-/* # The Initial Developer of the Original Code is */
-/* # Netscape Communications Corporation. */
-/* # Portions created by the Initial Developer are Copyright (C) 1998 */
-/* # the Initial Developer. All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either the GNU General Public License Version 2 or later (the \"GPL\"), or */
-/* # the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 /* # LOCALIZATION NOTE (EnterLoginForRealm, EnterLoginForProxy): */
 /* # %1 is an untrusted string provided by a remote server. It could try to */
 /* # take advantage of sentence structure in order to mislead the user (see */
 /* # bug 244273). %1 should be integrated into the translated sentences as */
 /* # little as possible. %2 is the url of the site being accessed. */
 "EnterLoginForRealm" = "A username and password are being requested by %2$S. The site says: “%1$S”";
 "EnterLoginForProxy" = "The proxy %2$S is requesting a username and password. The site says: “%1$S”";
--- a/resources/localized/English.lproj/global_locale_svg_svg_properties.strings.in
+++ b/resources/localized/English.lproj/global_locale_svg_svg_properties.strings.in
@@ -1,38 +1,5 @@
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 Mozilla SVG project. */
-/* # */
-/* # The Initial Developer of the Original Code is */
-/* # Robert Longson. */
-/* # Portions created by the Initial Developer are Copyright (C) 2006 */
-/* # the Initial Developer. All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* #    Robert Longson <longsonr@gmail.com> (original author) */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either the GNU General Public License Version 2 or later (the \"GPL\"), or */
-/* # the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 "AttributeParseWarning" = "Unexpected value %2$S parsing %1$S attribute.";
--- a/resources/localized/English.lproj/global_locale_xslt_xslt_properties.strings.in
+++ b/resources/localized/English.lproj/global_locale_xslt_xslt_properties.strings.in
@@ -1,44 +1,11 @@
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 TransforMiiX XSLT processor code. */
-/* # */
-/* # The Initial Developer of the Original Code is */
-/* # Netscape Communications Corporation. */
-/* # Portions created by the Initial Developer are Copyright (C) 2003 */
-/* # the Initial Developer. All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* #   Peter Van der Beken <peterv@propagandism.org> */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either the GNU General Public License Version 2 or later (the \"GPL\"), or */
-/* # the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 "1" = "Parsing an XSLT stylesheet failed.";
 "2" = "Parsing an XPath expression failed.";
 "3" = "";
 "4" = "XSLT transformation failed.";
 "5" = "Invalid XSLT/XPath function.";
 "6" = "XSLT Stylesheet (possibly) contains a recursion.";
 "7" = "Attribute value illegal in XSLT 1.0.";
--- a/resources/localized/English.lproj/necko_locale_necko_properties.strings.in
+++ b/resources/localized/English.lproj/necko_locale_necko_properties.strings.in
@@ -1,43 +1,11 @@
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 mozilla.org code. */
-/* # */
-/* # The Initial Developer of the Original Code is */
-/* # Netscape Communications Corporation. */
-/* # Portions created by the Initial Developer are Copyright (C) 1998 */
-/* # the Initial Developer. All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either the GNU General Public License Version 2 or later (the \"GPL\"), or */
-/* # the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 /* #ResolvingHost=Looking up */
 /* #ConnectedTo=Connected to  */
 /* #ConnectingTo=Connecting to  */
 /* #SendingRequestTo=Sending request to  */
 /* #TransferringDataFrom=Transferring data from  */
 
 "3" = "Looking up %1$S…";
--- a/resources/localized/English.lproj/pipnss_locale_pipnss_properties.strings.in
+++ b/resources/localized/English.lproj/pipnss_locale_pipnss_properties.strings.in
@@ -1,48 +1,11 @@
-/* # */
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 mozilla.org code. */
-/* # */
-/* # The Initial Developer of the Original Code is */
-/* # Netscape Communications Corporation. */
-/* # Portions created by the Initial Developer are Copyright (C) 1998 */
-/* # the Initial Developer. All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* #   Javier Delgadillo <javi@netscape.com> */
-/* #   Brian Ryner <bryner@brianryner.com> */
-/* #   Terry Hayes <thayes@netscape.com> */
-/* #   John Gardiner Myers <jgmyers@speakeasy.net> */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either the GNU General Public License Version 2 or later (the \"GPL\"), or */
-/* # the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 "SignedBy" = "Authenticated by %S";
 "CertPassPrompt" = "Please enter the master password for the %S.";
 /* # the following strings have special requirements: */
 /* # they must fit in a 32 or 64 byte buffer after being translated */
 /* # to UTF8.  Note to translator. It’s not easy for you to figure */
 /* # whether the escaped unicode string you produce will fit in  */
 /* # the space allocated. */
--- a/resources/localized/English.lproj/pipnss_locale_security_properties.strings.in
+++ b/resources/localized/English.lproj/pipnss_locale_security_properties.strings.in
@@ -1,45 +1,11 @@
-/* # */
-/* # ***** BEGIN LICENSE BLOCK ***** */
-/* # Version: MPL 1.1/GPL 2.0/LGPL 2.1 */
-/* # */
-/* # 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 mozilla.org code. */
-/* # */
-/* # The Initial Developer of the Original Code is */
-/* # Netscape Communications Corporation. */
-/* # Portions created by the Initial Developer are Copyright (C) 1998 */
-/* # the Initial Developer. All Rights Reserved. */
-/* # */
-/* # Contributor(s): */
-/* #   Sean Cotter <cotter@netscape.com> */
-/* # */
-/* # Alternatively, the contents of this file may be used under the terms of */
-/* # either the GNU General Public License Version 2 or later (the \"GPL\"), or */
-/* # the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"), */
-/* # in which case the provisions of the GPL or the LGPL are applicable instead */
-/* # of those above. If you wish to allow use of your version of this file only */
-/* # under the terms of either the GPL or the LGPL, and not to allow others to */
-/* # use your version of this file under the terms of the MPL, indicate your */
-/* # decision by deleting the provisions above and replace them with the notice */
-/* # and other provisions required by the GPL or the LGPL. If you do not delete */
-/* # the provisions above, a recipient may use your version of this file under */
-/* # the terms of any one of the MPL, the GPL or the LGPL. */
-/* # */
-/* # ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
 "Title" = "Security Warning";
 "MixedContentMessage" = "You have requested an encrypted page that contains some unencrypted information. Information that you see or enter on this page could easily be read by a third party.";
 "LeaveSecureMessage" = "You are about to leave an encrypted page. Information you send or receive from now on could easily be read by a third party.";
 "EnterSecureMessage" = "You have requested an encrypted page. The web site has identified itself correctly, and information you see or enter on this page can’t easily be read by a third party.";
 "WeakSecureMessage" = "You have requested a page that uses low-grade encryption. The web site has identified itself correctly, but information you see or enter on this page could be read by a third party. ";
 "PostToInsecureFromSecureMessage" = "Although this page is encrypted, the information you have entered is to be sent over an unencrypted connection and could easily be read by a third party.##Are you sure you want to continue sending this information?##";
 "PostToInsecureFromInsecureMessage" = "The information you have entered is to be sent over an unencrypted connection and could easily be read by a third party.##Are you sure you want to continue sending this information?##";