bug 341899 - document the prefwindow reorg, patch by Ryan Flint (rflint@dslr.net), Jeff Walden (jwalden+bmo@mit.edu) and Eric Shepherd (eshepherd@mozilla.com) r=me

This commit is contained in:
mconnor%steelgryphon.com 2006-09-13 15:10:44 +00:00
Родитель 7d3a6014fe
Коммит 1223aa030f
10 изменённых файлов: 651 добавлений и 569 удалений

Просмотреть файл

@ -50,6 +50,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<prefpane id="panePrivacy" onpaneload="gPrivacyPane.init();"
helpTopic="prefs-privacy"
helpURI="chrome://browser/locale/help/help.rdf">
<preferences id="privacyPreferences">

Просмотреть файл

@ -65,16 +65,14 @@ Contributors:
&brandShortName;:</p>
<ol>
<li>Select &pref.menuPath;.</li>
<li>Click the <em>Privacy</em> panel, and then click on the <em>Cookies</em>
tab.</li>
<li>Select the <em>until I close &brandShortName;</em> &pref.singular; from
the <em>Keep Cookies</em> combo box.</li>
<li>Select &pref.menuPath; and open the <em>Privacy</em> panel.</li>
<li>Select the <em>I close &brandShortName;</em> &pref.singular; from the
<em>Keep until</em> menu.</li>
</ol>
<p>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
<a href="#cookies_exceptions"><em>Exceptions</em></a>, enter the site address,
(e.g., to allow you to log in automatically to a site), click <a
href="#cookies_exceptions"><em>Exceptions...</em></a>, enter the site address,
and click <em>Allow</em>.</p>
<h3 id="all_the_settings">All the Settings</h3>
@ -83,59 +81,35 @@ Contributors:
&brandShortName;:</p>
<dl>
<dt>Allow sites to set cookies</dt>
<dt>Accept cookies from sites</dt>
<dd><p>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 <a href="#cookies_exceptions">Cookies Exceptions
Window</a> by clicking <em>Exceptions</em>, enter the site address, and
click <em>Allow</em> or <em>Allow for Session</em>.</p></dd>
<dt>for the originating web site only</dt>
<dd>
<p>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.</p>
<p>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.</p>
<p>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.</p>
</dd>
<dt>unless I have removed Cookies set by the site</dt>
<dd><p>If you remove Cookies in the <em>View Cookies</em> dialog while this
checkbox is checked, &brandShortName; won't allow the respective sites to
store cookies again.</p></dd>
<dt>Keep Cookies:</dt>
store cookies, open the <a href="#cookies_exceptions">Cookies Exceptions</a>
window by clicking <em>Exceptions...</em>, enter the site address, and click
<em>Allow</em> or <em>Allow for Session</em>.</p></dd>
<dt>Keep until</dt>
<dd>
<ul>
<li><strong>until they expire</strong>: If this &pref.singular; is selected,
each cookie will be removed when it reaches its expiration date.</li>
<li><strong>until I close &brandShortName;:</strong> 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.</li>
<li><strong>ask me every time:</strong> Display an alert every time a web
site tries to store a cookie to ask you if you want that cookie
stored.</li>
<li><em>they expire</em><br/>
If this &pref.singular; is selected, each cookie will be removed when the
site that set it has determined the cookie should expire.</li>
<li><em>I close &brandShortName;</em><br/>
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.</li>
<li><em>ask me every time</em><br/>
Display an alert every time a web site tries to store a cookie asking you
if you want that cookie stored.</li>
</ul>
</dd>
</dl>
<h2 id="accepting_and_blocking_cookies">Accepting and Blocking Cookies</h2>
<p>If you've chosen <em>ask me every time</em> from the <em>Keep Cookies</em>
combo box, you'll see a dialog whenever a site tries to store a cookie on your
<p>If you've chosen <em>ask me every time</em> from the <em>Keep until</em>
menu, you'll see a dialog whenever a site tries to store a cookie on your
computer providing the following options:</p>
<dl>
@ -153,13 +127,13 @@ Contributors:
<dt>Use my choice for all cookies from this site</dt>
<dd>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 <a href="#cookies_exceptions">Cookie Exceptions Window</a>,
be added to the <a href="#cookies_exceptions">Cookie Exceptions</a> window,
where you can revert your choice should you wish to do so later.</dd>
</dl>
<h2 id="cookies_exceptions">The Cookies Exceptions Window</h2>
<p>Access this window by clicking the <em>Exceptions</em> button in cookies
<p>Access this window by clicking the <em>Exceptions...</em> 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:
<p>To remove a cookie from the list, select it and click <em>Remove Cookie</em>.
To remove a site's cookies, select the site and click <em>Remove
Cookie(s)</em>. To wipe all cookies, click <em>Remove All Cookies</em>.
(This is the same as clicking the <em>Clear Cookies Now</em> button from the
<a href="prefs.xhtml#privacy_cookies"><em>Cookies</em> tab</a> of the
<em>Privacy</em> panel of the &pref.pluralCaps; window.)</p>
Cookie(s)</em>. To wipe all cookies, click <em>Remove All Cookies</em>.</p>
<div class="contentsBox"><em>07 July 2005</em></div>
<div class="contentsBox"><em>12 September 2006</em></div>
<p>Copyright &copy; 2003-2006 Contributors to the Mozilla Help Viewer Project.</p>
</body>

