summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-09-17 13:53:54 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-09-17 13:53:54 +0000
commitad327e4ae85f2bd79b17a79fe050196beef31298 (patch)
tree25842f9caa970d287d7b980dcca1037313bafc31
parentc1958bfc25cb83f71177068ca6061929eeb8e9d5 (diff)
CWS-TOOLING: integrate CWS encsig09
2009-09-14 15:11:29 +0200 oc r276125 : #i105049# MacroSignatur needs Macro 2009-09-09 17:09:46 +0200 jl r276005 : #i103989# could not signe encrypted doc containing a formular object 2009-09-09 13:11:24 +0200 jl r275985 : #i103989# could not signe encrypted doc containing a formular object 2009-09-08 15:54:02 +0200 mav r275934 : #i103906# fix the automation test scenario ( tempfile should be writable for the user ) 2009-09-07 14:01:39 +0200 mav r275895 : #i103906# fix the problem with reload 2009-09-07 09:34:48 +0200 mav r275871 : #i104786# do the ODF version check only for ODF documents 2009-09-07 08:19:06 +0200 mav r275870 : #i104389# fix text 2009-09-06 22:24:21 +0200 mav r275867 : #i104786# check the consistency of ODF version 2009-09-06 22:23:24 +0200 mav r275866 : #i104786# check the consistency of ODF version 2009-09-06 22:23:00 +0200 mav r275865 : #i104786# check the consistency of ODF version 2009-09-06 22:22:36 +0200 mav r275864 : #i104786# check the consistency of ODF version 2009-09-06 22:22:03 +0200 mav r275863 : #i104786# check the consistency of ODF version 2009-09-02 17:09:30 +0200 mav r275722 : #i104715# let repairing mechanics use the streams correctly 2009-09-01 16:52:49 +0200 mav r275670 : #i104389# notify user not to trust the corrupted document 2009-09-01 16:31:37 +0200 mav r275668 : #i104389# use vnd.sun.star.zip: protocol to access zip files 2009-09-01 16:30:32 +0200 mav r275667 : #i104389# use vnd.sun.star.zip: protocol to access zip files 2009-09-01 16:22:13 +0200 jl r275666 : #i104339# small content change 2009-09-01 14:20:42 +0200 jl r275660 : #i103519# remove some debug output 2009-09-01 13:51:52 +0200 jl r275659 : #i103519# NSS uses '\' for escaping in distinguished names 2009-09-01 12:49:47 +0200 mav r275655 : #i104389# use zip-mode to read from jar files 2009-09-01 12:40:22 +0200 mav r275653 : #i104389# use zip-mode to read from jar files 2009-09-01 12:32:29 +0200 mav r275652 : #i104389# use constants 2009-08-31 21:58:00 +0200 mav r275637 : #i10000# fix warning 2009-08-31 21:11:17 +0200 mav r275636 : #i104227# adding of scripting signature removes the document signature 2009-08-31 20:55:05 +0200 mav r275635 : #i103905# ZipStorage supports Compressed property 2009-08-31 20:53:55 +0200 mav r275634 : #i103905# adjust macro signature transfer to usage of ZipStorage 2009-08-31 15:30:49 +0200 jl r275609 : #i103989# warning is shown as long the user does not click 'OK' 2009-08-31 14:36:10 +0200 jl r275608 : #i103989# changed warning text when signing macro and there is a document signature. This warning is only displayed once 2009-08-31 13:34:41 +0200 mav r275603 : #i104452# disable macros in repaired documents 2009-08-31 13:33:42 +0200 mav r275602 : #i104452# disable macros in repaired documents 2009-08-31 13:03:56 +0200 jl r275600 : #i45212# signature dialog could not be started when using read-only documents 2009-08-31 09:26:13 +0200 mav r275583 : #i104578# store the additional entry as the last one to workaround parsing problem in OOo3.1 and later 2009-08-30 20:54:25 +0200 mav r275562 : #i10000# adopt for unix 2009-08-30 10:56:00 +0200 mav r275561 : CWS-TOOLING: rebase CWS encsig09 to trunk@275331 (milestone: DEV300:m56) 2009-08-28 16:34:00 +0200 mav r275539 : #i104578# write necessary info in manifest.xml for ODF1.2 encrypted document 2009-08-28 14:04:22 +0200 mav r275533 : #104587# fix handling of readonly streams 2009-08-28 13:58:10 +0200 mav r275531 : #i104389# fix the broken document handling 2009-08-28 11:40:39 +0200 mav r275522 : #i104389# fix the signature streams check 2009-08-27 21:48:12 +0200 mav r275509 : #i103927# show the warning 2009-08-27 21:47:48 +0200 mav r275508 : #i103927# show the warning 2009-08-27 16:45:59 +0200 jl r275495 : #i45212# remove unused variable 2009-08-27 16:34:00 +0200 jl r275494 : #i103989# 2009-08-27 13:54:28 +0200 jl r275482 : #i103519# fixed replacement of 'S' by 'ST' 2009-08-27 12:32:21 +0200 mav r275472 : #i10000# fix warning 2009-08-27 11:58:11 +0200 mav r275467 : #i104389# handle the entry path correctly 2009-08-26 17:18:35 +0200 jl r275438 : #i103519# subject and issuer distinguished names were not properly displayed. The strings were obtained by system functions (Windows, NSS), which use quotes to escape the values, when they contain special characters 2009-08-26 11:00:20 +0200 mav r275403 : #i10000# fix warnings 2009-08-26 08:25:45 +0200 mav r275392 : #i10000# fix warning 2009-08-26 08:02:22 +0200 mav r275391 : #i10000# adopt for linux 2009-08-26 07:40:30 +0200 mav r275390 : #i10000# fix warning 2009-08-26 07:35:28 +0200 mav r275389 : #i10000# use correct include file name 2009-08-25 15:01:41 +0200 jl r275356 : #i103989# better check for mimetype of streams 2009-08-25 09:07:09 +0200 mav r275335 : CWS-TOOLING: rebase CWS encsig09 to trunk@274622 (milestone: DEV300:m54) 2009-08-24 18:17:02 +0200 mav r275329 : #i103927# check the nonencrypted streams 2009-08-24 18:14:14 +0200 mav r275328 : #i103927# check the nonencrypted streams 2009-08-24 17:59:34 +0200 mav r275327 : #i103927#,#i104389# check the package consistency and nonencrypted streams 2009-08-24 16:18:28 +0200 jl r275323 : #i103989# added comment 2009-08-24 13:08:47 +0200 jl r275305 : #i45212# #i66276# only write the X509Certificate element once and allow to add remove several certificates at a time 2009-08-21 12:57:28 +0200 ufi r275239 : 104339 2009-08-21 08:39:05 +0200 jl r275213 : #i10398# comparing URIs of signed files with the 'element list' 2009-08-20 13:39:47 +0200 jl r275178 : #i10398# displaying 'new partially signed' status in the status bar 2009-08-20 13:35:39 +0200 jl r275177 : #i10398# displaying 'new partially signed' status in the status bar 2009-08-20 13:29:06 +0200 jl r275176 : #i10398# displaying 'new partially signed' status in the status bar 2009-08-20 13:26:21 +0200 jl r275175 : #i10398# displaying 'new partially signed' status in the status bar 2009-08-20 12:05:09 +0200 ufi r275170 : i104339 2009-08-19 12:24:54 +0200 jl r275146 : #i10398# displaying 'old signature' icon and status in signature dialog 2009-08-18 15:18:48 +0200 jl r275111 : #i103989# document signatures containing manifest.xml are now validated according to the final ODF1.2 spec 2009-08-18 11:41:06 +0200 mav r275087 : #i103927# detect if encrypted ODF1.2 document contains nonencrypted streams 2009-08-18 11:35:13 +0200 mav r275085 : #i103927# detect if encrypted ODF1.2 document contains nonencrypted streams 2009-08-14 17:32:41 +0200 jl r274999 : #i103989# using c14n tranformation for XML streams 2009-08-14 15:27:43 +0200 jl r274987 : #i103989# remove special handling for encrypted document streams in UriBindingHelper::OpenInputStream, since we use zip storage this is not necessary anymore 2009-08-14 15:08:10 +0200 jl r274983 : #i103989# Showing a message when adding or removing a macro signature, that the document signature will be removed 2009-08-14 14:57:27 +0200 jl r274982 : #i103989# accesing Sequence at invalid index 2009-08-11 08:55:02 +0200 mav r274846 : #i103905# let signing service know if there is already a valid document signature 2009-08-10 11:33:37 +0200 jl r274799 : #i103905# do not truncate the stream 2009-08-10 10:43:47 +0200 mav r274797 : #i103905# provide the storage version 2009-08-07 16:58:46 +0200 jl r274780 : #i103989# 2009-08-07 16:56:19 +0200 jl r274779 : #i103989# using odf version string etc. 2009-08-07 15:20:53 +0200 mav r274771 : #i103905# provide the storage version 2009-08-07 15:19:12 +0200 mav r274770 : #i103905# provide the storage version 2009-08-07 12:41:45 +0200 mav r274758 : #103930# do not store thumbnail in case of encrypted document 2009-08-07 12:36:52 +0200 mav r274757 : #i103905# provide the storage version 2009-08-07 12:15:54 +0200 mav r274754 : #i103760# the signed state is not lost on saving 2009-08-07 12:06:19 +0200 mav r274753 : #i103760# avoid warning regarding signature removal on export 2009-08-07 12:06:01 +0200 mav r274752 : #i103760# avoid warning regarding signature removal on export 2009-08-06 08:47:34 +0200 mav r274703 : #i103905# allow to transport ODF version to the signing component 2009-08-05 21:34:42 +0200 mav r274701 : #i103905# allow to transport ODF version to the signing component 2009-08-05 15:48:17 +0200 mav r274683 : #i103905# allow to transport ODF version to the signing component 2009-08-05 14:58:12 +0200 jl r274673 : #i103989# documentsignature now signes all streams except documentsignatures.xml, all streams are processed as binary files 2009-08-05 12:00:32 +0200 mav r274648 : #i103905# allow to transport ODF version to the signing component 2009-08-04 10:57:04 +0200 jl r274612 : #i103989# added XInitialization 2009-07-31 10:32:27 +0200 mav r274516 : #i103905# use zip storage to sign documents 2009-07-30 14:01:33 +0200 mav r274489 : #i103906# optimize the usage of temporary medium 2009-07-30 14:00:28 +0200 mav r274488 : #i103906# optimize the usage of temporary medium 2009-07-30 13:59:09 +0200 mav r274487 : #i103906# optimize the usage of temporary medium 2009-07-30 13:50:44 +0200 mav r274485 : #i103906# optimize the usage of temporary medium 2009-07-30 13:49:53 +0200 mav r274484 : #i103906# optimize the usage of temporary medium 2009-07-30 13:49:13 +0200 mav r274483 : #i103906# optimize the usage of temporary medium 2009-07-30 13:47:09 +0200 mav r274482 : #i103905#,#i103906# let the signing process use zip-storage; optimize the usage of temporary medium 2009-07-21 09:10:31 +0200 mav r274159 : CWS-TOOLING: rebase CWS encsig09 to trunk@273468 (milestone: DEV300:m51) 2009-05-05 08:39:01 +0200 mav r271496 : #i100832# allow to sign macros only when there are any
-rw-r--r--helpcontent2/source/auxiliary/main_transform.xsl2
-rwxr-xr-xhelpcontent2/source/text/scalc/main0208.xhp60
-rw-r--r--helpcontent2/source/text/shared/01/digitalsignatures.xhp76
-rwxr-xr-xhelpcontent2/source/text/shared/guide/digital_signatures.xhp116
-rw-r--r--helpcontent2/source/text/shared/guide/digitalsign_send.xhp178
-rwxr-xr-xhelpcontent2/source/text/swriter/main0208.xhp71
6 files changed, 264 insertions, 239 deletions
diff --git a/helpcontent2/source/auxiliary/main_transform.xsl b/helpcontent2/source/auxiliary/main_transform.xsl
index ca649b8c6..5686b2e5e 100644
--- a/helpcontent2/source/auxiliary/main_transform.xsl
+++ b/helpcontent2/source/auxiliary/main_transform.xsl
@@ -139,7 +139,7 @@
<!-- parts of help and image urls -->
<xsl:variable name="help_url_prefix" select="'vnd.sun.star.help://'"/>
-<xsl:variable name="img_url_prefix" select="concat('vnd.sun.star.pkg://',$imgrepos,'/')"/>
+<xsl:variable name="img_url_prefix" select="concat('vnd.sun.star.zip://',$imgrepos,'/')"/>
<xsl:variable name="urlpost" select="concat('?Language=',$lang,$am,'System=',$System,$am,'UseDB=no')"/>
<xsl:variable name="urlpre" select="$help_url_prefix" />
<xsl:variable name="linkprefix" select="$urlpre"/>
diff --git a/helpcontent2/source/text/scalc/main0208.xhp b/helpcontent2/source/text/scalc/main0208.xhp
index f2e6a8c3b..e61b47035 100755
--- a/helpcontent2/source/text/scalc/main0208.xhp
+++ b/helpcontent2/source/text/scalc/main0208.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0208.xhp,v $
- * $Revision: 1.5 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -29,30 +30,29 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalcmain0208xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Status Bar</title>
-<filename>/text/scalc/main0208.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-08T10:25:20">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="statusleiste">
-<paragraph role="heading" id="hd_id3151385" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/main0208.xhp" name="Status Bar">Status Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="2">The <emph>Status Bar</emph> displays information about the current sheet.</paragraph>
-</section>
-<embed href="text/scalc/02/08010000.xhp#positionimdokument"/>
-<embed href="text/shared/02/20020000.xhp#aktuelleseitenvorlage"/>
-<embed href="text/shared/02/20030000.xhp#maszstab"/>
-<embed href="text/shared/02/20040000.xhp#einfuegemodus"/>
-<embed href="text/shared/02/20050000.xhp#selektionsmodus"/>
-<embed href="text/shared/02/20060000.xhp#dokumentveraenderung"/>
-<embed href="text/scalc/02/08080000.xhp#datumzeit"/>
-</body>
-</helpdocument>
+ <topic id="textscalcmain0208xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Status Bar</title>
+ <filename>/text/scalc/main0208.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="statusleiste">
+ <paragraph xml-lang="en-US" id="hd_id3151385" role="heading" level="1" l10n="U" oldref="1"><link href="text/scalc/main0208.xhp" name="Status Bar">Status Bar</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149669" role="paragraph" l10n="U" oldref="2">The <emph>Status Bar</emph> displays information about the current sheet.</paragraph>
+ </section>
+ <embed href="text/scalc/02/08010000.xhp#positionimdokument"/>
+ <embed href="text/shared/02/20020000.xhp#aktuelleseitenvorlage"/>
+ <embed href="text/shared/02/20030000.xhp#maszstab"/>
+ <embed href="text/shared/02/20040000.xhp#einfuegemodus"/>
+ <embed href="text/shared/02/20050000.xhp#selektionsmodus"/>
+ <embed href="text/shared/02/20060000.xhp#dokumentveraenderung"/>
+ <paragraph xml-lang="en-US" id="hd_id0821200911024321" role="heading" level="2" l10n="NEW">Digital Signature</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200911024344" role="paragraph" l10n="NEW">See also <link href="text/shared/guide/digital_signatures.xhp">Digital Signatures</link>.</paragraph>
+ <embed href="text/scalc/02/08080000.xhp#datumzeit"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/digitalsignatures.xhp b/helpcontent2/source/text/shared/01/digitalsignatures.xhp
index d9fe1d5bb..39979a49e 100644
--- a/helpcontent2/source/text/shared/01/digitalsignatures.xhp
+++ b/helpcontent2/source/text/shared/01/digitalsignatures.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: digitalsignatures.xhp,v $
- * $Revision: 1.15 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -32,51 +32,47 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared01digitalsignaturesxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Digital Signatures</title>
-<filename>/text/shared/01/digitalsignatures.xhp</filename>
-</topic>
-<history>
-<created date="2004-08-25T17:23:25">UFI: Digital Signatures from File-Properties-General</created>
-<lastedited date="2007-03-02T16:29:34">dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="digitalsignatures">
+ <topic id="textshared01digitalsignaturesxhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Digital Signatures</title>
+ <filename>/text/shared/01/digitalsignatures.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="digitalsignatures">
<bookmark xml-lang="en-US" branch="hid/SID_SIGNATURE" id="bm_id9475924" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Signature" id="bm_id127567" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sfx2_PushButton_TP_DOCINFODOC_BTN_SIGNATURE" id="bm_id4573503" localize="false"/>
-<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link></paragraph>
-<paragraph role="paragraph" id="par_idN10548" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds and removes digital signatures to and from your document. You can also use the dialog to view certificates.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#digitalsig"/>
-</section>
-<embed href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
+<paragraph xml-lang="en-US" id="par_idN10544" role="heading" level="1" l10n="NEW"><link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10548" role="paragraph" l10n="NEW"><ahelp hid=".">Adds and removes digital signatures to and from your document. You can also use the dialog to view certificates.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000401.xhp#digitalsig"/>
+ </section>
+ <embed href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_QUERY_SAVEBEFORESIGN" id="bm_id1376689" localize="false"/>
-<paragraph role="paragraph" id="par_idN10629" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">You must save a file before you can apply a digital signature to the file.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10629" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">You must save a file before you can apply a digital signature to the file.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_INFO_WRONGDOCFORMAT" id="bm_id133060" localize="false"/>
-<paragraph role="paragraph" id="par_idN10644" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">You must save a file in OpenDocument format before you can apply a digital signature to the file.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10644" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">You must save a file in OpenDocument format before you can apply a digital signature to the file.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_SIGNATURESDLG" id="bm_id685445" localize="false"/>
-<paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">List</paragraph>
-<paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the digital signatures for the current document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW">The Signed icon
-<image id="img_id4557023" src="xmlsecurity/res/signet_11x16.png" width="0.222inch" height="0.1528inch"><alt id="alt_id4557023" xml-lang="en-US">icon</alt>
+<paragraph xml-lang="en-US" id="par_idN1055F" role="heading" level="2" l10n="NEW">List</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10563" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the digital signatures for the current document.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10566" role="paragraph" l10n="NEW">The Signed icon
+<image id="img_id4557023" src="xmlsecurity/res/certificate_16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id4557023">Icon</alt>
</image> indicates a valid digital signature, while the Exclamation mark icon
-<image id="img_id249336" src="xmlsecurity/res/caution_11x16.png" width="0.1665inch" height="0.1146inch"><alt id="alt_id249336" xml-lang="en-US">icon</alt>
+<image id="img_id249336" src="xmlsecurity/res/caution_11x16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id249336">Icon</alt>
</image> indicates an invalid digital signature.</paragraph>
-<paragraph role="tip" id="par_idN10569" xml-lang="en-US" l10n="NEW">A Signed icon is also shown in the Status bar when a signed document only contains valid digital signatures.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200910573716" role="paragraph" l10n="NEW">See also <link href="text/shared/guide/digital_signatures.xhp">Digital Signatures</link>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECDLG_DIGSIG_BTN_VIEWCERT" id="bm_id7360759" localize="false"/>
-<paragraph role="heading" id="par_idN1056C" xml-lang="en-US" level="2" l10n="NEW">View Certificate</paragraph>
-<paragraph role="paragraph" id="par_idN10570" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN1056C" role="heading" level="2" l10n="NEW">View Certificate</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10570" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/padmin_PushButton_RID_PADIALOG_RID_PA_BTN_STD" id="bm_id2279122" localize="false"/>
-<paragraph role="heading" id="par_idN10581" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN10585" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10581" role="heading" level="2" l10n="NEW">Add</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10585" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/padmin_PushButton_RID_PADIALOG_RID_PA_BTN_DEL" id="bm_id4170964" localize="false"/>
-<paragraph role="heading" id="par_idN10596" xml-lang="en-US" level="2" l10n="NEW">Remove</paragraph>
-<paragraph role="paragraph" id="par_idN1059A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the selected source from the list.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN10596" role="heading" level="2" l10n="NEW">Remove</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1059A" role="paragraph" l10n="NEW"><ahelp hid=".">Removes the selected source from the list.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/digital_signatures.xhp b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
index f1369473a..f7d56606a 100755
--- a/helpcontent2/source/text/shared/guide/digital_signatures.xhp
+++ b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: digital_signatures.xhp,v $
- * $Revision: 1.14.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -35,38 +35,86 @@
<meta>
-<topic id="textsharedguidedigital_signaturesxhp" indexer="include">
-<title id="tit" xml-lang="en-US">About Digital Signatures</title>
-<filename>/text/shared/guide/digital_signatures.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidedigital_signaturesxhp" indexer="include">
+ <title xml-lang="en-US" id="tit">About Digital Signatures</title>
+ <filename>/text/shared/guide/digital_signatures.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id7430951"><bookmark_value>certificates</bookmark_value>
-<bookmark_value>digital signatures;overview</bookmark_value>
-<bookmark_value>security;digital signatures</bookmark_value>
+ <bookmark_value>digital signatures;overview</bookmark_value>
+ <bookmark_value>security;digital signatures</bookmark_value>
</bookmark><comment>mw moved 1 entry to digitalsign_send.xhp and made "digital signatures" a two level entry and added a new entry</comment>
-<paragraph role="heading" id="hd_id2767418" xml-lang="en-US" level="1" l10n="NEW"><variable id="digital_signatures"><link href="text/shared/guide/digital_signatures.xhp">About Digital Signatures</link>
+<paragraph xml-lang="en-US" id="hd_id2767418" role="heading" level="1" l10n="NEW"><variable id="digital_signatures"><link href="text/shared/guide/digital_signatures.xhp">About Digital Signatures</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW">In %PRODUCTNAME, you can digitally sign your documents and macros. </paragraph>
-<paragraph role="heading" id="hd_id6564531" xml-lang="en-US" level="2" l10n="NEW">Certificates</paragraph>
-<paragraph role="paragraph" id="par_idN10639" xml-lang="en-US" l10n="NEW">To sign a document digitally, you need a personal key, the certificate. A personal key is stored on your computer as a combination of a private key, which must be kept secret, and a public key, which you add to your documents when you sign them.</paragraph>
-<paragraph role="heading" id="par_idN1066D" xml-lang="en-US" level="2" l10n="NEW">Save and sign the document</paragraph>
-<paragraph role="paragraph" id="par_idN10671" xml-lang="en-US" l10n="NEW">When you apply a digital signature to a document, a kind of checksum is computed from the document's content plus your personal key. The checksum and your public key are stored together with the document.</paragraph>
-<paragraph role="heading" id="par_idN10674" xml-lang="en-US" level="2" l10n="NEW">Open a signed document</paragraph>
-<paragraph role="paragraph" id="par_idN10678" xml-lang="en-US" l10n="NEW">When someone later opens the document on any computer with a recent version of %PRODUCTNAME, the program will compute the checksum again and compare it with the stored checksum. If both are the same, the program will signal that you see the original, unchanged document. In addition, the program can show you the public key information from the certificate.</paragraph>
-<paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US" l10n="NEW">You can compare the public key with the public key that is published on the web site of the certificate authority.</paragraph>
-<paragraph role="paragraph" id="par_idN1067E" xml-lang="en-US" l10n="NEW">Whenever someone changes something in the document, this change breaks the digital signature. After the change, there will be no sign that you see the original document.</paragraph>
-<paragraph role="heading" id="hd_id9354228" xml-lang="en-US" level="2" l10n="NEW">Security Warnings</paragraph>
-<paragraph role="paragraph" id="par_id2372508" xml-lang="en-US" l10n="NEW">When you receive a signed document, and the software reports that the signature is valid, this does not mean that you can be absolutely sure that the document is the same that the sender has sent. Signing documents with software certificates is not a perfectly secure method. Numerous ways are possible to circumvent the security features.</paragraph>
-<paragraph role="paragraph" id="par_id7953123" xml-lang="en-US" l10n="NEW">Example: Think about someone who wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed e-mail pretending he is working for your bank. You will get that e-mail, and the e-mail or the document within has the "valid signed" icon. </paragraph>
-<paragraph role="paragraph" id="par_id6195257" xml-lang="en-US" l10n="NEW">Do not trust the icon. Inspect and verify the certificates.</paragraph>
-<paragraph role="warning" id="par_id8635517" xml-lang="en-US" l10n="CHG">The validation of a signature is not a legally binding guarantee of any kind.</paragraph>
-<paragraph role="paragraph" id="par_id6075624" xml-lang="en-US" l10n="NEW">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
-<paragraph role="warning" id="par_id6819971" xml-lang="en-US" l10n="NEW">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3204443" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
-<paragraph role="paragraph" id="par_id486465" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
-<paragraph role="paragraph" id="par_id3448591" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN10632" role="paragraph" l10n="NEW">In %PRODUCTNAME, you can digitally sign your documents and macros. </paragraph>
+ <paragraph xml-lang="en-US" id="hd_id6564531" role="heading" level="2" l10n="NEW">Certificates</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10639" role="paragraph" l10n="NEW">To sign a document digitally, you need a personal key, the certificate. A personal key is stored on your computer as a combination of a private key, which must be kept secret, and a public key, which you add to your documents when you sign them.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="2" l10n="NEW">Save and sign the document</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10671" role="paragraph" l10n="NEW">When you apply a digital signature to a document, a kind of checksum is computed from the document's content plus your personal key. The checksum and your public key are stored together with the document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10674" role="heading" level="2" l10n="NEW">Open a signed document</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10678" role="paragraph" l10n="NEW">When someone later opens the document on any computer with a recent version of %PRODUCTNAME, the program will compute the checksum again and compare it with the stored checksum. If both are the same, the program will signal that you see the original, unchanged document. In addition, the program can show you the public key information from the certificate.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1067B" role="paragraph" l10n="NEW">You can compare the public key with the public key that is published on the web site of the certificate authority.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1067E" role="paragraph" l10n="NEW">Whenever someone changes something in the document, this change breaks the digital signature. After the change, there will be no sign that you see the original document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2008200911381426" role="paragraph" l10n="NEW">The result of the signature validation is displayed in the status bar and within the Digital Signature dialog. Several documents and macro signatures can exist inside an ODF document. If there is a problem with one signature, then the validation result of that one signature is assumed for all signatures. That is, if there are ten valid signatures and one invalid signature, then the status bar and the status field in the dialog will flag the signature as invalid.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200911571878" role="paragraph" l10n="NEW">You can see any of the following icons and messages when you open a signed document.</paragraph>
+ <table id="tbl_id0821200912400398">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504050" role="tablehead" l10n="NEW">Icon in Status bar</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504061" role="tablehead" l10n="NEW">Signature status</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504010" role="tablecontent" l10n="NEW">
+<image id="img_id0821200912421569" src="xmlsecurity/res/certificate_16.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id0821200912421569">Icon</alt>
+ </image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504189" role="tablecontent" l10n="NEW">The signature is valid.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id082120091250418" role="tablecontent" l10n="NEW">
+<image id="img_id0821200912431081" src="xmlsecurity/res/notcertificate_16.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id0821200912431081">Icon</alt>
+ </image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504133" role="tablecontent" l10n="NEW">The signature is OK, but the certificates could not be validated.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200912504165" role="tablecontent" l10n="NEW">The signature and the certificate are OK, but not all parts of the document are signed. (For documents that were signed with OpenOffice.org prior to 3.2 or StarOffice prior to 9.2, see note below.)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504237" role="tablecontent" l10n="NEW">
+<image id="img_id0821200912435090" src="xmlsecurity/res/caution_11x16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id0821200912435090">Icon</alt>
+ </image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504233" role="tablecontent" l10n="NEW">The signature is invalid.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <paragraph xml-lang="en-US" id="hd_id0821200910191787" role="heading" level="3" l10n="NEW">Signatures and software versions</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200910191747" role="paragraph" l10n="NEW">The signing of contents got changed with OpenOffice.org 3.2 and StarOffice 9.2. Now all contents of the files, except the signature file itself (META-INF/documentsignatures.xml) are signed. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200910191774" role="paragraph" l10n="NEW">When you sign a document with OpenOffice.org 3.2 or StarOffice 9.2 or a later version, and you open that document in an older version of the software, the signature will be displayed as "invalid". Signatures created with older versions of the software will be marked with "only parts of the documents are signed" when loaded in the newer software.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2008200911583098" role="note" l10n="NEW">When you load an ODF document, you might see an icon in the status bar and the status field in the dialog that indicates that the document is only partially signed. This status will appear when the signature and certificate are valid, but they were created with a version of OpenOffice.org before 3.2 or StarOffice before 9.2. In versions of OpenOffice.org before 3.0 or StarOffice before 9.0, the document signature was applied to the main contents, pictures and embedded objects only and some contents, like macros, were not signed. In OpenOffice.org 3.0 and StarOffice 9.0 the document signature was applied to most content, including macros. However, the mimetype and the content of the META-INF folder were not signed. And in OpenOffice.org 3.2 and StarOffice 9.2 all contents, except the signature file itself (META-INF/documentsignatures.xml), are signed.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id9354228" role="heading" level="2" l10n="NEW">Security Warnings</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2372508" role="paragraph" l10n="NEW">When you receive a signed document, and the software reports that the signature is valid, this does not mean that you can be absolutely sure that the document is the same that the sender has sent. Signing documents with software certificates is not a perfectly secure method. Numerous ways are possible to circumvent the security features.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7953123" role="paragraph" l10n="NEW">Example: Think about someone who wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed e-mail pretending he is working for your bank. You will get that e-mail, and the e-mail or the document within has the "valid signed" icon. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id6195257" role="paragraph" l10n="NEW">Do not trust the icon. Inspect and verify the certificates.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8635517" role="warning" l10n="CHG">The validation of a signature is not a legally binding guarantee of any kind.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6075624" role="paragraph" l10n="NEW">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6819971" role="warning" l10n="NEW">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id486465" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3448591" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
index 774e0f406..b68bb1240 100644
--- a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
+++ b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: digitalsign_send.xhp,v $
- * $Revision: 1.4 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,109 +32,88 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidedigitalsign_sendxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Applying Digital Signatures</title>
-<filename>/text/shared/guide/digitalsign_send.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
+ <topic id="textsharedguidedigitalsign_sendxhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Applying Digital Signatures</title>
+ <filename>/text/shared/guide/digitalsign_send.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id7430951"><bookmark_value>signing documents with digital signatures</bookmark_value>
-<bookmark_value>digital signatures;getting/managing/applying</bookmark_value>
-</bookmark>
- <comment>mw transferred one entry from digital_signatures.xhp and added a new entry</comment>
- <paragraph xml-lang="en-US" id="hd_id344248" role="heading" level="1" l10n="NEW"><variable id="digitalsign_send"><link href="text/shared/guide/digitalsign_send.xhp">Applying Digital Signatures</link>
-</variable></paragraph>
- <comment>MW created this file by splitting shared/guide/digital_signatures.xhp</comment>
- <paragraph xml-lang="en-US" id="par_idN1063C" role="heading" level="2" l10n="NEW">Getting a Certificate</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10640" role="paragraph" l10n="NEW">You can get a certificate from a certification authority, which may be a private company or a governmental institution. Some certification authorities want money for their service, for example when they certify your identity. Other certificates are free of costs, for example those offered by some e-mail providers, which certify your e-mail address. A few of the companies that offer certificates to private persons are listed in the following, in alphabetical order: <link href="http://www.globalsign.net">GlobalSign</link> , <link href="http://www.thawte.com">Thawte</link>, <link href="http://www.verisign.com">Verisign</link>.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="2" l10n="NEW">Managing your Certificates</paragraph>
-
+ <bookmark_value>digital signatures;getting/managing/applying</bookmark_value>
+</bookmark><comment>mw transferred one entry from digital_signatures.xhp and added a new entry</comment>
+<paragraph xml-lang="en-US" id="hd_id344248" role="heading" level="1" l10n="NEW"><variable id="digitalsign_send"><link href="text/shared/guide/digitalsign_send.xhp">Applying Digital Signatures</link>
+</variable></paragraph><comment>MW created this file by splitting shared/guide/digital_signatures.xhp</comment>
+<paragraph xml-lang="en-US" id="par_idN1063C" role="heading" level="2" l10n="NEW">Getting a Certificate</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10640" role="paragraph" l10n="NEW">You can get a certificate from a certification authority, which may be a private company or a governmental institution. Some certification authorities want money for their service, for example when they certify your identity. Other certificates are free of costs, for example those offered by some e-mail providers, which certify your e-mail address. A few of the companies that offer certificates to private persons are listed in the following, in alphabetical order: <link href="http://www.globalsign.net">GlobalSign</link> , <link href="http://www.thawte.com">Thawte</link>, <link href="http://www.verisign.com">Verisign</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="2" l10n="NEW">Managing your Certificates</paragraph>
<switch select="sys">
-
<case select="WIN">
- <paragraph xml-lang="en-US" id="par_idN1070A" role="paragraph" l10n="NEW">If you are using Microsoft Windows, you can manage your certificates from the Control Panel applet "Internet Options" on the "Contents" tab page.</paragraph>
- <paragraph xml-lang="en-US" id="par_id8311410" role="paragraph" l10n="NEW">Import your new root certificate into the Trusted Root Certification Authorities list.</paragraph>
-
+<paragraph xml-lang="en-US" id="par_idN1070A" role="paragraph" l10n="NEW">If you are using Microsoft Windows, you can manage your certificates from the Control Panel applet "Internet Options" on the "Contents" tab page.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8311410" role="paragraph" l10n="NEW">Import your new root certificate into the Trusted Root Certification Authorities list.</paragraph>
</case>
-
<default>
- <paragraph xml-lang="en-US" id="par_idN1071D" role="paragraph" l10n="NEW">If you are using Solaris or Linux, you must install a recent version of Thunderbird, Mozilla Suite, or Firefox software to install some system files that are needed for encryption.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10720" role="tip" l10n="NEW">If you have created different profiles in Thunderbird, Mozilla, or Firefox, and you want %PRODUCTNAME to use one specified profile for certificates, then you can set the environment variable MOZILLA_CERTIFICATE_FOLDER to point to the folder of that specified profile.</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id944242" role="paragraph" l10n="NEW">Open your Web browser's preferences dialog, select the Privacy &amp; Security tab page, click on Certificates - Manage Certificates. </paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id6452223" role="paragraph" l10n="NEW">Import your new root certificate, then select and edit the certificate. Enable the root certificate to be trusted at least for web and email access. This ensures that the certificate can sign your documents. You may edit any intermediate certificate in the same way, but it is not mandatory for signing documents.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id6486098" role="paragraph" l10n="NEW">When you have edited the new certificates, restart %PRODUCTNAME.</paragraph>
- </listitem>
- </list>
-
+<paragraph xml-lang="en-US" id="par_idN1071D" role="paragraph" l10n="NEW">If you are using Solaris or Linux, you must install a recent version of Thunderbird, Mozilla Suite, or Firefox software to install some system files that are needed for encryption.<comment>how about Mac OS X?</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10720" role="tip" l10n="NEW">If you have created different profiles in Thunderbird, Mozilla, or Firefox, and you want %PRODUCTNAME to use one specified profile for certificates, then you can set the environment variable MOZILLA_CERTIFICATE_FOLDER to point to the folder of that specified profile.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id944242" role="paragraph" l10n="NEW">Open your Web browser's preferences dialog, select the Privacy &amp; Security tab page, click on Certificates - Manage Certificates. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id6452223" role="paragraph" l10n="NEW">Import your new root certificate, then select and edit the certificate. Enable the root certificate to be trusted at least for web and email access. This ensures that the certificate can sign your documents. You may edit any intermediate certificate in the same way, but it is not mandatory for signing documents.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id6486098" role="paragraph" l10n="NEW">When you have edited the new certificates, restart %PRODUCTNAME.</paragraph>
+ </listitem>
+ </list>
</default>
-
</switch>
- <paragraph xml-lang="en-US" id="par_idN10681" role="heading" level="2" l10n="NEW">Signing a document</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10688" role="paragraph" l10n="NEW">Choose <emph>File - Digital Signatures</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10690" role="paragraph" l10n="NEW">A message box advises you to save the document. Click <emph>Yes</emph> to save the file.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10698" role="paragraph" l10n="NEW">After saving, you see the <link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link> dialog. Click <emph>Add</emph> to add a public key to the document.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106AE" role="paragraph" l10n="NEW">In the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog, select your certificate and click OK. </paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106C0" role="paragraph" l10n="NEW">You see again the Digital Signatures dialog, where you can add more certificates if you want. Click OK to add the public key to the saved file.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_idN106C3" role="paragraph" l10n="NEW">A signed document shows an icon
-<image id="img_id262764" src="xmlsecurity/res/certificate_16.png" width="0.1665inch" height="0.1665inch"><alt xml-lang="en-US" id="alt_id262764">icon</alt>
+<paragraph xml-lang="en-US" id="par_idN10681" role="heading" level="2" l10n="NEW">Signing a document</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10688" role="paragraph" l10n="NEW">Choose <emph>File - Digital Signatures</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10690" role="paragraph" l10n="NEW">A message box advises you to save the document. Click <emph>Yes</emph> to save the file.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10698" role="paragraph" l10n="NEW">After saving, you see the <link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link> dialog. Click <emph>Add</emph> to add a public key to the document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106AE" role="paragraph" l10n="NEW">In the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog, select your certificate and click OK. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106C0" role="paragraph" l10n="NEW">You see again the Digital Signatures dialog, where you can add more certificates if you want. Click OK to add the public key to the saved file.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN106C3" role="paragraph" l10n="NEW">A signed document shows an icon
+<image id="img_id262764" src="xmlsecurity/res/certificate_16.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id262764">Icon</alt>
</image> in the status bar. You can double-click the icon in the status bar to view the certificate.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106E0" role="heading" level="2" l10n="NEW">Signing the macros inside a document</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106E4" role="paragraph" l10n="NEW">Normally, macros are part of a document. If you sign a document, the macros inside the document are signed automatically. If you want to sign only the macros, but not the document, proceed as follows:</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106EA" role="paragraph" l10n="NEW">Choose <emph>Tools - Macros - Digital Signature</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106F2" role="paragraph" l10n="NEW">Apply the signature as described above for documents.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_idN106F5" role="paragraph" l10n="NEW">When you open the Basic IDE that contains signed macros, you see an icon
-<image id="img_id9252296" src="xmlsecurity/res/certificate_16.png" width="0.1665inch" height="0.1665inch"><alt xml-lang="en-US" id="alt_id9252296">icon</alt>
- </image> in the status bar. You can double-click the icon in the status bar to view the certificate.</paragraph>
- <comment>WebDAV see issue 32935</comment>
- <comment>main dialog IDs are here to lead the user initially to this help page</comment>
- <comment>Examine certificate button</comment>
-
+ <paragraph xml-lang="en-US" id="par_id2008200911381426" role="paragraph" l10n="NEW">The result of the signature validation is displayed in the status bar and within the Digital Signature dialog. Several documents and macro signatures can exist inside an ODF document. If there is a problem with one signature, then the validation result of that one signature is assumed for all signatures. That is, if there are ten valid signatures and one invalid signature, then the status bar and the status field in the dialog will flag the signature as invalid.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E0" role="heading" level="2" l10n="NEW">Signing the macros inside a document</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E4" role="paragraph" l10n="NEW">Normally, macros are part of a document. If you sign a document, the macros inside the document are signed automatically. If you want to sign only the macros, but not the document, proceed as follows:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106EA" role="paragraph" l10n="NEW">Choose <emph>Tools - Macros - Digital Signature</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106F2" role="paragraph" l10n="NEW">Apply the signature as described above for documents.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN106F5" role="paragraph" l10n="NEW">When you open the Basic IDE that contains signed macros, you see an icon
+<image id="img_id9252296" src="xmlsecurity/res/certificate_16.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id9252296">Icon</alt>
+ </image> in the status bar. You can double-click the icon in the status bar to view the certificate.</paragraph><comment>WebDAV see issue 32935</comment><comment>main dialog IDs are here to lead the user initially to this help page</comment><comment>Examine certificate button</comment>
<bookmark xml-lang="en-US" branch="hid/1311740419" id="bm_id2454298" localize="false"/>
- <paragraph xml-lang="en-US" id="par_id5734733" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open the View Certificate dialog.</ahelp></paragraph>
- <comment>Accept this certificate temporarily for this session radio button</comment>
-
+<paragraph xml-lang="en-US" id="par_id5734733" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open the View Certificate dialog.</ahelp></paragraph><comment>Accept this certificate temporarily for this session radio button</comment>
<bookmark xml-lang="en-US" branch="hid/1311736321" id="bm_id2307199" localize="false"/>
- <paragraph xml-lang="en-US" id="par_id561540" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to accept the certificate until you exit %PRODUCTNAME.</ahelp></paragraph>
- <comment>Do not accept this certificate and do not connect to this Web site radio button</comment>
-
+<paragraph xml-lang="en-US" id="par_id561540" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to accept the certificate until you exit %PRODUCTNAME.</ahelp></paragraph><comment>Do not accept this certificate and do not connect to this Web site radio button</comment>
<bookmark xml-lang="en-US" branch="hid/1311736326" id="bm_id9983825" localize="false"/>
- <paragraph xml-lang="en-US" id="par_id7705618" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to cancel the connection.</ahelp></paragraph>
- <section id="relatedtopics">
-
- <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id5166173" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
-
- </section>
- </body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id7705618" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to cancel the connection.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id5166173" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/main0208.xhp b/helpcontent2/source/text/swriter/main0208.xhp
index 08aedc5b1..d564e0079 100755
--- a/helpcontent2/source/text/swriter/main0208.xhp
+++ b/helpcontent2/source/text/swriter/main0208.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0208.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -33,32 +32,36 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswritermain0208xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Status Bar</title>
-<filename>/text/swriter/main0208.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="status">
-<paragraph role="heading" id="hd_id3153397" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0208.xhp" name="Status Bar">Status Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3153414" xml-lang="en-US" l10n="CHG" oldref="2">The Status Bar contains information about the current document and offers various buttons with special functions. </paragraph>
-</section>
-<embed href="text/swriter/02/08010000.xhp#seitennummer"/>
-<embed href="text/shared/02/20020000.xhp#aktuelleseitenvorlage"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:LanguageStatus" id="bm_id8360850" localize="false"/><paragraph role="heading" id="hd_id9648731" xml-lang="en-US" level="2" l10n="NEW">Language<comment>i80434</comment></paragraph>
-<paragraph role="paragraph" id="par_id8193914" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the language for the selected text. <br/>Click to open a menu where you can choose another language for the selected text or for the current paragraph. <br/>Choose None to exclude the text from spellchecking and hyphenation. <br/>Choose More to open a dialog with more options.</ahelp></paragraph>
-<embed href="text/shared/02/20040000.xhp#einfuegemodus"/>
-<embed href="text/shared/02/20050000.xhp#selektionsmodus"/>
-<embed href="text/shared/02/20060000.xhp#dokumentveraenderung"/>
-<embed href="text/swriter/02/08080000.xhp#kombinierteanzeige"/>
-<paragraph role="heading" id="hd_id8070314" xml-lang="en-US" level="2" l10n="NEW">Zoom &amp; View Layout</paragraph>
-<paragraph role="paragraph" id="par_id7723929" xml-lang="en-US" l10n="NEW">Three controls on the Writer Status Bar allow to change the zoom and view layout of your text documents. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ViewLayout" id="bm_id5961180" localize="false"/><paragraph role="paragraph" id="par_id3666188" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The View Layout icons show from left to right: Single column mode. View mode with pages side by side. Book mode with two pages as in an open book.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ZoomSlider" id="bm_id6407055" localize="false"/><paragraph role="paragraph" id="par_id8796349" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Drag the Zoom slider to the left to show more pages, drag to the right to zoom into a page and show a smaller area of the page.</ahelp></paragraph>
-<embed href="text/shared/02/20030000.xhp#maszstab"/>
-</body>
-</helpdocument>
+ <topic id="textswritermain0208xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Status Bar</title>
+ <filename>/text/swriter/main0208.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="status">
+ <paragraph xml-lang="en-US" id="hd_id3153397" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/main0208.xhp" name="Status Bar">Status Bar</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153414" role="paragraph" l10n="CHG" oldref="2">The Status Bar contains information about the current document and offers various buttons with special functions. </paragraph>
+ </section>
+ <embed href="text/swriter/02/08010000.xhp#seitennummer"/>
+ <embed href="text/shared/02/20020000.xhp#aktuelleseitenvorlage"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:LanguageStatus" id="bm_id8360850" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9648731" role="heading" level="1" l10n="NEW">Language<comment>i80434</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id8193914" role="paragraph" l10n="NEW"><ahelp hid=".">Displays the language for the selected text. <br/>Click to open a menu where you can choose another language for the selected text or for the current paragraph. <br/>Choose None to exclude the text from spellchecking and hyphenation. <br/>Choose More to open a dialog with more options.</ahelp></paragraph>
+ <embed href="text/shared/02/20040000.xhp#einfuegemodus"/>
+ <embed href="text/shared/02/20050000.xhp#selektionsmodus"/>
+ <embed href="text/shared/02/20060000.xhp#dokumentveraenderung"/>
+ <paragraph xml-lang="en-US" id="hd_id0821200911015962" role="heading" level="2" l10n="NEW">Digital Signature</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200911015941" role="paragraph" l10n="NEW">See also <link href="text/shared/guide/digital_signatures.xhp">Digital Signatures</link>.</paragraph>
+ <embed href="text/swriter/02/08080000.xhp#kombinierteanzeige"/>
+ <paragraph xml-lang="en-US" id="hd_id8070314" role="heading" level="1" l10n="NEW">Zoom &amp; View Layout</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7723929" role="paragraph" l10n="NEW">Three controls on the Writer Status Bar allow to change the zoom and view layout of your text documents. </paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ViewLayout" id="bm_id5961180" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3666188" role="paragraph" l10n="NEW"><ahelp hid=".">The View Layout icons show from left to right: Single column mode. View mode with pages side by side. Book mode with two pages as in an open book.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ZoomSlider" id="bm_id6407055" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8796349" role="paragraph" l10n="NEW"><ahelp hid=".">Drag the Zoom slider to the left to show more pages, drag to the right to zoom into a page and show a smaller area of the page.</ahelp></paragraph>
+ <embed href="text/shared/02/20030000.xhp#maszstab"/>
+ </body>
+</helpdocument> \ No newline at end of file