[Gpg4win-commits] r1667 - in trunk/doc: . website
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed May 18 09:24:58 CEST 2011
Author: emanuel
Date: 2011-05-18 09:24:56 +0200 (Wed, 18 May 2011)
New Revision: 1667
Modified:
trunk/doc/ChangeLog
trunk/doc/HOWTO-SMIME.en.txt
trunk/doc/website/about-de.htm4
trunk/doc/website/about.htm4
trunk/doc/website/contribute-de.htm4
trunk/doc/website/donate-de.htm4
trunk/doc/website/features-de.htm4
trunk/doc/website/features.htm4
trunk/doc/website/index-de.htm4
trunk/doc/website/index.htm4
trunk/doc/website/screenshots.htm4
Log:
Fixed typos and translations issues.
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2011-05-02 17:58:33 UTC (rev 1666)
+++ trunk/doc/ChangeLog 2011-05-18 07:24:56 UTC (rev 1667)
@@ -1,3 +1,12 @@
+2011-05-18 Emanuel Schuetze <emanuel at intevation.de>
+
+ * website/features.htm4, website/index-de.htm4,
+ website/donate-de.htm4, website/features-de.htm4,
+ website/index.htm4, website/screenshots.htm4,
+ website/contribute-de.htm4, website/about.htm4,
+ website/about-de.htm4, HOWTO-SMIME.en.txt:
+ Fix typos and translation errors.
+
2011-04-01 Emanuel Schuetze <emanuel at intevation.de>
* website/SPONSOR: Add new sponsor.
Modified: trunk/doc/HOWTO-SMIME.en.txt
===================================================================
--- trunk/doc/HOWTO-SMIME.en.txt 2011-05-02 17:58:33 UTC (rev 1666)
+++ trunk/doc/HOWTO-SMIME.en.txt 2011-05-18 07:24:56 UTC (rev 1667)
@@ -27,7 +27,7 @@
If the above folder is not visible?
Please read the reference note to the view options [1].
-2. Set ultimate trustable
+2. Set ultimate trusted
a) Open the following file with a text editor:
[Windows 2000/XP]:
@@ -80,9 +80,9 @@
Open Kleopatra and import your X.509 certificate chains.
The imported certificate chains should appear under the tab "Trusted
Certificates". Gpg4win recognizes your imported root certificates as
- trustable.
+ trusted.
- Problems? Kleopatra doesn't shows your root certificate as trustable?
+ Problems? Kleopatra doesn't shows your root certificate as trusted?
Solutions:
* Click on the "Redisplay" button in Kleopatra to update the certificate view.
* Add "relax" after the relevant root certificate in the trustlist.txt - see
Modified: trunk/doc/website/about-de.htm4
===================================================================
--- trunk/doc/website/about-de.htm4 2011-05-02 17:58:33 UTC (rev 1666)
+++ trunk/doc/website/about-de.htm4 2011-05-18 07:24:56 UTC (rev 1667)
@@ -71,6 +71,7 @@
</li>
</ul>
+<a name="requirements"></a>
<h2>Systemvorausetzungen</h2>
<p>Gpg4win ist lauffähig unter Windows 2000, XP, Vista und 7. 32 und 64bit Systeme werden
unterstützt.</p>
Modified: trunk/doc/website/about.htm4
===================================================================
--- trunk/doc/website/about.htm4 2011-05-02 17:58:33 UTC (rev 1666)
+++ trunk/doc/website/about.htm4 2011-05-18 07:24:56 UTC (rev 1667)
@@ -67,6 +67,7 @@
</li>
</ul>
+<a name="requirements"></a>
<h2>System Requirements</h2>
<p>Gpg4win runs on Windows 2000, XP, Vista and 7. Both 32 and
64bit systems are supported.</p>
Modified: trunk/doc/website/contribute-de.htm4
===================================================================
--- trunk/doc/website/contribute-de.htm4 2011-05-02 17:58:33 UTC (rev 1666)
+++ trunk/doc/website/contribute-de.htm4 2011-05-18 07:24:56 UTC (rev 1667)
@@ -56,7 +56,7 @@
<h2>Als Geldgeber</h2>
-<p>Die Ggp4win-Initiative ist dankbar für jede Form der finanziellen
+<p>Die Gpg4win-Initiative ist dankbar für jede Form der finanziellen
Unterstützung. Nutzen Sie die
<a href="donate-de.html">Spenden-Seite</a> für weitere
Informationen.</p>
Modified: trunk/doc/website/donate-de.htm4
===================================================================
--- trunk/doc/website/donate-de.htm4 2011-05-02 17:58:33 UTC (rev 1666)
+++ trunk/doc/website/donate-de.htm4 2011-05-18 07:24:56 UTC (rev 1667)
@@ -21,7 +21,7 @@
<div id="intro">
<h2>Spenden</h2>
<p>Ihre Spende unterstützt die Pflege und Weiterentwicklung von Gpg4win
-sowie hilft uns die Freie Software Initiative Gpg4win voranzutreiben.
+und hilft uns die Freie Software Initiative Gpg4win voranzutreiben.
Wir sind dankbar für jede finanzielle Unterstützung. Helfen auch Sie!</p>
</div>
Modified: trunk/doc/website/features-de.htm4
===================================================================
--- trunk/doc/website/features-de.htm4 2011-05-02 17:58:33 UTC (rev 1666)
+++ trunk/doc/website/features-de.htm4 2011-05-18 07:24:56 UTC (rev 1667)
@@ -39,8 +39,8 @@
<h4>Hohe Algorithmenstärken in GnuPG</h4>
<p>Gpg4win ist die offizielle <a href="http://gnupg.org">GnuPG</a> Distribution für Windows und bietet
damit die gewohnt hohe Sicherheit von GnuPG. GnuPG hält sich an die
-Empfehlungen des <a href="http://www.bsi.bund.de">Bundesamtes für Sicherheit in der
-Informationstechnik (BSI)</a>.</p>
+Empfehlungen des <a href="http://www.bsi.bund.de/Algorithmenkatalog.html">Bundesamtes
+für Sicherheit in der Informationstechnik (BSI)</a>.</p>
<p>Bei der Erstellung von OpenPGP- und X.509-Zertifikaten wird eine
voreingestellte Schlüssellänge von 2048 bit verwendet. Als Signatur- und Verschlüsselungsverfahren
@@ -196,7 +196,7 @@
<p>GpgOL erfordert Outlook 2003 oder 2007. Outlook 2010 wird nicht
unterstützt.</p>
<p>Details unter den Angaben zur <a
-href="about-de.html">Systemanforderung</a>.</p>
+href="about-de.html#requirements">Systemanforderung</a>.</p>
</div>
<div class="column3">
Modified: trunk/doc/website/features.htm4
===================================================================
--- trunk/doc/website/features.htm4 2011-05-02 17:58:33 UTC (rev 1666)
+++ trunk/doc/website/features.htm4 2011-05-18 07:24:56 UTC (rev 1667)
@@ -13,8 +13,8 @@
<div id="intro">
<h2>Features</h2>
-<p>The security of your data is the most important thing for Gpg4win.
-The focus is on secure file and email encryption as well as good usability.
+<p>The security of your data is the most important thing.
+The focus of Gpg4win is on secure file and email encryption as well as good usability.
</p>
</div>
@@ -29,7 +29,7 @@
<p>The configuration of X.509 root certificates is made simple by
Gpg4win. Now, also inexperienced users can start using S/MIME out-of-the-box.
Security aware system administrators will read the step by step instructions
-and define a systems-wide list of trustable X.509 root certificates.
+and define a systems-wide list of trusted X.509 root certificates.
</p>
<img src="img/sc-pinentry-openpgp_de.png">
</div>
@@ -37,14 +37,14 @@
<div class="column2">
<h4>High algorithmic strength of GnuPG</h4>
<p>Gpg4win is the official <a href="http://gnupg.org">GnuPG</a>
-distribution for Windows and provides the usual high cryptographic
+distribution for Windows and provides the high cryptographic
standards of the GNU Privacy Guard. GnuPG follows the recommendations
regarding algorithms and key length of the German
-<a href="http://www.bsi.bund.de">Federal Office for Information Security (BSI)</a>.</p>
+<a href="http://www.bsi.bund.de/Algorithmenkatalog.html">Federal Office for Information Security (BSI)</a>.</p>
<p>To create OpenPGP and X.509 certificates Gpg4win uses a key length
-of 2048bit by default. The default algorithm of signature and
-encryption is RSA.</p>
+of 2048bit by default. The default algorithm for signing and
+encrypting is RSA.</p>
</div>
<div class="column3">
@@ -62,18 +62,21 @@
<div class="column1">
<h4>Sign/Encrypt</h4>
<p>Sign single files or complete folders directly from the Windows
-Explorer - using GpgEX.
+Explorer with GpgEX or Kleopatra.
You can select multiple files and folders to sign and encrypt them
recursively into a gpgtar archive.</p>
</div>
<div class="column2">
<h4>Checksums</h4>
-<p>Create and verify checksums of files - also directly from the Windows Explorer.
-Gpg4win creates (recursively) a unique checksum for each selected file
-and ensured with it the integrity of the files. The verification of
-checksums works as well as creation.
-Gpg4win supports the algorithm sha1sum, sha256sum and md5sum.</p>
+<p>Create and verify checksums of files - also directly from the
+Windows Explorer or Kleopatra.
+Gpg4win can create a unique checksum for each selected file, with
+which the integrity of these files can be verified any time later.
+Both, creation and verification of these crypotraphic checksums
+(hashes) are carried out in analogous manner in the
+GUI. Gpg4win supports the hash algorithms SHA-1, SHA-256 and MD5.
+</p>
</div>
<div class="column3">
<img src="img/sc-gpgex-explorer-options_cut_de.png">
@@ -83,11 +86,11 @@
<h2>Email</h2>
<div class="column1">
-<h4>Sign and encrypt</h4>
-<p>The included Outlook plugin GpgOL allows to sign and encrypt
-emails directly in Microsoft Outlook (2003 and 2007). Attachments are
-also encrypted. Verify signature and encrypt message works in
-Outlook, too.
+<h4>Signing and encrypting</h4>
+<p>The provided Outlook plugin GpgOL allows to sign and encrypt
+emails directly in Microsoft Outlook (2003 and 2007). Attachments can
+be encrypted as well, in one go with the email body. Verifying
+signatures and decrypting messages is done directly in Outlook, too.
</p>
<img src="img/sc-ol-emailfolder_cut_de.png">
</div>
@@ -103,10 +106,9 @@
<div class="column3">
<h4> </h4>
-<p>For "power user" Gpg4win provides the option to show this confirm
-dialog only in case of conflict. Thereby you don't need to confirm
-certificates which match correctly.
-Your work goes more quickly - without reducing security.
+<p>For "power users" Gpg4win provides the option to show this confirmation
+dialog only in case of conflict. Thereby you do not need to confirm
+certificates which do accord uniquely. You work more quickly - without reducing security.
</p>
</div>
@@ -117,9 +119,9 @@
<div class="column1">
<h4>Installer</h4>
-<p>The Gpg4win Installer helps to install Gpg4win very simple and
-secure. You can find a step-by-step install instruction in the <a
-href="http://gpg4win.de/doc/en/gpg4win-compendium_11.html">Gpg4win Compendium</a>.</p>
+<p>The Gpg4win Installer enables you to install Gpg4win in a very simple and
+secure manner. A step-by-step installation guide us provided as part
+of the <a href="http://gpg4win.de/doc/en/gpg4win-compendium_11.html">Gpg4win Compendium</a>.</p>
</div>
<div class="column2">
@@ -130,7 +132,7 @@
<div class="column3">
<h4>Gpg4win Compendium</h4>
<p>The <a href="documentation.html">Gpg4win Compendium</a> provides
-an illustrative documentation for getting started in the topic of
+an illustrative documentation for getting started in the field of applied
cryptography and using Gpg4win.
It is available in German and English.</p>
</div>
@@ -159,20 +161,20 @@
<img src="img/sc-kleopatra-certifyCertificate1_de.png"></a>
<p>Use Kleopatra to certify (sign) a public OpenPGP certificate of
a trusted person.
-Thereby the certificate is marked as "trusted certificates".
+Thereby these certificates are marked as "trusted certificates".
</p>
</div>
<br clear="all"/>
-<h2>Another things to know</h2>
+<h2>Other things to know</h2>
<div class="column1">
<h4>Free Software</h4>
<p>Gpg4win is Free Software and
consists of several independently developed packages which have different
<a href="license.html">Free Software licenses</a>.
The majority (as Gpg4win) is licensed under
-GNU General Public License (GNU GPL). The using of Gpg4win is free.
+GNU General Public License (GNU GPL). The usage of Gpg4win is for free.
</div>
<div class="column2">
@@ -180,16 +182,16 @@
<p>Gpg4win supports Windows 7. All <a
href="screenshots.html">screenshots</a>
are made with Windows 7.
-Beyond Windows 2000, XP and Vista are supported.</p>
+Furthermore Windows 2000, XP and Vista are supported.</p>
<p>GpgOL requires Microsoft Outlook 2003 or 2007. Outlook 2010 is not
supported.</p>
-<p>Details are listed in the section of <a
-href="about.html">system requirements</a>.</p>
+<p>Details are listed in the section <a
+href="about.html#requirements">System Requirements</a> of Gpg4win's "About"-webpage.</p>
</div>
<div class="column3">
<h4>Internationalisation</h4>
-<p>All dialogs in Gpg4win are full available in English and German language.
+<p>All dialogs of Gpg4win are available in English and German language.
The Gpg4win Installer provides some additional languages.</p>
</div>
Modified: trunk/doc/website/index-de.htm4
===================================================================
--- trunk/doc/website/index-de.htm4 2011-05-02 17:58:33 UTC (rev 1666)
+++ trunk/doc/website/index-de.htm4 2011-05-18 07:24:56 UTC (rev 1667)
@@ -25,27 +25,31 @@
<div class="column1">
<h4>Gpg4win kennen lernen</h4>
- <p>Entdecken Sie, was in Gpg4win steckt! Lernen Sie kennen, <a href="about-de.html">was
- Gpg4win ist</a> und lassen Sie sich die <a href="features-de.html">Funktionen</a> zeigen.
- </p>
+<p>
+Entdecken Sie, was in Gpg4win steckt! Lernen Sie Gpg4win kennen und lassen Sie sich die Funktionen zeigen.
+</p>
+<a href="about-de.html">Über Gpg4win »</a>
+
</div>
<div class="column2">
<h4>Erste Schritte</h4>
-<p>Wir helfen Ihnen Gpg4win zum Einsatz zu bringen.
+<p>
+Wir helfen Ihnen Gpg4win zum Einsatz zu bringen.
Lernen Sie, wie einfach der Einstieg in die Kryptografie ist und
-beginnen Sie am besten mit dem <a href="./doc/de/gpg4win-compendium.html">Gpg4win-Kompendium</a>!</p>
+beginnen Sie am besten mit dem Gpg4win-Kompendium!
+</p>
+<a href="./doc/de/gpg4win-compendium.html">Zum Gpg4win-Kompendium »</a>
</div>
<div class="column3">
<h4>Gemeinschaft erleben</h4>
-<p>Ggp4win ist Freie Software. Nutzen Sie die <a href="community-de.html">Gemeinschaft</a>
-und nehmen Sie Kontakt mit uns auf!
-Wir empfehlen, sich in die <a
- href="http://lists.wald.intevation.org/mailman/listinfo/gpg4win-announce-de">Gpg4win-Bekanntmachungs-Mailingliste</a> einzuschreiben, um
- automatisch über neue Versionen und andere wichtige Neuigkeiten zu
- Gpg4win informiert zu werden.
+<p>
+Gpg4win ist Freie Software. Nutzen Sie die Gemeinschaft und gestalten
+Sie mit!<br> Unsere Empfehlung: Abonnieren Sie die
+<a href="http://lists.wald.intevation.org/mailman/listinfo/gpg4win-announce-de">Gpg4win-Bekanntmachungs-Mailingliste</a>, um automatisch über neue Versionen informiert zu werden.
</p>
+<a href="community-de.html">Zur Gpg4win-Gemeinschaft »</a>
</div>
</div>
Modified: trunk/doc/website/index.htm4
===================================================================
--- trunk/doc/website/index.htm4 2011-05-02 17:58:33 UTC (rev 1666)
+++ trunk/doc/website/index.htm4 2011-05-18 07:24:56 UTC (rev 1667)
@@ -23,31 +23,37 @@
<div class="column1">
<h4>Discover Gpg4win</h4>
- <p>Learn <a href="about.html">what
- Gpg4win is</a> and read more about the <a href="features.html">features</a> of
- our solution!
- </p>
+<p>
+Learn what Gpg4win is and read more about the features of our solution!
+</p>
+<a href="about.html">About Gpg4win »</a>
</div>
<div class="column2">
<h4>Getting started</h4>
<p>We help you to use Gpg4win. Learn the basics about Gpg4win and
get in the world of cryptography.
-The best point to start is with the illustrative
-<a href="./doc/en/gpg4win-compendium.html">Gpg4win Compendium</a>.
+The best point to start is with the illustrative Gpg4win Compendium.
+</p>
+<p>
+<a href="./doc/en/gpg4win-compendium.html">Go to the Gpg4win Compendium »</a>
+</p>
</p>
</div>
<div class="column3">
<h4>Join the community</h4>
-<p>Ggp4win is Free Software. Join the <a href="community.html">community</a>!
+<p>Gpg4win is Free Software. Join the community!
We recommend subscribing to the
<a href="http://lists.wald.intevation.org/mailman/listinfo/gpg4win-announce"
>Gpg4win announcement mailing list</a>
to be automatically informed about new releases and other
important Gpg4win news.
</p>
+<p>
+<a href="community.html">Go to the community »</a>
+</p>
</div>
</div>
Modified: trunk/doc/website/screenshots.htm4
===================================================================
--- trunk/doc/website/screenshots.htm4 2011-05-02 17:58:33 UTC (rev 1666)
+++ trunk/doc/website/screenshots.htm4 2011-05-18 07:24:56 UTC (rev 1667)
@@ -51,7 +51,7 @@
<img class="imgfloatleft imageframe"
src="img/sc-kleopatra-mainwindow-openpgp-certificates_de.png">
</a>
-<p>Kleopatra's main window with two (trustable) OpenPGP certificates.
+<p>Kleopatra's main window with two (trusted) OpenPGP certificates.
</p>
</li>
<li>
@@ -60,7 +60,7 @@
src="img/sc-kleopatra-mainwindow-x509-certificates_de.png">
</a>
<p>Kleopatra's main window of an imported X.509 certificate chain.
-The root certificate is trustable (blue background color).
+The root certificate is trusted (blue background color).
</p>
</li>
More information about the Gpg4win-commits
mailing list