diff --git a/browser/components/preferences/privacy.xul b/browser/components/preferences/privacy.xul index ddb841280d2..e65fe4be09c 100644 --- a/browser/components/preferences/privacy.xul +++ b/browser/components/preferences/privacy.xul @@ -50,6 +50,7 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> diff --git a/browser/locales/en-US/chrome/help/cookies.xhtml b/browser/locales/en-US/chrome/help/cookies.xhtml index 1aee21a8c69..a78598fe7f8 100644 --- a/browser/locales/en-US/chrome/help/cookies.xhtml +++ b/browser/locales/en-US/chrome/help/cookies.xhtml @@ -65,16 +65,14 @@ Contributors: &brandShortName;:

    -
  1. Select &pref.menuPath;.
    2. -
  2. Click the Privacy panel, and then click on the Cookies - tab.
    3. -
  3. Select the until I close &brandShortName; &pref.singular; from - the Keep Cookies combo box.
    4. +
  4. Select &pref.menuPath; and open the Privacy panel.
    5. +
  5. Select the I close &brandShortName; &pref.singular; from the + Keep until menu.

If you want to grant sites you trust the ability to store cookies permanently - (e.g., to allow you to log in automatically to a site), click - Exceptions, enter the site address, + (e.g., to allow you to log in automatically to a site), click Exceptions..., enter the site address, and click Allow.

All the Settings

@@ -83,59 +81,35 @@ Contributors: &brandShortName;:

-
Allow sites to set cookies
+
Accept cookies from sites

If you don't want any sites to store cookies on your computer, uncheck this &pref.singular;. Note that some sites may not work properly when cookies are disabled. If you want to grant certain sites the ability to - store cookies, open the Cookies Exceptions - Window by clicking Exceptions, enter the site address, and - click Allow or Allow for Session.

-
for the originating web site only
-
-

If &brandShortName; stores a site's cookie, it will return the cookie - only to that particular site. &brandShortName; will not provide one site - with cookies set by another. Since a web site can only receive its own - cookies, it can learn about your activities while you are at that site - but not your activities in general while surfing the Web.

-

However, sometimes a web site displays content that is hosted on another - site. That content can be anything from an image to text or an - advertisement. The other web site that hosts also has the ability to - store a cookie in &brandShortName;, even though you haven't visited the - site directly.

-

Cookies that are stored by a site other than the one you are visiting - are called third-party cookies or foreign cookies. Web sites sometimes - use third-party cookies with transparent GIFs, which are special images - that help sites count users, track email responses, learn more about how - visitors use the site, or customize your browsing experience. - (Transparent GIFs are also known as web beacons or web bugs.) When this - checkbox is checked, it blocks these foreign cookies from being - stored.

-
-
unless I have removed Cookies set by the site
-

If you remove Cookies in the View Cookies dialog while this - checkbox is checked, &brandShortName; won't allow the respective sites to - store cookies again.

-
Keep Cookies:
+ store cookies, open the Cookies Exceptions + window by clicking Exceptions..., enter the site address, and click + Allow or Allow for Session.

+
Keep until
    -
  • until they expire: If this &pref.singular; is selected, - each cookie will be removed when it reaches its expiration date.
    • -
  • until I close &brandShortName;: If this &pref.singular; - is selected, cookies will be removed when you restart - &brandShortName;. Web sites requiring the use of cookies will still - work, but if you restart &brandShortName;, the web site will think that - you logged into the site for the first time again.
    • -
  • ask me every time: Display an alert every time a web - site tries to store a cookie to ask you if you want that cookie - stored.
    • +
  • they expire
    + If this &pref.singular; is selected, each cookie will be removed when the + site that set it has determined the cookie should expire.
    • +
  • I close &brandShortName;
    + If this &pref.singular; is selected, cookies will be removed when you + restart &brandShortName;. Web sites requiring the use of cookies will + still work, but if you restart &brandShortName;, the web site will think + that you logged into the site for the first time again.
    • +
  • ask me every time
    + Display an alert every time a web site tries to store a cookie asking you + if you want that cookie stored.

Accepting and Blocking Cookies

-

If you've chosen ask me every time from the Keep Cookies - combo box, you'll see a dialog whenever a site tries to store a cookie on your +

