bug 344893 - Align (c) lines between branch and trunk (and minor cleanups), p=giacomo.magnini@portalis.it r=IanN

This commit is contained in:
kairo%kairo.at 2006-08-08 13:16:20 +00:00
parent 73ae02fb78
commit ffa95dbed8
6 changed files with 178 additions and 156 deletions

View File

@ -835,7 +835,7 @@ nc:link="chrome://help/locale/nav_help.xhtml#plugins_and_downloads"/> </rdf:li>
<rdf:li><rdf:Description ID="privacy-doc-visit" nc:name="What Information Does My Browser Give to a Website?" nc:link="privacy_help.xhtml#what_information_does_my_browser_give_to_a_web_site"/> </rdf:li>
<rdf:li><rdf:Description ID="privacy-doc-cookies" nc:name="What Are Cookies, and How Do They Work?" nc:link="privacy_help.xhtml#what_are_cookies_and_how_do_they_work"/> </rdf:li>
<rdf:li><rdf:Description ID="privacy-doc-email" nc:name="How Can I Control Web Pages in Email Messages?" nc:link="privacy_help.xhtml#how_can_i_control_web_pages_in_email_messages"/> </rdf:li>
<rdf:li><rdf:Description ID="privacy-doc-unauth" nc:name="How Do I Make Sure Unauthorized People Don't Use Information About Me?" nc:link="privacy_help.xhtml#how_do_i_make_sure_unauthorized_people_dont_use_information_about_me"/> </rdf:li>
<rdf:li><rdf:Description ID="privacy-doc-unauth" nc:name="How Can I Make Sure Unauthorized People Don't Use Information About Me?" nc:link="privacy_help.xhtml#how_can_i_make_sure_unauthorized_people_dont_use_information_about_me"/> </rdf:li>
</rdf:Seq>
</nc:subheadings>
</rdf:Description>

View File

@ -553,13 +553,15 @@
no subcategories are visible, double-click Mail &amp; Newsgroups to
expand the list.)</li>
<li>In the General section, do one of the following:
<ul>To allow all remote content, uncheck <q>Block images and other content
from remote sources</q>.</ul>
<ul>To block all remote content, uncheck <q>but allow if the sender is in
this address book:</q>.</ul>
<ul>To change which address book you use for people who send messages that
are allowed to display remote content, select the correct address book
from the drop down.</ul>
<ul>
<li>To allow all remote content, uncheck <q>Block images and other
content from remote sources</q>.</li>
<li>To block all remote content, uncheck <q>but allow if the sender is in
this address book:</q>.</li>
<li>To change which address book you use for people who send messages
that are allowed to display remote content, select the correct address
book from the drop down.</li>
</ul>
</li>
<li>Click OK to have your change take affect.</li>
</ol>
@ -573,10 +575,12 @@
<li>Under the Advanced category, click Scripts &amp; Plug-ins. (If no
subcategories are visible, double-click Advanced to expand the
list.)
<ul>Under <q>Enable JavaScript for</q>, check <q>Mail &amp; Newsgroups</q>
to enable JavaScript.</ul>
<ul>Under <q>Enable Plug-ins for</q>, check <q>Mail &amp; Newsgroups</q>
to enable plug-ins.</ul>
<ul>
<li>Under <q>Enable JavaScript for</q>, check <q>Mail &amp;
Newsgroups</q> to enable JavaScript.</li>
<li>Under <q>Enable Plug-ins for</q>, check <q>Mail &amp; Newsgroups</q>
to enable plug-ins.</li>
</ul>
</li>
<li>Click OK to have your changes take affect.</li>
</ol>
@ -4005,7 +4009,6 @@ to filter unwanted mail.</p>
<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
section</a>]</p>
<h2 id="junk_settings">Mail &amp; Newsgroups Account Settings - Junk
Settings</h2>
@ -4052,7 +4055,6 @@ to filter unwanted mail.</p>
<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
section</a>]</p>
<h2 id="return_receipts">Mail &amp; Newsgroups Account Settings - Return
Receipts</h2>
@ -4712,7 +4714,6 @@ to filter unwanted mail.</p>
<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
section</a>]</p>
<h2 id="global_junk_settings">Mail &amp; Newsgroups Preferences -
Junk Mail</h2>
@ -4753,7 +4754,6 @@ to filter unwanted mail.</p>
<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
section</a>]</p>
<h2 id="labels">Mail &amp; Newsgroups Preferences - Labels</h2>
<p>This section describes how to use the Labels preferences panel. You use the

