Update about_credits.html by re-running license.py...

chrome/browser/resources/about_credits.html

Index: chrome/browser/resources/about_credits.html
===================================================================
--- chrome/browser/resources/about_credits.html	(revision 68262)
+++ chrome/browser/resources/about_credits.html	(working copy)
@@ -3319,6 +3319,55 @@
 
 
 <div class="product">
+<span class="title">OpenGL ES 2.0 Conformance Tests</span>
+<a class="show" href="#" onclick="return toggle(this);">show license</a>
+<span class="homepage"><a href="https://www.khronos.org/opengles/adopters/login/conformance/">homepage</a></span>
+<div class="licence">
+<pre>/*
+** Copyright (c) 2008 The Khronos Group Inc.
+** 
+** All Rights Reserved.  This code is protected by copyright laws and 
+** contains material proprietary to the Khronos Group, Inc.  This is 
+** UNPUBLISHED PROPRIETARY SOURCE CODE that may not be disclosed in whole 
+** or in part to third parties, and may not be reproduced, republished, 
+** distributed, transmitted, displayed, broadcast or otherwise exploited 
+** in any manner without the express prior written permission of Khronos 
+** Group.
+** 
+** The receipt or possession of this code does not convey any rights to 
+** reproduce, disclose, or distribute its contents, or to manufacture, 
+** use, or sell anything that it may describe, in whole or in part other 
+** than under the terms of the Khronos Adopters Agreement or Khronos 
+** Conformance Test Source License Agreement as executed between Khronos 
+** and the recipient.
+** 
+** For the avoidance of doubt, this code when provided: a) under the 
+** Khronos Conformance Test Source License Agreement is for the sole 
+** purpose of creating conformance tests for delivery to Khronos and does 
+** not provide for formally testing products or use of Khronos trademarks 
+** on conformant products; b) under the Khronos Adopters Agreement is for 
+** the sole purpose of formally administering tests to products pursuant 
+** to the Khronos Conformance Process Document.
+** 
+** Khronos, OpenKODE, OpenVG, OpenWF, glFX, OpenMAX and OpenSL ES are 
+** trademarks of the Khronos Group Inc.  COLLADA is a trademark of Sony 
+** Computer Entertainment Inc. used by permission by Khronos.  OpenGL and 
+** OpenML are registered trademarks and the OpenGL ES logo is a trademark 
+** of Silicon Graphics Inc. used by permission by Khronos. 
+** 
+** Use, duplication or disclosure by the Government is subject to 
+** restrictions as set forth in subdivision (c)(1)(ii) of the Rights in 
+** Technical Data and Computer Software clause at DFARS 252.227-7013, and/
+** or in similar or successor clauses in the FAR, DOD or NASA FAR 
+** Supplement. Unpublished rights reserved under the Copyright Laws of 
+** the United States and other countries.
+*/
+</pre>
+</div>
+</div>
+
+
+<div class="product">
 <span class="title">gpsd</span>
 <a class="show" href="#" onclick="return toggle(this);">show license</a>
 <span class="homepage"><a href="http://git.berlios.de/cgi-bin/gitweb.cgi?p=gpsd;a=summary">homepage</a></span>
@@ -3401,6 +3450,28 @@
 
 
 <div class="product">
+<span class="title">hunspell</span>
+<a class="show" href="#" onclick="return toggle(this);">show license</a>
+<span class="homepage"><a href="http://hunspell.sourceforge.net/">homepage</a></span>
+<div class="licence">
+<pre>GPL 2.0/LGPL 2.1/MPL 1.1 tri-license
+
+The contents of this software may be used under the terms 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",
+see COPYING.LGPL) or (excepting the LGPLed GNU gettext library in the
+intl/ directory) the Mozilla Public License Version 1.1 or later
+(the "MPL", see COPYING.MPL).
+
+Software distributed under these licenses is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the licences
+for the specific language governing rights and limitations under the licenses.
+</pre>
+</div>
+</div>
+
+
+<div class="product">
 <span class="title">hunspell dictionaries</span>
 <a class="show" href="#" onclick="return toggle(this);">show license</a>
 <span class="homepage"><a href="http://wiki.services.openoffice.org/wiki/Dictionaries">homepage</a></span>
@@ -3423,6 +3494,33 @@
 
 
 <div class="product">
+<span class="title">hyphen-2.6</span>
+<a class="show" href="#" onclick="return toggle(this);">show license</a>
+<span class="homepage"><a href="http://sourceforge.net/projects/hunspell/files/Hyphen/">homepage</a></span>
+<div class="licence">
+<pre>GPL 2.0/LGPL 2.1/MPL 1.1 tri-license
+
+The contents of this software may be used under the terms 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",
+see COPYING.LGPL) or the Mozilla Public License Version 1.1 or later
+(the "MPL", see COPYING.MPL).
+
+The Plain TeX hyphenation tables "hyphen.tex" by Donald E. Knuth
+has a non MPL/LGPL compatible license, but freely redistributable:
+"Unlimited copying and redistribution of this file are permitted as long
+as this file is not modified. Modifications are permitted, but only if
+the resulting file is not named hyphen.tex."
+
+Software distributed under these licenses is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the licences
+for the specific language governing rights and limitations under the licenses.
+</pre>
+</div>
+</div>
+
+
+<div class="product">
 <span class="title">IAccessible2 COM interfaces for accessibility</span>
 <a class="show" href="#" onclick="return toggle(this);">show license</a>
 <span class="homepage"><a href="http://www.linuxfoundation.org/collaborate/workgroups/accessibility/iaccessible2">homepage</a></span>