If you've chosen ask me every time from the Keep until + menu, you'll see a dialog whenever a site tries to store a cookie on your computer providing the following options:

@@ -153,13 +127,13 @@ Contributors:
Use my choice for all cookies from this site
Select this checkbox before clicking any of the buttons if you want &brandShortName; to remember your decision and not ask again. The site will - be added to the Cookie Exceptions Window, + be added to the Cookie Exceptions window, where you can revert your choice should you wish to do so later.

The Cookies Exceptions Window

-

Access this window by clicking the Exceptions button in cookies +

Access this window by clicking the Exceptions... button in cookies &pref.plural;. Here you can make exceptions from your general cookies &pref.plural; for specific sites. Using exceptions, you can allow all cookies, reject all cookies, or allow all cookies but have them deleted when you exit @@ -187,12 +161,9 @@ Contributors:

To remove a cookie from the list, select it and click Remove Cookie. To remove a site's cookies, select the site and click Remove - Cookie(s). To wipe all cookies, click Remove All Cookies. - (This is the same as clicking the Clear Cookies Now button from the - Cookies tab of the - Privacy panel of the &pref.pluralCaps; window.)

+ Cookie(s). To wipe all cookies, click Remove All Cookies.

-
07 July 2005
+
12 September 2006

Copyright © 2003-2006 Contributors to the Mozilla Help Viewer Project.

diff --git a/browser/locales/en-US/chrome/help/customization.xhtml b/browser/locales/en-US/chrome/help/customization.xhtml index 5527af23311..fe802e6b7cc 100644 --- a/browser/locales/en-US/chrome/help/customization.xhtml +++ b/browser/locales/en-US/chrome/help/customization.xhtml @@ -172,7 +172,7 @@ Contributors:

Configuring Extensions

Extensions often provide a dialog to configure their functionality. To open - the preferences dialog of an extension, select the Extensions panel, select + the &pref.plural; dialog of an extension, select the Extensions panel, select the extension of your choice, and click its &pref.pluralCaps; button, or simply double-click the extension.

@@ -182,7 +182,7 @@ Contributors: theme of your choice, and click its Use Theme button. You need to restart &brandShortName; for changes to take effect.

-
25 August 2006
+
12 September 2006

Copyright © 2003-2006 Contributors to the Mozilla Help Viewer Project.

diff --git a/browser/locales/en-US/chrome/help/download_manager.xhtml b/browser/locales/en-US/chrome/help/download_manager.xhtml index 7ddfc332d48..49a2f96bc49 100644 --- a/browser/locales/en-US/chrome/help/download_manager.xhtml +++ b/browser/locales/en-US/chrome/help/download_manager.xhtml @@ -84,12 +84,12 @@ Contributors:

Download Manager &pref.pluralCaps;

The &pref.plural; for the Download Manager are accessible by opening the - Downloads panel in the &pref.pluralCaps; window. They allow - you to change several downloading &pref.plural;. More information regarding - the various &pref.plural; is available in the - &pref.pluralCaps; page.

+ Downloads section of the Main panel in the &pref.pluralCaps; window. + They allow you to change several downloading &pref.plural;. More information + regarding the various &pref.plural; is available in the &pref.pluralCaps; page.

-
21 October 2005
+
12 September 2006

Copyright © 2003-2006 Contributors to the Mozilla Help Viewer Project.