View File

@ -30,7 +30,8 @@
<li><a href="#password_manager">Password Manager</a></li>
<li><a href="#master_passwords">Privacy &amp; Security Preferences -
Master Passwords</a></li>
<li><a href="#change_master_password">Change Master Password</a></li>
<li><a href="#change_master_password">Change Master Passwords</a></li>
<li><a href="#master_password_timeout">Master Password Timeout</a></li>
<li><a href="#reset_master_password">Reset Master Password</a></li>
</ul>
</div>
@ -99,8 +100,8 @@
periodically, which can be inconvenient. (For information about controlling
how often it is requested, see the discussion of the Master Password
timeout at
<a href="#master_passwords">Privacy &amp;
Security Preferences - Master Passwords</a>.)</li>
<a href="#master_passwords">Privacy &amp; Security Preferences - Master
Passwords</a>.)</li>
<li>If you use obscuring, you may not have to set a master password at all
(unless you&apos;re using certificates for identification purposes), but it
may be easier for a stranger who has access to your computer to steal your
@ -182,8 +183,8 @@
"using_priv_help.xhtml#using_the_password_manager">Using the Password
Manager</a>.</p>
<h2 id="master_passwords">Privacy &amp;
Security Preferences - Master Passwords</h2>
<h2 id="master_passwords">Privacy &amp; Security Preferences - Master
Passwords</h2>
<p>This section describes the Master Passwords preferences panel. If you are
not already viewing it, follow these steps:</p>
@ -196,8 +197,6 @@
the list.)</li>
</ol>
<h3 id="change_master_passwords">Change Master Password</h3>
<p>A master password protects a security device, which is a software or
hardware device that stores sensitive information associated with your
identity, such as keys or certificates.</p>
@ -211,65 +210,32 @@
passwords, and other data stored by the Password Manager and Form
Manager.</p>
<p>Each security device, whether it is software or hardware, has its own
separate Master Password.</p>
<ul>
<li><strong>Change Password:</strong> Click this button to set or change any
of your master passwords. For information about using the Change Master
Password dialog box that appears when you click this button, see
<a href="#change_master_password">Change Master Password</a>.</li>
</ul>
<h3 id="master_password_timeout">Master Password Timeout</h3>
<p>After you first set a new master password, you will be asked to enter it
only when the newly launched browser first needs it to access personal
information, such as a user name and password, saved form data, or personal
certificates.</p>
<p>You can control how often the browser requests your master password:</p>
<ul>
<li><strong>The first time it is needed.</strong> This setting
(selected by default) causes the browser to request your master password
only the first time it needs access to the private key database after
launching. The browser will not request the master password again until
after you exit and relaunch it. This setting provides the lowest level of
protection.</li>
<li><strong>Every time it is needed.</strong> This setting ensures that the
browser will never access your saved personal information without first
requesting your master password. This setting provides the highest level of
protection.</li>
<li><strong>If it has not been used for __ minutes or longer.</strong> This
setting causes the browser to request your master password if it needs to
access your personal information and the specified interval has elapsed
since the last time it did so.</li>
</ul>
<h3>Reset Master Password</h3>
<p><strong>Warning:</strong> If you reset your master password, you will
permanently erase all the encrypted web passwords, email passwords, and form
data saved on your behalf by Password Manager and Form Manager. You will also
lose all your personal certificates associated with the
<a href="glossary.xhtml#software_security_device">Software
Security Device</a>.</p>
<p>Note that encrypted passwords and form data will be lost only if you have
turned on encryption for this stored information. For information about
turning encryption on or off, see
<a href="using_priv_help.xhtml#turning_encryption_on_and_off">Turning
Encryption On and Off</a>.</p>
<p>To change your master password rather than resetting it, click the Change
Password button in the Master Passwords preferences panel.</p>
<p>You must remember your old master password to change it with the Change
Password button.</p>
<p>If you are really sure that you want to reset your master password and
permanently erase all your encrypted personal information and
certificates:</p>
<ul>
<li>You can control how often the browser requests your master password:
<ul>
<li><strong>The first time it is needed.</strong> This setting
(selected by default) causes the browser to request your master
password only the first time it needs access to the private key
database after launching. The browser will not request the master
password again until after you exit and relaunch it. This setting
provides the lowest level of protection.</li>
<li><strong>Every time it is needed.</strong> This setting ensures that
the browser will never access your saved personal information without
first requesting your master password. This setting provides the
highest level of protection.</li>
<li><strong>If it has not been used for __ minutes or longer.</strong>
This setting causes the browser to request your master password if it
needs to access your personal information and the specified interval
has elapsed since the last time it did so.</li>
</ul>
</li>
<li><strong>Reset Master Password:</strong> Click this button to reset the
master password for the Software Security Device. For more information,
see <a href="#reset_master_password">Reset Master Password</a>.</li>
@ -277,6 +243,9 @@
<h2 id="change_master_password">Change Master Password</h2>
<p>You must remember your old master password to change it with the Change
Password button.</p>
<p>This section describes the Change Master Password dialog box. If you&apos;re
not already viewing it, follow these steps:</p>
@ -347,8 +316,50 @@
important information, such as websites that require passwords or
certificates stored on your computer.</p>
<h2 id="master_password_timeout">Master Password Timeout</h2>
<p>After you first set a new master password, you will be asked to enter it
only when the newly launched browser first needs it to access personal
information, such as a user name and password, saved form data, or personal
certificates.</p>
<p>You can control how often the browser requests your master password:</p>
<ul>
<li><strong>The first time it is needed.</strong> This setting
(selected by default) causes the browser to request your master password
only the first time it needs access to the private key database after
launching. The browser will not request the master password again until
after you exit and relaunch it. This setting provides the lowest level
of protection.</li>
<li><strong>Every time it is needed.</strong> This setting ensures that
the browser will never access your saved personal information without
first requesting your master password. This setting provides the highest
level of protection.</li>
<li><strong>If it has not been used for __ minutes or longer.</strong>
This setting causes the browser to request your master password if it
needs to access your personal information and the specified interval
has elapsed since the last time it did so.</li>
</ul>
<h2 id="reset_master_password">Reset Master Password</h2>
<p><strong>Warning:</strong> If you reset your master password, you will
permanently erase all the encrypted web passwords, email passwords, and form
data saved on your behalf by Password Manager and Form Manager. You will also
lose all your personal certificates associated with the
<a href="glossary.xhtml#software_security_device">Software Security
Device</a>.</p>
<p>Note that encrypted passwords and form data will be lost only if you have
turned on encryption for this stored information. For information about
turning encryption on or off, see
<a href="using_priv_help.xhtml#turning_encryption_on_and_off">Turning
Encryption On and Off</a>.</p>
<p>To change your master password rather than resetting it, click the Change
Password button in the Master Passwords preferences panel.</p>
<p>This section describes the Reset Master Password dialog box. If you&apos;re
not already viewing it, follow these steps:</p>
@ -407,7 +418,7 @@
the master password for a smart card (assuming that you remember it), but you
cannot reset it.</p>
<p>Copyright &copy; 2003-2005 The Mozilla Foundation.</p>
<p>Copyright &copy; 2003-2006 The Mozilla Foundation.</p>
</body>
</html>

