diff options
author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-12 20:12:47 +0000 |
---|---|---|
committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-12 20:12:47 +0000 |
commit | 4b6c04f4c1be73ade992d60cadf6c331fac07b92 (patch) | |
tree | 2058b24209abab1fa7041eddeebdf230bb05c967 /chrome/app | |
parent | 98ad1cc6839fac2db5a8c22cb9429dfc8f20f407 (diff) | |
download | chromium_src-4b6c04f4c1be73ade992d60cadf6c331fac07b92.zip chromium_src-4b6c04f4c1be73ade992d60cadf6c331fac07b92.tar.gz chromium_src-4b6c04f4c1be73ade992d60cadf6c331fac07b92.tar.bz2 |
Oops, missed some changes to the English Terms of Service the first time.
BUG=none
TEST=two URLs in 6.1, and section 8.7 exists
Review URL: http://codereview.chromium.org/1574023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/resources/terms/terms_en-GB.html | 3 | ||||
-rw-r--r-- | chrome/app/resources/terms/terms_en.html | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/app/resources/terms/terms_en-GB.html b/chrome/app/resources/terms/terms_en-GB.html index df18a35..57122f2 100644 --- a/chrome/app/resources/terms/terms_en-GB.html +++ b/chrome/app/resources/terms/terms_en-GB.html @@ -53,7 +53,7 @@ function carry_tracking(obj) { <p>5.3 Unless you have been specifically permitted to do so in a separate agreement with Google, you agree that you will not reproduce, duplicate, copy, sell, trade or resell the Services for any purpose.</p> <p>5.4 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the Terms and for the consequences (including any loss or damage that Google may suffer) of any such breach.</p> <p><strong>6. Privacy and your personal information</strong></p> -<p>6.1 For information about Google’s data protection practices, please read Google’s privacy policy at http://www.google.co.uk/privacy.html. This policy explains how Google treats your personal information and protects your privacy when you use the Services.</p> +<p>6.1 For information about Google’s data protection practices, please read Google’s privacy policy at http://www.google.co.uk/privacy.html and at http://www.google.com/chrome/intl/en-GB/privacy.html. This policy explains how Google treats your personal information and protects your privacy when you use the Services.</p> <p>6.2 You agree to the use of your data in accordance with Google’s privacy policies.</p> <p><strong>7. Content in the Services</strong></p> <p>7.1 You understand that all information (such as data files, written text, computer software, music, audio files or other sounds, photographs, videos or other images) that you may have access to as part of, or through your use of the Services are the sole responsibility of the person from which such content originated. All such information is referred to below as the “Content”.</p> @@ -68,6 +68,7 @@ function carry_tracking(obj) { <p>8.4 Google acknowledges and agrees that it obtains no right, title or interest from you (or your licensors) under these Terms in or to any Content that you submit, post, transmit or display on or through the Services, including any intellectual property rights which subsist in that Content (whether those rights happen to be registered or not, and wherever in the world those rights may exist). Unless you have agreed otherwise in writing with Google, you agree that you are responsible for protecting and enforcing those rights and that Google has no obligation to do so on your behalf.</p> <p>8.5 You agree that you shall not remove, obscure or alter any proprietary rights notices (including copyright and trade-mark notices) that may be affixed to or contained within the Services.</p> <p>8.6 Unless you have been expressly authorised to do so in writing by Google, you agree that in using the Services, you will not use any trade mark, service mark, trade name, logo of any company or organisation in a way that is likely or intended to cause confusion about the owner or authorised user of such marks, names or logos.</p> +<p>8.7 THIS PRODUCT IS LICENSED UNDER THE AVC PATENT PORTFOLIO LICENCE FOR THE PERSONAL AND NON-COMMERCIAL USE OF A CONSUMER TO (i) ENCODE VIDEO IN COMPLIANCE WITH THE AVC STANDARD (“AVC VIDEO”) AND/OR (ii) DECODE AVC VIDEO THAT WAS ENCODED BY A CONSUMER ENGAGED IN A PERSONAL AND NON-COMMERCIAL ACTIVITY AND/OR WAS OBTAINED FROM A VIDEO PARTNER LICENSED TO PROVIDE AVC VIDEO. NO LICENCE IS GRANTED OR SHALL BE IMPLIED FOR ANY OTHER USE. ADDITIONAL INFORMATION MAY BE OBTAINED FROM MPEG LA, L.L.C. SEE HTTP://WWW.MPEGLA.COM.</p> <p><strong>9. Licence from Google</strong></p> <p>9.1 Google gives you a personal, worldwide, royalty-free, non-assignable and non-exclusive licence to use the software provided to you by Google as part of the Services provided to you by Google (referred to as the “Software” below). This licence is for the sole purpose of enabling you to use and enjoy the benefit of the Services as provided by Google, in the manner permitted by the Terms.</p> <p>9.2 Subject to section 1.2, you may not (and you may not permit anyone else to) copy, modify, create a derivative work of, reverse-engineer, decompile or otherwise attempt to extract the source code of the Software or any part thereof, unless this is expressly permitted or required by law or unless you have been specifically told that you may do so by Google, in writing.</p> diff --git a/chrome/app/resources/terms/terms_en.html b/chrome/app/resources/terms/terms_en.html index 545064e..c4ab134 100644 --- a/chrome/app/resources/terms/terms_en.html +++ b/chrome/app/resources/terms/terms_en.html @@ -53,7 +53,7 @@ function carry_tracking(obj) { <p>5.3 Unless you have been specifically permitted to do so in a separate agreement with Google, you agree that you will not reproduce, duplicate, copy, sell, trade or resell the Services for any purpose.</p> <p>5.4 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the Terms and for the consequences (including any loss or damage which Google may suffer) of any such breach.</p> <p><strong>6. Privacy and your personal information</strong></p> -<p>6.1 For information about Google’s data protection practices, please read Google’s privacy policy at http://www.google.com/privacy.html. This policy explains how Google treats your personal information, and protects your privacy, when you use the Services.</p> +<p>6.1 For information about Google’s data protection practices, please read Google’s privacy policy at http://www.google.com/privacy.html and at http://www.google.com/chrome/intl/en/privacy.html. This policy explains how Google treats your personal information, and protects your privacy, when you use the Services.</p> <p>6.2 You agree to the use of your data in accordance with Google’s privacy policies.</p> <p><strong>7. Content in the Services</strong></p> <p>7.1 You understand that all information (such as data files, written text, computer software, music, audio files or other sounds, photographs, videos or other images) which you may have access to as part of, or through your use of, the Services are the sole responsibility of the person from which such content originated. All such information is referred to below as the “Content.”</p> @@ -68,6 +68,7 @@ function carry_tracking(obj) { <p>8.4 Google acknowledges and agrees that it obtains no right, title or interest from you (or your licensors) under these Terms in or to any Content that you submit, post, transmit or display on, or through, the Services, including any intellectual property rights which subsist in that Content (whether those rights happen to be registered or not, and wherever in the world those rights may exist). Unless you have agreed otherwise in writing with Google, you agree that you are responsible for protecting and enforcing those rights and that Google has no obligation to do so on your behalf.</p> <p>8.5 You agree that you shall not remove, obscure, or alter any proprietary rights notices (including copyright and trade mark notices) which may be affixed to or contained within the Services.</p> <p>8.6 Unless you have been expressly authorized to do so in writing by Google, you agree that in using the Services, you will not use any trade mark, service mark, trade name, logo of any company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.</p> +<p>8.7 THIS PRODUCT IS LICENSED UNDER THE AVC PATENT PORTFOLIO LICENSE FOR THE PERSONAL AND NON-COMMERCIAL USE OF A CONSUMER TO (i) ENCODE VIDEO IN COMPLIANCE WITH THE AVC STANDARD (“AVC VIDEO”) AND/OR (ii) DECODE AVC VIDEO THAT WAS ENCODED BY A CONSUMER ENGAGED IN A PERSONAL AND NON-COMMERCIAL ACTIVITY AND/OR WAS OBTAINED FROM A VIDEO PARTNER LICENSED TO PROVIDE AVC VIDEO. NO LICENSE IS GRANTED OR SHALL BE IMPLIED FOR ANY OTHER USE. ADDITIONAL INFORMATION MAY BE OBTAINED FROM MPEG LA, L.L.C. SEE HTTP://WWW.MPEGLA.COM.</p> <p><strong>9. License from Google</strong></p> <p>9.1 Google gives you a personal, worldwide, royalty-free, non-assignable and non-exclusive license to use the software provided to you by Google as part of the Services as provided to you by Google (referred to as the “Software” below). This license is for the sole purpose of enabling you to use and enjoy the benefit of the Services as provided by Google, in the manner permitted by the Terms.</p> <p>9.2 Subject to section 1.2, you may not (and you may not permit anyone else to) copy, modify, create a derivative work of, reverse engineer, decompile or otherwise attempt to extract the source code of the Software or any part thereof, unless this is expressly permitted or required by law, or unless you have been specifically told that you may do so by Google, in writing.</p> |