diff --git a/browser/locales/en-US/chrome/help/firebird-toc.rdf b/browser/locales/en-US/chrome/help/firebird-toc.rdf index ed7d11fd961..67f05e04fec 100644 --- a/browser/locales/en-US/chrome/help/firebird-toc.rdf +++ b/browser/locales/en-US/chrome/help/firebird-toc.rdf @@ -6,6 +6,7 @@ ]> @@ -414,7 +415,9 @@ - + + + - - - - - - - - + +
    • +
    • +
    • +
    • +
    • +
    • +
    • +     - + + + +
    • +
    • +
    • +     +     +     + + + + +
    • +
    • +
    • +     +     +     + + - - - +
    • +
    • +
    • -     - - +     + + - - - - - - - - - + +
    • +
    • +     -     - - + + + - - - - + +
    • +
    • +
    • +
    • +     -     - - - - - - - - - - - - - - - - - - - - - +     diff --git a/browser/locales/en-US/chrome/help/menu_reference.xhtml b/browser/locales/en-US/chrome/help/menu_reference.xhtml index 7045df26472..eeeaac1c252 100644 --- a/browser/locales/en-US/chrome/help/menu_reference.xhtml +++ b/browser/locales/en-US/chrome/help/menu_reference.xhtml @@ -53,7 +53,7 @@ Contributors: &brandShortName; completely. If you happen to select this menu item with more than one tab or window open, &brandShortName; will ask you to confirm your choice to prevent accidental exits. You can switch off this warning - by deselecting the Warn when closing multiple tabs checkbox in + by deselecting the Warn me when closing multiple tabs checkbox in the Tabs panel of &pref.menuPath;. &brandShortName; will also warn you if you are currently downloading any files.

    @@ -125,7 +125,7 @@ Contributors: &brandShortName; completely. If you happen to select this menu item with more than one tab or window open, &brandShortName; will ask you to confirm your choice to prevent accidental exits. You can switch off this warning - by deselecting the Warn when closing multiple tabs checkbox in + by deselecting the Warn me when closing multiple tabs checkbox in the Tabs panel of &pref.menuPath;. &brandShortName; will also warn you if you are currently downloading any files.

    @@ -281,7 +281,7 @@ Contributors:

    Home

    Displays your home page. This is the same as clicking on the Home button on the navigation toolbar. To change the home page, - select &pref.menuPath; and open the General panel. You + select &pref.menuPath; and open the Main panel. You can specify to use a blank page, the current page (or tab group), a bookmark, or a manually entered address.

    @@ -408,7 +408,7 @@ Contributors: the current version and a brief list of credits.

    -
    25 August 2006
    +
    12 September 2006

    Copyright © 2003-2006 Contributors to the Mozilla Help Viewer Project.

    diff --git a/browser/locales/en-US/chrome/help/popup.xhtml b/browser/locales/en-US/chrome/help/popup.xhtml index 05e3c1b2d95..dfb7ed7b0f3 100644 --- a/browser/locales/en-US/chrome/help/popup.xhtml +++ b/browser/locales/en-US/chrome/help/popup.xhtml @@ -65,13 +65,13 @@ popups, some web sites may show popups using uncovered methods, even when blocke -

    The Popup Blocker &pref.pluralCaps; are located in the Content panel of -&pref.menuPath;.

    +

    The Popup Blocker &pref.pluralCaps; are located in the Content panel of &pref.menuPath;.

    From there, you can do the following things:

    @@ -113,8 +113,8 @@ Contributors:
    Instead of using only one web page as your homepage, you can make your home page a set of tabs. Select your favorite web sites and open them in tabs in a single window. Select &pref.menuPath; and open the General panel. Under - Home Page, press the Use Current Pages button. Now + href="prefs.xhtml#main_options">General panel. Under + Startup, press the Use Current Pages button. Now when you press the Home button, your favorite web sites will load with just a click.
    @@ -130,7 +130,7 @@ Contributors: -
    26 July 2006
    +
    12 September 2006

    Copyright © 2003-2006 Contributors to the Mozilla Help Viewer Project.

    diff --git a/browser/locales/en-US/chrome/help/using_firebird.xhtml b/browser/locales/en-US/chrome/help/using_firebird.xhtml index eb57fa06a37..034623a462d 100644 --- a/browser/locales/en-US/chrome/help/using_firebird.xhtml +++ b/browser/locales/en-US/chrome/help/using_firebird.xhtml @@ -493,8 +493,8 @@ Contributors: open the Content panel, and click the Manage... button in the File Types section. You can change the action for a file type or remove it. - More information about this dialog is available in the respective section of - Download &pref.pluralCaps;.

    + More information about this dialog is available in File Types &pref.plural;.

    When you click on a file and &brandShortName; doesn't know how to handle it, an Opening dialog box is displayed, offering these choices:

    @@ -552,7 +552,7 @@ Contributors: &brandShortName;'s Navigation Toolbar. &brandShortName; then loads and displays the latest version of the page.

    -
    08 September 2006
    +
    12 September 2006

    Copyright © 2003-2006 Contributors to the Mozilla Help Viewer Project.