@@ -3483,6 +3581,65 @@
 
 
 <div class="product">
+<span class="title">iccjpeg</span>
+<a class="show" href="#" onclick="return toggle(this);">show license</a>
+<span class="homepage"><a href="http://www.ijg.org">homepage</a></span>
+<div class="licence">
+<pre>LICENSE extracted from IJG's jpeg distribution:
+-----------------------------------------------
+
+In plain English:
+
+1. We don't promise that this software works.  (But if you find any bugs,
+   please let us know!)
+2. You can use this software for whatever you want.  You don't have to pay us.
+3. You may not pretend that you wrote this software.  If you use it in a
+   program, you must acknowledge somewhere in your documentation that
+   you've used the IJG code.
+
+In legalese:
+
+The authors make NO WARRANTY or representation, either express or implied,
+with respect to this software, its quality, accuracy, merchantability, or
+fitness for a particular purpose.  This software is provided "AS IS", and you,
+its user, assume the entire risk as to its quality and accuracy.
+
+This software is copyright (C) 1991-1998, Thomas G. Lane.
+All Rights Reserved except as specified below.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+software (or portions thereof) for any purpose, without fee, subject to these
+conditions:
+(1) If any part of the source code for this software is distributed, then this
+README file must be included, with this copyright and no-warranty notice
+unaltered; and any additions, deletions, or changes to the original files
+must be clearly indicated in accompanying documentation.
+(2) If only executable code is distributed, then the accompanying
+documentation must state that "this software is based in part on the work of
+the Independent JPEG Group".
+(3) Permission for use of this software is granted only if the user accepts
+full responsibility for any undesirable consequences; the authors accept
+NO LIABILITY for damages of any kind.
+
+These conditions apply to any software derived from or based on the IJG code,
+not just to the unmodified library.  If you use our work, you ought to
+acknowledge us.
+
+Permission is NOT granted for the use of any IJG author's name or company name
+in advertising or publicity relating to this software or products derived from
+it.  This software may be referred to only as "the Independent JPEG Group's
+software".
+
+We specifically permit and encourage the use of this software as the basis of
+commercial products, provided that all warranty or liability claims are
+assumed by the product vendor.
+
+</pre>
+</div>
+</div>
+
+
+<div class="product">
 <span class="title">ICU</span>
 <a class="show" href="#" onclick="return toggle(this);">show license</a>
 <span class="homepage"><a href="http://site.icu-project.org/">homepage</a></span>
@@ -3531,6 +3688,187 @@
 
 
 <div class="product">