Просмотреть файл

@ -172,7 +172,7 @@ Contributors:
<h4 id="add_ons_configuring_extensions">Configuring Extensions</h4>
<p>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 <em>&pref.pluralCaps;</em> button,
or simply double-click the extension.</p>
@ -182,7 +182,7 @@ Contributors:
theme of your choice, and click its <em>Use Theme</em> button. You need to
restart &brandShortName; for changes to take effect.</p>
<div class="contentsBox"><em>25 August 2006</em></div>
<div class="contentsBox"><em>12 September 2006</em></div>
<p>Copyright &copy; 2003-2006 Contributors to the Mozilla Help Viewer Project.</p>
</body>

Просмотреть файл

@ -84,12 +84,12 @@ Contributors:
<h2 id="download_manager_options">Download Manager &pref.pluralCaps;</h2>
<p>The &pref.plural; for the Download Manager are accessible by opening the
<em>Downloads</em> 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
<a href="prefs.xhtml#downloads_options">&pref.pluralCaps; page</a>.</p>
Downloads section of the <em>Main</em> 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 <a
href="prefs.xhtml#downloads">&pref.pluralCaps; page</a>.</p>
<div class="contentsBox"><em>21 October 2005</em></div>
<div class="contentsBox"><em>12 September 2006</em></div>
<p>Copyright &copy; 2003-2006 Contributors to the Mozilla Help Viewer Project.</p>
</body>

Просмотреть файл

