Bug 1524032 - Update SeaMonkey about:right for SeaMonkey e.V. r=IanN
authorRicardo Palomares <rpmdisguise-nave@yahoo.es>
Sun, 03 Feb 2019 22:20:25 +0100
changeset 11076 01c80ede3996
parent 11075 281d09a13f69
child 11077 ddc7c5f8e29a
push id116
push userfrancesco.lodolo@mozillaitalia.org
push dateThu, 07 Feb 2019 11:55:15 +0000
reviewersIanN
bugs1524032
Bug 1524032 - Update SeaMonkey about:right for SeaMonkey e.V. r=IanN X-Channel-Repo: comm-central X-Channel-Converted-Revision: 40fc0f9bc45ad1c3135e6025c3997bd10d7e1eff X-Channel-Repo: releases/comm-beta X-Channel-Revision: 56d23c07d815137aaa90810b3c846b60253a4fc3 X-Channel-Repo: releases/comm-release X-Channel-Revision: 37e71a51014ab3c6ed6532d776e7d313580f41bc
suite/chrome/branding/aboutRights.dtd
suite/chrome/branding/aboutRights.properties
--- a/suite/chrome/branding/aboutRights.dtd
+++ b/suite/chrome/branding/aboutRights.dtd
@@ -15,22 +15,22 @@
      chunk, it can be left blank.
 
      Also note the leading/trailing whitespace in strings here, which is
      deliberate for formatting around the embedded links. -->
 <!ENTITY rights.intro-point1a "&brandShortName; is made available to you under the terms of the ">
 <!ENTITY rights.intro-point1b "Mozilla Public License">
 <!ENTITY rights.intro-point1c ". This means you may use, copy and distribute &brandShortName; to others.  You are also welcome to modify the source code of &brandShortName; as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.">
 
-<!ENTITY rights.intro-point2a "Mozilla does not grant you any rights to the Mozilla and SeaMonkey trademarks or logos. Additional information on Trademarks may be found ">
+<!ENTITY rights.intro-point2a "SeaMonkey e.V does not grant you any rights to the SeaMonkey trademarks or logos. Additional information on Trademarks may be found ">
 <!ENTITY rights.intro-point2b "here">
 <!ENTITY rights.intro-point2c ".">
 
 <!-- point 2d is technically point 3. in the list -->
-<!ENTITY rights.intro-point2d "Some features in &brandShortName;, such as the Crash Reporter, give you the option to provide feedback to &vendorShortName;. By choosing to submit feedback, you give &vendorShortName; and Mozilla permission to use the feedback to improve their applications, to publish the feedback on their websites, and to distribute the feedback.">
+<!ENTITY rights.intro-point2d "Some features in &brandShortName;, such as the Crash Reporter, give you the option to provide feedback to &vendorShortName;. By choosing to submit feedback, you give &vendorShortName; permission to use the feedback to improve their applications, to publish the feedback on their websites, and to distribute the feedback.">
 
 <!-- point 3 text for official branded builds -->
 <!ENTITY rights.intro-point3a "Privacy policies for &vendorShortName;'s products may be found ">
 <!ENTITY rights.intro-point3b "here">
 <!ENTITY rights.intro-point3c ".">
 
 <!-- point 4 text for official branded builds -->
 <!ENTITY rights2.intro-point4a "&brandShortName; offers optional website information services, such as Add-on or Safe Browsing services; however, we cannot guarantee that they are 100&#37; accurate or error-free. More details, including information on how to disable the services, can be found in the ">
@@ -68,16 +68,16 @@
 <!ENTITY rights.locationawarebrowsing-a "Location Aware Browsing: ">
 <!ENTITY rights.locationawarebrowsing-b "is always opt-in.  No location information is ever sent without your permission.  If you wish to disable the feature completely, follow these steps:">
 <!ENTITY rights.locationawarebrowsing-term1 "Open the application preferences">
 <!ENTITY rights.locationawarebrowsing-term2 "Select the main &security.label; panel">
 <!ENTITY rights.locationawarebrowsing-term3 "Select the option to &quot;&geoDisabled.label;&quot;">
 <!ENTITY rights.locationawarebrowsing-term4 "Location Aware Browsing is now disabled">
 
 <!-- points 0-6 text for branded builds -->
-<!ENTITY rights.webservices-term0 "&vendorShortName; and Mozilla along with their contributors, licensors, and partners work to provide the most accurate and up-to-date Services.  However, we cannot guarantee that this information is comprehensive and error-free.  For example, the Safe Browsing Service may not identify some risky sites and may identify some safe sites in error and the Location Aware Service all locations returned by our service providers are estimates only. Neither we nor our service providers guarantee the accuracy of the locations provided.">
+<!ENTITY rights.webservices-term0 "&vendorShortName; along with their contributors, licensors, and partners work to provide the most accurate and up-to-date Services.  However, we cannot guarantee that this information is comprehensive and error-free.  For example, the Safe Browsing Service may not identify some risky sites and may identify some safe sites in error and the Location Aware Service all locations returned by our service providers are estimates only. Neither we nor our service providers guarantee the accuracy of the locations provided.">
 <!ENTITY rights.webservices-term1 "&vendorShortName; may discontinue or change the Services at its discretion.">
 <!ENTITY rights.webservices-term2 "You are welcome to use these Services with the accompanying version of &brandShortName;, and you have all the rights necessary to do so. &vendorShortName; and its licensors reserve all other rights in the Services. These terms are not intended to limit any rights granted under open source licenses applicable to &brandShortName; and to corresponding source code versions of &brandShortName;.">
 <!ENTITY rights.webservices-term3 "The Services are provided &quot;as-is.&quot;  &vendorShortName;, its contributors, licensors, and distributors, disclaim all warranties, whether express or implied, including without limitation, warranties that the Services are merchantable and fit for your particular purposes.  You bear the entire risk as to selecting the Services for your purposes and as to the quality and performance of the Services. Some jurisdictions do not allow the exclusion or limitation of implied warranties, so this disclaimer may not apply to you.">
 <!ENTITY rights.webservices-term4 "Except as required by law, &vendorShortName;, its contributors, licensors, and distributors will not be liable for any indirect, special, incidental, consequential, punitive, or exemplary damages arising out of or in any way relating to the use of &brandShortName; and the Services.  The collective liability under these terms will not exceed $500 (five hundred dollars). Some jurisdictions do not allow the exclusion or limitation of certain damages, so this exclusion and limitation may not apply to you.">
 <!ENTITY rights.webservices-term5 "&vendorShortName; may update these terms as necessary from time to time. These terms may not be modified or cancelled without &vendorShortName;'s written agreement.">
-<!ENTITY rights.webservices-term6 "These terms are governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions. If any portion of these terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.">
+<!ENTITY rights.webservices-term6 "These terms are governed by and construed in accordance with the laws of Germany and all disputes arising in connection with these Terms shall be submitted to the exclusive jurisdiction of the competent court in Germany. If any portion of these terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.">
 
--- a/suite/chrome/branding/aboutRights.properties
+++ b/suite/chrome/branding/aboutRights.properties
@@ -1,7 +1,7 @@
 # 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/.
 
 buttonLabel = Know your rights
 buttonAccessKey = K
-notifyRightsText = %S is free and open software from the non-profit Mozilla Foundation.
+notifyRightsText = %S is free and open software from the German registered association SeaMonkey e.V.