+<span class="title">Chinese and Japanese Word List</span>
+<a class="show" href="#" onclick="return toggle(this);">show license</a>
+<span class="homepage"><a href="http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/icu42/source/data/brkitr/">homepage</a></span>
+<div class="licence">
+<pre>The list of words in cjdict.txt are obtained by combining three word
+lists listed below with further processing for compound word breaking.
+The frequency is generated with an iterative training against Google
+web corpora.
+
+* CC-CEDICT (Chinese)
+  - http://www.mdbg.net/chindict/chindict.php?page=cedict (home page)
+  - http://www.mdbg.net/chindict/export/cedict/cedict_1_0_ts_utf-8_mdbg.txt.gz (word list)
+  - It is licensed under a Creative Commons Attribution-Share Alike 3.0 License.
+    (see http://creativecommons.org/licenses/by-sa/3.0 for more details)
+
+  - The portion of words derived from CC-CEDICT is also separately available
+    in cc_cedict.txt per the above CC Attribution-Share Alike 3.0 License.
+
+* Libtabe (Chinese)
+  - https://sourceforge.net/project/?group_id=1519
+  - Its license terms and conditions are shown below.
+
+* IPADIC (Japanese)
+  - http://chasen.aist-nara.ac.jp/chasen/distribution.html
+  - Its license terms and conditions are shown below.
+
+---------COPYING.libtabe ---- BEGIN--------------------
+
+/*
+ * Copyrighy (c) 1999 TaBE Project.
+ * Copyright (c) 1999 Pai-Hsiang Hsiao.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * . Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * . Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in
+ *   the documentation and/or other materials provided with the
+ *   distribution.
+ * . Neither the name of the TaBE Project nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1999 Computer Systems and Communication Lab,
+ *                    Institute of Information Science, Academia Sinica.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * . Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * . Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in
+ *   the documentation and/or other materials provided with the
+ *   distribution.
+ * . Neither the name of the Computer Systems and Communication Lab
+ *   nor the names of its contributors may be used to endorse or
+ *   promote products derived from this software without specific
+ *   prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+Copyright 1996 Chih-Hao Tsai @ Beckman Institute, University of Illinois
+c-tsai4@uiuc.edu  http://casper.beckman.uiuc.edu/~c-tsai4
+
+---------------COPYING.libtabe-----END------------------------------------
+
+
+---------------COPYING.ipadic-----BEGIN------------------------------------
+
+Copyright 2000, 2001, 2002, 2003 Nara Institute of Science
+and Technology.  All Rights Reserved.
+
+Use, reproduction, and distribution of this software is permitted.
+Any copy of this software, whether in its original form or modified,
+must include both the above copyright notice and the following
+paragraphs.
+
+Nara Institute of Science and Technology (NAIST),
+the copyright holders, disclaims all warranties with regard to this
+software, including all implied warranties of merchantability and
+fitness, in no event shall NAIST be liable for
+any special, indirect or consequential damages or any damages
+whatsoever resulting from loss of use, data or profits, whether in an
+action of contract, negligence or other tortuous action, arising out
+of or in connection with the use or performance of this software.
+
+A large portion of the dictionary entries
+originate from ICOT Free Software.  The following conditions for ICOT
+Free Software applies to the current dictionary as well.
+
+Each User may also freely distribute the Program, whether in its
+original form or modified, to any third party or parties, PROVIDED
+that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
+on, or be attached to, the Program, which is distributed substantially
+in the same form as set out herein and that such intended
+distribution, if actually made, will neither violate or otherwise
+contravene any of the laws and regulations of the countries having
+jurisdiction over the User or the intended distribution itself.
+
+NO WARRANTY
+
+The program was produced on an experimental basis in the course of the
+research and development conducted during the project and is provided
+to users as so produced on an experimental basis.  Accordingly, the
+program is provided without any warranty whatsoever, whether express,
+implied, statutory or otherwise.  The term "warranty" used herein
+includes, but is not limited to, any warranty of the quality,
+performance, merchantability and fitness for a particular purpose of
+the program and the nonexistence of any infringement or violation of
+any right of any third party.
+
+Each user of the program will agree and understand, and be deemed to
+have agreed and understood, that there is no warranty whatsoever for
+the program and, accordingly, the entire risk arising from or
+otherwise connected with the program is assumed by the user.
+
+Therefore, neither ICOT, the copyright holder, or any other
+organization that participated in or was otherwise related to the
+development of the program and their respective officials, directors,
+officers and other employees shall be held liable for any and all
+damages, including, without limitation, general, special, incidental
+and consequential damages, arising out of or otherwise in connection
+with the use or inability to use the program or any product, material
+or result produced or otherwise obtained by using the program,
+regardless of whether they have been advised of, or otherwise had
+knowledge of, the possibility of such damages at any time during the
+project or thereafter.  Each user will be deemed to have agreed to the
+foregoing by his or her commencement of use of the program.  The term
+"use" as used herein includes, but is not limited to, the use,
+modification, copying and distribution of the program and the
+production of secondary products from the program.
+
+In the case where the program, whether in its original form or
+modified, was distributed or delivered to or received by a user from
+any person, organization or entity other than ICOT, unless it makes or
+grants independently of ICOT any specific warranty to the user in
+writing, such person, organization or entity, will also be exempted
+from and not be held liable to the user for any such damages as noted
+above as far as the program is concerned.
+
+---------------COPYING.ipadic-----END------------------------------------
+</pre>
+</div>
+</div>
+
+
+<div class="product">
 <span class="title">ISimpleDOM COM interfaces for accessibility</span>
 <a class="show" href="#" onclick="return toggle(this);">show license</a>
 <span class="homepage"><a href="http://www.mozilla.org/access/windows/at-apis">homepage</a></span>
@@ -3963,6 +4301,46 @@
 
 
 <div class="product">
+<span class="title">libvpx</span>
+<a class="show" href="#" onclick="return toggle(this);">show license</a>
+<span class="homepage"><a href="http://www.webmproject.org">homepage</a></span>
+<div class="licence">
+<pre>Copyright (c) 2010, Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+</pre>
+</div>
+</div>
+
+
+<div class="product">
 <span class="title">libwebpdecode</span>
 <a class="show" href="#" onclick="return toggle(this);">show license</a>
 <span class="homepage"><a href="http://code.google.com/speed/webp">homepage</a></span>
@@ -5031,41 +5409,6 @@
 
 
 <div class="product">
-<span class="title">SCons</span>
-<a class="show" href="#" onclick="return toggle(this);">show license</a>
-<span class="homepage"><a href="http://www.scons.org">homepage</a></span>
-<div class="licence">
-<pre>        Copyright and license for SCons - a software construction tool
-
-        This copyright and license do not apply to any other software
-        with which this software may have been included.
-
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</pre>
-</div>
-</div>
-
-
-<div class="product">
 <span class="title">simplejson</span>
 <a class="show" href="#" onclick="return toggle(this);">show license</a>
 <span class="homepage"><a href="http://undefined.org/python/#simplejson">homepage</a></span>