@ -6,6 +6,7 @@
]>
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:nc="http://home.netscape.com/NC-rdf#">
<rdf:Description about="urn:root">
@ -414,7 +415,9 @@
</rdf:Description>
<!-- The following nodes are intentionally linkable but not displayable -->
<rdf:Description ID="prefs-languages" nc:name="Languages" nc:link="prefs.xhtml#languages"/>
<Description rdf:ID="prefs-languages" nc:name="Languages" nc:link="prefs.xhtml#languages"/>
<Description rdf:ID="prefs-fonts-and-colors" nc:name="Fonts &amp; Colors" nc:link="prefs.xhtml#fonts_and_colors"/>
<Description rdf:ID="prefs-connection-settings" nc:name="Connection Settings" nc:link="prefs.xhtml#connection_settings"/>
<!-- The following nodes are trees used multiple times in the hierarchy
(for platform-specific reasons). To display one of these trees,
@ -422,69 +425,66 @@
"#" plus the value of the rdf:ID for the appropriate tree within
the appropriate rdf:Description element. -->
<rdf:Seq rdf:ID="prefs-tree">
<rdf:li> <rdf:Description ID="prefs-general" nc:name="General" nc:link="prefs.xhtml#general_options"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-privacy" nc:name="Privacy" nc:link="prefs.xhtml#privacy_options"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-content" nc:name="Content" nc:link="prefs.xhtml#content_options"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-tabs" nc:name="Tabs" nc:link="prefs.xhtml#tabs_options"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-downloads" nc:name="Downloads" nc:link="prefs.xhtml#downloads_options"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-advanced" nc:name="Advanced" nc:link="prefs.xhtml#advanced_options"/> </rdf:li>
</rdf:Seq>
<Seq rdf:ID="prefs-tree">
<li><Description ID="prefs-main" nc:name="Main" nc:link="prefs.xhtml#main_options"/></li>
<li><Description ID="prefs-tabs" nc:name="Tabs" nc:link="prefs.xhtml#tabs_options"/></li>
<li><Description ID="prefs-content" nc:name="Content" nc:link="prefs.xhtml#content_options"/></li>
<li><Description ID="prefs-feeds" nc:name="Feeds" nc:link="prefs.xhtml#feeds_options"/></li>
<li><Description ID="prefs-privacy" nc:name="Privacy" nc:link="prefs.xhtml#privacy_options"/></li>
<li><Description ID="prefs-security" nc:name="Security" nc:link="prefs.xhtml#security_options"/></li>
<li><Description ID="prefs-advanced" nc:name="Advanced" nc:link="prefs.xhtml#advanced_options"/></li>
</Seq>
<!-- The following are subnodes of trees used multiple times in the hierarchy. -->
<rdf:Description about="#prefs-general">
<Description rdf:about="#prefs-main">
<nc:subheadings>
<Seq>
<li><Description rdf:ID="prefs-startup" nc:name="Startup" nc:link="prefs.xhtml#startup"/></li>
<li><Description rdf:ID="prefs-downloads" nc:name="Downloads" nc:link="prefs.xhtml#downloads"/></li>
<li><Description rdf:ID="prefs-system-defaults" nc:name="System Defaults" nc:link="prefs.xhtml#system_defaults"/></li>
</Seq>
</nc:subheadings>
</Description>
<Description rdf:about="#prefs-content">
<nc:subheadings>
<Seq>
<li><Description rdf:ID="prefs-advanced-javascript" nc:name="Advanced Javascript Settings" nc:link="prefs.xhtml#advanced_javascript"/></li>
<li><Description rdf:ID="prefs-fonts-and-colors" nc:name="Fonts and Colors" nc:link="prefs.xhtml#fonts_and_colors"/></li>
<li><Description rdf:ID="prefs-file-types" nc:name="File Types" nc:link="prefs.xhtml#file_types"/></li>
</Seq>
</nc:subheadings>
</Description>
<Description rdf:about="#prefs-privacy">
<nc:subheadings>
<rdf:Seq>
<rdf:li> <rdf:Description ID="prefs-home-page" nc:name="Home Page" nc:link="prefs.xhtml#home_page"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-default-browser" nc:name="Default Browser" nc:link="prefs.xhtml#default_browser"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-connection-settings" nc:name="Connection Settings" nc:link="prefs.xhtml#connection_settings"/> </rdf:li>
<li><Description rdf:ID="prefs-privacy-history" nc:name="History" nc:link="prefs.xhtml#privacy_history"/></li>
<li><Description rdf:ID="prefs-privacy-cookies" nc:name="Cookies" nc:link="prefs.xhtml#privacy_cookies"/></li>
<li><Description rdf:ID="prefs-clear-private-data" nc:name="Private Data" nc:link="prefs.xhtml#private_data"/></li>
</rdf:Seq>
</nc:subheadings>
</rdf:Description>
<rdf:Description about="#prefs-privacy">
</Description>
<Description rdf:about="#prefs-security">
<nc:subheadings>
<rdf:Seq>
<rdf:li> <rdf:Description ID="prefs-clear-private-data" nc:name="Clear Private Data Settings" nc:link="prefs.xhtml#clear_private_data"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-history" nc:name="History" nc:link="prefs.xhtml#privacy_history"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-saved-forms" nc:name="Saved Forms" nc:link="prefs.xhtml#privacy_saved_forms"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-passwords" nc:name="Passwords" nc:link="prefs.xhtml#privacy_passwords"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-download-history" nc:name="Download History" nc:link="prefs.xhtml#privacy_download_history"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-cookies" nc:name="Cookies" nc:link="prefs.xhtml#privacy_cookies"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-cache" nc:name="Cache" nc:link="prefs.xhtml#privacy_cache"/> </rdf:li>
</rdf:Seq>
<Seq>
<li><Description rdf:ID="prefs-passwords" nc:name="Passwords" nc:link="prefs.xhtml#security_passwords"/></li>
<li><Description rdf:ID="prefs-warning-messages" nc:name="Warning Messages" nc:link="prefs.xhtml#warning_messages"/></li>
</Seq>
</nc:subheadings>
</rdf:Description>
<rdf:Description about="#prefs-content">
</Description>
<Description rdf:about="#prefs-advanced">
<nc:subheadings>
<rdf:Seq>
<rdf:li> <rdf:Description ID="prefs-fonts-and-colors" nc:name="Fonts and Colors" nc:link="prefs.xhtml#fonts_and_colors"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-advanced-javascript" nc:name="Advanced Javascript Settings" nc:link="prefs.xhtml#advanced_javascript"/> </rdf:li>
</rdf:Seq>
<Seq>
<li><Description rdf:ID="prefs-advanced-general" nc:name="General" nc:link="prefs.xhtml#advanced_general"/></li>
<li><Description rdf:ID="prefs-advanced-network" nc:name="Network" nc:link="prefs.xhtml#advanced_network"/></li>
<li><Description rdf:ID="prefs-advanced-update" nc:name="Update" nc:link="prefs.xhtml#advanced_update"/></li>
<li><Description rdf:ID="prefs-advanced-encryption" nc:name="Encryption" nc:link="prefs.xhtml#advanced_encryption"/></li>
</Seq>
</nc:subheadings>
</rdf:Description>
<rdf:Description about="#prefs-downloads">
<nc:subheadings>
<rdf:Seq>
<rdf:li> <rdf:Description ID="prefs-download-folder" nc:name="Download Folder" nc:link="prefs.xhtml#download_folder"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-download-manager" nc:name="Download Manager" nc:link="prefs.xhtml#download_manager"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-download-actions" nc:name="Download Actions" nc:link="prefs.xhtml#download_actions"/> </rdf:li>
</rdf:Seq>
</nc:subheadings>
</rdf:Description>
<rdf:Description about="#prefs-advanced">
<nc:subheadings>
<rdf:Seq>
<rdf:li> <rdf:Description ID="prefs-advanced-general" nc:name="General" nc:link="prefs.xhtml#advanced_general"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-advanced-update" nc:name="Update" nc:link="prefs.xhtml#advanced_update"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-advanced-security" nc:name="Security" nc:link="prefs.xhtml#advanced_security"/> </rdf:li>
<rdf:li> <rdf:Description ID="prefs-advanced-safebrowsing" nc:name="Anti-Phishing" nc:link="prefs.xhtml#advanced_safebrowsing"/> </rdf:li>
</rdf:Seq>
</nc:subheadings>
</rdf:Description>
</Description>
</rdf:RDF>

