[Gpg4win-commits] r1653 - in trunk/doc: . website website/img

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Wed Mar 16 10:17:02 CET 2011


Author: emanuel
Date: 2011-03-16 10:17:01 +0100 (Wed, 16 Mar 2011)
New Revision: 1653

Added:
   trunk/doc/website/img/page_bg.png
Modified:
   trunk/doc/ChangeLog
   trunk/doc/website/SPONSORS
   trunk/doc/website/community.htm4
   trunk/doc/website/contribute.htm4
   trunk/doc/website/documentation.htm4
   trunk/doc/website/donate.htm4
   trunk/doc/website/download-de.htm4
   trunk/doc/website/download.htm4
   trunk/doc/website/features.htm4
   trunk/doc/website/screenshots.htm4
   trunk/doc/website/support.htm4
   trunk/doc/website/template_header.m4
   trunk/doc/website/versions.m4
Log:
Fixed English typos. Added missing background image. Added new
sponsor.


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2011-03-15 13:53:08 UTC (rev 1652)
+++ trunk/doc/ChangeLog	2011-03-16 09:17:01 UTC (rev 1653)
@@ -1,3 +1,8 @@
+2011-03-16  Emanuel Schuetze <emanuel at intevation.de>
+
+	* website/*: Fixed typo. Added missing background image. Added new
+	sponsor.
+
 2011-03-15  Emanuel Schuetze <emanuel at intevation.de>
 
 	* website/*: Redesign website and update for gpg4win 2.1.0 release.

Modified: trunk/doc/website/SPONSORS
===================================================================
--- trunk/doc/website/SPONSORS	2011-03-15 13:53:08 UTC (rev 1652)
+++ trunk/doc/website/SPONSORS	2011-03-16 09:17:01 UTC (rev 1653)
@@ -4,6 +4,7 @@
 Ben Gerber
 Christopher Dawes
 Christian de Boor
+Christoph Wickert
 Daniel Aleksandersen 
 Daniele Berti 
 Florian Töpfer 

Modified: trunk/doc/website/community.htm4
===================================================================
--- trunk/doc/website/community.htm4	2011-03-15 13:53:08 UTC (rev 1652)
+++ trunk/doc/website/community.htm4	2011-03-16 09:17:01 UTC (rev 1653)
@@ -81,7 +81,7 @@
 
 <h2>Web Forums</h2>
 
-<p>As an alternative to mailing lists you can use following Gpg4win web
+<p>As an alternative to mailing lists you can use the following Gpg4win web
 forums for your questions and discussions.<br>
 <em>Note:</em> 
 You have to <a

Modified: trunk/doc/website/contribute.htm4
===================================================================
--- trunk/doc/website/contribute.htm4	2011-03-15 13:53:08 UTC (rev 1652)
+++ trunk/doc/website/contribute.htm4	2011-03-16 09:17:01 UTC (rev 1653)
@@ -16,14 +16,14 @@
 This is easier than you think and even little
 contributions may have a viable effect.
 As with any other Free Software you may either
-contribute yout time or money.
+contribute your time or money.
 </p>
 </div>
 
 <div id="main">
 <h2>As volunteer</h2>
 
-No matter what your strenghts and weaknesses are,
+No matter what your strengths and weaknesses are,
 you can get active for Gpg4win:
 
 <ul>
@@ -65,7 +65,7 @@
 
 
 </p>
-<p>You havn't found anything? Then please ask on the <a
+<p>You have not found anything? Then please ask on the <a
 href="http://lists.wald.intevation.org/mailman/listinfo/gpg4win-devel/">developer
 mailing list</a> what you can do!</p>
 
@@ -74,7 +74,7 @@
 
 <ul>
 
-<li> Give a small anount via the payment opportunity of the web site.
+<li> Give a small amount via the payment opportunity of the web site.
      Add a short comment along with a payment and explain for
      which improvements you would again pay.
      Even smallest amounts help and motivate.
@@ -82,7 +82,7 @@
 <p>
 
 <li> For an average amount, contact one of the project members
-     and receive a official invoice. You could also
+     and receive an official invoice. You could also
      contract for some specific step, update, bug fix or new features.
      Take care that your contracted improvements will be integrated
      into the main development of Gpg4win.

Modified: trunk/doc/website/documentation.htm4
===================================================================
--- trunk/doc/website/documentation.htm4	2011-03-15 13:53:08 UTC (rev 1652)
+++ trunk/doc/website/documentation.htm4	2011-03-16 09:17:01 UTC (rev 1653)
@@ -61,7 +61,7 @@
 </div>
 
 <p>
-The German langauage version of the Gpg4win-Compendium (v3.0.0) is also 
+The German language version of the Gpg4win-Compendium (v3.0.0) is also 
 available as a printed book with CD:
 </p>
 
@@ -81,7 +81,7 @@
 longer updated):
 
 <dl>
-  <dt><b>Gpg4win for Novices</b> (Englisch translation of "Gpg4win für Einsteiger")</dt>
+  <dt><b>Gpg4win for Novices</b> (English translation of "Gpg4win für Einsteiger")</dt>
   <dd>Last version: 1.0.0 (2006-11-30)<br>
    <a href="http://wald.intevation.org/frs/?group_id=11">All
 PDF versions</a> | <a

Modified: trunk/doc/website/donate.htm4
===================================================================
--- trunk/doc/website/donate.htm4	2011-03-15 13:53:08 UTC (rev 1652)
+++ trunk/doc/website/donate.htm4	2011-03-16 09:17:01 UTC (rev 1653)
@@ -22,7 +22,7 @@
 <h2>Donate</h2>
 <p>Your donation supports the maintenance and further development of
 Gpg4win and helps us to push the Free Software initiative Gpg4win. We
-are greatful for every financial aid. 
+are gratful for every financial aid. 
 </p>
 </div>
 
@@ -35,7 +35,7 @@
 motivate.</p>
 
 <p>For an <b>average amount</b>, contact one of the project members and
-receive a official invoice. You could also contract for some specific
+receive an official invoice. You could also contract for some specific
 step, update, bug fix or new features.  Take care that your contracted
 improvements will be integrated into the main development of
 Gpg4win.</p>

Modified: trunk/doc/website/download-de.htm4
===================================================================
--- trunk/doc/website/download-de.htm4	2011-03-15 13:53:08 UTC (rev 1652)
+++ trunk/doc/website/download-de.htm4	2011-03-16 09:17:01 UTC (rev 1653)
@@ -9,13 +9,6 @@
 m4_define(`MAIN', `download')
 
 PAGE_START
-<!--
-<div class="download_header">
- <span class="text">
- Sichere E-Mail- und Datei-Verschlüsselung<br/> mit GnuPG für Windows
- </span>
-</div>
--->
 
 <div id="intro">
 <h2>Download</h2>

Modified: trunk/doc/website/download.htm4
===================================================================
--- trunk/doc/website/download.htm4	2011-03-15 13:53:08 UTC (rev 1652)
+++ trunk/doc/website/download.htm4	2011-03-16 09:17:01 UTC (rev 1653)
@@ -130,3 +130,10 @@
 <a href="http://ftp.heanet.ie/about/">HEAnet</a>)</p>
 
 </div>
+
+<div id="sidebar">
+    <h3>Gpg4win VERSION contains:</h3>
+    <pre>
+    SOFTWAREOVERVIEW
+    </pre>
+</div>

Modified: trunk/doc/website/features.htm4
===================================================================
--- trunk/doc/website/features.htm4	2011-03-15 13:53:08 UTC (rev 1652)
+++ trunk/doc/website/features.htm4	2011-03-16 09:17:01 UTC (rev 1653)
@@ -28,7 +28,7 @@
 <b>OpenPGP</b> and <b>S/MIME (X.509)</b></p>
 <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 administratiors will read the step by step instructions
+Security aware system administrators will read the step by step instructions
 and define a systems-wide list of trustable X.509 root certificates.
 </p>
 <img src="img/sc-pinentry-openpgp_de.png">
@@ -38,14 +38,13 @@
 <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 
-standards of the Gnu Privacy Guard. GnuPG follows the recommendations
+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>
 
-<p>Bei der Erstellung von OpenPGP- und X.509-Zertifikaten wird standardmäißg eine 
-Schlüssellänge von 2048 bit verwendet. Als Signatur- und Verschlüsselungsverfahren
-kommt RSA zum Einsatz.</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>
 </div>
 
 <div class="column3">
@@ -71,10 +70,10 @@
 <div class="column2">
 <h4>Checksums</h4>
 <p>Create and verify checksums of files - also directly from the Windows Explorer. 
-Gpg4win creates (recursively) a unique chechsum for each selected file
+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 und md5sum.</p>
+Gpg4win supports the algorithm sha1sum, sha256sum and md5sum.</p>
 </div>
 <div class="column3">
 <img src="img/sc-gpgex-explorer-options_cut_de.png">
@@ -106,7 +105,7 @@
 <h4>&nbsp;</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 matches correctly.
+certificates which match correctly.
 Your work goes more quickly - without reducing security.
 </p>
 </div>
@@ -142,9 +141,9 @@
 
 
 <div class="column1">
-<h4>Manage certificates securely and komfortably</h4>
-<p>Kleopatra is the prefered certificate manager in Gpg4win.
-Kleopatra allows to manage all your certificates (OpenPGP und S/MIME) 
+<h4>Manage certificates securely and comfortably</h4>
+<p>Kleopatra is the preferred certificate manager in Gpg4win.
+Kleopatra allows to manage all your certificates (OpenPGP and S/MIME) 
 in one tool.</p>
 <a href="img/sc-kleopatra-mainwindow-openpgp-certificates_de.png">
 <img style="width:540px;" src="img/sc-kleopatra-mainwindow-openpgp-certificates_de.png"></a>
@@ -152,14 +151,14 @@
 <div class="column2">
 <h4>Certificate Server</h4>
 <p>Kleopatra provides a simple im- and export of certificates
-from and to (OpenPGP and X.509) certifikate servers (also called key servers).</p>
+from and to (OpenPGP and X.509) certificate servers (also called key servers).</p>
 </div>
 <div class="column3">
 <h4>Certify OpenPGP Certificates</h4>
 <a href="img/sc-kleopatra-certifyCertificate1_de.png">
 <img src="img/sc-kleopatra-certifyCertificate1_de.png"></a>
-<p>Use Kleopatra to certify (sign) an public OpenPGP certificate of 
-an trusted person.
+<p>Use Kleopatra to certify (sign) a public OpenPGP certificate of 
+a trusted person.
 Thereby the certificate is marked as "trusted certificates".
 </p>
 </div>
@@ -170,9 +169,9 @@
 <div class="column1">
 <h4>Free Software</h4>
 <p>Gpg4win is Free Software and 
-consists several independently developed packages which have different 
+consists of several independently developed packages which have different 
 <a href="license.html">Free Software licenses</a>. 
-The majority (as Gpg4win) is licenced under 
+The majority (as Gpg4win) is licensed under 
 GNU General Public License (GNU GPL). The using of Gpg4win is free.
 </div>
 

Added: trunk/doc/website/img/page_bg.png
===================================================================
(Binary files differ)


Property changes on: trunk/doc/website/img/page_bg.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/doc/website/screenshots.htm4
===================================================================
--- trunk/doc/website/screenshots.htm4	2011-03-15 13:53:08 UTC (rev 1652)
+++ trunk/doc/website/screenshots.htm4	2011-03-16 09:17:01 UTC (rev 1653)
@@ -158,7 +158,7 @@
 <img class="imgfloatleft imageframe"
 src="img/sc-gpgex-explorer-options_de.png">
 </a>
-<p>The context menu of GpgEX in Windows Explorer - with advances 
+<p>The context menu of GpgEX in Windows Explorer - with advanced 
 Options.</p>
 </li>
 </ul>

Modified: trunk/doc/website/support.htm4
===================================================================
--- trunk/doc/website/support.htm4	2011-03-15 13:53:08 UTC (rev 1652)
+++ trunk/doc/website/support.htm4	2011-03-16 09:17:01 UTC (rev 1653)
@@ -13,7 +13,7 @@
 <div id="intro">
 <h2>Professional Support for Gpg4win</h2>
 <p>The maintenance of the website is actually quite simply
-because many things are automized.
+because many things are automatized.
 What you should be (or should become) familiar with: a text editor,
 HTML, ssh and Subversions.</p> 
 </div>
@@ -34,9 +34,9 @@
 <p>
 In case timely answers, quick software modification or general
 consulting for using Gpg4win (installation, configuration etc.) is
-needed, the German free software companies
+needed, the German Free Software companies
 <a href="http://www.intevation.de">Intevation
-GmbH</a>, <a href="http://www.g10code.de">g10code GmbH</a> und 
+GmbH</a>, <a href="http://www.g10code.de">g10code GmbH</a> and 
 <a href="http://www.kdab.de">KDAB</a> jointly
 offer suitable professional support.
 The support contracts are tailored to the needs of the individual

Modified: trunk/doc/website/template_header.m4
===================================================================
--- trunk/doc/website/template_header.m4	2011-03-15 13:53:08 UTC (rev 1652)
+++ trunk/doc/website/template_header.m4	2011-03-16 09:17:01 UTC (rev 1653)
@@ -114,7 +114,8 @@
      MENU(`links', `Links', `Links', `links', SUB, LANG_DE)
      m4_ifelse(LANG_DE, `1', `<li><a href="Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win.html">Kurzstudie Gpg4win</a></li>', 
          `<li><a href="ShortStudy-Sustainable-FS-example-Gpg4win.html">Short Study Gpg4win</a></li>')
-     <li><a href="http://wald.intevation.org/projects/gpg4win/">Entwicklungsplattform</a></li>
+     m4_ifelse(LANG_DE, `1', `<li><a href="http://wald.intevation.org/projects/gpg4win/">Entwicklungsplattform</a></li>', 
+         `<li><a href="http://wald.intevation.org/projects/gpg4win/">Development Platform</a></li>')
      MENU(`contributors', `Mitwirkende', `Contributors', `contributors', SUB, LANG_DE)
      MENU(`impressum', `Impressum', `Impressum', `impressum', SUB, LANG_DE)
     </ul>

Modified: trunk/doc/website/versions.m4
===================================================================
--- trunk/doc/website/versions.m4	2011-03-15 13:53:08 UTC (rev 1652)
+++ trunk/doc/website/versions.m4	2011-03-16 09:17:01 UTC (rev 1653)
@@ -25,7 +25,8 @@
 <a href="http://www.g10code.de/p-gpgol.html">GpgOL</a> 1.1.2
 <a href="http://cvs.gnupg.org/cgi-bin/viewcvs.cgi/?root=GpgEX">GpgEX</a> 0.9.7
 <a href="http://www.claws-mail.org/">Claws Mail</a> 3.7.8cvs47
-I18N(`EN', `<a href="doc/de/gpg4win-compendium.html">Gpg4win Compendium</a> 3.0.0-beta1')I18N(`DE', `<a href="doc/de/gpg4win-compendium.html">Gpg4win-Kompendium</a> 3.0.0') 
+<a href="doc/de/gpg4win-compendium.html">Kompendium (de)</a> 3.0.0
+<a href="doc/en/gpg4win-compendium.html">Compendium (en)</a> 3.0.0-beta1
 ')
 
 m4_define(`COMPENDIUM_VERSION_DE',`3.0.0')



More information about the Gpg4win-commits mailing list