View File

@ -553,13 +553,15 @@
no subcategories are visible, double-click Mail &amp; Newsgroups to
expand the list.)</li>
<li>In the General section, do one of the following:
<ul>To allow all remote content, uncheck <q>Block images and other content
from remote sources</q>.</ul>
<ul>To block all remote content, uncheck <q>but allow if the sender is in
this address book:</q>.</ul>
<ul>To change which address book you use for people who send messages that
are allowed to display remote content, select the correct address book
from the drop down.</ul>
<ul>
<li>To allow all remote content, uncheck <q>Block images and other
content from remote sources</q>.</li>
<li>To block all remote content, uncheck <q>but allow if the sender is in
this address book:</q>.</li>
<li>To change which address book you use for people who send messages
that are allowed to display remote content, select the correct address
book from the drop down.</li>
</ul>
</li>
<li>Click OK to have your change take affect.</li>
</ol>
@ -573,10 +575,12 @@
<li>Under the Advanced category, click Scripts &amp; Plug-ins. (If no
subcategories are visible, double-click Advanced to expand the
list.)
<ul>Under <q>Enable JavaScript for</q>, check <q>Mail &amp; Newsgroups</q>
to enable JavaScript.</ul>
<ul>Under <q>Enable Plug-ins for</q>, check <q>Mail &amp; Newsgroups</q>
to enable plug-ins.</ul>
<ul>
<li>Under <q>Enable JavaScript for</q>, check <q>Mail &amp;
Newsgroups</q> to enable JavaScript.</li>
<li>Under <q>Enable Plug-ins for</q>, check <q>Mail &amp; Newsgroups</q>
to enable plug-ins.</li>
</ul>
</li>
<li>Click OK to have your changes take affect.</li>
</ol>
@ -4005,7 +4009,6 @@ to filter unwanted mail.</p>
<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
section</a>]</p>
<h2 id="junk_settings">Mail &amp; Newsgroups Account Settings - Junk
Settings</h2>
@ -4052,7 +4055,6 @@ to filter unwanted mail.</p>
<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
section</a>]</p>
<h2 id="return_receipts">Mail &amp; Newsgroups Account Settings - Return
Receipts</h2>
@ -4712,7 +4714,6 @@ to filter unwanted mail.</p>
<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
section</a>]</p>
<h2 id="global_junk_settings">Mail &amp; Newsgroups Preferences -
Junk Mail</h2>
@ -4753,7 +4754,6 @@ to filter unwanted mail.</p>
<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
section</a>]</p>
<h2 id="labels">Mail &amp; Newsgroups Preferences - Labels</h2>
<p>This section describes how to use the Labels preferences panel. You use the