Просмотреть файл

@ -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 <em>Warn when closing multiple tabs</em> checkbox in
by deselecting the <em>Warn me when closing multiple tabs</em> checkbox in
the <em>Tabs</em> panel of &pref.menuPath;. &brandShortName; will also
warn you if you are currently downloading any files.</p>
</div>
@ -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 <em>Warn when closing multiple tabs</em> checkbox in
by deselecting the <em>Warn me when closing multiple tabs</em> checkbox in
the <em>Tabs</em> panel of &pref.menuPath;. &brandShortName; will also
warn you if you are currently downloading any files.</p>
</div>
@ -281,7 +281,7 @@ Contributors:
<h3 id="home">Home</h3>
<p>Displays your home page. This is the same as clicking on the
<em>Home</em> button on the navigation toolbar. To change the home page,
select &pref.menuPath; and open the <em>General</em> panel. You
select &pref.menuPath; and open the <em>Main</em> panel. You
can specify to use a blank page, the current page (or tab group), a
bookmark, or a manually entered address.</p>
@ -408,7 +408,7 @@ Contributors:
the current version and a brief list of credits.</p>
</div>
<div class="contentsBox"><em>25 August 2006</em></div>
<div class="contentsBox"><em>12 September 2006</em></div>
<p>Copyright &copy; 2003-2006 Contributors to the Mozilla Help Viewer Project.</p>
</body>

