Permalink
Browse files

Bug 812955 : [Settings] Tweaked for legal and add privacy links r=ehu…

…ng r=stas
  • Loading branch information...
1 parent 347a8bd commit c815b2d6718f3904e864aeddc86f5b32924f175c @rexboy7 rexboy7 committed with julienw Dec 5, 2012
View
@@ -1656,14 +1656,14 @@ <h2 data-l10n-id="devSettings"> Developer Settings </h2>
-->
</section>
- <!-- Device :: Information :: About Your Rights -->
+ <!-- Device :: Information :: Your Rights -->
<section role="region" hidden id="about-yourRights">
<!--
<header>
<button type="reset">
<span data-l10n-id="back" class="icon icon-back">Back</span>
</button>
- <h1 data-l10n-id="about-your-rights"> About Your Rights </h1>
+ <h1 data-l10n-id="your-rights"> Your Rights </h1>
</header>
<ul>
@@ -1696,22 +1696,33 @@ <h1 data-l10n-id="about-your-rights"> About Your Rights </h1>
-->
</section>
- <!-- Device :: Information :: About Your Privacy -->
+ <!-- Device :: Information :: Your Privacy -->
<section role="region" hidden id="about-yourPrivacy">
<!--
<header>
<button type="reset">
<span data-l10n-id="back" class="icon icon-back">Back</span>
</button>
- <h1 data-l10n-id="about-your-privacy"> About Your Privacy </h1>
+ <h1 data-l10n-id="your-privacy"> Your Privacy </h1>
</header>
+ <header>
+ <h2> Mozilla </h2>
+ </header>
<ul>
- <li class="privacy-menuitem privacy-browserOS">
- <a href="https://www.mozilla.org/legal/privacy/firefox.html">Browser OS</a>
+ <li>
+ <a class="privacy-menuitem privacy-browserOS" href="https://www.mozilla.org/legal/privacy/firefox.html" data-l10n-id="brandShortName">B2G OS</a>
</li>
- <li class="privacy-menuitem privacy-everythingME">
- <a href="http://corp.everything.me/#/privacy">everything.me</a>
+ <li>
+ <a class="privacy-menuitem privacy-marketPlace" href="https://marketplace.firefox.com/privacy-policy">Marketplace</a>
+ </li>
+ </ul>
+ <header>
+ <h2 data-l10n-id="about-other"> Other </h2>
+ </header>
+ <ul>
+ <li>
+ <a class="privacy-menuitem privacy-everythingME" href="http://corp.everything.me/privacy">everything.me</a>
</li>
</ul>
-->
@@ -1824,13 +1835,13 @@ <h2 data-l10n-id="aboutBrowserOS"> About Browser OS </h2>
<li>
<label>
<button data-href="#about-yourRights"
- data-l10n-id="about-your-rights"> About Your Rights </button>
+ data-l10n-id="your-rights"> Your Rights </button>
</label>
</li>
<li>
<label>
<button data-href="#about-yourPrivacy"
- data-l10n-id="about-your-privacy"> About Your Privacy </button>
+ data-l10n-id="your-privacy"> Your Privacy </button>
</label>
</li>
<li>
@@ -407,16 +407,16 @@ reset-phone=Reset Phone
reset-warning-1= CAUTION: Resetting will erase all your data, including any apps you’ve purchased.
reset-warning-2= The phone will be restored to its factory condition. None of your settings or data will be saved.
# LOCALIZATION NOTE: the licensing* strings below aren’t ready for translation yet.
-about-your-rights = About your rights
+your-rights = Your Rights
about-your-rights-0 = {{brandShortName}} is built on free and open source software by a community of thousands from all over the world. There are a few things you should know:
about-your-rights-1 = {{brandShortName}} is made available to you under the terms of several open source licenses including the Mozilla Public License. A device running {{brandShortName}} may also contain proprietary software from third parties. Any code provided under open licenses give you the right to modify the source code and distribute your modified versions as long as you comply with their terms.
about-your-rights-2 = You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the {{brandShortName}} name or logo.
about-your-rights-3 = Some features in {{brandShortName}}, such as the Crash Reporter, give you the option to provide feedback to Mozilla. By choosing to submit feedback, you give Mozilla permission to use the feedback to improve its products, to publish the feedback on its websites, and to distribute the feedback.
-about-your-privacy = About your privacy
about-legal-info = Legal Information
open-source-notices = Open Source Notices
about-mozilla = Mozilla
about-other = Other
+your-privacy = Your Privacy
licensing-1 = Binaries of this product have been made available to you by the Mozilla Project, under the Mozilla Public License 2.0 (MPL). Know your rights.
licensing-2 = All of the source code to this product is available under licenses that are both free and open source. Most of it is available under the Mozilla Public License 2.0 (MPL).
licensing-3 = The remainder of the software that is not under the Mozilla Public License 2.0 MPL is available under one of a variety of other licenses. Those that require reproduction of the license text in the distribution are given below. (Note: Your copy of this product may not contain code covered by one or more of the licenses listed here, depending on the exact product and version you choose.)
@@ -279,8 +279,9 @@
*/
.privacy-menuitem {
+ padding-left: 5.5rem;
background-repeat: no-repeat;
- background-position: right 3rem top 50%; /* same position as for Wi-Fi signal levels */
+ background-position: 1.4rem center;
}
.privacy-browserOS {
@@ -291,6 +292,9 @@
background-image: -moz-image-rect(url(images/privacy_sprite.png), 0, 64, 32, 32);
}
+.privacy-marketPlace {
+ background-image: -moz-image-rect(url(images/privacy_sprite.png), 0, 96, 32, 64);
+}
/******************************************************************************
* Right-To-Left layout
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c815b2d

Please sign in to comment.