View File

@ -30,7 +30,8 @@
<li><a href="#password_manager">Password Manager</a></li>
<li><a href="#master_passwords">Privacy &amp; Security Preferences -
Master Passwords</a></li>
<li><a href="#change_master_password">Change Master Password</a></li>
<li><a href="#change_master_password">Change Master Passwords</a></li>
<li><a href="#master_password_timeout">Master Password Timeout</a></li>
<li><a href="#reset_master_password">Reset Master Password</a></li>
</ul>
</div>
@ -99,8 +100,8 @@
periodically, which can be inconvenient. (For information about controlling
how often it is requested, see the discussion of the Master Password
timeout at
<a href="#master_passwords">Privacy &amp;
Security Preferences - Master Passwords</a>.)</li>
<a href="#master_passwords">Privacy &amp; Security Preferences - Master
Passwords</a>.)</li>
<li>If you use obscuring, you may not have to set a master password at all
(unless you&apos;re using certificates for identification purposes), but it
may be easier for a stranger who has access to your computer to steal your
@ -182,8 +183,8 @@
"using_priv_help.xhtml#using_the_password_manager">Using the Password
Manager</a>.</p>
<h2 id="master_passwords">Privacy &amp;
Security Preferences - Master Passwords</h2>
<h2 id="master_passwords">Privacy &amp; Security Preferences - Master
Passwords</h2>
<p>This section describes the Master Passwords preferences panel. If you are
not already viewing it, follow these steps:</p>
@ -196,8 +197,6 @@
the list.)</li>
</ol>
<h3 id="change_master_passwords">Change Master Password</h3>
<p>A master password protects a security device, which is a software or
hardware device that stores sensitive information associated with your
identity, such as keys or certificates.</p>
@ -211,65 +210,32 @@
passwords, and other data stored by the Password Manager and Form
Manager.</p>
<p>Each security device, whether it is software or hardware, has its own
separate Master Password.</p>
<ul>
<li><strong>Change Password:</strong> Click this button to set or change any
of your master passwords. For information about using the Change Master
Password dialog box that appears when you click this button, see
<a href="#change_master_password">Change Master Password</a>.</li>
</ul>
<h3 id="master_password_timeout">Master Password Timeout</h3>
<p>After you first set a new master password, you will be asked to enter it
only when the newly launched browser first needs it to access personal
information, such as a user name and password, saved form data, or personal
certificates.</p>
<p>You can control how often the browser requests your master password:</p>
<ul>
<li><strong>The first time it is needed.</strong> This setting
(selected by default) causes the browser to request your master password
only the first time it needs access to the private key database after
launching. The browser will not request the master password again until
after you exit and relaunch it. This setting provides the lowest level of
protection.</li>
<li><strong>Every time it is needed.</strong> This setting ensures that the
browser will never access your saved personal information without first
requesting your master password. This setting provides the highest level of
protection.</li>
<li><strong>If it has not been used for __ minutes or longer.</strong> This
setting causes the browser to request your master password if it needs to
access your personal information and the specified interval has elapsed
since the last time it did so.</li>
</ul>
<h3>Reset Master Password</h3>
<p><strong>Warning:</strong> If you reset your master password, you will
permanently erase all the encrypted web passwords, email passwords, and form
data saved on your behalf by Password Manager and Form Manager. You will also
lose all your personal certificates associated with the
<a href="glossary.xhtml#software_security_device">Software
Security Device</a>.</p>
<p>Note that encrypted passwords and form data will be lost only if you have
turned on encryption for this stored information. For information about
turning encryption on or off, see
<a href="using_priv_help.xhtml#turning_encryption_on_and_off">Turning
Encryption On and Off</a>.</p>
<p>To change your master password rather than resetting it, click the Change
Password button in the Master Passwords preferences panel.</p>
<p>You must remember your old master password to change it with the Change
Password button.</p>
<p>If you are really sure that you want to reset your master password and
permanently erase all your encrypted personal information and
certificates:</p>
<ul>
<li>You can control how often the browser requests your master password:
<ul>
<li><strong>The first time it is needed.</strong> This setting
(selected by default) causes the browser to request your master
password only the first time it needs access to the private key
database after launching. The browser will not request the master
password again until after you exit and relaunch it. This setting
provides the lowest level of protection.</li>
<li><strong>Every time it is needed.</strong> This setting ensures that
the browser will never access your saved personal information without
first requesting your master password. This setting provides the
highest level of protection.</li>
<li><strong>If it has not been used for __ minutes or longer.</strong>
This setting causes the browser to request your master password if it
needs to access your personal information and the specified interval
has elapsed since the last time it did so.</li>
</ul>
</li>
<li><strong>Reset Master Password:</strong> Click this button to reset the
master password for the Software Security Device. For more information,
see <a href="#reset_master_password">Reset Master Password</a>.</li>
@ -277,6 +243,9 @@
<h2 id="change_master_password">Change Master Password</h2>
<p>You must remember your old master password to change it with the Change
Password button.</p>
<p>This section describes the Change Master Password dialog box. If you&apos;re
not already viewing it, follow these steps:</p>
@ -347,8 +316,50 @@
important information, such as websites that require passwords or
certificates stored on your computer.</p>
<h2 id="master_password_timeout">Master Password Timeout</h2>
<p>After you first set a new master password, you will be asked to enter it
only when the newly launched browser first needs it to access personal
information, such as a user name and password, saved form data, or personal
certificates.</p>
<p>You can control how often the browser requests your master password:</p>
<ul>
<li><strong>The first time it is needed.</strong> This setting
(selected by default) causes the browser to request your master password
only the first time it needs access to the private key database after
launching. The browser will not request the master password again until
after you exit and relaunch it. This setting provides the lowest level
of protection.</li>
<li><strong>Every time it is needed.</strong> This setting ensures that
the browser will never access your saved personal information without
first requesting your master password. This setting provides the highest
level of protection.</li>
<li><strong>If it has not been used for __ minutes or longer.</strong>
This setting causes the browser to request your master password if it
needs to access your personal information and the specified interval
has elapsed since the last time it did so.</li>
</ul>
<h2 id="reset_master_password">Reset Master Password</h2>
<p><strong>Warning:</strong> If you reset your master password, you will
permanently erase all the encrypted web passwords, email passwords, and form
data saved on your behalf by Password Manager and Form Manager. You will also
lose all your personal certificates associated with the
<a href="glossary.xhtml#software_security_device">Software Security
Device</a>.</p>
<p>Note that encrypted passwords and form data will be lost only if you have
turned on encryption for this stored information. For information about
turning encryption on or off, see
<a href="using_priv_help.xhtml#turning_encryption_on_and_off">Turning
Encryption On and Off</a>.</p>
<p>To change your master password rather than resetting it, click the Change
Password button in the Master Passwords preferences panel.</p>
<p>This section describes the Reset Master Password dialog box. If you&apos;re
not already viewing it, follow these steps:</p>
@ -407,7 +418,7 @@
the master password for a smart card (assuming that you remember it), but you
cannot reset it.</p>
<p>Copyright &copy; 2003-2005 The Mozilla Foundation.</p>
<p>Copyright &copy; 2003-2006 The Mozilla Foundation.</p>
</body>
</html>