Просмотреть файл

@ -65,13 +65,13 @@ popups, some web sites may show popups using uncovered methods, even when blocke
<h2 id="popup_blocker_preferences">Popup Blocker &pref.pluralCaps;</h2>
<p>The Popup Blocker &pref.pluralCaps; are located in the Content panel of
&pref.menuPath;.</p>
<p>The Popup Blocker &pref.pluralCaps; are located in the <a
href="prefs.xhtml#content_options">Content panel</a> of &pref.menuPath;.</p>
<p>From there, you can do the following things:</p>
<ul>
<li><strong>Block Popup Windows</strong>: Deselect this &pref.singular; to
<li><strong>Block pop-up windows</strong>: Deselect this &pref.singular; to
disable the popup blocker altogether.</li>
<li><strong>Exceptions dialog</strong>: This is a list of sites that you want to allow
to display popups. The dialog has the following choices:
@ -88,7 +88,7 @@ popups, some web sites may show popups using uncovered methods, even when blocke
some web sites. For more information about blocking popups, see
<a href="#what_are_popups">What are Popups</a>.</p>
<div class="contentsBox"><em>14 May 2005</em></div>
<div class="contentsBox"><em>12 September 2005</em></div>
<p>Copyright &copy; 2003-2006 Contributors to the Mozilla Help Viewer Project.</p>
</body>

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -53,7 +53,7 @@ Contributors:
to change this.)</li>
<li>Drag and drop the link onto a tab to open the link in that tab.</li>
<li><span class="noMac">Right-click</span><span class="mac">Press &ctrlKey;,
click on</span> the link and choose <span
click on</span> the link, and choose <span
class="menuPath">Open Link in New Tab</span> from the context menu.</li>
</ul>
@ -113,8 +113,8 @@ Contributors:
<dd>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 <a
href="prefs.xhtml#general_options"><em>General</em> panel</a>. Under
<em>Home Page</em>, press the <em>Use Current Pages</em> button. Now
href="prefs.xhtml#main_options"><em>General</em> panel</a>. Under
<em>Startup</em>, press the <em>Use Current Pages</em> button. Now
when you press the Home button, your favorite web sites will load with just
a click.</dd>
@ -130,7 +130,7 @@ Contributors:
</dl>
<div class="contentsBox"><em>26 July 2006</em></div>
<div class="contentsBox"><em>12 September 2006</em></div>
<p>Copyright &copy; 2003-2006 Contributors to the Mozilla Help Viewer Project.</p>
</body>

Просмотреть файл

@ -493,8 +493,8 @@ Contributors:
open the <em>Content</em> panel, and click the <em>Manage...</em> button in
the <em>File Types</em> 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
<a href="prefs.xhtml#download_actions">Download &pref.pluralCaps;</a>.</p>
More information about this dialog is available in <a
href="prefs.xhtml#file_types">File Types &pref.plural;</a>.</p>
<p>When you click on a file and &brandShortName; doesn't know how to handle it,
an <em>Opening</em> dialog box is displayed, offering these choices:</p>
@ -552,7 +552,7 @@ Contributors:
&brandShortName;'s <em>Navigation Toolbar</em>. &brandShortName; then loads
and displays the latest version of the page.</p>
<div class="contentsBox"><em>08 September 2006</em></div>
<div class="contentsBox"><em>12 September 2006</em></div>
<p>Copyright &copy; 2003-2006 Contributors to the Mozilla Help Viewer Project.</p>
</body>