View File

@ -835,7 +835,7 @@ nc:link="chrome://help/locale/nav_help.xhtml#plugins_and_downloads"/> </rdf:li>
<rdf:li><rdf:Description ID="privacy-doc-visit" nc:name="What Information Does My Browser Give to a Website?" nc:link="privacy_help.xhtml#what_information_does_my_browser_give_to_a_web_site"/> </rdf:li>
<rdf:li><rdf:Description ID="privacy-doc-cookies" nc:name="What Are Cookies, and How Do They Work?" nc:link="privacy_help.xhtml#what_are_cookies_and_how_do_they_work"/> </rdf:li>
<rdf:li><rdf:Description ID="privacy-doc-email" nc:name="How Can I Control Web Pages in Email Messages?" nc:link="privacy_help.xhtml#how_can_i_control_web_pages_in_email_messages"/> </rdf:li>
<rdf:li><rdf:Description ID="privacy-doc-unauth" nc:name="How Do I Make Sure Unauthorized People Don't Use Information About Me?" nc:link="privacy_help.xhtml#how_do_i_make_sure_unauthorized_people_dont_use_information_about_me"/> </rdf:li>
<rdf:li><rdf:Description ID="privacy-doc-unauth" nc:name="How Can I Make Sure Unauthorized People Don't Use Information About Me?" nc:link="privacy_help.xhtml#how_can_i_make_sure_unauthorized_people_dont_use_information_about_me"/> </rdf:li>
</rdf:Seq>
</nc:subheadings>
</rdf:Description>