[Gpg4win-commits] r1645 - in trunk/doc: . website website/img
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Mar 15 09:23:05 CET 2011
Author: emanuel
Date: 2011-03-15 09:22:55 +0100 (Tue, 15 Mar 2011)
New Revision: 1645
Added:
trunk/doc/website/AUTHORS
trunk/doc/website/SPONSORS
trunk/doc/website/change-history-de.htm4
trunk/doc/website/change-history.htm4
trunk/doc/website/contributors-de.htm4
trunk/doc/website/contributors.htm4
trunk/doc/website/favicon.png
trunk/doc/website/features-de.htm4
trunk/doc/website/features.htm4
trunk/doc/website/header.m4
trunk/doc/website/img/
trunk/doc/website/img/bulletin.png
trunk/doc/website/img/donate_button.png
trunk/doc/website/img/donate_button_mini.png
trunk/doc/website/img/download_bg.png
trunk/doc/website/img/download_button.png
trunk/doc/website/img/download_button_mini.png
trunk/doc/website/img/english.png
trunk/doc/website/img/fancy_bg.png
trunk/doc/website/img/german.png
trunk/doc/website/img/gnupg.png
trunk/doc/website/img/heart.png
trunk/doc/website/img/help.png
trunk/doc/website/img/inmenudonate.png
trunk/doc/website/img/inmenudownload.png
trunk/doc/website/img/inmenulogo.png
trunk/doc/website/img/last.png
trunk/doc/website/img/logo.png
trunk/doc/website/img/logo_footer.png
trunk/doc/website/img/logo_mini.png
trunk/doc/website/img/menu_bg.png
trunk/doc/website/img/menubar.png
trunk/doc/website/img/sc-gpgex-explorer-options_cut_de.png
trunk/doc/website/img/sc-gpgex-explorer-options_de.png
trunk/doc/website/img/sc-gpgex-explorer-signEncrypt_cut_de.png
trunk/doc/website/img/sc-gpgol-options_de.png
trunk/doc/website/img/sc-gpgol-sendSignEncryptedMail_de.png
trunk/doc/website/img/sc-inst-welcome_de.png
trunk/doc/website/img/sc-kleopatra-ChooseCertificateFormat_de.png
trunk/doc/website/img/sc-kleopatra-certificateSearchOnKeyserver_de.png
trunk/doc/website/img/sc-kleopatra-certifyCertificate1_de.png
trunk/doc/website/img/sc-kleopatra-certifyCertificate2_de.png
trunk/doc/website/img/sc-kleopatra-certifyCertificate3_de.png
trunk/doc/website/img/sc-kleopatra-checksums-verify.png
trunk/doc/website/img/sc-kleopatra-configureCertificateserver_de.png
trunk/doc/website/img/sc-kleopatra-encryptFile1_de.png
trunk/doc/website/img/sc-kleopatra-encryptFile2_de.png
trunk/doc/website/img/sc-kleopatra-encryptFile3_de.png
trunk/doc/website/img/sc-kleopatra-mail-certificateselection-signencrypt_de.png
trunk/doc/website/img/sc-kleopatra-mail-decryptVerify-successful_de.png
trunk/doc/website/img/sc-kleopatra-mainwindow-openpgp-certificates_de.png
trunk/doc/website/img/sc-kleopatra-mainwindow-x509-certificates_de.png
trunk/doc/website/img/sc-kleopatra-openpgp-certificateDetails_de.png
trunk/doc/website/img/sc-kleopatra-openpgp-createKey_de.png
trunk/doc/website/img/sc-kleopatra-openpgp-ownertrust_de.png
trunk/doc/website/img/sc-kleopatra-openpgp-personalDetails_de.png
trunk/doc/website/img/sc-kleopatra-splashscreen_de.png
trunk/doc/website/img/sc-kleopatra-verifyFile2-details_de.png
trunk/doc/website/img/sc-kleopatra-x509-personalDetails_de.png
trunk/doc/website/img/sc-ol-emailfolder_cut_de.png
trunk/doc/website/img/sc-ol-emailfolder_de.png
trunk/doc/website/img/sc-pinentry-openpgp-set-passphrase_de.png
trunk/doc/website/img/sc-pinentry-openpgp_de.png
trunk/doc/website/img/sc-pinentry-smime_de.png
trunk/doc/website/img/sub_bg.png
trunk/doc/website/img/sub_tail.png
trunk/doc/website/img/t250.sc-gpgex-explorer-options_cut_de.png
trunk/doc/website/img/t250.sc-gpgex-explorer-options_de.png
trunk/doc/website/img/t250.sc-gpgex-explorer-signEncrypt_cut_de.png
trunk/doc/website/img/t250.sc-gpgol-options_de.png
trunk/doc/website/img/t250.sc-gpgol-sendSignEncryptedMail_de.png
trunk/doc/website/img/t250.sc-inst-welcome_de.png
trunk/doc/website/img/t250.sc-kleopatra-ChooseCertificateFormat_de.png
trunk/doc/website/img/t250.sc-kleopatra-certificateSearchOnKeyserver_de.png
trunk/doc/website/img/t250.sc-kleopatra-certifyCertificate1_de.png
trunk/doc/website/img/t250.sc-kleopatra-certifyCertificate2_de.png
trunk/doc/website/img/t250.sc-kleopatra-certifyCertificate3_de.png
trunk/doc/website/img/t250.sc-kleopatra-checksums-verify.png
trunk/doc/website/img/t250.sc-kleopatra-configureCertificateserver_de.png
trunk/doc/website/img/t250.sc-kleopatra-encryptFile1_de.png
trunk/doc/website/img/t250.sc-kleopatra-encryptFile2_de.png
trunk/doc/website/img/t250.sc-kleopatra-encryptFile3_de.png
trunk/doc/website/img/t250.sc-kleopatra-mail-certificateselection-signencrypt_de.png
trunk/doc/website/img/t250.sc-kleopatra-mail-decryptVerify-successful_de.png
trunk/doc/website/img/t250.sc-kleopatra-mainwindow-openpgp-certificates_de.png
trunk/doc/website/img/t250.sc-kleopatra-mainwindow-x509-certificates_de.png
trunk/doc/website/img/t250.sc-kleopatra-openpgp-certificateDetails_de.png
trunk/doc/website/img/t250.sc-kleopatra-openpgp-createKey_de.png
trunk/doc/website/img/t250.sc-kleopatra-openpgp-ownertrust_de.png
trunk/doc/website/img/t250.sc-kleopatra-openpgp-personalDetails_de.png
trunk/doc/website/img/t250.sc-kleopatra-splashscreen_de.png
trunk/doc/website/img/t250.sc-kleopatra-verifyFile2-details_de.png
trunk/doc/website/img/t250.sc-kleopatra-x509-personalDetails_de.png
trunk/doc/website/img/t250.sc-ol-emailfolder_cut_de.png
trunk/doc/website/img/t250.sc-ol-emailfolder_de.png
trunk/doc/website/img/t250.sc-pinentry-openpgp-set-passphrase_de.png
trunk/doc/website/img/t250.sc-pinentry-openpgp_de.png
trunk/doc/website/img/t250.sc-pinentry-smime_de.png
trunk/doc/website/license-de.htm4
trunk/doc/website/license.htm4
trunk/doc/website/screenshots-de.htm4
trunk/doc/website/screenshots.htm4
Removed:
trunk/doc/website/candidates-de.htm4
trunk/doc/website/candidates.htm4
trunk/doc/website/favicon.ico
trunk/doc/website/template_link_boxes_de.m4
trunk/doc/website/template_link_boxes_en.m4
Modified:
trunk/doc/ChangeLog
trunk/doc/README.de.txt
trunk/doc/website/Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win.htm4
trunk/doc/website/Makefile.am
trunk/doc/website/NEWS.last
trunk/doc/website/about-de.htm4
trunk/doc/website/about.htm4
trunk/doc/website/build-history.awk
trunk/doc/website/build-installer-de.htm4
trunk/doc/website/build-installer-gnulinux-de.htm4
trunk/doc/website/build-installer-gnulinux.htm4
trunk/doc/website/build-installer-on-vm-de.htm4
trunk/doc/website/build-installer-on-vm.htm4
trunk/doc/website/build-installer-on-w32-debian-screenshots-de.htm4
trunk/doc/website/build-installer-on-w32-debian-screenshots.htm4
trunk/doc/website/build-installer.htm4
trunk/doc/website/buildhtml.mk
trunk/doc/website/community-de.htm4
trunk/doc/website/community.htm4
trunk/doc/website/contribute-de.htm4
trunk/doc/website/contribute.htm4
trunk/doc/website/documentation-de.htm4
trunk/doc/website/documentation.htm4
trunk/doc/website/donate-de.htm4
trunk/doc/website/donate.htm4
trunk/doc/website/download-de.htm4
trunk/doc/website/download.htm4
trunk/doc/website/gpg4win.css
trunk/doc/website/impressum-de.htm4
trunk/doc/website/impressum.htm4
trunk/doc/website/index-de.htm4
trunk/doc/website/index.htm4
trunk/doc/website/links-de.htm4
trunk/doc/website/links.htm4
trunk/doc/website/localize-gpg4win.htm4
trunk/doc/website/newsarchive-de.htm4
trunk/doc/website/newsarchive.htm4
trunk/doc/website/package-integrity-de.htm4
trunk/doc/website/package-integrity.htm4
trunk/doc/website/reporting-bugs-de.htm4
trunk/doc/website/reporting-bugs.htm4
trunk/doc/website/support-de.htm4
trunk/doc/website/support.htm4
trunk/doc/website/template.m4
trunk/doc/website/template_header.m4
trunk/doc/website/versions.m4
trunk/doc/website/website-maintenance-de.htm4
trunk/doc/website/website-maintenance.htm4
Log:
Redesigned website and updated for gpg4win 2.1.0 release.
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/ChangeLog 2011-03-15 08:22:55 UTC (rev 1645)
@@ -1,3 +1,7 @@
+2011-03-15 Emanuel Schuetze <emanuel at intevation.de>
+
+ * website/*: Redesign website and update for gpg4win 2.1.0 release.
+
2011-03-02 Emanuel Schuetze <emanuel at intevation.de>
* README.de.txt, README.en.txt: Update for 2.1.0
Modified: trunk/doc/README.de.txt
===================================================================
--- trunk/doc/README.de.txt 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/README.de.txt 2011-03-15 08:22:55 UTC (rev 1645)
@@ -325,10 +325,10 @@
7. Rechtliche Hinweise zu den einzelnen Bestandteilen der Software
==================================================================
-Gpw4win besteht aus einer ganzen Reihe von unabhängig entwickelten
+Gpg4win besteht aus einer ganzen Reihe von unabhängig entwickelten
Packeten, die teilweise unterschiedliche Lizenzen haben. Der Großteil
dieser Software ist, wie Gpg4win selbst, steht unter der GNU General
-Public License (GNU GPL). Gemeinsam ist allen, daß die Software ohne
+Public License (GNU GPL). Gemeinsam ist, dass die Software ohne
Restriktionen benutzt werden kann, verändert werden darf und
Änderungen weitergeben dürfen. Wenn die Quelltexte (also
gpg4win-x.y.z.tar.bz2) mit weitergegeben werden und auf die die GNU
Added: trunk/doc/website/AUTHORS
===================================================================
--- trunk/doc/website/AUTHORS 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/AUTHORS 2011-03-15 08:22:55 UTC (rev 1645)
@@ -0,0 +1,20 @@
+Bernhard Herzog
+Bernhard Reiter
+Brigitte Hamilton
+Colin Leroy
+CJ
+Diego Escalante Urrelo
+Emanuel Schütze
+Fabian Rodriguez
+Florian von Samson
+Frank Osterfeld
+Dr. Jan-Oliver Wagner
+Khaled Hosny
+Marc Mutz
+Marcel Newmann
+Marco A.G.Pinto
+Marcus Brinkmann
+Till Adam
+Werner Koch
+
+(2011-03-15)
Modified: trunk/doc/website/Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win.htm4
===================================================================
--- trunk/doc/website/Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,39 +4,44 @@
m4_define(`DE')
m4_define(`EN_FILE', `ShortStudy-Sustainable-FS-example-Gpg4win.html')
+
+m4_define(`TITLE', `Kurzstudie: Nachhaltige Freie Software am Beispiel Gpg4win')
+m4_define(`MAIN', `main')
+
PAGE_START
+<div id="intro">
+<h2>Kurzstudie: <br><br>
+"Nachhaltige Freie Software:
+Vom Projekt zur Dauertätigkeit am Beispiel Gpg4win"
+</h2>
+<br>
+<p><a href="http://intevation.de">
+<img class="imgfloatleft imageframe" src="pix/intevation-logo.png"
+style="margin-top:20px"></a>
+</p>
<p>
-Zum Download verfügbar: <a href="http://wald.intevation.org/frs/download.php/787/Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win-20071005.pdf">Dieser Text als PDF-Dokument</a>
+<b>Autoren:</b><BR>
+Dr. Jan-Oliver Wagner <jan-oliver.wagner at intevation.de><BR>
+Bernhard Reiter <bernhard.reiter at intevation.de><BR>
+Intevation GmbH, Neuer Graben 17, 49074 Osnabrück<BR>
+Tel: 0541/33508-30, Fax: 0541/33508-59
</p>
+<br clear="all">
+<p>
+Diese Kurzstudie ist
+<a
+href="http://wald.intevation.org/frs/download.php/787/Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win-20071005.pdf">als
+PDF-Dokument zum Download</a> verfügbar.
+</p>
-<h1>Kurzstudie</h1>
-<h1 style="text-align: left; padding-bottom: 6px;">Nachhaltige Freie Software:
-Vom Projekt zur Dauertätigkeit am Beispiel Gpg4win</h1>
+<p><B>Stand Juni 2006</B>,
+Fassung vom 20. September 2007 (Webfassung 30.09.2008)</p>
+</div>
-<IMG SRC="pix/intevation-logo.png" NAME="Grafik17">
-<BR>
+<div id="main">
-<FONT FACE="Nimbus Roman No9 L, serif">Autoren:</FONT><BR>
-<FONT FACE="Nimbus Roman No9 L, serif">Dr. Jan-Oliver
-Wagner <jan-oliver.wagner at intevation.de></FONT><BR>
-<FONT FACE="Nimbus Roman No9 L, serif">Bernhard
-Reiter <bernhard.reiter at intevation.de></FONT><BR>
-<FONT FACE="Nimbus Roman No9 L, serif">Intevation GmbH, Neuer Graben
-17, 49074 Osnabrück</FONT><BR>
-<FONT FACE="Nimbus Roman No9 L, serif">Tel: 0541/33508-30, Fax:
-0541/33508-59 </FONT>
-<BR>
-
-<P ALIGN=RIGHT STYLE="margin-bottom: 0cm; background: transparent; border: none; padding: 0cm; line-height: 100%">
-<FONT FACE="Nimbus Roman No9 L, serif"><B>Stand Juni 2006</B>,
-Fassung vom 20. September 2007 (Webfassung 30.09.2008)</FONT>
-</P>
-<DIV ID="Inhaltsverzeichnis1" DIR="LTR">
- <DIV ID="Inhaltsverzeichnis1_Head" DIR="LTR">
- <P STYLE="margin-top: 6px; page-break-before: always; page-break-after: avoid">
- <FONT FACE="Nimbus Sans L, sans-serif"><FONT SIZE=4 STYLE="font-size: 16pt"><B>Inhaltsverzeichnis</B></FONT></FONT></P>
- </DIV>
+<h2>Inhaltsverzeichnis</h2>
<P STYLE="margin-bottom: 0cm">1 Zusammenfassung 3</P>
<P STYLE="margin-bottom: 0cm">2 Einleitung 3</P>
<P STYLE="margin-bottom: 0cm">3 Methodik 4</P>
@@ -98,7 +103,7 @@
Freiwilliger 23</P>
<P STYLE="margin-left: 0.5cm; margin-bottom: 0cm">A.2 Als
Geldgeber 23</P>
-</DIV>
+
<H2 CLASS="western">1 Zusammenfassung</H2>
<P ALIGN=JUSTIFY STYLE="margin-top: 0.11cm; margin-bottom: 0cm; background: transparent; border: none; padding: 0cm; line-height: 100%; page-break-inside: auto; page-break-before: auto; page-break-after: auto">
Wer in die Entwicklung einer Freien Software (Open Source)
@@ -1381,7 +1386,4 @@
<A
HREF="http://www.deshalbfrei.org/moinmoin/freiheit_helfen">http://www.deshalbfrei.org/moinmoin/freiheit_helfen.</A></P>
</DIV>
-<DIV TYPE=FOOTER>
- <P ALIGN=CENTER STYLE="margin-top: 0.5cm; margin-bottom: 0cm">- <SDFIELD TYPE=PAGE SUBTYPE=RANDOM FORMAT=PAGE>23</SDFIELD>
- / <SDFIELD TYPE=DOCSTAT SUBTYPE=PAGE FORMAT=PAGE>23</SDFIELD> -</P>
-</DIV>
+</div>
Modified: trunk/doc/website/Makefile.am
===================================================================
--- trunk/doc/website/Makefile.am 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/Makefile.am 2011-03-15 08:22:55 UTC (rev 1645)
@@ -18,9 +18,8 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
EXTRA_DIST = README buildhtml.mk gpg4win.css index-de.htm4 index.htm4 \
- newsarchive.htm4 newsarchive-de.htm4 \
template.m4 template_header.m4 versions.m4 build-history.awk \
- pix/disk.png pix/lock.png pix/logo.png mk-chksums NEWS.last
+ pix/disk.png pix/lock.png pix/logo.png mk-chksums NEWS.last
Modified: trunk/doc/website/NEWS.last
===================================================================
--- trunk/doc/website/NEWS.last 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/NEWS.last 2011-03-15 08:22:55 UTC (rev 1645)
@@ -3,6 +3,24 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
+Noteworthy changes in version 2.1.0 (2011-03-15)
+------------------------------------------------
+
+(en) New versions of GnuPG, Kleopatra, GpgEX, GpgOL, Claws.
+
+(de) Neue Versionen von GnuPG, Kleopatra, GpgEX, GpgOL, Claws.
+
+~~~~~~~~~~~~~~~
+GnuPG: 2.0.17
+Kleopatra: 2.1.0 (2011-02-04)
+GPA: 0.9.1-svn1024
+GpgOL: 1.1.2
+GpgEX: 0.9.7
+Claws-Mail: 3.7.8cvs47
+Kompendium DE: 3.0.0
+Kompendium EN: 3.0.0-beta1
+~~~~~~~~~~~~~~~
+
Noteworthy changes in version 2.0.4 (2010-07-28)
------------------------------------------------
Added: trunk/doc/website/SPONSORS
===================================================================
--- trunk/doc/website/SPONSORS 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/SPONSORS 2011-03-15 08:22:55 UTC (rev 1645)
@@ -0,0 +1,43 @@
+Andrew Huang
+Andy Fletcher
+Armando Villani
+Ben Gerber
+Christopher Dawes
+Christian de Boor
+Daniel Aleksandersen
+Daniele Berti
+Florian Töpfer
+Gerd Schweinsberg
+Greg Robinson
+Gunner Gewiß
+Hendrik Jan Strijker
+Hugh Glenister
+Igor Sharov
+Ingolf Petersohn
+James Carpenter
+Jay Litwyn
+Joachim Bolle
+Johannes Egbert Münch
+Jürgen Sättler
+Kurt Meyer
+Kevin Smith
+Lilo von Hanffstengel
+Marcel Bade
+Marco A G Pinto
+Mark Jennings
+Markus Barkholz
+Michael Langhammer
+Nelson Ingersoll
+note.com LLC
+Oliver Schubbe
+PCMasters.de
+Peter Engel
+Richard Dorn
+Rudolf Doczkal
+Sebastian Morkisch
+Terry Sullivan
+Thomas Freeman
+Tom Niderost
+Wilford Isner III
+
+(2011-03-10)
Modified: trunk/doc/website/about-de.htm4
===================================================================
--- trunk/doc/website/about-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/about-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,34 +4,111 @@
m4_define(`DE')
m4_define(`EN_FILE', `about.html')
+m4_define(`about-de.html', `0')
+
+m4_define(`TITLE', `Über Gpg4win')
+m4_define(`MAIN', `about')
+
PAGE_START
-<h1>Über Gpg4win</h2>
+<div id="intro">
+<h2>Über Gpg4win</h2>
+<p>Gpg4win (GNU Privacy Guard for Windows) ist ein
+Kryptografie-Werkzeugpaket zum Verschlüsseln und Signieren unter
+Windows.</p>
+</div>
-<p>Die Gpg4win-Initiative hat das <b>Ziel</b>
-das Gpg4win-Windows-Installationspaket für
-die Verschlüsselungssoftware
-GnuPG sowie zugehörige Anwendungen
-<b>kontinuierlich zu aktualisieren</b>.
-Insbesondere wird die <a href="documentation-de.html">Dokumentation</a>
-("Gpg4win-Kompendium") direkt von den Gpg4win-Machern gepflegt.</p>
+<div id="main">
+<h2>Was ist Gpg4win?</h2>
+<p>Mit Gpg4win kann jeder E-Mails, Dateien und Datei-Ordner einfach und
+kostenlos ver- und entschlüsseln, sowie ihre Integrität
+(Unverändertheit) und Herkunft (Authentizität) mittels digitaler
+Signaturen absichern und überprüfen.</p>
+
+<p>Gpg4win unterstützt die beiden relevanten kryptographischen Standards
+<b>OpenPGP</b> und <b>S/MIME (X.509)</b>. Gpg4win ist die offizielle
+GnuPG-Distribution für Windows und wird von den Entwicklern von GnuPG
+gepflegt. Gpg4win und die darin enthaltenen Komponenten sind <a
+href="http://fsfe.org/about/basics/freesoftware.en.html">Freie
+Software</a> (OSS). Alle Dialoge sind vollständig in deutscher Sprache
+verfügbar.</p>
+
+<p>Gpg4win wurde beauftragt vom
+<a href="http://www.bsi.bund.de">Bundesamt für Sicherheit in der Informationstechnik (BSI)</a>.
+
+<h2>Die Gpg4win-Kompenenten</h2>
+<p>Gpg4win ist ein Installationspaket für Windows und besteht aus
+verschiedenen Freien Software Komponenten, die wahlweise
+installiert werden können:</p>
+
+<ul>
+<li><b>GnuPG</b>
+ <p>Das Kernstück, das eigentliche Verschlüsselungsprogramm.</p>
+</li>
+<li><b>Kleopatra</b>
+ <p>Ein Zertifikatsmanager für OpenPGP und X.509 (S/MIME);
+ stellt einheitliche Benutzerführung für alle Krypto-Dialoge bereit.</p>
+</li>
+<li><b>GPA</b>
+ <p>Ein alternativer Zertifikatsmanager für OpenPGP und X.509.</p>
+</li>
+<li><b>GpgOL</b>
+ <p>Eine Programmerweiterung für Microsoft Outlook 2003 und 2007
+ (E-Mail-Verschlüsselung).</p>
+</li>
+<li><b>GpgEX</b>
+<p>Eine Programmerweiterung für den Microsoft Explorer
+ (Dateiverschlüsselung).</p>
+</li>
+<li><b>Claws Mail</b>
+<p>Ein komplettes E-Mail-Programm inklusive
+Programmerweiterung für GnuPG.</p>
+</li>
+<li><b>Gpg4win-Kompendium</b>
+<p>Die Dokumentation zu Gpg4win (für Einsteiger und
+Fortgeschrittene). Verfügbar in deutscher und englischer Sprache.</p>
+</li>
+</ul>
+
+<h2>Systemvorausetzungen</h2>
+<p>Gpg4win ist lauffähig unter Windows 2000, XP, Vista und 7. 32 und 64bit Systeme werden
+unterstützt.</p>
+
+<p>Das Outlook-Plugin GpgOL ist kompatibel mit Microsoft Outlook 2003 und 2007.
+Outlook 2010 wird nicht unterstützt.</p>
+
+<p><b>Wichtig:</b> Das Windows-Explorer-Plugin GgpEX funktioniert
+derzeit nur auf 32bit Windows-Systemen. Eine 64bit-Erweiterung ist in
+Arbeit. Unter Windows 64bit lassen sich alle Datei-Kryptofunktionen von
+GpgEX jedoch alternativ über das Datei-Menü von Kleopatra ausführen
+(z.B. Datei > Datei signieren/verschlüsseln).</p>
+
+
+<h2>Das Ziel der Gpg4win-Initiative</h2>
+<p>Die Gpg4win-Initiative hat das Ziel das
+Gpg4win-Windows-Installationspaket für die Verschlüsselungssoftware
+GnuPG sowie zugehörige Anwendungen kontinuierlich zu aktualisieren.
+Insbesondere wird die <a
+href="documentation-de.html">Dokumentation</a> (das
+"Gpg4win-Kompendium") direkt von den Gpg4win-Machern gepflegt.</p>
+
<p>
Ein weiteres zentrales Ziel ist die vereinigte Unterstützung
-für die beiden relevanten kryptographischen Standards <b>OpenPGP
-und S/MIME</b>.
+für die beiden relevanten kryptographischen Standards OpenPGP
+und S/MIME.
</p>
<p>
Gpg4win ist ein internationales Projekt, aufgrund der Herkunft
des Projektes und vieler Beteiligter liegt eine
-<b>vollständige deutsche Übersetzung</b> vor.
+vollständige deutsche Übersetzung vor.
</p>
<p>
Der Hauptunterschied zu den bisherigen Ansätzen
(vor allem GnuPP, GnuPT, Windows Privacy Tools und GnuPG-Basics)
-ist, dass zunächst der <b>Gpg4win-Builder</b> entwickelt wurde.
+ist, dass zunächst der Gpg4win-Builder entwickelt wurde.
Dieser erlaubt es, sehr leicht neue gpg4win.exe-Installer
mit aktualisierten Komponenten herzustellen.
Und zwar auf einem GNU/Linux System. Fast alle Produkte
@@ -39,67 +116,27 @@
</p>
<p>
-Damit verbindet sich die Hoffnung, der <b>schnellen Alterung von Installer-Paketen
-entgegenzuwirken</b>, denn eine Aktualisierung wird deutlich einfacher
+Damit verbindet sich die Hoffnung, der schnellen Alterung von Installer-Paketen
+entgegenzuwirken, denn eine Aktualisierung wird deutlich einfacher
und hängt eben nicht von einer Einzelperson ab.
</p>
-<p><br>
-Im Vorfeld der Beauftragung und Entwicklung von Gpg4win2 wurde eine Kurzstudie
-zum Thema <a
+<h2>Kurzstudie: Nachhaltige Freie Software</h2
+<p> Im Vorfeld der Beauftragung und Entwicklung von Gpg4win2 wurde
+eine Kurzstudie zum Thema <a
href="Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win.html">"Nachhaltige
-Freie Software: Vom Projekt zur Dauertätigkeit
-am Beispiel Gpg4win"</a> verfasst.
-</p>
+Freie Software: Vom Projekt zur Dauertätigkeit am Beispiel
+Gpg4win"</a> verfasst. </p>
-<h2>Bildschirmfotos</h2>
+<h2>Funktionen & Screenshots</h2>
-<p>Nachfolgend einige Bildschirmfotos von der Zertifikatsverwaltung
-Kleopatra und deren Krypto-Dialoge:</p>
+<p>Lesen Sie weiter und erfahren Sie mehr über die umfangreichen <a href="features-de.html">Funktionen</a>
+von Gpg4win. Einen ersten Eindruck bekommen Sie von den <a href="screenshots-de.html">Screenshots</a>.
+</p>
-<ul>
-<li><p><b>Gpg4win-Installer - der Begrüßungsbildschirm:</b></p>
-<a href="doc/images-compendium/sc-inst-welcome_de.png">
-<img src="doc/images-compendium/sc-inst-welcome_de.png"
-width="400px"
-alt="Gpg4win-Installer - der Begrüßungsbildschirm"
-title="Gpg4win-Installer - der Begrüßungsbildschirm">
-</a>
-</li>
+</div>
-<li><p><b>Kleopatra - die Erstellung eines OpenPGP-Zertifikats:</b></p>
-<a href="doc/images-compendium/sc-kleopatra-openpgp-personalDetails_de.png">
-<img src="doc/images-compendium/sc-kleopatra-openpgp-personalDetails_de.png"
-width="400px"
-alt="Kleopatra - die Erstellung eines OpenPGP-Zertifikats"
-title="Kleopatra - die Erstellung eines OpenPGP-Zertifikats">
-</a>
-</li>
-
-<li>
-<p><b>Kleopatra - der Zertifikatsmanager mit einem OpenPGP-Zertifikat:</b></p>
-<a href="doc/images-compendium/sc-kleopatra-withOpenpgpTestkey_de.png">
-<img src="doc/images-compendium/sc-kleopatra-withOpenpgpTestkey_de.png"
-width="400px"
-alt="Kleopatra - der Zertifikatsmanager mit einem OpenPGP-Zertifikat"
-title="Kleopatra - der Zertifikatsmanager mit einem OpenPGP-Zertifikat">
-</a>
-</li>
-
-<li><p><b>Detailansicht eines OpenPGP-Zertifikats:</b></p>
-<a href="doc/images-compendium/sc-kleopatra-openpgp-certificateDetails_de.png">
-<img src="doc/images-compendium/sc-kleopatra-openpgp-certificateDetails_de.png"
-width="400px"
-alt="Details eines OpenPGP-Zertifikats" title="Details eines OpenPGP-Zertifikats">
-</a>
-</li>
-
-<li><p><b>Auswahldialog zum Verschlüsseln und Signieren von Dateien mit Kleopatra:</b></p>
-<a href="doc/images-compendium/sc-kleopatra-encryptFile1_de.png">
-<img src="doc/images-compendium/sc-kleopatra-encryptFile1_de.png"
-width="400px"
-alt="Auswahldialog zum Verschlüsseln und Signieren von Dateien mit Kleopatra" title="Auswahldialog zum Verschlüsseln und Signieren von Dateien mit Kleopatra">
-</a>
-</li>
-</ul>
+<div id="sidebarsimple">
+ <img src="img/logo.png">
+</div>
Modified: trunk/doc/website/about.htm4
===================================================================
--- trunk/doc/website/about.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/about.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,46 +4,112 @@
m4_define(`EN')
m4_define(`DE_FILE', `about-de.html')
+
+m4_define(`TITLE', `About Gpg4win')
+m4_define(`MAIN', `about')
+
PAGE_START
-<h1>About Gpg4win</h2>
+<div id="intro">
+<h2>About Gpg4win</h2>
+<p>Gpg4win (GNU Privacy Guard for Windows) is
+an encryption software for files and emails.</p>
+</div>
-<p>The Gpg4win initiative aims <b>to provide a current</b> Gpg4win Windows installation
+<div id="main">
+<h2>What ist Gpg4win?</h2>
+<p>Gpg4win enables users to securely transport emails and files
+with the help of encryption and digital signatures. Encryption protects
+the contents against an unwanted party reading it. Digital signatures
+make sure that it was not modified and comes from a specific sender.</p>
+
+<p>Gpg4win supports both relevant cryptography standards,
+<b>OpenPGP</b> and <b>S/MIME (X.509)</b>.
+
+Gpg4win is the official GnuPG distribution for Windows and is
+maintained by the developers of GnuPG.
+Gpg4win and the software included with Gpg4win
+are <a href="http://fsfe.org/about/basics/freesoftware.en.html">Free
+Software</a> (Open Source; among other things free of charge for
+all commercial and non-commercial purposes).
+</p>
+
+<p>Creation of Gpg4win was supported by the German
+<a href="http://www.bsi.bund.de">Federal Office for Information Security (BSI)</a>.
+
+<h2>Gpg4win Components</h2>
+<p>Gpg4win is an installer for Windows and contains several
+Free Software components:
+</p>
+
+<ul>
+<li><b>GnuPG</b>
+ <p>The core; this is the actual encryption tool.</p>
+</li>
+<li><b>Kleopatra</b>
+ <p>A certificate manager for OpenPGP and X.509 (S/MIME) and common crypto dialogs.</p>
+</li>
+<li><b>GPA</b>
+ <p>An alternative certificate manager for OpenPGP and X.509 (S/MIME).</p>
+</li>
+<li><b>GpgOL</b>
+ <p>A plugin for Microsoft Outlook 2003 and 2007 (email encryption).</p>
+</li>
+<li><b>GpgEX</b>
+<p>A plugin for Microsoft Explorer 32bit (file encryption).</p>
+</li>
+<li><b>Claws Mail</b>
+<p>A complete email application with crypto support.</p>
+</li>
+<li><b>Gpg4win Compendium</b>
+<p>The documentation (for beginner and advanced users),
+available in English and German.</p>
+</li>
+</ul>
+
+<h2>System Requirements</h2>
+<p>Gpg4win runs on Windows 2000, XP, Vista and 7. Both 32 and
+64bit systems are supported.</p>
+
+<p>The Outlook plugin GpgOL is compatible with Microsoft Outlook 2003
+and 2007. Outlook 2010 is not supported.</p>
+
+<p><b>Important:</b> Currently, the Windows Explorer plugin GgpEX
+works with 32bit Explorer only. It is possible to use the 32bit Explorer
+on some 64bit Windows. A 64bit update is in progress.
+All file crypto features of GpgEX on Windows 64bit can be accessed
+from the file menu of Kleopatra (e.g. File > Sign/encrypt file).</p>
+
+<h2>Aim of Gpg4win Initiative</h2>
+<p>The Gpg4win initiative aims to provide a current Gpg4win Windows installation
package including the GnuPG encryption tool and associated applications.
-The <a href="documentation.html">documentation</a>
-("Gpg4win Compendium" and "Novices") is directly maintained
-as part of the Gpg4win project.</p>
+The <a href="documentation.html">documentation</a> ("Gpg4win
+Compendium") is maintained as part of the effort.
+</p>
<p>
-Another goal is to support both relevant cryptographic standards,
-<b>OpenPGP and S/MIME</b> in a unified way.
+Both OpenPGP and S/MIME should be supported in a unified way.
</p>
<p>
-Gpg4win is an international effort. Due to the origin of the project and
-many members, there is a full German translation.
-Additional translators are welcome!
+Gpg4win is an international effort. Due to the origins of the initiative
+there is a full German translation.
+<a href="localization-gpg4win.html">Additional translators are
+welcome!</a>
</p>
<p>
-The main difference compared to all similar approaches
-(mainly GnuPP, GnuPT, Windows Privacy Tools and GnuPG-Basics)
-is that the first piece developed was the <b>Gpg4win-Builder</b>.
-This builder allows to easily create new gpg4win.exe installers
-with updated components.
-It runs best on a GNU/Linux system. Almost all products
-are even automatically cross-compiled for integration into
-the installer.
+A main achievement of Gpg4win is to focus on the builder,
+which allows to easily create updated installers.
+The builder runs best on a GNU/Linux system. Almost all software components
+are automatically cross-compiled for integration into
+the installer. Thus Gpg4win does not depend on a single
+person to manually create the installer.
</p>
+<h2>Short Study: Sustainable Free Software</h2>
<p>
-This concept raises hope to practically <b>prevent
-quick aging of the installer package</b> because updating is easier
-and does not depend on a single person.
-</p>
-
-<p><br>
-Before starting getting contracted to develop Gpg4win2,
+Before Gpg4win2 was developed,
Jan-Oliver Wagner and Bernhard Reiter wrote a short study
about <a href="ShortStudy-Sustainable-FS-example-Gpg4win.html">"Sustainable
Free Software: From project to permanent activity, using the example
@@ -51,54 +117,16 @@
</p>
-<h2>Screenshots</h2>
+<h2>Features & Screenshots</h2>
+<p>
+Read more about the <a href="features.html">features</a> of Gpg4win.
+Get a first impression of Gpg4win from the <a
+href="screenshots.html">screenshots</a>.
-<p>Some screenshots of the certificate manager Kleopatra and its
-crypto dialogs:</p>
+</p>
-<ul>
-<li><p><b>Gpg4win Installer - the welcome screen:</b></p>
-<a href="doc/images-compendium/sc-inst-welcome_en.png">
-<img src="doc/images-compendium/sc-inst-welcome_en.png"
-width="400px"
-alt="Gpg4win Installer - the welcome screen"
-title="Gpg4win Installer - the welcome screen">
-</a>
-</li>
+</div>
-<li><p><b>Kleopatra - the creation of an OpenPGP certificate:</b></p>
-<a href="doc/images-compendium/sc-kleopatra-openpgp-personalDetails_en.png">
-<img src="doc/images-compendium/sc-kleopatra-openpgp-personalDetails_en.png"
-width="400px"
-alt="Kleopatra - the creation of an OpenPGP certificate"
-title="Kleopatra - the creation of an OpenPGP certificate">
-</a>
-</li>
-
-<li><p><b>Kleopatra - the certificate manager with an OpenPGP certificate:</b></p>
-<a href="doc/images-compendium/sc-kleopatra-withOpenpgpTestkey_en.png">
-<img src="doc/images-compendium/sc-kleopatra-withOpenpgpTestkey_en.png"
-width="400px"
-alt="Kleopatra - the certificate manager with an OpenPGP certificate"
-title="Kleopatra - the certificate manager with an OpenPGP certificate">
-</a>
-</li>
-
-<li><p><b>Details of an OpenPGP certificate:</b></p>
-<a href="doc/images-compendium/sc-kleopatra-openpgp-certificateDetails_en.png">
-<img src="doc/images-compendium/sc-kleopatra-openpgp-certificateDetails_en.png"
-width="400px"
-alt="Details of an OpenPGP certificate"
-title="Details of an OpenPGP certificate">
-</a>
-</li>
-
-<li><p><b>Dialog to encrypt and/or sign files with Kleopatra:</b></p>
-<a href="doc/images-compendium/sc-kleopatra-encryptFile1_en.png">
-<img src="doc/images-compendium/sc-kleopatra-encryptFile1_en.png"
-width="400px"
-alt="Dialog to encrypt and/or sign files with Kleopatra"
-title="Dialog to encrypt and/or sign files with Kleopatra">
-</a>
-</li>
-</ul>
+<div id="sidebarsimple">
+ <img src="img/logo.png">
+</div>
Modified: trunk/doc/website/build-history.awk
===================================================================
--- trunk/doc/website/build-history.awk 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/build-history.awk 2011-03-15 08:22:55 UTC (rev 1645)
@@ -60,29 +60,38 @@
"m4_include(`template.m4')\n" \
"m4_define(`EN')\n" \
"m4_define(`DE_FILE', `change-history-de.html')\n" \
+ "m4_define(`TITLE', `Change History')\n" \
"PAGE_START\n" \
- "<h1>Change History of Gpg4win</h1>\n" \
+ "<div id='intro'>" \
+ "<h2>Change History of Gpg4win</h2>" \
"<p>Please note that old releases still contain meanwhile fixed\n" \
- "security issues.</p>\n" ;
+ "security issues.</p>\n" \
+ "</div>\n" \
+ "<div id='main'>\n" ;
header_text["de"] = "" \
"m4_dnl -*-html-*-\n" \
"m4_include(`template.m4')\n" \
"m4_define(`DE')\n" \
"m4_define(`EN_FILE', `change-history.html')\n" \
+ "m4_define(`TITLE', `Änderungshistorie')\n" \
"PAGE_START\n" \
- "<h1>Änderungshistorie von Gpg4win</h1>\n" \
- "<p>Die deutsche Übersetzung der Historie ist nicht notwendigerweise\n" \
- "vollständig. Begonnen wurde sie mit Version 1.0.0.</p>\n" \
+ "<div id='intro'>" \
+ "<h2>Änderungshistorie von Gpg4win</h2>" \
"<p>Bitte beachten Sie, dass die alten Versionen die ggf.\n" \
- "zwischenzeitlich beseitigten Sicherheitslöcher weiterhin enthalten!</p>\n";
-
+ "zwischenzeitlich beseitigten Sicherheitslöcher weiterhin enthalten!</p>\n" \
+ "</div>\n" \
+ "<div id='main'>\n" ;
+
+
release_text["en"] = "released ";
release_text["de"] = "veröffentlicht ";
noreldate_text["en"] = "[ in progress; not yet released ]";
noreldate_text["de"] = "[ in Arbeit; bisher noch nicht veröffentlicht ]";
explicit_dl_text["en"] = "Explicit download of this version:";
explicit_dl_text["de"] = "Expliziter Download dieser Version:";
+ readme_text["en"] = "Details in the README of this version:";
+ readme_text["de"] = "Details im README dieser Version:";
print header_text[lang];
}
@@ -91,8 +100,6 @@
/^---/ { next }
in_section && $0 ~ /^Noteworthy/ {
- if (in_para)
- print "</ul>"
if (in_vers)
print "</pre>"
in_section = 0;
@@ -129,15 +136,12 @@
if ( $0 ~ ("^\\(" lang "\\)" ) ) {
in_para = 1;
any_para = 1;
- print "<li>"
print substr ($0, 5);
}
next;
}
in_section && !in_vers && /^~~~/ {
- if (in_para && any_para)
- print "</ul>"
in_para = 0;
in_vers = 1;
print ""
@@ -156,6 +160,10 @@
printf "<p>%s ", explicit_dl_text[lang];
printf "<a href=\"http://ftp.gpg4win.org/gpg4win-%s.exe\">gpg4win-%s.exe</a><br>", version, version;
printf "</p>"
+
+ printf "<p>%s ", readme_text[lang];
+ printf "<a href=\"http://ftp.gpg4win.org/README-%s." lang ".txt\">README-%s." lang ".txt</a><br>", version, version;
+ printf "</p>"
}
in_vers {
@@ -165,6 +173,5 @@
END {
- if (in_para && any_para)
- print "</ul>"
+ print "</div>"
}
Modified: trunk/doc/website/build-installer-de.htm4
===================================================================
--- trunk/doc/website/build-installer-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/build-installer-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,13 +4,19 @@
m4_define(`DE')
m4_define(`EN_FILE', `build-installer.html')
+
+m4_define(`TITLE', `Bau von Gpg4win')
+m4_define(`MAIN', `community')
+
PAGE_START
-<h1>Gpg4win Installationspaket selbst herstellen</h1>
+<div id="intro">
+<h2>Bau von Gpg4win</h2>
+<p>Wie Sie Gpg4win-Installationspakete selbst herstellen erfahren Sie
+auf dieser Seite.</p>
+</div>
-<p><em>Achtung: Diese Seite (und die Unterseiten zum Bau von Gpg4win) ist noch nicht
-vollständig auf Gpg4win2 aktualisiert.</em></p>
-
+<div id="main">
<h2>Herkömmlicher ".exe-Installer"</h2>
<p>
@@ -188,3 +194,4 @@
src/make-msi.bat auf dem Windows-System benötigt. Sie sollten dort
auch wieder in das src/ Verzeichnis abgelgegt werden.
</ul>
+</div>
Modified: trunk/doc/website/build-installer-gnulinux-de.htm4
===================================================================
--- trunk/doc/website/build-installer-gnulinux-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/build-installer-gnulinux-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,20 +4,23 @@
m4_define(`DE')
m4_define(`EN_FILE', `build-installer-gnulinux.html')
+
+m4_define(`MAIN', `community')
+m4_define(`TITLE', `Bau von Gpg4win unter GNU/Linux')
+
PAGE_START
-<h1>Bau von Gpg4win unter GNU/Linux</h1>
-
-<p><b>
-Dieses Beispiel beschreibt konkret die Herstellung eines neuen
+<div id="intro">
+<h2>Bau von Gpg4win unter GNU/Linux</h2>
+<p>Dieses Beispiel beschreibt konkret die Herstellung eines neuen
Gpg4win Installers auf Debian GNU/Linux 'Etch' 4.0.
-Grundsätzlich können auch andere GNU/Linux Systeme verwendet werden.
-</b></p>
-
+Grundsätzlich können auch andere GNU/Linux Systeme verwendet werden.</p>
<p>
<a href="build-installer-de.html">Zurück zur Übersicht zum Installer-Bau</a>
</p>
+</div>
+<div id="main">
<h2>Den Gpg4win Installer direkt bauen</h2>
<ol>
@@ -180,4 +183,4 @@
Das zugehörige Quelltextpaket (mit den Quelltexten sämtlicher Module, sehr gross!) unter:<br>
<em>src/gpg4win-src-n.n.n.exe</em><br>
</p>
-
+</div>
Modified: trunk/doc/website/build-installer-gnulinux.htm4
===================================================================
--- trunk/doc/website/build-installer-gnulinux.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/build-installer-gnulinux.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,20 +4,24 @@
m4_define(`EN')
m4_define(`DE_FILE', `build-installer-gnulinux-de.html')
+
+m4_define(`MAIN', `community')
+m4_define(`TITLE', `Building Gpg4win under GNU/Linux')
+
PAGE_START
-<h1>Build Gpg4win under GNU/Linux</h1>
-
-<p><b>
-This example specifically describes how to create
+<div id="intro">
+<h2>Building Gpg4win under GNU/Linux</h2>
+<p>This example specifically describes how to create
a new Gpg4win installer on a Debian GNU/Linux 'Etch' 4.0.
-In principle, any other GNU/Linux system could be used as well.
-</b></p>
-
+In principle, any other GNU/Linux system could be used as well..</p>
<p>
<a href="build-installer.html">Back to overview on building installer</a>
</p>
+</div>
+<div id="main">
+
<h2>Create a new installer package</h2>
The character '#' indicates commands to be executed as administrator (root)
@@ -176,4 +180,5 @@
The corresponding source code packages (with the sources of all modules, very big!) is here:<br>
<em>src/gpg4win-src-n.n.n.exe</em><br>
</p>
+</div>
Modified: trunk/doc/website/build-installer-on-vm-de.htm4
===================================================================
--- trunk/doc/website/build-installer-on-vm-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/build-installer-on-vm-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,27 +4,30 @@
m4_define(`DE')
m4_define(`EN_FILE', `build-installer-on-vm.html')
+
+m4_define(`MAIN', `community')
+m4_define(`TITLE', `Bau von Gpg4win unter Windows')
+
PAGE_START
-<h1>Bau von Gpg4win unter Windows via eines virtualisiertem GNU/Linux</h1>
-
-<p><b>
-Dieses Beispiel beschreibt konkret die Herstellung eines neuen Gpg4win Installers
+<div id="intro">
+<h2>Bau von Gpg4win unter Windows<br>via eines virtualisiertem GNU/Linux</h2>
+<p>Dieses Beispiel beschreibt konkret die Herstellung eines neuen Gpg4win Installers
auf Windows XP/SP2 via Debian 'Etch' 4.0 in QEMU.
Grundsätzlich können für alle drei Komponenten auch Alternativen verwendet
werden.
-</b></p>
-
+</p>
<p>
Tipps: <a href="build-installer-gnulinux-de.html">Bauen unter
GNU/Linux etwas detaillierter beschrieben</a> und
<a href="build-installer-on-w32-debian-screenshots-de.html">Installation von Debian GNU/Linux 'Etch' 4.0 innerhalb einer virtuellen QEMU-Maschine als Screenshot-Serie illustriert</a>.
</p>
-
<p>
<a href="build-installer-de.html">Zurück zur Übersicht zum Installer-Bau</a>
</p>
+</div>
+<div id="main">
<h2>Inhalt</h2>
<p>
@@ -479,7 +482,7 @@
</p>
<h2><a name="references"></a>Referenzen (URLs)</h2>
-
+<p>
<tt>
<a name="ref1">[1]</a> <a href="http://fabrice.bellard.free.fr/qemu/">http://fabrice.bellard.free.fr/qemu/</a> <br>
<a name="ref2">[2]</a> <a href="http://www.debian.org/">http://www.debian.org/</a> <br>
@@ -493,3 +496,5 @@
<a name="ref10">[10]</a> <a href="http://cdimage.debian.org/debian-cd/4.0_r0/i386/iso-cd/debian-40r0-i386-netinst.iso">http://cdimage.debian.org/debian-cd/4.0_r0/i386/iso-cd/debian-40r0-i386-netinst.iso</a> <br>
<a name="ref11">[11]</a> <a href="http://cdimage.debian.org/debian-cd/4.0_r0/i386/iso-cd/debian-40r0-i386-businesscard.iso">http://cdimage.debian.org/debian-cd/4.0_r0/i386/iso-cd/debian-40r0-i386-businesscard.iso</a> <br>
</tt>
+</p>
+</div>
Modified: trunk/doc/website/build-installer-on-vm.htm4
===================================================================
--- trunk/doc/website/build-installer-on-vm.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/build-installer-on-vm.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,20 +4,14 @@
m4_define(`EN')
m4_define(`DE_FILE', `build-installer-on-vm-de.html')
-PAGE_START
-<p>
-<b>Attention: Translation of page into english in progress</b>
-</p>
+m4_define(`MAIN', `community')
+m4_define(`TITLE', `Build Gpg4win under Windows')
-<h1>Building of Gpg4win under Windows via virtual GNU/Linux</h1>
+PAGE_START
-<p><b>
-This example pracitcally describes how to build a new Gpg4win Installer on
-Windows XP/SP2 via Debian Etch 4.0 in QEMU. In principle also alternatives can
-be used for all of these three base components.
-</b></p>
-
+<div id="intro">
+<h2>Building of Gpg4win under Windows<br> via virtual GNU/Linux</h2>
<p>
Hints: <a href="build-installer-gnulinux.html">Building under GNU/Linux
in more detail</a> and
@@ -25,11 +19,13 @@
Debian GNU/Linux Etch 4.0 within a virtual QEMU machine illustrated as
screenshot-series.</a>.
</p>
-
<p>
<a href="build-installer.html">Back to the overview on building Gpg4win</a>
</p>
+</div>
+<div id="main">
+
<h2>Contents</h2>
<p>
@@ -399,3 +395,5 @@
<a name="ref8">[8]</a> <a href="http://cdimage.debian.org/debian-cd/4.0_r0/i386/iso-cd/debian-40r0-i386-netinst.iso">http://cdimage.debian.org/debian-cd/4.0_r0/i386/iso-cd/debian-40r0-i386-netinst.iso</a> <br>
<a name="ref9">[9]</a> <a href="http://cdimage.debian.org/debian-cd/4.0_r0/i386/iso-cd/debian-40r0-i386-businesscard.iso">http://cdimage.debian.org/debian-cd/4.0_r0/i386/iso-cd/debian-40r0-i386-businesscard.iso</a> <br>
</tt>
+
+</div>
\ No newline at end of file
Modified: trunk/doc/website/build-installer-on-w32-debian-screenshots-de.htm4
===================================================================
--- trunk/doc/website/build-installer-on-w32-debian-screenshots-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/build-installer-on-w32-debian-screenshots-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,16 +4,26 @@
m4_define(`DE')
m4_define(`EN_FILE', `build-installer-on-w32-debian-screenshots.html')
+m4_define(`MAIN', `community')
+m4_define(`TITLE', `Installation von Debian GNU/Linux in einer VM')
+
PAGE_START
+<div id="intro">
<h2>Installation von Debian GNU/Linux 'Etch' 4.0 innerhalb einer
virtuellen QEMU-Maschine</h2>
-
<p>
<a href="build-installer-on-vm-de.html">Zurück zur
Gpg4win-Bauanleitung für Windows</a>
</p>
+</div>
+
+<div id="main">
+
+<h2>Anleitung</h2>
+
+
<p>
Diese Installation wurde mit dem Business-Card-Boot-Medium von
Debian 'Etch' durchgeführt. Der Aufruf zum Starten der
@@ -170,3 +180,4 @@
Nach dem Boot-Vorgang sollte man sich erfolgreich als root-Nutzer anmelden
und System-Aktualisierungen bzw. weitere Installation durchführen können.
</p>
+</div>
Modified: trunk/doc/website/build-installer-on-w32-debian-screenshots.htm4
===================================================================
--- trunk/doc/website/build-installer-on-w32-debian-screenshots.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/build-installer-on-w32-debian-screenshots.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,15 +4,23 @@
m4_define(`EN')
m4_define(`DE_FILE', `build-installer-on-w32-debian-screenshots-de.html')
+
+m4_define(`MAIN', `community')
+m4_define(`TITLE', `Installation of Debian GNU/Linux in a VM')
+
PAGE_START
+<div id="intro">
<h2>Installation of Debian GNU/Linux 'Etch' 4.0 within a virtual QEMU machine</h2>
-
<p>
<a href="build-installer-on-vm.html">Back to the Gpg4win build instructions for
Windows</a>
</p>
+</div>
+<div id="main">
+<h2>Instruction</h2>
+
<p>
This installation was accomplished with the Business Card boot medium, version
Debian 'Etch'. The startup for the vitual machine reads:
@@ -172,3 +180,5 @@
After the boot procedure one should successfully login as root user
and be able to update the system and/or do further installation.
</p>
+
+</div>
Modified: trunk/doc/website/build-installer.htm4
===================================================================
--- trunk/doc/website/build-installer.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/build-installer.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,12 +4,18 @@
m4_define(`EN')
m4_define(`DE_FILE', `build-installer-de.html')
+
+m4_define(`TITLE', `Building Gpg4win installer')
+m4_define(`MAIN', `community')
+
PAGE_START
-<h1>Build Gpg4win installer packages on your own</h1>
+<div id="intro">
+<h2>Building Gpg4win installer package</h2>
+<p>Learn how you can build the Gpg4win installer packages on your own.</p>
+</div>
-<p><em>Attention: This page (and the other pages to build Gpg4win) is
-not yet updated to Gpg4win2.</em></p>
+<div id="main">
<h2>Conventional ".exe installer"</h2>
@@ -31,7 +37,7 @@
In principle, any current GNU/Linux system is
sufficient as the base system. Some minor
adaptions might be necessary though.
- The <a href="build-installer-gnulinux-de.html">specific
+ The <a href="build-installer-gnulinux.html">specific
GNU/Linux guide</a> is tested with a Debian GNU/Linux 'Etch' 4.0 system.
<br>
Furthermore, you need at least 503 MByte on your harddisk
@@ -185,3 +191,5 @@
src/make-msi.bat on your Windows system. You should store them in the
respective src/ directory.
</ul>
+
+</div>
Modified: trunk/doc/website/buildhtml.mk
===================================================================
--- trunk/doc/website/buildhtml.mk 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/buildhtml.mk 2011-03-15 08:22:55 UTC (rev 1645)
@@ -19,7 +19,7 @@
ADD_INST_TYPES = *.css *.ico *.php
ADD_INST_DIRS = pix
-USER=$(shell grep "svn+ssh://" .svn/entries | sed -e "s/.*svn+ssh:\/\///g" | sed -e "s/@.*//g" | head -1)
+#USER=$(shell grep "svn+ssh://" .svn/entries | sed -e "s/.*svn+ssh:\/\///g" | sed -e "s/@.*//g" | head -1)
CURDIR=$(shell pwd)
@@ -31,7 +31,7 @@
all: $(TARGETS) subdirs
$(TARGETS): template.m4 template_header.m4 versions.m4 \
- template_link_boxes_de.m4 template_link_boxes_en.m4 \
+ header.m4 \
gpg4win.css
subdirs: $(SUBDIRS)
Deleted: trunk/doc/website/candidates-de.htm4
===================================================================
--- trunk/doc/website/candidates-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/candidates-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -1,25 +0,0 @@
-m4_dnl -*-html-*-
-m4_include(`template.m4')
-m4_dnl $Id$
-
-m4_define(`DE')
-m4_define(`EN_FILE', `candidates.html')
-PAGE_START
-
-<h1>Weitere Kandidaten zur Integration in Gpg4win</h1>
-
-<p>
-Folgende Software-Module könnten Gpg4win sinnvoll erweitern.
-Wer Interesse hat, kann die Integration selbst durchführen,
-dafür gibt es einige <a href="build-installer-de.html">Hilfestellungen
-zur Erweiterung von Gpg4win</a>.
-</p>
-
-<h2>GPGrelay - Verschlüsselung im Hintergrund für alle E-Mail Programme</h2>
-
-<p>
-<a href="http://sites.inka.de/tesla/gpgrelay.html">GPGrelay</a> ist
-ein Verschlüsselungsprogramm welches im Hintergrund E-Mails
-verschlüsselt, so dass kein Plugin für das E-Mail Programm notwendig
-ist.
-</p>
Deleted: trunk/doc/website/candidates.htm4
===================================================================
--- trunk/doc/website/candidates.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/candidates.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -1,26 +0,0 @@
-m4_dnl -*-html-*-
-m4_include(`template.m4')
-m4_dnl $Id$
-
-m4_define(`EN')
-m4_define(`DE_FILE', `candidates-de.html')
-PAGE_START
-
-<h1>Candidates for integration in the Gpg4win installer package</h1>
-
-<p>
-The following software modules are potential candidates for integration
-in the Gpg4win installer package.
-If you are interested, just go ahead and integrate these modules, the
-<a href="build-installer.html">Howto extend the Gpg4win installer
-package</a> will help you.
-</p>
-
-<h2>GPGrelay - Encryption in the background for any email program</h2>
-
-<p>
-<a href="http://sites.inka.de/tesla/gpgrelay.html">GPGrelay</a> is
-an encryption tool which encrypts e-mails in the
-background, hence eliminating the need for a plugin for any e-mail
-tool of your choice.
-</p>
Added: trunk/doc/website/change-history-de.htm4
===================================================================
--- trunk/doc/website/change-history-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/change-history-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -0,0 +1,95 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_define(`DE')
+m4_define(`EN_FILE', `change-history.html')
+m4_define(`TITLE', `Änderungshistorie')
+PAGE_START
+<div id='intro'><h2>Änderungshistorie von Gpg4win</h2><p>Bitte beachten Sie, dass die alten Versionen die ggf.
+zwischenzeitlich beseitigten Sicherheitslöcher weiterhin enthalten!</p>
+</div>
+<div id='main'>
+
+<h2>Version 2.1.0 veröffentlicht 2011-03-15</h2>
+ Neue Versionen von GnuPG, Kleopatra, GpgEX, GpgOL, Claws.
+
+
+<pre>
+GnuPG: 2.0.17
+Kleopatra: 2.1.0 (2011-02-04)
+GPA: 0.9.1-svn1024
+GpgOL: 1.1.2
+GpgEX: 0.9.7
+Claws-Mail: 3.7.8cvs47
+Kompendium DE: 3.0.0
+Kompendium EN: 3.0.0-beta1
+</pre>
+<p>Expliziter Download dieser Version: <a href="http://ftp.gpg4win.org/gpg4win-2.1.0.exe">gpg4win-2.1.0.exe</a><br></p><p>Details im README dieser Version: <a href="http://ftp.gpg4win.org/README-2.1.0.de.txt">README-2.1.0.de.txt</a><br></p><h2>Version 2.0.4 veröffentlicht 2010-07-28</h2>
+ GpgSM Fehler wurde beseitigt.
+
+
+<pre>
+GnuPG: 2.0.14 + 02-gpgsm-realloc-bug.patch
+Kleopatra: 2.0.14-svn1098530 (20100303)
+GPA: 0.9.0
+GpgOL: 1.1.1
+GpgEX: 0.9.5
+Claws-Mail: 3.7.4cvs1
+Kompendium: 3.0.0
+</pre>
+<p>Expliziter Download dieser Version: <a href="http://ftp.gpg4win.org/gpg4win-2.0.4.exe">gpg4win-2.0.4.exe</a><br></p><p>Details im README dieser Version: <a href="http://ftp.gpg4win.org/README-2.0.4.de.txt">README-2.0.4.de.txt</a><br></p><h2>Version 2.0.3 veröffentlicht 2010-05-29</h2>
+ Fehler wurden beseitigt.
+
+
+<pre>
+GnuPG: 2.0.14
+Kleopatra: 2.0.14-svn1098530 (20100303)
+GPA: 0.9.0
+GpgOL: 1.1.1
+GpgEX: 0.9.5
+Claws-Mail: 3.7.4cvs1
+Kompendium: 3.0.0
+</pre>
+<p>Expliziter Download dieser Version: <a href="http://ftp.gpg4win.org/gpg4win-2.0.3.exe">gpg4win-2.0.3.exe</a><br></p><p>Details im README dieser Version: <a href="http://ftp.gpg4win.org/README-2.0.3.de.txt">README-2.0.3.de.txt</a><br></p><h2>Version 2.0.2 veröffentlicht 2010-04-12</h2>
+ Fehler wurden beseitigt und die Benutzerschnittstelle verbessert.
+
+
+<pre>
+GnuPG: 2.0.14
+Kleopatra: 2.0.14-svn1098530 (20100303)
+GPA: 0.9.0
+GpgOL: 1.1.1
+GpgEX: 0.9.5
+Claws-Mail: 3.7.4cvs1
+Kompendium: 3.0.0-rc1
+</pre>
+<p>Expliziter Download dieser Version: <a href="http://ftp.gpg4win.org/gpg4win-2.0.2.exe">gpg4win-2.0.2.exe</a><br></p><p>Details im README dieser Version: <a href="http://ftp.gpg4win.org/README-2.0.2.de.txt">README-2.0.2.de.txt</a><br></p><h2>Version 2.0.1 veröffentlicht 2009-09-28</h2>
+ Ein Problem beim Öffnen von Office Dokumenten und URLs mit einem
+ laufenden GpgOL wurde behoben.
+
+
+<pre>
+GnuPG: 2.0.12
+Kleopatra: 2.0.11-svn1008232 (2009-09-25)
+GPA: 0.9.0
+GpgOL: 1.0.1
+GpgEX: 0.9.3
+Claws-Mail: 3.7.2cvs27
+Kompendium: 3.0.0-beta4
+</pre>
+<p>Expliziter Download dieser Version: <a href="http://ftp.gpg4win.org/gpg4win-2.0.1.exe">gpg4win-2.0.1.exe</a><br></p><p>Details im README dieser Version: <a href="http://ftp.gpg4win.org/README-2.0.1.de.txt">README-2.0.1.de.txt</a><br></p><h2>Version 2.0.0 veröffentlicht 2009-08-07</h2>
+ Dies ist das erste produktionsreife Version der neuen Gpg4win
+ Architektur. In den vergangenen 15 Monaten wurden 16 Beta
+ Versionen veröffentlicht um die meisten der gravierenden
+ Programmfehler zu beseitigen.
+
+
+<pre>
+GnuPG: 2.0.12
+Kleopatra: 20090807
+GPA: 0.9.0
+GpgOL: 1.0.0
+GpgEX: 0.9.3
+Claws-Mail: 3.7.2
+Kompendium: 3.0.0-beta3
+</pre>
+<p>Expliziter Download dieser Version: <a href="http://ftp.gpg4win.org/gpg4win-2.0.0.exe">gpg4win-2.0.0.exe</a><br></p><p>Details im README dieser Version: <a href="http://ftp.gpg4win.org/README-2.0.0.de.txt">README-2.0.0.de.txt</a><br></p></div>
Added: trunk/doc/website/change-history.htm4
===================================================================
--- trunk/doc/website/change-history.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/change-history.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -0,0 +1,93 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_define(`EN')
+m4_define(`DE_FILE', `change-history-de.html')
+m4_define(`TITLE', `Change History')
+PAGE_START
+<div id='intro'><h2>Change History of Gpg4win</h2><p>Please note that old releases still contain meanwhile fixed
+security issues.</p>
+</div>
+<div id='main'>
+
+<h2>Version 2.1.0 released 2011-03-15</h2>
+ New versions of GnuPG, Kleopatra, GpgEX, GpgOL, Claws.
+
+
+<pre>
+GnuPG: 2.0.17
+Kleopatra: 2.1.0 (2011-02-04)
+GPA: 0.9.1-svn1024
+GpgOL: 1.1.2
+GpgEX: 0.9.7
+Claws-Mail: 3.7.8cvs47
+Kompendium DE: 3.0.0
+Kompendium EN: 3.0.0-beta1
+</pre>
+<p>Explicit download of this version: <a href="http://ftp.gpg4win.org/gpg4win-2.1.0.exe">gpg4win-2.1.0.exe</a><br></p><p>Details in the README of this version: <a href="http://ftp.gpg4win.org/README-2.1.0.en.txt">README-2.1.0.en.txt</a><br></p><h2>Version 2.0.4 released 2010-07-28</h2>
+ GpgSM bug fix.
+
+
+<pre>
+GnuPG: 2.0.14 + 02-gpgsm-realloc-bug.patch
+Kleopatra: 2.0.14-svn1098530 (20100303)
+GPA: 0.9.0
+GpgOL: 1.1.1
+GpgEX: 0.9.5
+Claws-Mail: 3.7.4cvs1
+Kompendium: 3.0.0
+</pre>
+<p>Explicit download of this version: <a href="http://ftp.gpg4win.org/gpg4win-2.0.4.exe">gpg4win-2.0.4.exe</a><br></p><p>Details in the README of this version: <a href="http://ftp.gpg4win.org/README-2.0.4.en.txt">README-2.0.4.en.txt</a><br></p><h2>Version 2.0.3 released 2010-05-29</h2>
+ Bug fixes.
+
+
+<pre>
+GnuPG: 2.0.14
+Kleopatra: 2.0.14-svn1098530 (20100303)
+GPA: 0.9.0
+GpgOL: 1.1.1
+GpgEX: 0.9.5
+Claws-Mail: 3.7.4cvs1
+Kompendium: 3.0.0
+</pre>
+<p>Explicit download of this version: <a href="http://ftp.gpg4win.org/gpg4win-2.0.3.exe">gpg4win-2.0.3.exe</a><br></p><p>Details in the README of this version: <a href="http://ftp.gpg4win.org/README-2.0.3.en.txt">README-2.0.3.en.txt</a><br></p><h2>Version 2.0.2 released 2010-04-12</h2>
+ Bug fixes and UI improvements.
+
+
+<pre>
+GnuPG: 2.0.14
+Kleopatra: 2.0.14-svn1098530 (20100303)
+GPA: 0.9.0
+GpgOL: 1.1.1
+GpgEX: 0.9.5
+Claws-Mail: 3.7.4cvs1
+Kompendium: 3.0.0-rc1
+</pre>
+<p>Explicit download of this version: <a href="http://ftp.gpg4win.org/gpg4win-2.0.2.exe">gpg4win-2.0.2.exe</a><br></p><p>Details in the README of this version: <a href="http://ftp.gpg4win.org/README-2.0.2.en.txt">README-2.0.2.en.txt</a><br></p><h2>Version 2.0.1 released 2009-09-28</h2>
+ Fixed a problem opening Office documents and URLs with a running
+ GpgOL.
+
+
+<pre>
+GnuPG: 2.0.12
+Kleopatra: 2.0.11-svn1008232 (2009-09-25)
+GPA: 0.9.0
+GpgOL: 1.0.1
+GpgEX: 0.9.3
+Claws-Mail: 3.7.2cvs27
+Kompendium: 3.0.0-beta4
+</pre>
+<p>Explicit download of this version: <a href="http://ftp.gpg4win.org/gpg4win-2.0.1.exe">gpg4win-2.0.1.exe</a><br></p><p>Details in the README of this version: <a href="http://ftp.gpg4win.org/README-2.0.1.en.txt">README-2.0.1.en.txt</a><br></p><h2>Version 2.0.0 released 2009-08-07</h2>
+ First production release of this major redesign. Over the last
+ 15 months we did 15 beta releases and hopefully squashed most of
+ the serious bugs.
+
+<pre>
+GnuPG: 2.0.12
+Kleopatra: 20090807
+GPA: 0.9.0
+GpgOL: 1.0.0
+GpgEX: 0.9.3
+Claws-Mail: 3.7.2
+Kompendium: 3.0.0-beta3
+</pre>
+<p>Explicit download of this version: <a href="http://ftp.gpg4win.org/gpg4win-2.0.0.exe">gpg4win-2.0.0.exe</a><br></p><p>Details in the README of this version: <a href="http://ftp.gpg4win.org/README-2.0.0.en.txt">README-2.0.0.en.txt</a><br></p></div>
Modified: trunk/doc/website/community-de.htm4
===================================================================
--- trunk/doc/website/community-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/community-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,18 +4,23 @@
m4_define(`DE')
m4_define(`EN_FILE', `community.html')
+
+m4_define(`TITLE', `Gpg4win Gemeinschaft')
+m4_define(`MAIN', `community')
+
PAGE_START
-<h1>Gpg4win-Gemeinschaft</h1>
-
+<div id="intro">
+<h2>Gpg4win-Gemeinschaft</h2>
<p>Wie jede Freies Software Initiative lebt auch
Gpg4win davon, dass sich Interessierte engagieren und <a
href="contribute-de.html">mitmachen</a>. Ein Schritt ist z.B. das <a
-href="reporting-bugs-de.html">Berichten von Problemen</a>.</p>
-
-<p>Mit Gpg4win-Gemeinschaft können Sie über mehrere Medien
+href="reporting-bugs-de.html">Berichten von Problemen</a>.<br>
+Mit Gpg4win-Gemeinschaft können Sie über mehrere Medien
kommunizieren: Mailinglisten, Webforen und IRC:</p>
+</div>
+<div id="main">
<h2>Mailinglisten</h2>
<p>Für die Gpg4win-Gemeinschaft gibt es derzeit nachfolgende
@@ -112,3 +117,15 @@
<p><a
href="irc://irc.freenode.net/#gpg4win">irc://irc.freenode.net/#gpg4win</a></p>
+</div>
+
+
+<div id="sidebar">
+ <h3>Benötigen Sie professionellen Support?</h3>
+
+ <p>Dann nutzen Sie den bezahlten Unterstützungsservice
+ von unseren Gpg4win Experten.</p>
+
+ <p>Erfahren Sie mehr über unseren
+ <a href="support-de.html">professionellen Gpg4win-Support</a>.</p>
+</div>
Modified: trunk/doc/website/community.htm4
===================================================================
--- trunk/doc/website/community.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/community.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,17 +4,23 @@
m4_define(`EN')
m4_define(`DE_FILE', `community-de.html')
+
+m4_define(`TITLE', `Gpg4win Community')
+m4_define(`MAIN', `community')
+
PAGE_START
-<h1>Gpg4win Community</h1>
-
+<div id="intro">
+<h2>Gpg4win Community</h2>
<p>Like any Free Software community Gpg4win needs people
who <a href="contribute.html">get involved</a> with the initiative.
-One step is e.g. to <a href="reporting-bugs-de.html">reporting problems</a>.</p>
-
-<p>You can communicate with the Gpg4win community via
+One step is e.g. to <a href="reporting-bugs-de.html">reporting problems</a>.
+<br>
+You can communicate with the Gpg4win community via
mailing lists, web forums and IRC:</p>
+</div>
+<div id="main">
<h2>Mailing lists</h2>
<em>Note:</em>
@@ -109,7 +115,6 @@
</dd>
-
<h2>IRC</h2>
<p>To contact Gpg4win users and developers in a chat you can use IRC:</p>
@@ -119,3 +124,15 @@
<p><a
href="irc://irc.freenode.net/#gpg4win">irc://irc.freenode.net/#gpg4win</a></p>
+
+</div>
+
+
+<div id="sidebar">
+ <h3>Do you need professional Support?</h3>
+
+ <p>Use our paid support service of our Gpg4win experts.</p>
+
+ <p>Learn more about our
+ <a href="support.html">professional support</a>.</p>
+</div>
Modified: trunk/doc/website/contribute-de.htm4
===================================================================
--- trunk/doc/website/contribute-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/contribute-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,68 +4,50 @@
m4_define(`DE')
m4_define(`EN_FILE', `contribute.html')
-PAGE_START
-<h1>Zu Gpg4win beitragen</h1>
+m4_define(`TITLE', `Zu Gpg4win beitragen')
+m4_define(`MAIN', `community')
+PAGE_START
+
+<div id="intro">
+<h2>Zu Gpg4win beitragen</h2>
<p>Sie finden Gpg4win gut? Dann unterstützen Sie das Projekt.
Es ist leichter als allgemein angenommen und selbst Wenig
kann Erstaunliches bewirken.
Wie bei jeder Freien Software können Sie entweder
Zeit oder Geld geben.</p>
+</div>
+<div id="main">
-
<h2>Als Freiwilliger</h2>
Egal, was Ihre Stärken und Schwächen sind,
sie können Gpg4win mit Tat zur Seite stehen:
<ul>
-
<li> Arbeiten Sie sich ein und werden Sie erst engagierter Anwender und dann
Beitragender. Beteiligen Sie sich an <a
href="community-de.html">Foren oder Mailinglisten</a>. Schon kleine
Hinweise von Ihnen können andere Nutzer von Gpg4win oder einer Komponente
freuen. Nehmen Sie sich einfach eine Aufgabe, sagen auf der Mailingliste
-Bescheid und fangen Sie damit an.
-
-<p>
-
+Bescheid und fangen Sie damit an.</li>
<li> Schreiben Sie Ihre Meinung. Was ist gut? Was ist schlecht? Wo liegt ein
Fehler? Ist die neue Version besser? Tun Sie das respektvoll, da die Adressaten
-oft auch Freiwillige sind.
-
-<p>
-
+oft auch Freiwillige sind.</li>
<li> Werben Sie andere Freiwillige und Geldgeber. Sprechen Sie beispielsweise
andere Nutzer an. Wenn Sie Unternehmen oder Behörden kennen, welche Gpg4win
schon einsetzen, lohnt vielleicht die Anregung etwas für die Sicherung der
Software zu tun. Einige Behörden haben die Entwicklung bereits gefördert.
Nehmen Sie auf die Politik Einfluss: Loben Sie die bisherigen Ergebnisse und
-fordern Sie eine Fortführung der Unterstützung.
-
-<p>
-
+fordern Sie eine Fortführung der Unterstützung.</li>
<li> Verbreiten Sie Gpg4win aktiv. Sie können Zeitschriften anregen, dass Sie
sich das Thema wünschen oder Softwareverbreiter darauf aufmerksam machen, dass
Ihnen Gpg4win fehlt. Sprechen oder schreiben Sie über Gpg4win. Motivieren Sie
-andere zur Nutzung.
-
+andere zur Nutzung.</li>
</ul>
-<p></p>
-
-<p>Sie suchen konkrete Anleitungen für eine mögliche Mithilfe?
-Schauen Sie doch einmal hier rein:
-<ul>
-<li><a href="reporting-bugs-de.html">Berichten von Problemen</a></li>
-<li><a href="build-installer-de.html">Installationspaket
-herstellen</a></li>
-<li><a href="website-maintenance-de.html">Website pflegen</a></li>
-<li><a href="localize-gpg4win.html">Gpg4win in your language</a></li>
-</ul>
-</p>
<p>Noch nichts passendes dabei? Dann fragen Sie doch einmal auf der
(englischsprachigen)
<a
@@ -75,28 +57,36 @@
<h2>Als Geldgeber</h2>
<ul>
-
<li> Geben Sie einen kleinen Betrag über die Zahlmöglichkeit der Webseite,
versehen mit einem kurzen Kommentar für welche Verbesserung Sie wieder etwas
geben würden und was Ihnen besonders an Gpg4win gefällt. Auch einstellige
-Euro-Beträge können helfen und motivieren.
-
-<p>
-
+Euro-Beträge können helfen und motivieren.</li>
<li> Bei einem mittleren Betrag, kontaktieren Sie einen der Projektbeteiligten
und zahlen gegen Rechnung. Eventuell können Sie ein bestimmten Schritt wie
Aktualisierung, Beseitigung eines Fehlers oder Hinzufügen einer Funktion
beauftragen. Achten Sie darauf, dass jede beauftragte Verbesserung dem Gpg4win
-Hauptstrom zu Gute kommt.
-
-<p>
-
+Hauptstrom zu Gute kommt.</li>
<li> Als Unternehmen oder Behörde beauftragen Sie die umfangreicheren
Maßnahmen zur Sicherung einer nachhaltige und eigenständigen
Fortführung des Projekts.
Sie erhalten damit Gpg4win dauerhaft für Ihre Organisation.
Einher geht der
Kollateralnutzen, dass darüber hinaus die Sicherheit beim Datenverkehr im
-Allgemeinen verbessert wird.
-
+Allgemeinen verbessert wird.</li>
</ul>
+</div>
+
+
+<div id="sidebar">
+ <h3>Mitmachen!</h3>
+
+ <p>Sie suchen konkrete Anleitungen für eine mögliche Mithilfe?
+ Schauen Sie doch einmal hier rein:</p>
+ <ul >
+ <li><a href="community-de.html">Gemeinschaft erleben</a></li>
+ <li><a href="reporting-bugs-de.html">Probleme melden</a></li>
+ <li><a href="build-installer-de.html">Installationspaket herstellen</a></li>
+ <li><a href="website-maintenance-de.html">Website pflegen</a></li>
+ <li><a href="localize-gpg4win.html">Gpg4win in your language</a></li>
+ </ul>
+</div>
Modified: trunk/doc/website/contribute.htm4
===================================================================
--- trunk/doc/website/contribute.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/contribute.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,18 +4,23 @@
m4_define(`EN')
m4_define(`DE_FILE', `contribute-de.html')
+
+m4_define(`TITLE', `Contribute to Gpg4win')
+m4_define(`MAIN', `community')
+
PAGE_START
-<h1>Contributing to Gpg4win</h1>
-
-You like Gpg4win? Then support this project.
+<div id="intro">
+<h2>Contributing to Gpg4win</h2>
+<p>You like Gpg4win? Then support this project.
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.
+</p>
+</div>
-<p>
-
+<div id="main">
<h2>As volunteer</h2>
No matter what your strenghts and weaknesses are,
@@ -58,16 +63,7 @@
</ul>
-<p></p>
-<p>You are looking for a concrete instructinos to getting involved?
-Just look at these pages:
-<ul>
-<li><a href="reporting-bugs.html">How to report a problem?</a></li>
-<li><a href="build-installer.html">Build Gp4win installer package</a></li>
-<li><a href="website-maintenance.html">Maintaining the Gpg4win website</a></li>
-<li><a href="localize-gpg4win.html">Gpg4win in your language</a></li>
-</ul>
</p>
<p>You havn't found anything? Then please ask on the <a
href="http://lists.wald.intevation.org/mailman/listinfo/gpg4win-devel/">developer
@@ -101,3 +97,18 @@
improving security for data exchange.
</ul>
+</div>
+
+<div id="sidebar">
+ <h3>Contribute!</h3>
+
+ <p>You are looking for a concrete instructinos to getting involved?
+ Just look at these pages:</p>
+ <ul >
+ <li><a href="community.html">Join the Community</a></li>
+ <li><a href="reporting-bugs.html">How to report a problem?</a></li>
+ <li><a href="build-installer.html">Build Gp4win installer package</a></li>
+ <li><a href="website-maintenance.html">Maintaining the Gpg4win website</a></li>
+ <li><a href="localize-gpg4win.html">Gpg4win in your language</a></li>
+ </ul>
+</div>
Added: trunk/doc/website/contributors-de.htm4
===================================================================
--- trunk/doc/website/contributors-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/contributors-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -0,0 +1,37 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`DE')
+m4_define(`EN_FILE', `contributors.html')
+
+m4_define(`TITLE', `Mitwirkende')
+
+PAGE_START
+
+<div id="intro">
+<h2>Mitwirkende</h2>
+<p>Gpg4win lebt von seinen Mitwirkenden. Werden auch Sie Teil der
+Gpg4win-Gemeinschaft und <a href="contribute-de.html">unterstützen Sie
+Gpg4win</a>.</p>
+</div>
+
+<div id="main">
+<h2>Danke!</h2>
+<p>Dieses Freie Software Produkt wurde u.a. im Rahmen kommerzieller
+Aufträge von folgenden Unternehmen entwickelt:
+<ul>
+<li><a href="http://www.intevation.de">Intevation GmbH</a>
+(Projektkoordination, QS, Kompendium)</li>
+<li><a href="http://www.g10code.de">g10 Code GmbH</a>
+(Krypto-Funktionalität, GpgOL, GpgEX, GPA)</li>
+<li><a href="http://www.kdab.com">KDAB</a> (Kleopatra)</li>
+</ul>
+</p>
+
+<p>Dabei wirkten folgende Personen mit:</p>
+<pre>
+m4_include(`AUTHORS')
+</pre>
+</div>
+
Added: trunk/doc/website/contributors.htm4
===================================================================
--- trunk/doc/website/contributors.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/contributors.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -0,0 +1,35 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`EN')
+m4_define(`DE_FILE', `contributors-de.html')
+
+m4_define(`TITLE', `Contributors')
+
+PAGE_START
+
+<div id="intro">
+<h2>Contributors</h2>
+<p>Gpg4win depend on contributors. Become a part of the Gpg4win
+community and <a href="contribute.html">contribute to Gpg4win</a>.</p>
+</div>
+
+<div id="main">
+<h2>Many Thanks!</h2>
+<p>This Free Software product was developed mostly as part of commercial
+contracts by the following companies:</p>
+<ul>
+<li><a href="http://www.intevation.net">Intevation GmbH</a>
+(Projekt coordination, QA, Compendium)</li>
+<li><a href="http://www.g10code.com">g10 Code GmbH</a>
+(Crypto Funktionality, GpgOL, GpgEX, GPA)</li>
+<li><a href="http://www.kdab.com">KDAB</a> (Kleopatra)</li>
+</ul>
+
+<p>The following persons have contributed:</p>
+<pre>
+m4_include(`AUTHORS')
+</pre>
+</div>
+
Modified: trunk/doc/website/documentation-de.htm4
===================================================================
--- trunk/doc/website/documentation-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/documentation-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,12 +4,20 @@
m4_define(`DE')
m4_define(`EN_FILE', `documentation.html')
+
+m4_define(`TITLE', `Dokumentation')
+m4_define(`MAIN', `doc')
+
PAGE_START
-<h1>Dokumentation</h1>
+<div id="intro">
+<h2>Dokumentation</h2>
+<p>Das Gpg4win-Kompendium ist der ideale Einstieg in die Welt der Kryptografie.
+Am Beispiel von Gpg4win lernen Sie Schritt für Schritt den sicheren Umgang mit Kleopatra,
+GpgEX und GpgOL.</p>
+</div>
-<p></p>
-
+<div id="main">
<h2>Gpg4win-Kompendium</h2>
<p>Das "Gpg4win-Kompendium" ist die neue deutschsprachige
@@ -19,8 +27,8 @@
unter anderem angepasst auf Kleopatra, GpgEX und PGP/MIME sowie
ergänzt um S/MIME bzw. X.509.</p>
-<p>Die englische Übersetzung finden Sie <a
-href="documentation.html">hier</a>. Übersetzungen von
+<p>Das Gpg4win-Kompendium liegt auch in einer vollständigen <a
+href="documentation.html">englische Übersetzung</a> vor. Übersetzungen von
der deutschen Kompendium-Version in weitere Sprachen sind sehr willkommen!
Bitte wenden Sie sich dazu an die
<a href="http://lists.wald.intevation.org/mailman/listinfo/gpg4win-devel">
@@ -32,17 +40,19 @@
<em>Gpg4win->Dokumentation</em> verfügbar.</p>
Die aktuelle PDF- und HTML-Version des Gpg4win-Kompendiums finden
-Sie auch hier:
-<a href="DOWNLOAD_URL_COMPENDIUM_DE"
- class="dlbutton2">Gpg4win-Kompendium COMPENDIUM_VERSION_DE (PDF, Deutsch)<br>
+Sie hier:
+<div class="dlbutton2">
+<a href="DOWNLOAD_URL_COMPENDIUM_DE">Gpg4win-Kompendium COMPENDIUM_VERSION_DE (PDF, Deutsch)<br>
<span class="version"><small>Größe: DL_SIZE_COMPENDIUM_DE |
Veröffentlicht: COMPENDIUM_DATE_DE</small></span>
</a>
+</div>
-<a href="./doc/de/gpg4win-compendium.html"
- class="dlbutton2">Gpg4win-Kompendium COMPENDIUM_VERSION_DE (HTML, Deutsch)<br>
+<div class="dlbutton2">
+<a href="./doc/de/gpg4win-compendium.html">Gpg4win-Kompendium COMPENDIUM_VERSION_DE (HTML, Deutsch)<br>
<span class="version"><small>Veröffentlicht: COMPENDIUM_DATE_DE</small></span>
</a>
+</div>
<p>
Das Gpg4win-Kompendium (v3.0.0) ist auch als Buch erhältlich:
@@ -67,19 +77,20 @@
<dd>Letzte Version: 2.0.2 (2006-05-30)<br>
<a href="http://wald.intevation.org/frs/?group_id=11">Alle
PDF-Versionen</a> | <a href="http://gpg4win.de/handbuecher/einsteiger.html">Letzte HTML-Version</a>
- </dd>.
+ </dd>
<dt><b>Gpg4win für Durchblicker</b></dt>
<dd>Letzte Version: 2.0.2 (2006-05-30)<br>
<a href="http://wald.intevation.org/frs/?group_id=11">Alle
PDF-Versionen</a> |
<a href="http://gpg4win.de/handbuecher/durchblicker.html">Letzte HTML-Version</a>
- </dd>.
+ </dd>
<dt><b>Gpg4win for Novices</b> (Englische Übersetzung von "Gpg4win für Einsteiger")</dt>
<dd>Letzte Version: 1.0.0 (2006-11-30)<br>
<a href="http://wald.intevation.org/frs/?group_id=11">Alle
PDF-Versionen</a> | <a href="http://gpg4win.de/handbuecher/novices.html">Letzte HTML-Version</a>
- </dd>.
+ </dd>
</dl>
-
+</div>
+
Modified: trunk/doc/website/documentation.htm4
===================================================================
--- trunk/doc/website/documentation.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/documentation.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,12 +4,20 @@
m4_define(`EN')
m4_define(`DE_FILE', `documentation-de.html')
+
+m4_define(`TITLE', `Documentation')
+m4_define(`MAIN', `doc')
+
PAGE_START
-<h1>Documentation</h1>
+<div id="intro">
+<h2>Documentation</h2>
+<p>The Gpg4win Compendium is the perfect documentation to get in the world of
+cryptography. Using the example of Gpg4win you learn step by step the
+secure using of Kleopatra, GpgEX and GpgOL.</p>
+</div>
-<p></p>
-
+<div id="main">
<h2>Gpg4win Compendium</h2>
<p>The "Gpg4win-Compendium" is the new end-user documentation for
@@ -38,16 +46,18 @@
the folder <em>Gpg4win->Documentation</em>.</p>
The current PDF and HTML versions of the Gpg4win-Compendium are also available here:
-<a href="DOWNLOAD_URL_COMPENDIUM_EN"
- class="dlbutton2">Gpg4win Compendium COMPENDIUM_VERSION_EN (PDF, English)<br>
+<div class="dlbutton2">
+<a href="DOWNLOAD_URL_COMPENDIUM_EN">Gpg4win Compendium COMPENDIUM_VERSION_EN (PDF, English)<br>
<span class="version"><small>Size: DL_SIZE_COMPENDIUM_EN |
Released: COMPENDIUM_DATE_EN</small></span>
</a>
+</div>
-<a href="./doc/en/gpg4win-compendium.html"
- class="dlbutton2">Gpg4win Compendium COMPENDIUM_VERSION_EN (HTML, English)<br>
+<div class="dlbutton2">
+<a href="./doc/en/gpg4win-compendium.html">Gpg4win Compendium COMPENDIUM_VERSION_EN (HTML, English)<br>
<span class="version"><small>Released: COMPENDIUM_DATE_EN</small></span>
</a>
+</div>
<p>
The German langauage version of the Gpg4win-Compendium (v3.0.0) is also
@@ -76,14 +86,14 @@
PDF versions</a> | <a
href="http://gpg4win.de/handbuecher/novices.html">Last HTML version</a>
</dd>
- </dd>.
+ </dd>
<dt><b>Gpg4win für Einsteiger</b> (German)</dt>
<dd>Last version: 2.0.2 (2006-05-30)<br>
<a href="http://wald.intevation.org/frs/?group_id=11">All PDF
versions</a> | <a
href="http://gpg4win.de/handbuecher/einsteiger.html">Last HTML version</a>
- </dd>.
+ </dd>
<dt><b>Gpg4win für Durchblicker</b> (German)</dt>
<dd>Last version: 2.0.2 (2006-05-30)<br>
@@ -91,5 +101,6 @@
PDF versions</a> |
<a href="http://gpg4win.de/handbuecher/durchblicker.html">Last
HTML version</a>
- </dd>.</dl>
-
+ </dd>
+</dl>
+</div>
Modified: trunk/doc/website/donate-de.htm4
===================================================================
--- trunk/doc/website/donate-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/donate-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,16 +4,51 @@
m4_define(`DE')
m4_define(`EN_FILE', `donate.html')
+
+m4_define(`TITLE', `Spenden')
+m4_define(`MAIN', `donate')
+
PAGE_START
-<h1>Spenden</h1>
+<div class="donate_header">
+ <span class="text">
+ Wir lieben Freie Software!<br />
+ Sie auch?<br />
+ <b>Unterstützen Sie Gpg4win!</b>
+ </span>
+</div>
-<p><b>Unterstützen Sie Gpg4win!</b></p>
-
-Ihre Spende unterstützt die Pflege und Weiterentwicklung von Gpg4win
+<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.
-Wir sind dankbar für jede finanzielle Unterstützung.
+Wir sind dankbar für jede finanzielle Unterstützung. Helfen auch Sie!</p>
+</div>
+<div id="main">
+
+<h2>Tragen Sie zu Gpg4win bei!</h2>
+
+<p>Geben Sie einen <b>kleinen Betrag</b> über die Zahlmöglichkeit dieser Seite,
+versehen mit einem kurzen Kommentar für welche Verbesserung Sie wieder etwas
+geben würden und was Ihnen besonders an Gpg4win gefällt. Auch einstellige
+Euro-Beträge können helfen und motivieren.</p>
+
+<p> Bei einem <b>mittleren Betrag</b>, kontaktieren Sie einen der Projektbeteiligten
+und zahlen gegen Rechnung. Eventuell können Sie ein bestimmten Schritt wie
+Aktualisierung, Beseitigung eines Fehlers oder Hinzufügen einer Funktion
+beauftragen. Achten Sie darauf, dass jede beauftragte Verbesserung dem Gpg4win
+Hauptstrom zu Gute kommt.</p>
+
+<p> Als Unternehmen oder Behörde <b>beauftragen</b> Sie die umfangreicheren
+Maßnahmen zur Sicherung einer nachhaltige und eigenständigen
+Fortführung des Projekts.
+Sie erhalten damit Gpg4win dauerhaft für Ihre Organisation.
+Einher geht der
+Kollateralnutzen, dass darüber hinaus die Sicherheit beim Datenverkehr im
+Allgemeinen verbessert wird.</p>
+
+
<h2>Liste der Spender</h2>
<p>Nachfolgend finden Sie eine Übersicht aller Spender, die bisher die
Gpg4win-Initiative unterstützt haben und einer Veröffentlichung Ihrer
@@ -21,47 +56,32 @@
<p><b>Spenden Sie online und erscheinen Sie selbst in dieser Liste!</b>
Nutzen Sie dafür die "Spenden"-Schaltfläche rechts auf dieser Seite.</p>
+<pre>
+m4_include(`SPONSORS')
+</pre>
+</div>
+
+<div id="sidebar">
+<h3>Spenden Sie jetzt!</h3>
<p>
-<ul>
-<li>Andrew Huang</li>
-<li>Andy Fletcher</li>
-<li>Armando Villani</li>
-<li>Ben Gerber</li>
-<li>Christopher Dawes</li>
-<li>Christian de Boor</li>
-<li>Daniel Aleksandersen</li>
-<li>Daniele Berti</li>
-<li>Florian Töpfer</li>
-<li>Gerd Schweinsberg</li>
-<li>Greg Robinson</li>
-<li>Gunner Gewiß</li>
-<li>Hendrik Jan Strijker</li>
-<li>Hugh Glenister</li>
-<li>Igor Sharov</li>
-<li>Ingolf Petersohn</li>
-<li>James Carpenter</li>
-<li>Jay Litwyn</li>
-<li>Joachim Bolle</li>
-<li>Johannes Egbert Münch</li>
-<li>Jürgen Sättler</li>
-<li>Kurt Meyer</li>
-<li>Kevin Smith</li>
-<li>Lilo von Hanffstengel</li>
-<li>Marcel Bade</li>
-<li>Marco A G Pinto</li>
-<li>Mark Jennings</li>
-<li>Markus Barkholz</li>
-<li>Michael Langhammer</li>
-<li>Nelson Ingersoll</li>
-<li>note.com LLC</li>
-<li>Oliver Schubbe</li>
-<li>PCMasters.de</li>
-<li>Peter Engel</li>
-<li>Richard Dorn</li>
-<li>Rudolf Doczkal</li>
-<li>Sebastian Morkisch</li>
-<li>Thomas Freeman</li>
-<li>Tom Niderost</li>
-<li>Wilford Isner III</li>
-</ul>
+<form action="https://www.paypal.com/de/cgi-bin/webscr" method="post">
+ <input name="cmd" value="_donations" type="hidden">
+ <input name="business" value="paypal at intevation.de" type="hidden">
+ <input name="undefined_quantity" value="1" type="hidden">
+ <input name="item_name" value="Gpg4win" type="hidden">
+ <input name="item_number" value="1000" type="hidden">
+ <input name="no_shipping" value="1" type="hidden">
+ <input name="cn" value="Kommentar an das Gpg4win-Entwicklerteam (Lob/Kritik)" type="hidden">
+ <input name="currency_code" value="EUR" type="hidden">
+ <input name="bn" value="PP-BuyNowBF" type="hidden">
+ <input src="https://www.paypal.com/de_DE//i/btn/btn_donate_LG.gif" name="submit" alt="Jetzt einfach, schnell und sicher online spenden - mit PayPal." type="image" border="0">
+ <input name="on0" value="Veröffentlichung der Spende zugestimmt?" type="hidden">
+ <input name="os0" value="Nein" type="hidden">
+ <br>
+
+ <input name="os0" value="Ja" checked="checked" type="checkbox">Spendernamen veröffentlichen
+ </form>
</p>
+<form action="">
+
+</div>
Modified: trunk/doc/website/donate.htm4
===================================================================
--- trunk/doc/website/donate.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/donate.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,16 +4,49 @@
m4_define(`EN')
m4_define(`DE_FILE', `donate-de.html')
+
+m4_define(`TITLE', `Donate')
+m4_define(`MAIN', `donate')
+
PAGE_START
-<h1>Donate</h1>
+<div class="donate_header">
+ <span class="text">
+ We love Free Software!<br />
+ You too?<br />
+ <b>Please support Gpg4win!</b>
+ </span>
+</div>
-<p><b>Please Support Gpg4win!</b></p>
+<div id="intro">
+<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.
+</p>
+</div>
-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.
+<div id="main">
+<h2>Contribute to Gpg4win!</h2>
+<p>Give a <b>small amount</b> via the payment opportunity of this web page.
+Add a short comment along with a payment and explain for which
+improvements you would again pay. Even smallest amounts help and
+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
+step, update, bug fix or new features. Take care that your contracted
+improvements will be integrated into the main development of
+Gpg4win.</p>
+
+<p>As a company or authority, <b>contract</b> for more extensive measures
+that will ensure continuation of the project. This way you will
+ensure sustainable availability of Gpg4win for your organisation.
+Such measures do provide the collateral benefit of generally improving
+security for data exchange.</p>
+
+
<h2>List of sponsors</h2>
<p>The following list shows all sponsors who have supported
the Gpg4win initiative and accepted to publish their donation.</p>
@@ -21,47 +54,31 @@
<p><b>Make your donation now and you will appear in this list!</b>
Please click on the "Donate" button (on the right).</p>
+<pre>
+m4_include(`SPONSORS')
+</pre>
+</div>
+
+<div id="sidebar">
+<h3>Make your donation now!</h3>
<p>
-<ul>
-<li>Andrew Huang</li>
-<li>Andy Fletcher</li>
-<li>Armando Villani</li>
-<li>Ben Gerber</li>
-<li>Christopher Dawes</li>
-<li>Christian de Boor</li>
-<li>Daniel Aleksandersen</li>
-<li>Daniele Berti</li>
-<li>Florian Töpfer</li>
-<li>Gerd Schweinsberg</li>
-<li>Greg Robinson</li>
-<li>Gunner Gewiß</li>
-<li>Hendrik Jan Strijker</li>
-<li>Hugh Glenister</li>
-<li>Igor Sharov</li>
-<li>Ingolf Petersohn</li>
-<li>James Carpenter</li>
-<li>Jay Litwyn</li>
-<li>Joachim Bolle</li>
-<li>Johannes Egbert Münch</li>
-<li>Jürgen Sättler</li>
-<li>Kurt Meyer</li>
-<li>Kevin Smith</li>
-<li>Lilo von Hanffstengel</li>
-<li>Marcel Bade</li>
-<li>Marco A G Pinto</li>
-<li>Mark Jennings</li>
-<li>Markus Barkholz</li>
-<li>Michael Langhammer</li>
-<li>Nelson Ingersoll</li>
-<li>note.com LLC</li>
-<li>Oliver Schubbe</li>
-<li>PCMasters.de</li>
-<li>Peter Engel</li>
-<li>Richard Dorn</li>
-<li>Rudolf Doczkal</li>
-<li>Sebastian Morkisch</li>
-<li>Thomas Freeman</li>
-<li>Tom Niderost</li>
-<li>Wilford Isner III</li>
-</ul>
-</p>
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <input name="cmd" value="_donations" type="hidden">
+ <input name="business" value="paypal at intevation.de" type="hidden">
+ <input name="lc" value="US" type="hidden">
+ <input name="undefined_quantity" value="1" type="hidden">
+
+ <input name="item_name" value="Gpg4win" type="hidden">
+ <input name="item_number" value="1000" type="hidden">
+ <input name="no_shipping" value="1" type="hidden">
+ <input name="cn" value="Comment to Gpg4win developer team (praise/criticism)" type="hidden">
+ <input name="currency_code" value="EUR" type="hidden">
+ <input name="bn" value="PP-BuyNowBF" type="hidden">
+ <input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="Pay with PayPal" type="image" border="0">
+ <input name="on0" value="Allowed to publish of your donation?" type="hidden">
+ <input name="os0" value="No" type="hidden">
+
+ <br>
+ <input name="os0" value="Yes" checked="checked" type="checkbox">Publish my sponsor name</a>
+</form>
+</div>
Modified: trunk/doc/website/download-de.htm4
===================================================================
--- trunk/doc/website/download-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/download-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -5,50 +5,35 @@
m4_define(`DE')
m4_define(`EN_FILE', `download.html')
+m4_define(`TITLE', `Download Gpg4win')
+m4_define(`MAIN', `download')
+
PAGE_START
-<h1>Download</h1>
+<!--
+<div class="download_header">
+ <span class="text">
+ Sichere E-Mail- und Datei-Verschlüsselung<br/> mit GnuPG für Windows
+ </span>
+</div>
+-->
-<h2>Gpg4win 2.1.0-rc2</h2>
+<div id="intro">
+<h2>Download</h2>
+<p>Freie Software zum freien Download</p>
+</div>
-<p>Der <b>zweite Release Candidate (RC)</b> - inklusive des deutschen
-und englischen Gpg4win-Kompendiums -
-von Gpg4win 2.1.0 kann hier herunter geladen werden:</p>
-<a href="http://ftp.gpg4win.org/Beta/gpg4win-2.1.0-rc2.exe" class="dlbutton2">Gpg4win 2.1.0-rc2<br>
-<span class="version"><small>Größe: 38 MByte | Veröffentlicht: 2011-02-04</small></span>
-</a>
+<div id="main">
-<ul>
- <li><a href="http://ftp.gpg4win.org/Beta/gpg4win-2.1.0-rc2.exe.sig"
- >OpenPGP-Signatur</a> (für gpg4win-2.1.0-rc2.exe)
- <li><b>SHA1-Prüfsumme</b> (für gpg4win-2.1.0-rc2.exe):
- <code>7eaad4949f521eea289f9efa9e85c1091dbae98a gpg4win-2.1.0-rc2.exe</code></li>
-
-<!--<li><a href="change-history-de.html">Änderungshistorie</a></li>-->
-
-<li>Quelltexte und andere Gpg4win-2.1.0-rc2 Varianten:
- <ul>
- <li><a href="http://ftp.gpg4win.org/Beta/gpg4win-light-2.1.0-rc2.exe">gpg4win-light-2.1.0-rc2.exe</a>
- (Vollversion <em>ohne</em> Kleopatra und Gpg4win-Kompendium);
- <small>Größe: 15 MByte</small></li>
- <li><a
- href="http://ftp.gpg4win.org/Beta/gpg4win-2.1.0-rc2.tar.bz2">gpg4win-2.1.0-rc2.tar.bz2</a>
- (Quelltextpaket); <small>Größe: 12 MByte</small></li>
- <li>Alle Versionen und OpenPGP-Signaturen unter <a
- href="http://ftp.gpg4win.org/Beta">ftp.gpg4win.org/Beta</a>.</li>
- </ul>
-</li>
-</ul>
-<p>Lesen Sie die aktuelle <a
- href="http://ftp.gpg4win.org/Beta/README-2.1.0-rc2.de.txt">README-Datei</a>.
-
-
<h2>Gpg4win VERSION</h2>
<p>Die Vollversion (inklusive des deutschen Gpg4win-Kompendiums) von Gpg4win VERSION
kann hier herunter geladen werden:</p>
-<a href="DOWNLOAD_URL" class="dlbutton2">Gpg4win VERSION<br>
-<span class="version"><small>Größe: DL_SIZE | Veröffentlicht: DL_DATE</small></span>
-</a>
+<div class="dlbutton2">
+ <img src="img/dl_arrow.png" alt="" />
+ <a href="DOWNLOAD_URL" class="dlbutton2">Gpg4win VERSION<br />
+ <span class="version"><small>Größe: DL_SIZE | Veröffentlicht: DL_DATE</small></span>
+ </a>
+</div>
<ul>
<li><a href="http://ftp.gpg4win.org/gpg4win-VERSION.exe.sig"
@@ -61,7 +46,7 @@
<li>Quelltexte und andere Gpg4win-VERSION Varianten:
<ul>
<li><a href="LDOWNLOAD_URL">gpg4win-light-VERSION.exe</a>
- (Vollversion <em>ohne</em> Kleopatra und Handbücher);
+ (Vollversion <em>ohne</em> Kleopatra und Gpg4win-Kompendium);
<small>Größe: LDL_SIZE</small></li>
<li><a
href="http://ftp.gpg4win.org/gpg4win-VERSION.tar.bz2">gpg4win-VERSION.tar.bz2</a>
@@ -89,16 +74,22 @@
<p>Die aktuelle PDF- und HTML-Version des Gpg4win-Kompendiums finden
Sie hier:</p>
-<a href="DOWNLOAD_URL_COMPENDIUM_DE"
- class="dlbutton2">Gpg4win-Kompendium COMPENDIUM_VERSION_DE (PDF, Deutsch)<br>
+<div class="dlbutton2">
+ <img src="img/dl_arrow.png" alt="" />
+<a href="DOWNLOAD_URL_COMPENDIUM_DE">Gpg4win-Kompendium COMPENDIUM_VERSION_DE
+(PDF, Deutsch)<br />
<span class="version"><small>Größe: DL_SIZE_COMPENDIUM_DE |
Veröffentlicht: COMPENDIUM_DATE_DE</small></span>
</a>
+</div>
-<a href="./doc/de/gpg4win-compendium.html"
- class="dlbutton2">Gpg4win-Kompendium COMPENDIUM_VERSION_DE (HTML, Deutsch)<br>
+<div class="dlbutton2">
+ <img src="img/dl_arrow.png" alt="" />
+<a href="./doc/de/gpg4win-compendium.html">Gpg4win-Kompendium
+COMPENDIUM_VERSION_DE (HTML, Deutsch)<br/>
<span class="version"><small>Veröffentlicht: COMPENDIUM_DATE_DE</small></span>
</a>
+</div>
<p>Lesen Sie die <a href="documentation-de.html">Dokumentationsseite</a>
für weitere Informationen über verfügbare Gpg4win Dokumentationen.</p>
@@ -141,9 +132,20 @@
>Gpg4win-Bekanntmachungs-Mailingliste</a> einzuschreiben,
um automatisch über neue Versionen und andere wichtige
Neuigkeiten zu Gpg4win informiert zu werden.
+</p>
<p>
-Ist das Herunterladen immer langsam? Versuchen Sie diesen Spiegelserver:
-</p>
+Ist das Herunterladen immer langsam? Versuchen Sie diesen
+Spiegelserver:<br>
<a href="MIRROR_IE_URL">Gpg4win Spiegelserver in Irland</a> (betrieben
von <a href="http://ftp.heanet.ie/about/">HEAnet</a>)
+</p>
+</div>
+
+
+<div id="sidebar">
+ <h3>Gpg4win VERSION enthält:</h3>
+ <pre>
+ SOFTWAREOVERVIEW
+ </pre>
+</div>
Modified: trunk/doc/website/download.htm4
===================================================================
--- trunk/doc/website/download.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/download.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -5,57 +5,34 @@
m4_define(`EN')
m4_define(`DE_FILE', `download-de.html')
+m4_define(`TITLE', `Download Gpg4win')
+m4_define(`MAIN', `download')
+
PAGE_START
-<h1>Download</h1>
-<h2>Gpg4win 2.1.0-rc2</h2>
+<div id="intro">
+<h2>Download</h2>
+<p>Free Software for free download.</p>
+</div>
-<p>You can download the <b>second release candidate</b> (including the
-English and German compendium) of Gpg4win 2.1.0 here:</p>
+<div id="main">
-<a href="http://ftp.gpg4win.org/Beta/gpg4win-2.1.0-rc2.exe" class="dlbutton2">Gpg4win 2.1.0-rc2<br>
-<span class="version"><small>Size: 38 MByte | Released: 2011-02-04</small></span>
-</a>
-
-<ul>
- <li><a href="http://ftp.gpg4win.org/Beta/gpg4win-2.1.0-rc2.exe.sig"
- >OpenPGP signatur</a> (for gpg4win-2.1.0-rc2.exe)
- <li><b>SHA1 checksum</b> (for gpg4win-2.1.0-rc2.exe):
- <code>7eaad4949f521eea289f9efa9e85c1091dbae98a gpg4win-2.1.0-rc2.exe</code></li>
-
-<!--<li><a href="change-history.html">Change History</a></li>-->
-
-<li>Sources and other Gpg4win-2.1.0-rc2 variants:
- <ul>
- <li><a href="http://ftp.gpg4win.org/Beta/gpg4win-light-2.1.0-rc2.exe">gpg4win-light-2.1.0-rc2.exe</a>
- (Full version <em>without</em> Kleopatra and Gpg4win Compendium);
- <small>Size: 15 MByte</small></li>
- <li><a
- href="http://ftp.gpg4win.org/Beta/gpg4win-2.1.0-rc2.tar.bz2">gpg4win-2.1.0-rc2.tar.bz2</a>
- (source code package); <small>Size: 12 MByte</small></li>
- <li>All versions and OpenPGP signatures: <a
- href="http://ftp.gpg4win.org/Beta">ftp.gpg4win.org/Beta</a>.</li>
- </ul>
-</li>
-</ul>
-<p>Read the current <a
- href="http://ftp.gpg4win.org/Beta/README-2.1.0-rc2.en.txt">README file</a>.
-
-
<h2>Gpg4win VERSION</h2>
-<p>You can download the full version (including the German compendium
-and the English novice manual) of Gpg4win VERSION here:</p>
+<p>You can download the full version (including the Gpg4win compendium)
+of Gpg4win VERSION here:</p>
+<div class="dlbutton2">
<a href="DOWNLOAD_URL" class="dlbutton2">Gpg4win VERSION<br>
<span class="version"><small>Size: DL_SIZE | Released: DL_DATE</small></span>
</a>
+</div>
<ul>
<li><a href="http://ftp.gpg4win.org/gpg4win-VERSION.exe.sig"
>OpenPGP signatur</a> (for gpg4win-VERSION.exe)
- <li><b>SHA1 checksum</b> (for gpg4win-VERSION.exe): <code>SHA1_EXE
- gpg4win-VERSION.exe </code></li>
+ <li><b>SHA1 checksum</b> (for gpg4win-VERSION.exe):<br>
+ <code>SHA1_EXE gpg4win-VERSION.exe </code></li>
<li><a href="change-history.html">Change History</a></li>
@@ -88,16 +65,20 @@
<h2>Gpg4win Compendium COMPENDIUM_VERSION_EN</h2>
You find the current PDF and HTML version of the Gpg4win Compendium here:
+<div class="dlbutton2">
<a href="DOWNLOAD_URL_COMPENDIUM_DE"
class="dlbutton2">Gpg4win Compendium COMPENDIUM_VERSION_EN (PDF, English)<br>
<span class="version"><small>Size: DL_SIZE_COMPENDIUM_EN |
Released: COMPENDIUM_DATE_EN</small></span>
</a>
+</div>
+<div class="dlbutton2">
<a href="./doc/en/gpg4win-compendium.html"
class="dlbutton2">Gpg4win Compendium COMPENDIUM_VERSION_DE (HTML, English)<br>
<span class="version"><small>Released: COMPENDIUM_DATE_DE</small></span>
</a>
+</div>
<p>Note: The compendium is currently availabe in a <b>beta version</b>!
Read the <a href="documentation.html">documentation page</a> for
@@ -146,4 +127,6 @@
<p>
Is downloading very slow? Try this mirror server:
<a href="MIRROR_IE_URL">Gpg4win mirror server in Ireland</a> (run by
-<a href="http://ftp.heanet.ie/about/">HEAnet</a>)
+<a href="http://ftp.heanet.ie/about/">HEAnet</a>)</p>
+
+</div>
Deleted: trunk/doc/website/favicon.ico
===================================================================
(Binary files differ)
Added: trunk/doc/website/favicon.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/favicon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/features-de.htm4
===================================================================
--- trunk/doc/website/features-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/features-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -0,0 +1,227 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`DE')
+m4_define(`EN_FILE', `features.html')
+m4_define(`features-de.html', `0')
+
+m4_define(`TITLE', `Funktionen')
+m4_define(`MAIN', `about')
+
+PAGE_START
+
+<div id="intro">
+<h2>Funktionen</h2>
+<p>Gpg4win stellt höchste Anforderungen an die Sicherheit. Sichere
+Datei- und E-Mail-Verschlüsselung sowie eine einfache
+Handhabung sind die Schwerpunkte von Gpg4win.
+Erfahren Sie hier, welche Funktionen in Gpg4win stecken!</p>
+</div>
+
+<div id="full">
+
+<h2>Sicherheit</h2>
+
+<div class="column1">
+<h4>OpenPGP & S/MIME</h4>
+<p>Gpg4win unterstützt die beiden kryptographischen Standards OpenPGP und S/MIME (X.509).</p>
+<p>Das Einrichten von X.509-Wurzelzertifikaten ist durch Gpg4win stark
+vereinfacht worden und ermöglicht so auch unerfahrenen Anwendern die
+einfache Verwendung von S/MIME.
+Für komplexere Anforderungen werden Systemadministratoren durch eine Anleitung
+bei der Einrichtung einer systemweiten Wurzel-Vertrauensstellung
+unterstützt.</p>
+<img src="img/sc-pinentry-openpgp_de.png">
+</div>
+
+<div class="column2">
+<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>
+
+<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>
+
+</div>
+
+<div class="column3">
+<h4>SmartCard</h4>
+<p>Gpg4win unterstützt (durch GnuPG) die sichere Nutzung von
+SmartCards für OpenPGP und S/MIME. Technische Details (in englisch) finden Sie bei <a
+href="http://www.gnupg.org/documentation/howtos.de.html#GnuPG-cardHOWTO">GnuPG</a>.</p>
+<img src="img/gnupg.png">
+</div>
+
+<br clear="all"/>
+
+<h2>Dateien und Ordner</h2>
+<div class="column1">
+<h4>Signieren/Verschlüsseln</h4>
+<p>Signieren Sie Dateien und Ordner direkt aus dem Windows
+Explorer - mit dem Explorer-Plugin GpgEX.
+Sie können auch mehrere Dateien und ganze Ordner auswählen und diese
+dann rekursiv signiern/verschlüsseln in einem gpgtar-Archiv
+ablegen.</p>
+</div>
+
+<div class="column2">
+<h4>Prüfsummen</h4>
+<p>Erstellen und Überprüfen Sie Prüfsummen von Dateien - ebenfalls
+direkt aus dem Windows Explorer. Gpg4win legt (rekursiv) für jede
+ausgewählte Datei eine eindeutige Prüfsumme ab und sichert damit die
+Unverändertheit (Integrität) der Dateien. Das Überprüfen dieser
+Prüfsummen funktioniert ebenso einfach wie das Erstellen.
+Gpg4win unterstützt die Verfahren sha1sum, sha256sum und md5sum.</p>
+</div>
+<div class="column3">
+<img src="img/sc-gpgex-explorer-options_cut_de.png">
+</div>
+
+<br clear="all"/>
+
+<h2>E-Mail</h2>
+<div class="column1">
+<h4>Signieren und Verschlüsseln</h4>
+<p>Das mitgelieferte Outlook-Plugin GpgOL ermöglicht E-Mails direkt
+in Microsoft Outlook (2003 und 2007) zu signieren und zu verschlüsseln. Dabei werden auch
+Anhänge verschlüsselt. Das Signaturprüfen und Entschlüsseln
+funktioniert genauso einfach direkt in Outlook.
+</p>
+<img src="img/sc-ol-emailfolder_cut_de.png">
+</div>
+
+<div class="column2">
+<h4>Benutzerfreundliche Zertifikatsauswahl</h4>
+<p>Die Auswahl des richtigen E-Mail-Zertifikats übernimmt Kleopatra - und
+zwar anhand der richtigen E-Mail-Adresse.
+Sollten Sie mehrere passende
+Zertifikate installiert haben, bietet Kleopatra Ihnen die Zertifikatsvorauswahl
+in einem übersichtlichen Dialog an.</p>
+<img style="width: 540px;"
+src="img/sc-kleopatra-mail-certificateselection-signencrypt_de.png">
+</div>
+
+<div class="column3">
+<h4> </h4>
+<p>Für "Viel-Benutzer" bietet Gpg4win die Möglichkeit die
+Zertifikatsbestätigung nur im Konfliktfall anzuzeigen. Damit entfällt
+z.B. das regelmäßige Bestätigen eines eindeutig passenden
+Zertifikats beim E-Mail signieren und verschlüsseln.
+Das Arbeiten läuft so wesentlich zügiger - ohne Verlust der
+Sicherheit.
+</p>
+</div>
+
+<br clear="all"/>
+
+
+<h2>Installation und Kompendium</h2>
+
+<div class="column1">
+<h4>Installationsassistent</h4>
+<p>Der Gpg4win-Installationsassistent erleichtert
+das einfache und sichere Installieren von
+Gpg4win. Eine konkrete Schritt-für-Schritt-Anleitung für die Installation
+bekommen Sie im <a
+href="http://gpg4win.de/doc/de/gpg4win-compendium_11.html">Gpg4win-Kompendium</a>.</p>
+</div>
+
+<div class="column2">
+<h4> </h4>
+<a href="img/sc-inst-welcome_de.png"><img src="img/sc-inst-welcome_de.png"></a>
+</div>
+
+<div class="column3">
+<h4>Gpg4win-Kompendium</h4>
+<p>Eine anschauliche und umfassende Dokumentation über den
+Einstieg in
+die Kryptographie und die Verwendung von Gpg4win bietet das
+<a href="documentation-de.html">Gpg4win-Kompendium</a>.
+Es ist verfügbar in deutscher und englischer Sprache.</p>
+</div>
+
+<br clear="all"/>
+
+<h2>Zertifikatsverwaltung mit Kleopatra</h2>
+
+
+<div class="column1">
+<h4>Zertifikate sicher und komfortabel verwalten</h4>
+<p>Kleopatra ist der bevorzugte Zertifikatsmanager in Gpg4win.
+Kleopatra ermöglicht Ihnen die einfache Verwaltung alle Zertifikate
+(OpenPGP und S/MIME).</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>
+</div>
+<div class="column2">
+<h4>Zertifikatsserver</h4>
+<p>Kleopatra bietet einen einfachen Im- und Export von Zertifikaten
+von bzw. zu OpenPGP-Zertifikatsservern (auch Schlüsselserver) und
+X.509-(LDAP-)Zertifikatsservern.</p>
+</div>
+<div class="column3">
+<h4>OpenPGP-Zertifikate beglaubigen</h4>
+<a href="img/sc-kleopatra-certifyCertificate1_de.png">
+<img src="img/sc-kleopatra-certifyCertificate1_de.png"></a>
+<p>Durch das Beglaubigen (auch signieren) von einem anderen, Ihnen
+vertrauten, OpenPGP-Zertifikat bringt Kleopatra dieses Zertifikat in
+eine neue Vertrauensstufe - gekennzeichnet als "vertrauenswürdiges
+Zertifikat".
+</<p>
+</div>
+
+<br clear="all"/>
+
+<h2>Weiteres Wissenswertes</h2>
+<div class="column1">
+<h4>Freie Software</h4>
+<p>Gpg4win ist Freie Software und besteht aus einer ganzen Reihe von
+unabhängig entwickelten Paketen, die teilweise unterschiedliche
+Lizenzen haben. Der Großteil dieser Software steht, wie Gpg4win
+selbst, unter der GNU General Public License (GNU GPL).
+Für die Nutzung von Gpg4win entstehen keine Lizenzkosten.
+</div>
+
+<div class="column2">
+<h4>Systemunterstützung</h4>
+<p>Gpg4win unterstützt Windows 7. Die <a
+href="screenshots-de.html">Screenshots</a>
+sind alle unter Windows 7 entstanden.
+Darüber hinaus wird auch Windows 2000, XP und Vista
+unterstützt.</p>
+<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>
+</div>
+
+<div class="column3">
+<h4>Internationalisierung</h4>
+<p>Alle Dialog in Gpg4win sind vollständig in deutscher und englischer Sprache
+verfügbar. Der Gpg4win-Installer bietet darüber hinaus weitere
+Sprachen an.</p>
+</div>
+
+</div>
+
+<!--
+<div id="sidebar">
+<h3>Funktionen in Gpg4win</h3>
+
+<ul class="cleanlist">
+<li><a href="#">Sicherheit</a></li>
+<li><a href="#">Dateien und Ordner</a></li>
+<li><a href="#">E-Mail</a></li>
+<li><a href="#">Systemunterstützung</a></li>
+<li><a href="#">Gpg4win-Kompendium</a></li>
+<li><a href="#">Internationalisierung</a></li>
+<li><a href="#">Freie Software</a></li>
+<li><a href="#">Gpg4win-Installer</a></li>
+<li><a href="#">Kleopatra</a></li>
+</ul>
+</div>
+-->
Added: trunk/doc/website/features.htm4
===================================================================
--- trunk/doc/website/features.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/features.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -0,0 +1,197 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`EN')
+m4_define(`DE_FILE', `features-de.html')
+m4_define(`features.html', `0')
+
+m4_define(`TITLE', `Features')
+m4_define(`MAIN', `about')
+
+PAGE_START
+
+<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>
+</div>
+
+<div id="full">
+
+<h2>Security</h2>
+
+<div class="column1">
+<h4>OpenPGP & S/MIME</h4>
+<p>Gpg4win supports both:
+<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
+and define a systems-wide list of trustable X.509 root certificates.
+</p>
+<img src="img/sc-pinentry-openpgp_de.png">
+</div>
+
+<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
+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>
+
+</div>
+
+<div class="column3">
+<h4>SmartCard</h4>
+<p>Gpg4win supports using SmartCards for
+OpenPGP and S/MIME. You can find technical details on the <a
+href="http://www.gnupg.org/documentation/howtos.de.html#GnuPG-cardHOWTO">GnuPG
+page</a>.</p>
+<img src="img/gnupg.png">
+</div>
+
+<br clear="all"/>
+
+<h2>Files and Folders</h2>
+<div class="column1">
+<h4>Sign/Encrypt</h4>
+<p>Sign single files or complete folders directly from the Windows
+Explorer - using GpgEX.
+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 chechsum 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>
+</div>
+<div class="column3">
+<img src="img/sc-gpgex-explorer-options_cut_de.png">
+</div>
+
+<br clear="all"/>
+
+<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.
+</p>
+<img src="img/sc-ol-emailfolder_cut_de.png">
+</div>
+
+<div class="column2">
+<h4>User-friendly Certificate Seletion</h4>
+<p>The selection of the right email certificate is a function of
+Kleopatra - based on the corresponding email address.
+Kleopatra shows the automated preselection of certificates in the following dialog.</p>
+<img style="width: 540px;"
+src="img/sc-kleopatra-mail-certificateselection-signencrypt_de.png">
+</div>
+
+<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 matches correctly.
+Your work goes more quickly - without reducing security.
+</p>
+</div>
+
+<br clear="all"/>
+
+
+<h2>Installation and Compendium</h2>
+
+<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>
+</div>
+
+<div class="column2">
+<h4> </h4>
+<a href="img/sc-inst-welcome_de.png"><img src="img/sc-inst-welcome_de.png"></a>
+</div>
+
+<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
+cryptography and using Gpg4win.
+It is available in German and English.</p>
+</div>
+
+<br clear="all"/>
+
+<h2>Certificate Management with Kleopatra</h2>
+
+
+<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)
+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>
+</div>
+<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>
+</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.
+Thereby the certificate is marked as "trusted certificates".
+</p>
+</div>
+
+<br clear="all"/>
+
+<h2>Another things to know</h2>
+<div class="column1">
+<h4>Free Software</h4>
+<p>Gpg4win is Free Software and
+consists several independently developed packages which have different
+<a href="license.html">Free Software licenses</a>.
+The majority (as Gpg4win) is licenced under
+GNU General Public License (GNU GPL). The using of Gpg4win is free.
+</div>
+
+<div class="column2">
+<h4>System Requirements</h4>
+<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>
+<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>
+</div>
+
+<div class="column3">
+<h4>Internationalisation</h4>
+<p>All dialogs in Gpg4win are full available in English and German language.
+The Gpg4win Installer provides some additional languages.</p>
+</div>
+
+</div>
Modified: trunk/doc/website/gpg4win.css
===================================================================
--- trunk/doc/website/gpg4win.css 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/gpg4win.css 2011-03-15 08:22:55 UTC (rev 1645)
@@ -1,231 +1,621 @@
-/* Styles for the Kolab Konsotium Site */
-/* $Id: kolabkonsortium.css,v 1.9 2005/08/08 06:40:38 jan Exp $
+/* Styles for the Gpg4win Website */
+body {
+ font-family: arial, helvetica, sans-serif;
+ font-size: 13px;
+ background: #FFFFFF url('img/page_bg.png') repeat-x;
+ color: #333333;
+ margin: 0px;
+ padding:0px;
+}
-/* TEXT STYLES */
+a {
+ color: #b51a22;
+ text-decoration: none;
+}
-BODY {
- margin: 0px;
- background-color: #eeeee0;
- font-family: Helvetica, Arial, sans-serif;
- font-size: 12px;
+a:hover {
+ text-decoration: underline;
}
-H1 {
- margin-top: 0px;
- font-size: 160%;
- font-weight: bold;
- color: black;
+img {
+ border: 0px;
}
-H2 {
- background-color: #ffff98;
- border-top: 2px solid #fdba19;
- border-bottom: 2px solid #fdba19;
- margin-top: 15px;
- margin-bottom: 3px;
- font-size: 125%;
- font-weight: bold;
+.imageframe {
+ border-color: #DEDEDE #AAAAAA #888888 #CECECE;
+ border-style: double;
+ border-width: 1px;
+ padding: 5px;
}
-H3 {
- background-color: #ffff98;
- border-bottom: 2px solid #fdba19;
- margin-top: 0px;
- font-size: 125%;
- font-weight: bold;
+.imgfloatleft {
+ float: left;
+ margin: 0px 20px 30px 0px;
}
-STRONG {
- color: #ff8000;
- font-weight: bold;
- text-decoration: none;
+td {
+ vertical-align: top;
}
-A {
- color: #fa050c;
- font-weight: bold;
- text-decoration: none;
+.odd td {
+ background: #E6E6E6;
}
-A:hover {
- color: #ff8000;
- text-decoration: none;
+.wrapper {
+ width: 900px;
+ margin: 0 auto;
+ text-align: left;
}
-IMG {
- border: none;
+.language_select {
+ float:right;
}
-.version {
- font-size: 75%;
- font-weight: normal;
- color: black;
+.logo {
+ margin-top: 20px;
+ margin-left: 15px;
}
-.swlist {
- font-weight: normal;
- color: black;
- white-space:pre;
- margin:0;
- font-family: Helvetica, Arial, sans-serif;
- font-size: 12px;
+.header {
+ height: 20px;
+ padding-top: 3px;
+ margin-bottom: 0px;
}
-.center {
- vertical-align: middle;
+.fancy_intro {
+ background: url('img/fancy_bg.png') no-repeat;
+ background-position: 310px 0px;
+ height:250px;
+ margin-bottom:25px;
+ border-bottom:1px solid gray;
}
-TD {
- padding: 10px;
- text-align: left;
- vertical-align: top;
+.mini_intro {
+ clear: both;
+ font-size: 12px;
+ line-height: 38px;
+ padding: 5px;
+ padding-top:0px;
}
-/* Buttons */
+#download_button {
+ position: relative;
+ left: 40px;
+ top: 45px;
+ width: 250px;
+ z-index: 0;
+}
-.dlbutton {
- padding: 10px;
- margin-bottom: 5px;
- font-size: 150%;
- font-weight: bold;
- display: block;
- width: 36%;
- height: 80px;
- border: 3px solid white;
- background-color: #fdba19;
- background-image: url(pix/disk.png);
- background-repeat: no-repeat;
- background-position: right bottom;
+#download_button a {
+ background: url('img/download_button.png');
+ background-repeat: no-repeat;
+ display: block;
+ height: 116px;
+ width: 260px;
+ color: #FFFFFF;
+ font-weight: bold;
+ text-decoration: none;
+ font-size: 19px;
}
-.dlbutton:hover {
- background-color: #fdd347;
+#download_button a:hover {
+ background-position: 0px -116px;
}
-.dlbutton2 {
- padding: 10px;
- margin: 20px;
- margin-top: 10px;
- font-size: 150%;
- font-weight: bold;
- text-align: center;
- display: block;
- border: 3px solid white;
- background-color: #fdba19;
+#download_button .text {
+ position: relative;
+ top: 23px;
+ left: 15px;
}
-.dlbutton2:hover {
- background-color: #fdd347;
+#breadcrum {
+ float:left;
}
-/* STRUCTURE ELEMENTS */
+#download_button_mini {
+ float:right;
+ text-align:center;
+}
-/* Head */
+#download_button_mini .links {
+ position: relative;
+ top: -13px;
+ font-size: 10px;
+}
-#header {
- clear: both;
+#download_button_mini .dmini_button {
+ background: url('img/download_button_mini.png');
+ background-repeat: no-repeat;
+ display: block;
+ height: 50px;
+ width: 189px;
+ text-align:left;
+ font-size: 11px;
+ line-height:50px;
+ color: #FFFFFF;
+ font-weight:bold;
+ text-decoration:none;
}
-#navbar {
- background-color: white;
- color: black;
- font-weight: bold;
- font-size: 80%;
- width: 100%;
+#download_button_mini .dmini_button:hover {
+ background-position: 0px -50px;
}
-#navbar TD {
- text-align: right;
- vertical-align: bottom;
+#download_button_mini .text {
+ position: relative;
+ left: 12px;
}
-#navbar H1 {
- font-size: 200%;
- margin: 0px;
- padding: 0px;
+.download_button_links {
+ font-size:11px;
+ position: relative;
+ left: 50px;
+ top: 43px;
+ width: 250px;
}
-#bigbar {
- text-align: left;
- background-color: #ffff98;
- background-image:url(pix/lock.png);
- background-repeat: no-repeat;
- background-position: right;
- border-top: 2px solid #fa050c;
- border-bottom: 2px solid #fa050c;
- color: black;
- font-weight: bold;
- height: 190px;
- width: 100%;
- min-width: 600px;
+#donate_button {
+ position: relative;
+ left: 695px;
+ top: 85px;
+ width: 200px;
}
-#vertable {
- width: 33%
+#donate_button a {
+ background: url('img/donate_button.png');
+ background-repeat: no-repeat;
+ display: block;
+ height: 79px;
+ width: 200px;
+ color: #FFFFFF;
+ font-weight: bold;
+ text-decoration: none;
+ font-size: 14px;
}
-/* colors */
-.yellow {
- color: #fdba19;
+#donate_button a:hover {
+ background-position: 0px -79px;
}
-.red {
- color: #fa050c;
+#donate_button .text {
+ position:relative;
+ top:20px;
+ left:10px;
}
-/* Content */
+.h_text {
+ position: relative;
+ top: -125px;
+ left: 695px;
+ width: 200px;
+ font-size: 11px;
+ border-left: 1px solid #CCCCCC;
+ padding-left: 10px;
+ margin-top: 12px;
+ height: 220px;
+}
+.h_text .heading {
+ font-size: 23px;
+ font-family: georgia, times, serif;
+ padding-bottom: 9px;
+}
+
+.h_text .serif_word {
+ font-size: 13px;
+ font-weight: bold;
+}
+
+
+
+.h_text .limiter {
+ border-bottom: 3px dotted #CCCCCC;
+ width: 190px;
+ height: 10px;
+ margin-bottom: 3px;
+}
+.center {
+ text-align: center;
+}
+
+.content {
+ width: 100%;
+}
+
+#intro {
+ padding: 0px 250px 20px 20px;
+}
+
+/*#intro span {
+ background: url('img/logo.png') no-repeat scroll 50px 0px transparent;
+ height: 56px;
+ margin: 0px;
+ width: 250px;
+ float: right;
+ margin: 0px;
+ line-height: 24px;
+ margin: 10px 200px 0 0;
+}*/
+
+#intro h2 {
+ font-family: georgia, times, serif;
+ font-size: 30px;
+ font-weight: normal;
+ color: #333333;
+ margin: 0px;
+}
+
+#intro p {
+ color: #555555;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 26px;
+ margin: 10px 0 0;
+ padding: 0;
+}
+
+.column1, .column2, .column3 {
+ display: inline;
+ float: left;
+ margin-right: 25px;
+ position: relative;
+ width: 270px;
+}
+
+.column3 {
+ margin-right: 0px;
+}
+
+.column1 img, .column2 img, .column3 img {
+ width: 270px;
+}
+
+
#main {
- min-width: 250px;
- padding: 40px;
- padding-top: 20px;
- padding-right: 0px;
- line-height: 150%;
- margin-right: 250px;
+ float: left;
+ padding: 0px 0px 0px 20px;
+ width: 600px;
}
-#main TABLE {
- width:100%;
- border-spacing:0px;
- border-collapse: collapse;
- margin-top: 5px;
- margin-bottom: 5px;
+#full {
+ float: left;
+ padding: 0px 20px 0px 20px;
+ width: 860px;
}
-#main TD {
- padding: 0px;
- padding-top: 3px;
- padding-bottom: 3px;
- text-align: left;
- vertical-align: top;
- border-top: 1px solid #7e7a7a;
- border-bottom: 1px solid #7e7a7a;
+#main h2, #full h2 {
+ font-size: 22px;
+ font-weight: normal;
+ color: #333333;
+ margin: 30px 0px 10px 0px;
+ padding: 0px;
+ clear: both;
}
-#boxes {
- float: right;
- width: 200px;
- padding: 10px;
+#main h4, #full h4 {
+ font-size: 18px;
+ color: #333333;
+ font-family: georgia, serif;
+ font-style: italic;
+ font-weight: normal;
}
-.box {
- background-color: #fdba19;
- border-left: 4px solid #fa050c;
- padding: 10px;
- margin-bottom: 10px;
+#main p, #full p {
+ color: #444444;
+ line-height: 20px;
+ margin: 0px 0px 10px;
}
-.box H1 {
- color: black;
- padding-bottom: 5px;
- border-bottom: 2px solid white;
- margin-bottom: 5px;
- font-size: 120%;
+.cleanlist li {
+ font-size: 13px;
+ list-style: none;
+ padding: 0px;
+ clear: both;
}
-.box P {
- margin: 0px;
- padding: 0px;
- margin-top: 5px;
+.screenshots img {
+ width: 250px;
}
+
+#sidebar {
+ -moz-border-radius: 10px 10px 10px 10px;
+ background: #FDF1CD;
+ border: 1px solid #CCCCCC;
+ float: right;
+ margin-top: 34px;
+ padding: 20px 20px 15px;
+ width: 220px;
+}
+
+#sidebar h3 {
+ color: #333333;
+ margin: 1px 0px 10px 0px;
+}
+
+#sidebarsimple {
+ float: right;
+ margin-top: 34px;
+}
+
+.newslist {
+ margin: 0px;
+ padding: 0px;
+}
+
+.newslist li {
+ font-size: 13px;
+ list-style: none;
+ padding: 0;
+}
+
+.newslist li a {
+ /*color: #555555;*/
+ display: block;
+ font-size: 12px;
+ font-weight: bold;
+ list-style: none;
+ margin: 0px;
+ padding: 10px 0px 10px 0px;
+ text-decoration: none;
+ border-bottom: 1px solid #EFEFEF;
+}
+
+.newslist li p {
+ color: #777777;
+ font-size: 10px;
+ font-weight: normal;
+ margin: 4px 0px 0px;
+ padding: 0px;
+}
+
+#menu {
+ height:45px;
+ z-index: 1;
+}
+
+#menu .active a {
+ background-position: 0px -180px;
+}
+
+#menu ul {
+ list-style: none;
+ padding: 0px;
+ margin: 0px;
+}
+
+#menu li {
+ float: left;
+ margin-right: 0px;
+ margin-left:0px;
+ padding: 0px;
+ text-align: center;
+}
+
+#menu .mlogo {
+ border:0px;
+}
+
+#menu .mlogo a {
+ display:block;
+ width: 198px;
+ height: 52px;
+ position: relative;
+ top: -4px;
+ background: url('img/inmenulogo.png');
+}
+
+#menu .mlogo a:hover {
+ background: url('img/inmenulogo.png');
+ background-position: 0px -52px;
+}
+
+#menu .last {
+ width:40px;
+ height: 45px;
+ background: url('img/last.png');
+}
+
+#menu .mdonate a {
+ display: block;
+ width: 110px;
+ height: 45px;
+ float:right;
+ background: url('img/inmenudonate.png');
+ color: #FFFFFF;
+ text-indent: -23px;
+}
+
+#menu .mdonate a:hover {
+ background: url('img/inmenudonate.png');
+ background-position: 0px -45px;
+}
+
+#menu li a {
+ background: #CCCCCC url('img/menubar.png') 0px -90px;
+ color: #2A2A2A;
+ line-height: 45px;
+ width: 148px;
+ display: block;
+ text-decoration: none;
+ font-weight: bold;
+ font-size: 11px;
+}
+
+#menu li a:hover {
+ background: #FFFFFF url('img/menubar.png') 0px -135px;
+ color:#FFFFFF;
+}
+
+#menu ul li ul {
+ width: 201px;
+ list-style: none;
+ position: absolute;
+ display: none;
+}
+
+#menu ul li ul li,
+#menu .active ul li ul li {
+ width: 148px;
+}
+
+#menu ul li .subcap {
+ background: url('img/sub_tail.png');
+ display: block;
+ width: 149px;
+ height: 5px;
+}
+
+#menu ul li ul li a,
+#menu .active ul li ul li a {
+ background: url('img/sub_bg.png');
+ line-height: 25px;
+ width: 142px;
+ font-weight: normal;
+ color: #2A2A2A;
+ text-align: left;
+ display: block;
+ padding-left: 5px;
+ border-left: 1px solid #8B7E57;
+ border-right: 1px solid #8B7E57;
+}
+
+#menu ul li ul li a:hover,
+#menu .active ul li a:hover {
+ background: #FBCA4C;
+ color: #2A2A2A;
+ text-decoration: none;
+ font-weight: bold;
+}
+
+#menu li:hover ul ul,
+#menu li:hover ul ul ul {
+ display: none;
+}
+
+#menu li:hover ul,
+#menu li li:hover ul,
+#menu li li li:hover ul {
+ display: block;
+ z-index:3;
+}
+
+.donate_header {
+ display: block;
+ position: relative;
+ top: -80px;
+ height: 180px;
+ background: url('img/heart.png') no-repeat;
+ background-position: 550px 10px;
+ font-size: 26px;
+ border-bottom: 1px solid #CCCCCC;
+ margin-bottom: -70px;
+ z-index: -100;
+}
+
+.donate_header .text {
+ position:relative;
+ left: 180px;
+ top: 40px;
+ text-align:center;
+}
+
+.donate_header b {
+ color: #D50D35;
+}
+
+.download_header {
+ height:160px;
+ background: url('img/download_bg.png') no-repeat;
+ background-position: 690px 10px;
+ font-size:26px;
+ border-bottom: 1px solid #CCCCCC;
+ margin-bottom:8px;
+}
+
+.download_header .text {
+ position:relative;
+ left: 120px;
+ top: 40px;
+ text-align:center;
+}
+
+.download_header b {
+ color: #D50D35;
+}
+
+.dlbutton2 a {
+ background-color: #6AC221;
+ -moz-border-radius: 10px 10px 10px 10px;
+ display: block;
+ font-size: 150%;
+ font-weight: bold;
+ margin: 10px 20px 20px;
+ padding: 10px;
+ text-align: center;
+ color: #FFFFFF;
+}
+
+.dlbutton2 a:hover {
+ background: #81C72B;
+ text-decoration: none;
+}
+
+.dlbutton2 img {
+ float:right;
+ position: relative;
+ right: 45px;
+ top: 8px;
+}
+
+.version {
+ color: #FFFFFF;
+ font-size: 75%;
+ font-weight: normal;
+}
+
+#footer {
+ background: #EBEBEB url('img/page_bg.png') repeat-x;
+ font-size: 11px;
+ padding-bottom: 20px;
+ color: #333333;
+ text-align: center;
+ margin-top: 30px;
+ border-top: 1px solid #CCCCCC;
+}
+
+#sitemap {
+ margin: auto;
+ width: 900px;
+ height: 170px;
+ text-align: left;
+}
+
+#sitemap ul {
+ list-style:none;
+ float: left;
+ width: 130px;
+ margin-left: 20px;
+ padding: 0px;
+}
+
+#sitemap li {
+ font-size: 12px;
+ line-height: 19px;
+ padding: 0px;
+}
+
+#sitemap li {
+ font-size: 12px;
+ line-height: 19px;
+ padding: 0px;
+}
+
+#sitemap ul li a {
+ color: #555555;
+ text-decoration: none;
+}
+
+#sitemap ul li a:hover {
+ text-decoration: underline;
+}
Added: trunk/doc/website/header.m4
===================================================================
--- trunk/doc/website/header.m4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/header.m4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -0,0 +1,81 @@
+ m4_ifdef(`FANCY_HEADER', `
+ <div class="fancy_intro">
+ <div id="download_button">
+ m4_ifelse(LANG_DE, `1', `
+ <a href="download-de.html">
+ <span class="text">
+ Gpg4win VERSION<br />herunterladen
+ </span></a>', `
+ <a href="download.html">
+ <span class="text">
+ Download<br />Gpg4win VERSION
+ </span></a>')
+ </div>
+ <div class="download_button_links">
+ m4_ifelse(LANG_DE, `1', `
+ <a href="change-history-de.html">Änderungshistorie</a>', `
+ <a href="change-history.html">Change History</a>')
+ -
+ m4_ifelse(LANG_DE, `1', `
+ <a href="package-integrity-de.html">Integrität prüfen</a>', `
+ <a href="package-integrity.html">Check integrity</a>')
+ </div>
+ <div class="h_text">
+ <p><span class="heading">News</span></p>
+ <small>2011-03-15</small><br>
+ <span class="serif_word"><img src="img/bulletin.png" alt="" />
+ m4_ifelse(LANG_DE, `1', `
+ <a href="download-de.html">Gpg4win 2.1.0 veröffentlicht</a></span>', `
+ <a href="dowwnload.html">Gpg4win 2.1.0 released</a></span>')
+ <div class="limiter"></div>
+ <p>
+ m4_ifelse(LANG_DE, `1', `
+ Ältere Meldungen im <a href="newsarchive-de.html">Newsarchiv</a>', `
+ Older messages in <a href="newsarchive.html">news archive</a>')
+ .</p>
+ </div>
+ </div>', `
+ m4_ifdef(`NO_HEADER',, `
+ <div class="mini_intro">
+ <div id="breadcrum">m4_ifelse(LANG_DE, `1', `<a href="index-de.html">', `<a
+ href="index.html">')Home</a> »
+ m4_ifelse(LANG_DE, `1', `
+ m4_ifelse(MAIN, `about', `Über Gpg4win')
+ m4_ifelse(MAIN, `doc', `Dokumentation')
+ m4_ifelse(MAIN, `community', `Gemeinschaft')
+ m4_ifelse(MAIN, `support', `Support')
+ m4_ifelse(MAIN, `download', `Download')
+ m4_ifelse(MAIN, `donate', `Spenden')
+ ')
+ m4_ifelse(LANG_DE, `0', `
+ m4_ifelse(MAIN, `about', `About Gpg4win')
+ m4_ifelse(MAIN, `doc', `Documentation')
+ m4_ifelse(MAIN, `community', `Community')
+ m4_ifelse(MAIN, `support', `Support')
+ m4_ifelse(MAIN, `download', `Download')
+ m4_ifelse(MAIN, `donate', `Donate')
+ ')
+ </div>
+ <div id="download_button_mini">
+ m4_ifelse(LANG_DE, `1', `
+ <a class="dmini_button" href="download-de.html">
+ ', `
+ <a class="dmini_button" href="download.html">
+ ')
+ <span class="text">
+ Download Gpg4win 2.1.0
+ </span>
+ </a>
+ <span class="links">
+ m4_ifelse(LANG_DE, `1', `
+ <a href="change-history-de.html">Änderungshistorie</a>', `
+ <a href="change-history.html">Change History</a>')
+ -
+ m4_ifelse(LANG_DE, `1', `
+ <a href="package-integrity-de.html">Integrität prüfen</a>', `
+ <a href="package-integrity.html">Check integrity</a>')
+ </span>
+ </div>
+ </div>
+ <br clear="all" />
+ ')')
Added: trunk/doc/website/img/bulletin.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/bulletin.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/donate_button.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/donate_button.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/donate_button_mini.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/donate_button_mini.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/download_bg.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/download_bg.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/download_button.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/download_button.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/download_button_mini.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/download_button_mini.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/english.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/english.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/fancy_bg.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/fancy_bg.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/german.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/german.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/gnupg.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/gnupg.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/heart.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/heart.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/help.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/help.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/inmenudonate.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/inmenudonate.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/inmenudownload.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/inmenudownload.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/inmenulogo.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/inmenulogo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/last.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/last.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/logo_footer.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/logo_footer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/logo_mini.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/logo_mini.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/menu_bg.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/menu_bg.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/menubar.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/menubar.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-gpgex-explorer-options_cut_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-gpgex-explorer-options_cut_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-gpgex-explorer-options_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-gpgex-explorer-options_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-gpgex-explorer-signEncrypt_cut_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-gpgex-explorer-signEncrypt_cut_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-gpgol-options_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-gpgol-options_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-gpgol-sendSignEncryptedMail_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-gpgol-sendSignEncryptedMail_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-inst-welcome_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-inst-welcome_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-ChooseCertificateFormat_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-ChooseCertificateFormat_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-certificateSearchOnKeyserver_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-certificateSearchOnKeyserver_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-certifyCertificate1_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-certifyCertificate1_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-certifyCertificate2_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-certifyCertificate2_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-certifyCertificate3_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-certifyCertificate3_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-checksums-verify.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-checksums-verify.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-configureCertificateserver_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-configureCertificateserver_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-encryptFile1_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-encryptFile1_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-encryptFile2_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-encryptFile2_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-encryptFile3_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-encryptFile3_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-mail-certificateselection-signencrypt_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-mail-certificateselection-signencrypt_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-mail-decryptVerify-successful_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-mail-decryptVerify-successful_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-mainwindow-openpgp-certificates_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-mainwindow-openpgp-certificates_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-mainwindow-x509-certificates_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-mainwindow-x509-certificates_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-openpgp-certificateDetails_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-openpgp-certificateDetails_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-openpgp-createKey_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-openpgp-createKey_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-openpgp-ownertrust_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-openpgp-ownertrust_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-openpgp-personalDetails_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-openpgp-personalDetails_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-splashscreen_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-splashscreen_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-verifyFile2-details_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-verifyFile2-details_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-kleopatra-x509-personalDetails_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-kleopatra-x509-personalDetails_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-ol-emailfolder_cut_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-ol-emailfolder_cut_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-ol-emailfolder_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-ol-emailfolder_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-pinentry-openpgp-set-passphrase_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-pinentry-openpgp-set-passphrase_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-pinentry-openpgp_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-pinentry-openpgp_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sc-pinentry-smime_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sc-pinentry-smime_de.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sub_bg.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sub_bg.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/sub_tail.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/sub_tail.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-gpgex-explorer-options_cut_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-gpgex-explorer-options_cut_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-gpgex-explorer-options_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-gpgex-explorer-options_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-gpgex-explorer-signEncrypt_cut_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-gpgex-explorer-signEncrypt_cut_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-gpgol-options_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-gpgol-options_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-gpgol-sendSignEncryptedMail_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-gpgol-sendSignEncryptedMail_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-inst-welcome_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-inst-welcome_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-ChooseCertificateFormat_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-ChooseCertificateFormat_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-certificateSearchOnKeyserver_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-certificateSearchOnKeyserver_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-certifyCertificate1_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-certifyCertificate1_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-certifyCertificate2_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-certifyCertificate2_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-certifyCertificate3_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-certifyCertificate3_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-checksums-verify.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-checksums-verify.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-configureCertificateserver_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-configureCertificateserver_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-encryptFile1_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-encryptFile1_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-encryptFile2_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-encryptFile2_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-encryptFile3_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-encryptFile3_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-mail-certificateselection-signencrypt_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-mail-certificateselection-signencrypt_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-mail-decryptVerify-successful_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-mail-decryptVerify-successful_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-mainwindow-openpgp-certificates_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-mainwindow-openpgp-certificates_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-mainwindow-x509-certificates_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-mainwindow-x509-certificates_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-openpgp-certificateDetails_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-openpgp-certificateDetails_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-openpgp-createKey_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-openpgp-createKey_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-openpgp-ownertrust_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-openpgp-ownertrust_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-openpgp-personalDetails_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-openpgp-personalDetails_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-splashscreen_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-splashscreen_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-verifyFile2-details_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-verifyFile2-details_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-kleopatra-x509-personalDetails_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-kleopatra-x509-personalDetails_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-ol-emailfolder_cut_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-ol-emailfolder_cut_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-ol-emailfolder_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-ol-emailfolder_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-pinentry-openpgp-set-passphrase_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-pinentry-openpgp-set-passphrase_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-pinentry-openpgp_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-pinentry-openpgp_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/website/img/t250.sc-pinentry-smime_de.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/website/img/t250.sc-pinentry-smime_de.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/doc/website/impressum-de.htm4
===================================================================
--- trunk/doc/website/impressum-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/impressum-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,22 +4,26 @@
m4_define(`DE')
m4_define(`EN_FILE', `impressum.html')
-PAGE_START
-<h1>Impressum</h1>
+m4_define(`TITLE', `Impressum')
+m4_define(`MAIN', `misc')
-<p>
-Die Web-Seiten von Gpg4win sowie die Projektseite werden von der Intevation GmbH
-bereitgestellt, der Download-Bereich ftp.gpg4win.org/gpg4win/ von der g10 Code GmbH.
-</p>
+PAGE_START
+<div id="intro">
+<h2>Impressum</h2>
<p>
+Die Gpg4win Webseiten werden von der Intevation GmbH
+bereitgestellt, der Downloadbereich (ftp.gpg4win.org/gpg4win/) von
+der g10 Code GmbH.
Die inhaltliche Gestaltung erfolgte und erfolgt durch die wechselnden
-aktiven Mitglieder des Gpg4win Projektes.
+aktiven Mitglieder der Gpg4win-Initiative.
</p>
+</div>
+<div id="main">
+<h2>Intevation GmbH</h2>
<p>
-<b>Intevation GmbH</b><br>
Neuer Graben 17<br>
49074 Osnabrück<br>
Deutschland<br>
@@ -27,11 +31,10 @@
Vertretungsberechtigt: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner<br>
Registereintrag: HR B 18998, Amtsgericht Osnabrück<br>
Umsatzsteuer-Identifikation: de 204 854 484<br>
-Telefon: 0541/335083-0<br>
</p>
+<h2>g10 Code GmbH</h2>
<p>
-<b>g10 Code GmbH</b><br>
Hüttenstr. 61<br>
40699 Erkrath<br>
Deutschland<br>
@@ -39,5 +42,5 @@
Vertretungsberechtigt: Werner Koch<br>
Registereintrag: HR B 14459, Amtsgericht Wuppertal<br>
Umsatzsteuer-Identifikation: de 215605608<br>
-Telefon: 02104/173855<br>
</p>
+</div>
Modified: trunk/doc/website/impressum.htm4
===================================================================
--- trunk/doc/website/impressum.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/impressum.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,42 +4,44 @@
m4_define(`EN')
m4_define(`DE_FILE', `impressum-de.html')
-PAGE_START
-<h1>Impressum / Legal notice</h1>
+m4_define(`TITLE', `Contact')
+m4_define(`MAIN', `misc')
+PAGE_START
+<div id="intro">
+<h2>Impressum / Legal notice</h2>
<p>
The web pages of Gpg4win as well as the project
site are hosted by Intevation GmbH.
The download area ftp.gpg4win.org/gpg4win/ is hosted by g10 Code GmbH.
-</p>
-
-<p>
The content has been created and is being maintained by the changing
active team members of the Gpg4win project.
</p>
+</div>
-<p>
-<b>Intevation GmbH</b><br>
-Neuer Graben 17<br>
+<div id="main">
+
+<h2>Intevation GmbH</h2>
+<p>Neuer Graben 17<br>
49074 Osnabrück<br>
Germany<br>
<a href="http://www.intevation.net">www.intevation.net</a><br>
Authorised: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner<br>
Registered as: HR B 18998, Amtsgericht Osnabrück<br>
VAT ID: de 204 854 484<br>
-Phone: +49 541 335083-0<br>
</p>
-<p>
-<b>g10 Code GmbH</b><br>
-Hüttenstr. 61<br>
+
+<h2>g10 Code GmbH</h2>
+<p>Hüttenstr. 61<br>
40699 Erkrath<br>
Germany<br>
<a href="http://www.g10code.com">www.g10code.com</a><br>
Authorised: Werner Koch<br>
Registered as: HR B 14459, Amtsgericht Wuppertal<br>
VAT ID: de 215605608<br>
-Phone: +49 2104 173855<br>
</p>
+
+</div>
Modified: trunk/doc/website/index-de.htm4
===================================================================
--- trunk/doc/website/index-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/index-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,108 +4,48 @@
m4_define(`DE')
m4_define(`EN_FILE', `index.html')
-PAGE_START
+m4_define(`TITLE', `Sichere E-Mail- und Datei-Verschlüsselung mit GnuPG für Windows')
-<p>
-<b>Gpg4win ist mit wenigen Mausklicks installiert</b> und kann ausprobiert werden.
-Sie sollten aber auf Ihrem System Administrator sein oder Administrationsrechte
-besitzen.
-</p>
-<p>
-Beginnen Sie am besten mit dem anschaulichen
-<a
-href="./doc/de/gpg4win-compendium.html">Gpg4win-Kompendium</a>.
-</p>
-<p>
-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>
+m4_define(`FANCY_HEADER')
-<h2>Neuigkeiten</h2>
-<p>
-<dl>
-<dt>
-<a
-href="download-de.html"><b>+++
-2011-02-04: Gpg4win 2.1.0-rc2 veröffentlicht +++</b></a></dt>
-<dd>Diese zweite Vorabversion von 2.1.0 enthält wichtige
-Aktualisierungen in GnuPG und Kleopatra.
-</dd>
+PAGE_START
-<dt><a
-href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-December/000013.html"><b>+++
-2010-12-20: Gpg4win 2.1.0-rc1 veröffentlicht +++</b></a></dt>
-<dd>Diese erste Vorabversion von 2.1.0 enthält wichtige Verbesserungen in
-Kleopatra, Pinentry und GnuPG.
-</dd>
+<div id="intro" style="float:left; padding-right:0; width:600px;">
+ <span></span>
+ <h2>Gpg4win - eine sichere Lösung...</h2>
+ <p>
+ ... zum Verschlüsseln und Signieren von E-Mails, Dateien und Ordner unter Windows.
+ Gpg4win (GNU Privacy Guard for Windows) ist Freie Software und mit
+ nur wenigen Mausklicks installiert.<br>
+ Starten Sie durch - in eine freie und sichere Zukunft!
+ </p>
+</div>
-<dt><a
-href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-September/000012.html"><b>+++
-2010-09-02: Gpg4win 2.1.0-beta1 veröffentlicht +++</b></a></dt>
-<dd>Diese Version bringt u.a. viele Verbesserungen in Kleopatra
-und GnuPG mit.
-</dd>
+<div id="full">
-<dt><a
-href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-September/000011.html"><b>+++
-2010-09-01: Englisches Gpg4win-Kompendium 3.0.0-beta1 veröffentlicht
-+++</b></a></dt>
-<dd>Das Gpg4win-Kompendium ist in einer ersten englischen Übersetung
-erschienen.
-</dd>
-</dl>
+<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>
+</div>
-Ältere Meldungen im <a href="newsarchive-de.html">Newsarchiv</a>.
+<div class="column2">
+<h4>Erste Schritte</h4>
+<p>Wir helfen Ihnen Gpg4win zum Einsatz zu bringen.
+Lernen Sie, wie einfach der Einstig in die Kryptografie ist und
+beginnen Sie am besten mit dem <a href="./doc/de/gpg4win-compendium.html">Gpg4win-Kompendium</a>!</p>
+</div>
-<h2>Gpg4win 2.x</h2>
-
-Gpg4win ist ein Installationspaket für Windows (2000/XP/2003/Vista/7)
-mit Computer-Programmen und Handbüchern für E-Mail- und Dateiverschlüsselung.
-Die beiden relevanten kryptographischen Standards OpenPGP und S/MIME werden
-unterstützt.
-Gpg4win und die in Gpg4win enthaltene Software
-sind <a href="http://www.fsfe.de/documents/freesoftware.de.html">Freie
-Software</a> (u.a. kostenlose gewerbliche und private Nutzung).
-
-
-<p>
-Wahlweise können alle oder einige der folgenden <b>Module</b> installiert werden:
+<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>
-<table>
- <tr>
- <td>GnuPG:</td>
- <td>Das Kernstück, das eigentliche Verschlüsselungsprogramm.</td>
- </tr>
- <tr>
- <td>Kleopatra:</td>
- <td>Ein Zertifikatsmanager für OpenPGP und X.509 (S/MIME); stellt
-einheitliche Benutzerführung für alle Krypto-Dialoge bereit. </td>
- </tr>
- <tr>
- <td>GPA:</td>
- <td>Ein anderer Zertifikatsmanager für OpenPGP und X.509 (S/MIME).</td>
- </tr>
- <tr>
- <td>GpgOL:</td>
- <td>Eine Programmerweiterung für Microsoft Outlook 2003 und 2007
-(E-Mail-Vverschlüsselung).</td>
- </tr>
- <tr>
- <td>GpgEX:</td>
- <td>Eine Programmerweiterung für den Microsoft Explorer (Dateiverschlüsselung).</td>
- </tr>
- <tr>
- <td>Claws Mail:</td>
- <td>Ein komplettes E-Mail-Programm inklusive Programmerweiterung für GnuPG.</td>
- </tr>
- <tr>
- <td>Gpg4win-Kompendium:</td>
- <td>Die neue deutschsprachige Dokumentation zu Gpg4win2 (für
-Einsteiger und Fortgeschrittene).</td>
- </tr>
-</table>
+</div>
-
+</div>
Modified: trunk/doc/website/index.htm4
===================================================================
--- trunk/doc/website/index.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/index.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -5,101 +5,55 @@
m4_define(`EN')
m4_define(`DE_FILE', `index-de.html')
+m4_define(`TITLE', `Secure email and file encryption with GnuPG for Windows')
+m4_define(`FANCY_HEADER')
+
PAGE_START
-<p>
-Gpg4win can be <b>installed and tested with just a few mouse clicks</b>.
-Of course you should be administrator of your system or have administration
-rights.
+<div id="intro" style="float:left; padding-right:0; width:600px;">
+ <span></span>
+ <h2>Gpg4win - a secure solution...</h2>
+ <p>
+ ... to encrypt and sign of emails, files and folders under Windows.
+ Gpg4win (GNU Privacy Guard for Windows) is Free Software and
+ can be installed with just a few mouse clicks.<br>
+ Go on - in a free and secure future!
</p>
-<p>
+</div>
+
+<div id="full">
+
+<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>
+</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>.
+<a href="./doc/en/gpg4win-compendium.html">Gpg4win Compendium</a>.
+
</p>
-<p>
+</div>
+
+<div class="column3">
+<h4>Gemeinschaft erleben</h4>
+<p>Ggp4win is Free Software. Join the <a href="community.html">community</a>!
We recommend subscribing to the
<a href="http://lists.wald.intevation.org/mailman/listinfo/gpg4win-announce"
- >Gpg4win announcement mailing list</a>
+>Gpg4win announcement mailing list</a>
to be automatically informed about new releases and other
important Gpg4win news.
</p>
+</div>
-<h2>News</h2>
-<p>
-<dl>
+</div>
-<dt>
-<a href="download.html"><b>+++
-2011-02-04: Gpg4win 2.1.0-rc2 released +++</b></a></dt>
-<dd>with important updates of GnuPG and Kleopatra.
-</dd>
-<dt><a
-href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2010-December/000049.html"><b>+++
-2010-12-20: Gpg4win 2.1.0-rc1 released +++</b></a></dt>
-<dd>with important improvements in Kleopatra, Pinentry and GnuPG.
-</dd>
-
-<dt><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2010-September/000048.html"><b>+++ 2010-09-02: Gpg4win 2.1.0-beta1 released +++</b></a></dt>
-<dd>with a lot of improvements in Kleopatra and GnuPG. </dd>
-
-<dt><a
-href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2010-September/000047.html"><b>+++
-2010-09-01: English Gpg4win Compendium 3.0.0-beta1 released
-+++</b></a></dt>
-<dd>This is the first beta version of the translated English Gpg4win
-documentation. </dd>
-
-</dl>
-
-Older messages in <a href="newsarchive.html">news archive</a>.
-
-<h2>Gpg4win 2.x</h2>
-
-Gpg4win is an installer package for Windows (2000/XP/2003/Vista/7) with
-computer programs and handbooks for email and file encryption. Both
-relevant cryptography standards are supported, OpenPGP and S/MIME.
-Gpg4win and the software included with Gpg4win
-are <a href="http://www.fsf.org/licensing/essays/free-sw.html">Free
-Software</a> (among other things free of charge for all commercial and
-non-commercial purposes).
-
-<p>
-You can choose all or some of the following <b>modules</b> during installation:
-</p>
-<table>
- <tr>
- <td>GnuPG:</td>
- <td>The core; this is the actual encryption tool.</td>
- </tr>
- <tr>
- <td>Kleopatra:</td>
- <td>A certificate manager for OpenPGP and X.509 (S/MIME) and common crypto dialogs.</td>
- </tr>
- <tr>
- <td>GPA:</td>
- <td>Another certificate manager for OpenPGP and X.509 (S/MIME).</td>
- </tr>
- <tr>
- <td>GpgOL:</td>
- <td>A plugin for Microsoft Outlook 2003 and 2007 (email encryption).</td>
- </tr>
- <tr>
- <td>GpgEX:</td>
- <td>A plugin for Microsoft Explorer (file encryption).</td>
- </tr>
- <tr>
- <td>Claws Mail:</td>
- <td>A complete email program including the plugin for GnuPG.</td>
- </tr>
- <tr>
- <td>Gpg4win Compendium:</td>
- <td>The new (German!) documentation about Gpg4win2 (translation already scheduled).</td>
- </tr>
- <tr>
- <td>Gpg4win for Novices:</td>
- <td>The old English handbook about Gpg4win1 (for newbies).</td>
- </tr>
-</table>
-
+
+
Added: trunk/doc/website/license-de.htm4
===================================================================
--- trunk/doc/website/license-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/license-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -0,0 +1,369 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`DE')
+m4_define(`EN_FILE', `license.html')
+m4_define(`license-de.html', `0')
+
+m4_define(`TITLE', `Lizenz')
+
+PAGE_START
+
+<div id="intro">
+<h2>Lizenz</h2>
+<p>Gpg4win ist Freie Software und besteht aus einer ganzen Reihe von unabhängig entwickelten
+Paketen, die teilweise unterschiedliche Lizenzen haben. Der Großteil
+dieser Software steht, wie Gpg4win selbst, unter der <b>GNU General
+Public License (GNU GPL)</b>. Gemeinsam ist, dass die Software ohne
+Restriktionen benutzt werden kann, verändert werden darf und
+Änderungen weitergeben dürfen. Wenn die
+<a href="http://ftp.gpg4win.org/gpg4win-VERSION.tar.bz2">Quelltexte</a>
+mit weitergegeben werden und auf die die GNU GPL hingewiesen wird,
+ist die Weitergabe in jedem Fall möglich.
+</p>
+</div>
+
+<div id="main">
+<h2>Copyright Erklärungen</h2>
+<p>Zur Übersicht folgt eine Liste der Copyright Erklärungen.
+Einen aktuelle Übersicht gibt es auch in der aktuellen
+<a href="http://ftp.gpg4win.org/README-VERSION.de.txt">README-Datei</a>.
+</p>
+<br>
+<pre>
+Gpg4win is
+
+ Copyright (C) 2005-2011 g10 Code GmbH, Intevation GmbH
+
+ Gpg4win is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Gpg4win is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA
+
+GnuPG is
+
+ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+ GnuPG is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ GnuPG is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+ See the files AUTHORS and THANKS for credits, further legal
+ information and bug reporting addresses pertaining to GnuPG.
+
+
+NSIS is
+
+ Copyright (C) 1999-2008 Nullsoft and Contributors
+
+ This license applies to everything in the NSIS package, except where
+ otherwise noted.
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
+ The user interface used with the installer is
+
+ Copyright (C) 2002-2005 Joost Verburg
+
+ [It is distributed along with NSIS and the same conditions as stated
+ above apply]
+
+
+GLIB is
+
+ Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
+ Modified by the GLib Team and others 1997-2000. See the AUTHORS
+ file for a list of people on the GLib Team. See the ChangeLog
+ files for a list of changes. These files are distributed with
+ GLib at ftp://ftp.gtk.org/pub/gtk/.
+
+
+GPA is
+
+ Copyright (C) 2000-2002 G-N-U GmbH (http://www.g-n-u.de)
+ Copyright (C) 2002-2003 Miguel Coca.
+ Copyright (C) 2005, 2008, 2009 g10 Code GmbH.
+
+ GPA uses fragments from the following programs and libraries:
+ JNLIB, Copyright (C) 1998-2000 Free Software Foundation, Inc.
+ GPGME, Copyright (C) 2000-2001 Werner Koch
+ WinPT, Copyright (C) 2000-2002 Timo Schulz
+ (For details, see the file `AUTHORS'.)
+
+ GPA is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ GPA is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+
+GPGME is
+
+ Copyright (C) 2000 Werner Koch (dd9jn)
+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008,
+ 2009 g10 Code GmbH
+
+ GPGME is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ GPGME is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+ See the files AUTHORS and THANKS for credits, further legal
+ information and bug reporting addresses pertaining to GPGME.
+
+
+GpgOL is
+
+ Copyright (C) 2001 G Data Software AG, http://www.gdata.de
+ Copyright (C) 2004, 2005, 2007, 2008, 2009 g10 Code GmbH
+
+ GpgOL is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ GpgOL is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+ See the files AUTHORS and THANKS for credits, further legal
+ information and bug reporting addresses pertaining to GpgOL.
+
+
+LIBGPG-ERROR is
+
+ Copyright (C) 2003, 2004 g10 Code GmbH
+
+ libgpg-error is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License
+ as published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ libgpg-error is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+
+Pthreads-win32 is
+
+ Copyright(C) 1998 John E. Bossom
+ Copyright(C) 1999,2002 Pthreads-win32 contributors
+
+ Most of this is work available under the GNU Lesser General Public
+ License as published by the Free Software Foundation version 2.1 of
+ the License. The detailed terms are given in the file COPYING in
+ the source distribution; that very file may not be modified and thus
+ it is not possible to include it here.
+
+
+Claws Mail is
+
+ Copyright(C) 1999-2007 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> and the
+ Claws Mail Team
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ For more details see the file COPYING.
+
+
+BZIP2 is
+
+ This program, "bzip2", the associated library "libbzip2", and all
+ documentation, are copyright (C) 1996-2006 Julian R Seward. All
+ rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+
+ 3. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+
+ 4. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ Julian Seward, Cambridge, UK.
+ jseward at bzip.org
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+
+
+ADNS
+
+ adns is Copyright 2008 g10 Code GmbH, Copyright 1997-2000,2003,2006
+ Ian Jackson, Copyright 1999-2000,2003,2006 Tony Finch, and Copyright
+ (C) 1991 Massachusetts Institute of Technology.
+
+ adns is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program and documentation is distributed in the hope that it will
+ be useful, but without any warranty; without even the implied warranty
+ of merchantability or fitness for a particular purpose. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with adns, or one should be available above; if not, write to
+ the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
+ MA 02111-1307, USA, or email adns-maint at chiark.greenend.org.uk.
+
+
+Paperkey
+
+ Copyright (C) 2007, 2008, 2009 David Shaw <dshaw at jabberwocky.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+ The included man page is
+
+ Copyright (C) 2007 Peter Palfrader <peter at palfrader.org>
+
+ Examples have been taken from David Shaw's README. The license is
+ the same as for Paperkey.
+
+
+Scute
+
+ Copyright 2006, 2008 g10 Code GmbH
+
+ Scute is licensed under the GNU General Pubic License, either
+ version 2, or (at your option) any later version with this special
+ exception:
+
+ In addition, as a special exception, g10 Code GmbH gives permission
+ to link this library: with the Mozilla Foundation's code for
+ Mozilla (or with modified versions of it that use the same license
+ as the "Mozilla" code), and distribute the linked executables. You
+ must obey the GNU General Public License in all respects for all of
+ the code used other than "Mozilla". If you modify the software, you
+ may extend this exception to your version of the software, but you
+ are not obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version and from all source files.
+
+</pre>
+</div>
Added: trunk/doc/website/license.htm4
===================================================================
--- trunk/doc/website/license.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/license.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -0,0 +1,368 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`EN')
+m4_define(`DE_FILE', `license-de.html')
+m4_define(`license.html', `0')
+
+m4_define(`TITLE', `License')
+
+PAGE_START
+
+<div id="intro">
+<h2>License</h2>
+<p>Gpg4win is Free Software and consist of several independent developed packages, available
+under different license conditions. Most of these packages however
+are available under the <b>GNU General Public License (GNU GPL)</b>. Common
+to all is that they are free to use without restrictions, may be
+modified and that modifications may be distributed. If the
+<a href="http://ftp.gpg4win.org/gpg4win-VERSION.tar.bz2">source files</a>
+are distributed along with the binaries and the use of the GNU GPL has been pointed out,
+distribution is in in all cases possible.</p>
+</div>
+
+<div id="main">
+<h2>Copyright Statements</h2>
+<p>Here is a list with collected copyright notices. For details see the
+description of each individual package.
+A current list is also available in the
+<a href="http://ftp.gpg4win.org/README-VERSION.en.txt">README</a> of Gpg4win.
+</p>
+<br>
+<pre>
+Gpg4win is
+
+ Copyright (C) 2005-2011 g10 Code GmbH, Intevation GmbH
+
+ Gpg4win is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Gpg4win is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA
+
+GnuPG is
+
+ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+ GnuPG is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ GnuPG is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+ See the files AUTHORS and THANKS for credits, further legal
+ information and bug reporting addresses pertaining to GnuPG.
+
+
+NSIS is
+
+ Copyright (C) 1999-2008 Nullsoft and Contributors
+
+ This license applies to everything in the NSIS package, except where
+ otherwise noted.
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
+ The user interface used with the installer is
+
+ Copyright (C) 2002-2005 Joost Verburg
+
+ [It is distributed along with NSIS and the same conditions as stated
+ above apply]
+
+
+GLIB is
+
+ Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
+ Modified by the GLib Team and others 1997-2000. See the AUTHORS
+ file for a list of people on the GLib Team. See the ChangeLog
+ files for a list of changes. These files are distributed with
+ GLib at ftp://ftp.gtk.org/pub/gtk/.
+
+
+GPA is
+
+ Copyright (C) 2000-2002 G-N-U GmbH (http://www.g-n-u.de)
+ Copyright (C) 2002-2003 Miguel Coca.
+ Copyright (C) 2005, 2008, 2009 g10 Code GmbH.
+
+ GPA uses fragments from the following programs and libraries:
+ JNLIB, Copyright (C) 1998-2000 Free Software Foundation, Inc.
+ GPGME, Copyright (C) 2000-2001 Werner Koch
+ WinPT, Copyright (C) 2000-2002 Timo Schulz
+ (For details, see the file `AUTHORS'.)
+
+ GPA is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ GPA is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+
+GPGME is
+
+ Copyright (C) 2000 Werner Koch (dd9jn)
+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008,
+ 2009 g10 Code GmbH
+
+ GPGME is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ GPGME is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+ See the files AUTHORS and THANKS for credits, further legal
+ information and bug reporting addresses pertaining to GPGME.
+
+
+GpgOL is
+
+ Copyright (C) 2001 G Data Software AG, http://www.gdata.de
+ Copyright (C) 2004, 2005, 2007, 2008, 2009 g10 Code GmbH
+
+ GpgOL is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ GpgOL is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+ See the files AUTHORS and THANKS for credits, further legal
+ information and bug reporting addresses pertaining to GpgOL.
+
+
+LIBGPG-ERROR is
+
+ Copyright (C) 2003, 2004 g10 Code GmbH
+
+ libgpg-error is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License
+ as published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ libgpg-error is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+
+Pthreads-win32 is
+
+ Copyright(C) 1998 John E. Bossom
+ Copyright(C) 1999,2002 Pthreads-win32 contributors
+
+ Most of this is work available under the GNU Lesser General Public
+ License as published by the Free Software Foundation version 2.1 of
+ the License. The detailed terms are given in the file COPYING in
+ the source distribution; that very file may not be modified and thus
+ it is not possible to include it here.
+
+
+Claws Mail is
+
+ Copyright(C) 1999-2007 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> and the
+ Claws Mail Team
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ For more details see the file COPYING.
+
+
+BZIP2 is
+
+ This program, "bzip2", the associated library "libbzip2", and all
+ documentation, are copyright (C) 1996-2006 Julian R Seward. All
+ rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+
+ 3. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+
+ 4. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ Julian Seward, Cambridge, UK.
+ jseward at bzip.org
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+
+
+ADNS
+
+ adns is Copyright 2008 g10 Code GmbH, Copyright 1997-2000,2003,2006
+ Ian Jackson, Copyright 1999-2000,2003,2006 Tony Finch, and Copyright
+ (C) 1991 Massachusetts Institute of Technology.
+
+ adns is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program and documentation is distributed in the hope that it will
+ be useful, but without any warranty; without even the implied warranty
+ of merchantability or fitness for a particular purpose. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with adns, or one should be available above; if not, write to
+ the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
+ MA 02111-1307, USA, or email adns-maint at chiark.greenend.org.uk.
+
+
+Paperkey
+
+ Copyright (C) 2007, 2008, 2009 David Shaw <dshaw at jabberwocky.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+ The included man page is
+
+ Copyright (C) 2007 Peter Palfrader <peter at palfrader.org>
+
+ Examples have been taken from David Shaw's README. The license is
+ the same as for Paperkey.
+
+
+Scute
+
+ Copyright 2006, 2008 g10 Code GmbH
+
+ Scute is licensed under the GNU General Pubic License, either
+ version 2, or (at your option) any later version with this special
+ exception:
+
+ In addition, as a special exception, g10 Code GmbH gives permission
+ to link this library: with the Mozilla Foundation's code for
+ Mozilla (or with modified versions of it that use the same license
+ as the "Mozilla" code), and distribute the linked executables. You
+ must obey the GNU General Public License in all respects for all of
+ the code used other than "Mozilla". If you modify the software, you
+ may extend this exception to your version of the software, but you
+ are not obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version and from all source files.
+
+</pre>
+</div>
Modified: trunk/doc/website/links-de.htm4
===================================================================
--- trunk/doc/website/links-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/links-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,36 +4,34 @@
m4_define(`DE')
m4_define(`EN_FILE', `links.html')
-PAGE_START
-<h1>Links</h1>
+m4_define(`TITLE', `Links')
-<h2>Ähnliche Projekte</h2>
+PAGE_START
-<p>
-<dl>
-<dt><a href="http://www.gpg4kde.de">Gpg4kde</a></dt>
-<dd><br></dd>
+<div id="intro">
+<h2>Links</h2>
+<p>Kryptografie im Netz</p>
+</div>
-<dt><a href="http://home.arcor.de/rose-indorf/">GnuPG-Basics</a></dt>
-<dd><br></dd>
+<div id="main">
+<h2>Änliche Projekte</h2>
-<dt><a href="http://sites.inka.de/tesla/gpgrelay.html">GPGrelay</a></dt>
-<dd>ist ein Verschlüsselungsprogramm welches im Hintergrund E-Mails
+<ul>
+<li><a href="http://www.gnupg.org">GnuPG</a></li>
+<li><a href="http://www.gpg4kde.de">Gpg4kde</a></li>
+<li><a href="http://home.arcor.de/rose-indorf/">GnuPG-Basics</a></li>
+<li><a href="http://sites.inka.de/tesla/gpgrelay.html">GPGrelay</a>
+<p>ist ein Verschlüsselungsprogramm welches im Hintergrund E-Mails
verschlüsselt, so dass kein Plugin für das E-Mail Programm notwendig
ist.<br>
-Wer Interesse hat, Gpg4win um diese Software zu erweitertn, kann die Integration
+Wer Interesse hat, Gpg4win um diese Software zu erweitern, kann die Integration
selbst durchführen. Dafür gibt es einige <a href="build-installer-de.html">Hilfestellungen
-zur Erweiterung von Gpg4win</a>.
-</dd>
+zur Erweiterung von Gpg4win</a>.</p></li>
+<li><a
+href="http://www.thunderbird-mail.de/wiki/Enigmail_OpenPGP">Thunderbird/Enigmail</a></li>
+</li>
+<li><a href="http://www.gnupp.de/start.html">GnuPP</a> (veraltet)</li>
+</ul>
+</div>
-</dl>
-
-
-<p>Veraltet:<br>
-<a href="http://www.gnupp.de/start.html">GnuPP</a>
-</p>
-
-<p>Verwandt:<br>
-<a href="http://www.thunderbird-mail.de/wiki/Enigmail_OpenPGP">Thunderbird/Enigmail</a>
-</p>
Modified: trunk/doc/website/links.htm4
===================================================================
--- trunk/doc/website/links.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/links.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -1,4 +1,4 @@
-ggm4_dnl -*-html-*-
+m4_dnl -*-html-*-
m4_include(`template.m4')
m4_dnl $Id$
@@ -6,20 +6,20 @@
m4_define(`DE_FILE', `links-de.html')
PAGE_START
-<h1>Links</h1>
+<div id="intro">
+<h2>Links</h2>
+<p>Cryptography on the web</p>
+</div>
+<div id="main">
<h2>Similar Projects</h2>
-<p>
-<dl>
-<dt><a href="http://www.gpg4kde.org">Gpg4kde</a></dt>
-<dd><br></dd>
-
-<dt><a href="http://home.arcor.de/rose-indorf/">GnuPG-Basics</a></dt>
-<dd><br></dd>
-
-<dt><a href="http://sites.inka.de/tesla/gpgrelay.html">GPGrelay</a></dt>
-<dd>is an encryption tool which encrypts e-mails in the
+<ul>
+<li><a href="http://www.gnupg.org">GnuPG</a></li>
+<li><a href="http://www.gpg4kde.org">Gpg4kde</a></li>
+<li><a href="http://home.arcor.de/rose-indorf/">GnuPG-Basics</a></li>
+<li><a href="http://sites.inka.de/tesla/gpgrelay.html">GPGrelay</a>
+<p>is an encryption tool which encrypts e-mails in the
background, hence eliminating the need for a plugin for any e-mail
tool of your choice.
<br>
@@ -27,14 +27,8 @@
in the Gpg4win installer package.
If you are interested, just go ahead and integrate these modules, the
<a href="build-installer.html">Howto extend the Gpg4win installer
-package</a> will help you.
-</dd>
-
-
-<p>Outdated:<br>
-<a href="http://www.gnupp.de/start.html">GnuPP</a>
-</p>
-
-<p>Related:<br>
-<a href="http://enigmail.mozdev.org/">Thunderbird/Enigmail</a>
-</p>
+package</a> will help you.</p></li>
+<li><a href="http://enigmail.mozdev.org/">Thunderbird/Enigmail</a></li>
+<li><a href="http://www.gnupp.de/start.html">GnuPP</a> (veraltet)</li>
+</ul>
+</div>
Modified: trunk/doc/website/localize-gpg4win.htm4
===================================================================
--- trunk/doc/website/localize-gpg4win.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/localize-gpg4win.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,20 +4,25 @@
m4_define(`EN')
m4_dnl m4_define(`DE_FILE', `localize-gpg4win-de.html')
+
+m4_define(`MAIN', `community')
+m4_define(`TITLE', `Translate Gpg4win into your language')
+
PAGE_START
-<h1>How to translate all of Gpg4win into your language</h1>
-
+<div id="intro">
+<h2>How to translate all of Gpg4win into your language</h2>
<p>
Gpg4win consists out of various modules. Some to already support
numerous languages, some only few.
-</p>
-
-<p>
Here, you find a description on how to translate each of the
modules or just how to check whether it supports your language.
</p>
+</div>
+<div id="main">
+
+<h2>Introduction</h2>
<p>
Note, that english is always the default base for any translation.
</p>
@@ -104,7 +109,7 @@
Else, english is used.
</p>
-<h2>Gpg4win Web-Site</h2>
+<h2>Gpg4win Website</h2>
<h4>Available languages</h4>
@@ -315,9 +320,9 @@
<h2>Kleopatra</h2>
<p>
-This new certificate and key manager is not yet a integrated module.
-Please ask on the gpg4win developer
-mailing list for more information.
+This certificate manager is a project of <a
+href="http://kde.org">KDE</a>.
+Please ask the <a href="http://i18n.kde.org">i18n KDE team</a> for more information.
</p>
<h2>GnuPG</h2>
@@ -345,3 +350,4 @@
the apropriate language is selected automatically if available.
Else, english is used.
</p>
+</div>
Modified: trunk/doc/website/newsarchive-de.htm4
===================================================================
--- trunk/doc/website/newsarchive-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/newsarchive-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,94 +4,103 @@
m4_define(`DE')
m4_define(`EN_FILE', `newsarchive.html')
+m4_define(`TITLE', `Newsarchiv')
PAGE_START
-<h1>Newsarchiv</h1>
+<div id="intro">
+<h2>Newsarchiv</h2>
+<p>
+Rückblick auf Gpg4win-Bekanntmachungen aus den letzten Jahren.
+Aktuelle Meldungen gibt es auf der <a href="index-de.html">Startseite</a>.
+</p>
+</div>
-<p></p>
+<div id="main">
+<h2>2011</h2>
+<ul class="newslist">
+ <li><a href="download-de.html">2011-02-04: Gpg4win 2.1.0-rc2 veröffentlicht
+ <p>Diese zweite Vorabversion von 2.1.0 enthält wichtige Aktualisierungen in
+ GnuPG und Kleopatra.
+ </p></a></li>
+</ul>
+
+
<h2>2010</h2>
-<dl>
-<dt> Die neusten Meldungen gibt es auf der <a
-href="./">Startseite</a>.</dt>
-<dd>[..]</dd>
+<ul class="newslist">
+ <li><a href="download-de.html">2010-12-20: Gpg4win 2.1.0-rc1 veröffentlicht
+ <p>Diese erste Vorabversion von 2.1.0 enthält wichtige Verbesserungen in
+ Kleopatra, Pinentry und GnuPG. Details in der
+ Bekanntmachung.</p></a></li>
-</dd>
-<dt><b>+++ 2010-07-28: Gpg4win 2.0.4 veröffentlicht +++</b></dt>
-<dd>Security-Fix für GPGSM (GnuPG). Details in der <a
-href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-July/000010.html">Bekanntmachung</a>.
-</dd>
+ <li><a href="download-de.html">
+ 2010-09-02: Gpg4win 2.1.0-beta1 veröffentlicht
+ <p>Diese Version bringt u.a. viele Verbesserungen in Kleopatra und GnuPG mit.
+ Details in der Bekanntmachung.</p></a></li>
-<dt><b>+++ 2010-06-15: Neue Gpg4win-Spenden-Seite +++</b></dt>
-<dd>Unterstützen Sie die Gpg4win-Initiative und erscheinen Sie auf
-dieser <a href="donate-de.html">Spenderliste</a>!
-</dd>
+ <li><a href="download-de.html">
+ 2010-09-01: Englisches Gpg4win-Kompendium 3.0.0-beta1 veröffentlicht
+ <p>Das Gpg4win-Kompendium ist in einer ersten englischen
+ Übersetung erschienen. Details in der Bekanntmachung.</p></a></li>
-<dt><b>+++ 2010-05-29: Gpg4win 2.0.3 veröffentlicht +++</b></dt>
-<dd>Details in der <a
-href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-June/000009.html">Bekanntmachung</a>.
-</dd>
+ <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-July/000010.html"
+ >2010-07-28: Gpg4win 2.0.4 veröffentlicht
+ <p>Security-Fix für GPGSM (GnuPG). Details in der Bekanntmachung.</p></a></li>
-<dt><b>+++ 2010-05-28: Gpg4win-Kompendium 3.0.0 ist veröffentlicht +++</b></dt>
-<dd>Diese vollständige überarbeitete, deutschprachige
-Übersichtsdokumentation zu Gpg4win2 ermöglicht Einsteigern und
-Fortgeschrittenen einen einfachen Einstieg in die Welt der
-Kryptografie mit Gpg4win. Das Kompendium ist verfügbar als <a
-href="documentation-de.html">PDF- und HTML-Fassung</a>.
-</dd>
+ <li><a href="donate-de.html">2010-06-15: Neue Gpg4win-Spenden-Seite
+ <p>Unterstützen Sie die Gpg4win-Initiative und erscheinen Sie auf
+ dieser Spenderliste!</p></a></li>
-<dt><b>+++ 2010-04-13: Gpg4win 2.0.2 ist veröffentlicht +++</b></dt>
-<dd>Diese Version ist praktisch identisch zu dem Release Candidate
-2.0.2 RC2, bringt zusätzlich aber das Kompendium 3.0.0 RC1 mit.
-Details in der <a
-href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-April/000007.html">Bekanntmachung</a>.
-</dd>
+ <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-June/000009.html">
+ 2010-05-29: Gpg4win 2.0.3 veröffentlicht
+ <p>Details in der Bekanntmachung.</p></a></li>
-<dt><b>+++ 2010-04-01: Gpg4win-Kompendium 3.0.0 RC1 ist veröffentlicht +++</b></dt>
-<dd>Dies ist die letzte Vorabfassung für die im April/Mail 2010 erscheinende
-finale Version 3.0.0 des deutschsprachigen Kompendiums. </dd>
+ <li><a href="documentation-de.html">
+ 2010-05-28: Gpg4win-Kompendium 3.0.0 ist veröffentlicht
+ <p>Diese vollständige überarbeitete, deutschprachige
+ Übersichtsdokumentation zu Gpg4win2 ermöglicht Einsteigern und
+ Fortgeschrittenen einen einfachen Einstieg in die Welt der
+ Kryptografie mit Gpg4win. Das Kompendium ist verfügbar als PDF- und HTML-Fassung.</p></a></li>
-<dt><b>+++ 2010-03-05: Gpg4win 2.0.2 RC2 ist veröffentlicht +++</b></dt>
-<dd>Diese Version bringt u.a. viele Verbesserungen in Kleopatra und Pinentry
-mit. Hier ist die <a
-href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-March/000005.html">Bekanntmachung</a>.
-</dd>
+ <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-April/000007.html">
+ 2010-04-13: Gpg4win 2.0.2 ist veröffentlicht
+ <p>Diese Version ist praktisch identisch zu dem Release Candidate
+ 2.0.2 RC2, bringt zusätzlich aber das Kompendium 3.0.0 RC1 mit.
+ Details in der Bekanntmachung.</p></a></li>
-<dt><b>+++ 2010-02-04: Gpg4win 2.0.2 RC1 ist veröffentlicht +++</b></dt>
-<dd>Diese Version bringt u.a. viele Verbesserungen in Kleopatra, GpgOL
-und GnuPG mit.
-</dd>
+ <li><a href="download-de.html">2010-04-01: Gpg4win-Kompendium 3.0.0 RC1 ist veröffentlicht
+ <p>Dies ist die letzte Vorabfassung für die im April/Mail 2010 erscheinende
+ finale Version 3.0.0 des deutschsprachigen Kompendiums.</p></a></li>
-</dl>
+ <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-March/000005.html">2010-03-05: Gpg4win 2.0.2 RC2 ist veröffentlicht
+ <p>Diese Version bringt u.a. viele Verbesserungen in Kleopatra und Pinentry
+ mit. Detail in der Bekanntmachung.</p></a></li>
+ <li><a href="download-de.html">2010-02-04: Gpg4win 2.0.2 RC1 ist veröffentlicht
+ <p>Diese Version bringt u.a. viele Verbesserungen in Kleopatra, GpgOL
+ und GnuPG mit.</p></a></li>
+</ul>
<h2>2009</h2>
-<dl>
+<ul class="newslist">
+ <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2009-September/000004.html">
+ 2009-09-28: Gpg4win 2.0.1 ist veröffentlicht
+ <p>Diese Version ist praktisch identisch zu dem Release Candidate
+ 2.0.1 RC1.</p></a></li>
-<dt><b>+++ 2009-09-28: Gpg4win 2.0.1 ist veröffentlicht +++</b></dt>
-<dd>Diese Version ist praktisch identisch zu dem Release Candidate
- 2.0.1 RC1.
-Hier ist die <a
-href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2009-September/000004.html">Bekanntmachung</a>.
-</dd>
+ <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2009-September/000001.html">
+ 2009-09-01: Outlook-Nutzer sollten Gpg4win 2.0.1 RC1 herunterladen
+ <p>Verzögerungen machten Outlook 2003 oder 2007 für viele Anwender unbenutzbar;
+ Gpg4win 2.0.1 RC1 adressiert diese Probleme.
+ Hinweis: E-Mails per Exchange von Outlook/GpgOL zu senden geht weiterhin nicht.</p></a></li>
-<dt><b>+++ 2009-09-01: Outlook-Nutzer sollten Gpg4win 2.0.1 RC1
-herunterladen +++</b></dt>
-<dd>
-Verzögerungen machten Outlook 2003 oder 2007 für viele Anwender unbenutzbar;
-Gpg4win 2.0.1 RC1 adressiert diese Probleme.
-Hinweis: Emails per Exchange von Outlook/GpgOl zu senden geht weiterhin nicht.
-Hier ist die <a
-href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2009-September/000001.html">Bekanntmachung</a>.</dd>
+ <li><a href="#">2009-08-19: Smartcards verwenden mit Gpg4win 2.0.0
+ <p>Hinweise für die Nutzung der unterstützen OpenPGP- und
+ X.509-Smartcards mit Kleopatra finden Sie in der aktualisierten README-Datei.</p></a></li>
-<dt><b>+++ 2009-08-19: Smartcards verwenden mit Gpg4win 2.0.0 +++</b></dt>
-<dd>Hinweise für die Nutzung der unterstützen OpenPGP- und
-X.509-Smartcards mit Kleopatra finden Sie in der aktualisierten <a
-href="doc/README.de.txt">README-Datei</a>.</dd>
-
-<dt><b>+++ 2009-08-12: Gpg4win 2.0.0 ist veröffentlicht +++</b></dt>
-<dd>Hier die <a href="news-20090812-de.html">Pressemitteilung</a>.</dd>
-
-</dl>
+ <li><a href="news-20090812-de.html">2009-08-12: Gpg4win 2.0.0 ist veröffentlicht
+ <p>Zur Pressemitteilung</p></a></li>
+</ul>
+</div>
Modified: trunk/doc/website/newsarchive.htm4
===================================================================
--- trunk/doc/website/newsarchive.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/newsarchive.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,17 +4,29 @@
m4_define(`EN')
m4_define(`DE_FILE', `newsarchive-de.html')
+m4_define(`TITLE', `News Archive')
PAGE_START
-<h1>News Archive</h1>
+<div id="intro">
+<h2>News Archive</h2>
+<p>
+The Gpg4win announcements of the last years.
+The latest news are placed at the <a href="./">welcome page</a>.
+</p>
+</div>
-<p></p>
+<div id="main">
+
+<h2>2011</h2>
+
+<dt><b>+++ 2011-02-04: Gpg4win 2.1.0-rc2 released +++</b></dt>
+<dd>with important updates of GnuPG and Kleopatra.
+</dd>
+
<h2>2010</h2>
<dl>
-<dt> The latest news are placed at the <a href="./">welcome page</a>.</dt>
-<dd>[..]</dd>
<dt><b>+++ 2010-07-28: Gpg4win 2.0.4 released +++</b></dt>
<dd>Security fix for GPGSM (GnuPG). See the <a
@@ -87,3 +99,5 @@
<dt><b>+++ 2009-08-12: Gpg4win 2.0.0 released +++</b></dt>
<dd>Read the <a href="news-20090812.html">Press release</a>.</dd>
</dl>
+
+</div>
Modified: trunk/doc/website/package-integrity-de.htm4
===================================================================
--- trunk/doc/website/package-integrity-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/package-integrity-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,14 +4,19 @@
m4_define(`DE')
m4_define(`EN_FILE', `package-integrity.html')
+m4_define(`TITLE', `Integrität prüfen')
+m4_define(`MAIN', `misc')
PAGE_START
-<h1>Integrität der Gpg4win-Pakete prüfen</h1>
-
-Wie man die Integrität prüft, kann man z.B.
+<div id="intro">
+<h2>Integrität der Gpg4win-Pakete prüfen</h2>
+<p>Wie man die Integrität prüft, kann man z.B.
auf der <a href="http://www.gnupg.org/download/integrity_check.de.html">
GnuPG Seite zur Integritätsprüfung</a> nachlesen.
+</p>
+</div>
+<div id="main">
<h2>SHA1 Prüfsummen</h2>
<pre>
@@ -33,7 +38,7 @@
<h2>OpenPGP Signaturen</h2>
-Für gpg4win-VERSION.exe:
+<p>Für gpg4win-VERSION.exe:
<a href="http://ftp.gpg4win.org/gpg4win-VERSION.exe.sig"
>http://ftp.gpg4win.org/gpg4win-VERSION.exe.sig</a><br>
@@ -48,8 +53,8 @@
Für gpg4win-VERSION.tar.bz2:
<a href="http://ftp.gpg4win.org/gpg4win-VERSION.tar.bz2.sig"
>http://ftp.gpg4win.org/gpg4win-VERSION.tar.bz2.sig</a>
+</p>
-
<p>
Die Signaturen wurden mit folgendem OpenPGP-Zertifikat erstellt:<br>
<b>Intevation File Distribution Key <distribution-key at intevation.de>
@@ -66,10 +71,10 @@
<h2>Dateilängen</h2>
-Falls die Prüfsumme nicht stimmen sollte oder eine fehlerhafte Signatur
+<p>Falls die Prüfsumme nicht stimmen sollte oder eine fehlerhafte Signatur
angezeigt wird, so sollten Sie zuerst die Dateilänge überprüfen, um
sicherzustellen, daß Sie auch die komplette Datei heruntergeladen
-haben. Hier sind die Längen die Sie erhalten sollten:
+haben. Hier sind die Längen die Sie erhalten sollten:</p>
<pre>
LEN_EXE bytes für gpg4win-VERSION.exe
@@ -77,3 +82,4 @@
LEN_EXS bytes für gpg4win-src-VERSION.exe
LEN_SRC bytes für gpg4win-VERSION.tar.bz2
</pre>
+</div>
Modified: trunk/doc/website/package-integrity.htm4
===================================================================
--- trunk/doc/website/package-integrity.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/package-integrity.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,15 +4,20 @@
m4_define(`EN')
m4_define(`DE_FILE', `package-integrity-de.html')
+m4_define(`TITLE', `Check Integrity')
PAGE_START
-<h1>Check integrity of Gpg4win packages</h1>
-
-How to actually perform the checks can be found e.g.
+<div id="intro">
+<h2>Check integrity of Gpg4win packages</h2>
+<p>How to actually perform the checks can be found e.g.
on the
<a href="http://www.gnupg.org/download/integrity_check.html">
GnuPG web page on integrity checks</a>.
+</p>
+</div>
+<div id="main">
+
<h2>SHA1 checksums</h2>
<pre>
@@ -23,8 +28,8 @@
</pre>
<h2>MD5 checksums</h2>
-<b>Attention: Using of MD5 is insecure!
-Please use SHA1 only.</b>
+<p><b>Attention: Using of MD5 is insecure!
+Please use SHA1 only.</b></p>
<pre>
MD5_EXE gpg4win-VERSION.exe
MD5_EXL gpg4win-light-VERSION.exe
@@ -34,7 +39,7 @@
<h2>OpenPGP signatures</h2>
-For gpg4win-VERSION.exe:
+<p>For gpg4win-VERSION.exe:
<a href="http://ftp.gpg4win.org/gpg4win-VERSION.exe.sig"
>http://ftp.gpg4win.org/gpg4win-VERSION.exe.sig</a><br>
@@ -49,6 +54,7 @@
For gpg4win-VERSION.tar.bz2:
<a href="http://ftp.gpg4win.org/gpg4win-VERSION.tar.bz2.sig"
>http://ftp.gpg4win.org/gpg4win-VERSION.tar.bz2.sig</a>
+ </p>
<p>
The signatures have been created with the following OpenPGP certificate<br>
@@ -66,9 +72,9 @@
<h2>File lengths</h2>
-If you have a mismatch on the checksum or a bad signature you should
+<p>If you have a mismatch on the checksum or a bad signature you should
first verify that you really downloaded the complete file. Here are
-the lengths you should get:
+the lengths you should get:</p>
<pre>
LEN_EXE bytes for gpg4win-VERSION.exe
@@ -77,4 +83,4 @@
LEN_SRC bytes for gpg4win-VERSION.tar.bz2
</pre>
-
+</div>
Modified: trunk/doc/website/reporting-bugs-de.htm4
===================================================================
--- trunk/doc/website/reporting-bugs-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/reporting-bugs-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,10 +4,19 @@
m4_define(`DE')
m4_define(`EN_FILE', `reporting-bugs.html')
+
+m4_define(`TITLE', `Probleme melden')
+m4_define(`MAIN', `community')
+
PAGE_START
-<h1>Wie man am besten ein Problem meldet</h1>
+<div id="intro">
+<h2>Probleme melden</h2>
+<p>Eine Anleitung</p>
+</div>
+<div id="main">
+
<h2>1. Prüfen, ob man die aktuellste Version von Gpg4win verwendet</h2>
<p>
@@ -102,3 +111,19 @@
Wer sich in der Lage dazu fühlt, sollte die nur die relevanten
Information der Logdatei dem Fehlerbericht beilegen.
</p>
+
+</div>
+
+
+<div id="sidebar">
+ <h3>Suchen Sie professionellen Support?</h3>
+
+ <ul>
+ <li><a href="#">TODO
+ <p>Hier bestellen.</p></a></li>
+
+ </ul>
+
+ <p>Kontaktadresse:<br>
+ <a href="#">gpg4win-professional at intevation.de</a></p>
+</div>
Modified: trunk/doc/website/reporting-bugs.htm4
===================================================================
--- trunk/doc/website/reporting-bugs.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/reporting-bugs.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,10 +4,18 @@
m4_define(`EN')
m4_define(`DE_FILE', `reporting-bugs-de.html')
+
+m4_define(`TITLE', `Reporting Bugs')
+m4_define(`MAIN', `community')
+
PAGE_START
-<h1>How to report a problem</h1>
+<div id="intro">
+<h2>How to report a problem</h2>
+<p>A step-by-step instruction.</p>
+</div>
+<div id="main">
<h2>1. Check whether you are using the newest version of Gpg4win</h2>
<p>
@@ -96,3 +104,5 @@
If you feel able to, just send a excerpt with the relevant
information.
</p>
+
+</div>
Added: trunk/doc/website/screenshots-de.htm4
===================================================================
--- trunk/doc/website/screenshots-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/screenshots-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -0,0 +1,225 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`DE')
+m4_define(`EN_FILE', `screenshots.html')
+m4_define(`screenshots-de.html', `0')
+
+m4_define(`TITLE', `Screenshots')
+m4_define(`MAIN', `about')
+
+PAGE_START
+
+<div id="intro">
+<h2>Screenshots</h2>
+<p>Machen Sie sich einen ersten Eindruck von Gpg4win.
+Die Screenshots zeigen Ihnen ausgewählte Komponenten in Aktion.</p>
+</div>
+
+<div id="main" class="screenshots">
+<h2>Gpg4win-Installationsassistent</h2>
+
+<ul class="cleanlist">
+<li>
+<a href="img/sc-inst-welcome_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-inst-welcome_de.png">
+</a>
+<p>Begrüßungsbildschirm</p>
+</li>
+</ul>
+
+<h2>Kleopatra</h2>
+<ul class="cleanlist">
+<li>
+<a href="img/sc-kleopatra-splashscreen_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-kleopatra-splashscreen_de.png">
+</a>
+<p>Kleopatras Begrüßungsbildschirm</p>
+</li>
+
+<li>
+<a href="img/sc-kleopatra-mainwindow-openpgp-certificates_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-kleopatra-mainwindow-openpgp-certificates_de.png">
+</a>
+<p>Darstellung von zwei (vertrauenswürdigen) OpenPGP-Zertifiakten.
+</p>
+</li>
+<li>
+<a href="img/sc-kleopatra-mainwindow-x509-certificates_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-kleopatra-mainwindow-x509-certificates_de.png">
+</a>
+<p>Darstellung einer importierten X.509-Zertifikatskette. Das Wurzelzertifikat ist
+vertrauenswürdig (blau hinterlegt).
+</p>
+</li>
+
+
+<li>
+<a href="img/sc-kleopatra-openpgp-personalDetails_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-kleopatra-openpgp-personalDetails_de.png">
+</a>
+<p>Erstellung eines OpenPGP-Zertifikats: Eingabe der persönlichen
+Angaben.
+</p>
+</li>
+<li>
+<a href="img/sc-kleopatra-x509-personalDetails_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-kleopatra-x509-personalDetails_de.png">
+</a>
+<p>Erstellung eines S/MIME-Zertifikats: Eingabe der persönlichen
+Angben.
+</p>
+</li>
+<li>
+<a href="img/sc-kleopatra-openpgp-personalDetails_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-kleopatra-openpgp-personalDetails_de.png">
+</a>
+<p>Details eines OpenPGP-Zertifikat.
+</p>
+</li>
+
+<li>
+<a href="img/sc-kleopatra-configureCertificateserver_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-kleopatra-configureCertificateserver_de.png">
+</a>
+<p>Konfiguration von OpenPGP- und X.509-Zertifikatsservern.</p>
+</li>
+
+<li>
+<a href="img/sc-kleopatra-certifyCertificate1_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-kleopatra-certifyCertificate1_de.png">
+</a>
+<p>Ein OpenPGP-Zertifikat beglaubigen.
+</p>
+</li>
+
+<li>
+<a href="img/sc-kleopatra-openpgp-ownertrust_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-kleopatra-openpgp-ownertrust_de.png">
+</a>
+<p>Vertrauenseinstellungen eines öffentlichen OpenPGP-Zertifikats.
+</p>
+</li>
+
+<li>
+<a href="img/sc-kleopatra-encryptFile1_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-kleopatra-encryptFile1_de.png">
+</a>
+<p>Dateien und Ordner verschlüsseln in 3 Schritten:<br>
+1. Dateien auswählen ...
+</p>
+</li>
+
+<li>
+<a href="img/sc-kleopatra-encryptFile2_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-kleopatra-encryptFile2_de.png">
+</a>
+<p>2. Empfängerzertifikate auswählen (zum Verschlüsseln) ...
+</p>
+</li>
+<li>
+<a href="img/sc-kleopatra-encryptFile3_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-kleopatra-encryptFile3_de.png">
+</a>
+<p>3. Die fertig verschlüsselte Archivdatei.</p>
+</li>
+<li>
+<a href="img/sc-kleopatra-verifyFile2-details_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-kleopatra-verifyFile2-details_de.png"
+</a>
+<p>Erfolgreiche Signaturprüfung einer mit OpenPGP signierten Datei.
+</p>
+</li>
+
+</ul>
+
+<h2>GpgEX</h2>
+<ul class="cleanlist">
+<li>
+<a href="img/sc-gpgex-explorer-options_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-gpgex-explorer-options_de.png">
+</a>
+<p> Das Kontextmenü von GpgEX im Windows Explorer - mit den
+erweitereten Optionen.</p>
+</li>
+</ul>
+
+
+<h2>GpgOL</h2>
+<ul class="cleanlist">
+<li>
+<a href="img/sc-gpgol-sendSignEncryptedMail_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-gpgol-sendSignEncryptedMail_de.png">
+</a>
+<p>Signieren und Verschlüsseln eine E-Mail in Outlook
+</p>
+</li>
+
+<li>
+<a href="img/sc-ol-emailfolder_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-ol-emailfolder_de.png">
+</a>
+<p>Darstellung von signierten und verschlüsselten Nachrichten in der
+E-Mail-Ordner-Ansicht von Outlook 2007.
+</p>
+</li>
+
+<li>
+<a href="img/sc-gpgol-options_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-gpgol-options_de.png">
+</a>
+<p>Die Optionen von GpgOL.
+</li>
+</ul>
+
+<h2>Pinentry</h2>
+
+<ul class="cleanlist">
+<li>
+<a href="img/sc-pinentry-openpgp-set-passphrase_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-pinentry-openpgp-set-passphrase_de.png">
+</a>
+<p>Setzen einer Passphrase (mit Qualitätsprüfung).
+</p>
+</li>
+<li>
+<a href="img/sc-pinentry-openpgp_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-pinentry-openpgp_de.png">
+</a>
+<p>Pinentry zur Eingabe der Passphrase eines OpenPGP-Zertifikats.
+</p>
+</li>
+<li>
+<a href="img/sc-pinentry-smime_de.png">
+<img class="imgfloatleft imageframe"
+src="img/t250.sc-pinentry-smime_de.png">
+</a>
+<p>Pinentry zur Eingabe der Passphrase X.509-Zertifikats.
+</p>
+</li>
+
+</ul>
+
+
+</div>
Added: trunk/doc/website/screenshots.htm4
===================================================================
--- trunk/doc/website/screenshots.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/screenshots.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -0,0 +1,226 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`EN')
+m4_define(`DE_FILE', `screenshots-de.html')
+m4_define(`screenshots.html', `0')
+
+m4_define(`TITLE', `Screenshots')
+m4_define(`MAIN', `about')
+
+PAGE_START
+
+<div id="intro">
+<h2>Screenshots</h2>
+<p>Getting a first impression of Gpg4win.
+The screenshots show you some components in action.</p>
+</div>
+
+<div id="main" class="screenshots">
+
+<i>Note: All screenshots are in German only. Please contact the
+<a href="community.html">gpgwin-devel mailing list</a> if you can create Windows7 screenshots for Gpg4win in English.</i>
+
+
+<h2>Gpg4win Installer</h2>
+
+<ul class="cleanlist">
+<li>
+<a href="img/sc-inst-welcome_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-inst-welcome_de.png">
+</a>
+<p>The welcome screen</p>
+</li>
+</ul>
+
+
+<h2>Kleopatra</h2>
+<ul class="cleanlist">
+<li>
+<a href="img/sc-kleopatra-splashscreen_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-kleopatra-splashscreen_de.png">
+</a>
+<p>Kleopatra's splash screen</p>
+</li>
+
+<li>
+<a href="img/sc-kleopatra-mainwindow-openpgp-certificates_de.png">
+<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>
+</li>
+<li>
+<a href="img/sc-kleopatra-mainwindow-x509-certificates_de.png">
+<img class="imgfloatleft imageframe"
+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).
+</p>
+</li>
+
+<li>
+<a href="img/sc-kleopatra-openpgp-personalDetails_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-kleopatra-openpgp-personalDetails_de.png">
+</a>
+<p>Creation of an OpenPGP certificate: Input of personal details.
+</p>
+</li>
+<li>
+<a href="img/sc-kleopatra-x509-personalDetails_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-kleopatra-x509-personalDetails_de.png">
+</a>
+<p>Creation of an X.509 certificate: Input of personal details.
+</p>
+</li>
+<li>
+<a href="img/sc-kleopatra-openpgp-personalDetails_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-kleopatra-openpgp-personalDetails_de.png">
+</a>
+<p>Details of an OpenPGP certificate.
+</p>
+</li>
+
+<li>
+<a href="img/sc-kleopatra-configureCertificateserver_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-kleopatra-configureCertificateserver_de.png">
+</a>
+<p>Configuration of certificate servers (OpenPGP and X.509).</p>
+</li>
+
+<li>
+<a href="img/sc-kleopatra-certifyCertificate1_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-kleopatra-certifyCertificate1_de.png">
+</a>
+<p>Certify an OpenPGP certificate.
+</p>
+</li>
+
+<li>
+<a href="img/sc-kleopatra-openpgp-ownertrust_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-kleopatra-openpgp-ownertrust_de.png">
+</a>
+<p>Owner trust settings of an public OpenPGP certificate.
+</p>
+</li>
+
+<li>
+<a href="img/sc-kleopatra-encryptFile1_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-kleopatra-encryptFile1_de.png">
+</a>
+<p>Encrypting files and folders in 3 steps:<br>
+1. Select files and folders...
+</p>
+</li>
+
+<li>
+<a href="img/sc-kleopatra-encryptFile2_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-kleopatra-encryptFile2_de.png">
+</a>
+<p>2. Select certificates for whom you want the files to be encrypted...
+</p>
+</li>
+<li>
+<a href="img/sc-kleopatra-encryptFile3_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-kleopatra-encryptFile3_de.png">
+</a>
+<p>3. Finished. The encrypted archive file.</p>
+</li>
+<li>
+<a href="img/sc-kleopatra-verifyFile2-details_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-kleopatra-verifyFile2-details_de.png"
+</a>
+<p>Successful check of a signed file.
+</p>
+</li>
+
+</ul>
+
+<h2>GpgEX</h2>
+<ul class="cleanlist">
+<li>
+<a href="img/sc-gpgex-explorer-options_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-gpgex-explorer-options_de.png">
+</a>
+<p>The context menu of GpgEX in Windows Explorer - with advances
+Options.</p>
+</li>
+</ul>
+
+
+<h2>GpgOL</h2>
+<ul class="cleanlist">
+<li>
+<a href="img/sc-gpgol-sendSignEncryptedMail_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-gpgol-sendSignEncryptedMail_de.png">
+</a>
+<p>Sign and encrypt an email in Outlook.
+</p>
+</li>
+
+<li>
+<a href="img/sc-ol-emailfolder_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-ol-emailfolder_de.png">
+</a>
+<p>Signed and encrypted messages in the
+email folder view of Outlook 2007.
+</p>
+</li>
+
+<li>
+<a href="img/sc-gpgol-options_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-gpgol-options_de.png">
+</a>
+<p>The option dialog of GpgOL.
+</li>
+</ul>
+
+<h2>Pinentry</h2>
+
+<ul class="cleanlist">
+<li>
+<a href="img/sc-pinentry-openpgp-set-passphrase_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-pinentry-openpgp-set-passphrase_de.png">
+</a>
+<p>Set a passphrase (with quality check).
+</p>
+</li>
+<li>
+<a href="img/sc-pinentry-openpgp_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-pinentry-openpgp_de.png">
+</a>
+<p>Pinentry for enter the passphrase of an OpenPGP certificate.
+</p>
+</li>
+<li>
+<a href="img/sc-pinentry-smime_de.png">
+<img class="imgfloatleft imageframe"
+src="img/sc-pinentry-smime_de.png">
+</a>
+<p>Pinentry for entering the passphrase of an X.509 certificate.
+</p>
+</li>
+</ul>
+
+</div>
Modified: trunk/doc/website/support-de.htm4
===================================================================
--- trunk/doc/website/support-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/support-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,10 +4,20 @@
m4_define(`DE')
m4_define(`EN_FILE', `support.html')
+
+m4_define(`TITLE', `Professioneller Support')
+m4_define(`MAIN', `support')
+
PAGE_START
-<h1>Professioneller Support für Gpg4win</h1>
+<div id="intro">
+ <h2>Professioneller Support für Gpg4win</h2>
+ <p>Überlassen Sie die Arbeit den Experten.</p>
+</div>
+<div id="main">
+
+<h2>Problem erkennen</h2>
<p>
Der Support, der über die öffentlichen <a href="community-de.html">Mailinglisten, Webforen und
den Bug Tracker</a> geliefert wird, kommt in der Regel von Freiwilligen.
@@ -16,6 +26,7 @@
Zeitnahe und erschöpfend richtige Antworten können natürlich nicht garantiert werden.
</p>
+<h2>Antworten finden</h2>
<p>
Werden zeitnahe Antworten, schnelle Anpassungen oder Korrekturen sowie
allgemeine Beratung für den Einsatz (Installation, Konfiguration, etc.)
@@ -28,15 +39,16 @@
finden Sie hier keine Preistabelle oder ähnliches.
</p>
+<h2>Angebotsanfrage stellen</h2>
<p>
Bitte kontaktieren Sie uns
<!--über das untenstehende Formular oder direkt an-->
unter <a
href="mailto:gpg4win-professional at intevation.de">gpg4win-professional at intevation.de</a>,
wenn Sie professionellen Support durch die o.g. drei Unternehmen einkaufen
-möchten.
+möchten.</p>
-Beschreiben Sie dabei am besten
+<p>Beschreiben Sie dabei am besten
schon mit der Anfrage Ihre fachlichen Anforderungen (z.B. welche Anwendungen,
welche Krypto-Workflows), sowie Anzahl der Nutzer, Ihre IT-Infrastruktur (z.B. welche
Windows-Versionen, Terminal-Server, V-Server), welche Aufgaben Sie bei sich
@@ -48,88 +60,20 @@
sowie ggf. Rückfragen melden.
</p>
-<!--
-<h2>Angebotsanfrage stellen</h2>
-<p>
-Wir schicken Ihnen gerne ein individuelles Angebot auf Ihre Anfrage.
+<h2>Unterstützungsart</h2>
+
+<p><b>Professionelle Unterstützung beim Einsatz von Gpg4win:</b><br>
+Sie haben z.B. ein Problem bei der Konfiguration in Ihrem
+Unternehmen oder benötigen Unterstützung beim korrekten Betrieb von
+Gpg4win? Dann bieten wir Ihnen unseren technischen Support an.
</p>
-<form action="support-de.html" method="get">
-
-<table cellpadding="10">
-<tr valign="top">
-
- <td><b>Unterstützungsart</b></td>
- <td>
- Ich habe Interesse an ...
- <p>
- <input type="radio" name="product" value="support"
- checked>professioneller Unterstützung beim Einsatz von
- <b>Gpg4win 2.0.0</b>.<br>
- (Sie haben z.B. ein Problem bei der Konfiguration in Ihrem
- Unternehmen oder benötigen Unterstützung beim korrekten Betrieb von
- Gpg4win? Dann bieten wir Ihnen unseren technischen Support an.)
- </p>
- <p>
- <input type="radio" name="product" value="development"
- >der Weiterentwicklung von <b>Gpg4win 2.0.0</b>.<br>
- (Sie vermissen eine wichtige Funktion in Gpg4win? Sie haben
- spezielle Vorstellungen, um die Weiterentwicklung von Gpg4win2 zu
- fördern? Dann kontaktieren Sie uns! Wir stellen Ihnen - nach
- Einschätzung unserer Entwicklern - eine individuelles Angbot zusammen.)
- </p>
- </td>
-</tr>
-<tr valign="top">
- <td><b>Unternehmen / Einrichtung</b></td>
- <td><input name="company" type="text" size="50" maxlength="50"></td>
-</tr>
-<tr valign="top">
- <td><b>Anschrift</b></td>
- <td>
- <textarea name="address" cols="50" rows="4"></textarea>
- </td>
-</tr>
-<tr valign="top">
- <td><b>Ansprechpartner</b></td>
- <td><input name="name" type="text" size="50" maxlength="50"></td>
-</tr>
-<tr valign="top">
- <td><b>E-Mail</b></td>
- <td><input name="email" type="text" size="50" maxlength="50"></td>
-</tr>
-<tr valign="top">
- <td><b>Telefon</b></td>
- <td><input name="phone" type="text" size="50" maxlength="50"></td>
-</tr>
-<tr valign="top">
- <td><b>Bevorzugte Kontakt-Methode</b></td>
- <td>
- <input type="radio" name="preferred_contact" value="email" checked><b>E-Mail</b>
- <input type="radio" name="preferred_contact" value="postal"><b>Postalisch</b>
- <input type="radio" name="preferred_contact" value="phone"><b>Telefon</b>
- </td>
-</tr>
-<tr valign="top">
- <td><b>Rabatte</b></td>
- <td>
- <input type="checkbox" name="discount" value="ps">Öffentliche/gemeinnützige Einrichtung (Behörde, Universität, etc)<br>
- <input type="checkbox" name="discount" value="pr">Nennung als Kunde (Öffentliche Nennung als Kunde gestattet)<br>
- </td>
-
-</tr>
-<tr valign="top">
- <td><b>Kommentar</b></td>
- <td>
- <textarea name="comment" cols="50" rows="10"></textarea>
- </td>
-</tr>
-</table>
-
-<p align="center">
- <input type="submit" value="Angebotsanfrage absenden">
+<p><b>Weiterentwicklung von Gpg4win:</b><br>
+Sie vermissen eine wichtige Funktion in Gpg4win? Sie haben
+spezielle Vorstellungen, um die Weiterentwicklung von Gpg4win zu
+fördern? Dann kontaktieren Sie uns! Wir stellen Ihnen - nach
+Einschätzung unserer Entwicklern - eine individuelles Angbot zusammen.
</p>
+</div>
-</form>
--->
Modified: trunk/doc/website/support.htm4
===================================================================
--- trunk/doc/website/support.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/support.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,10 +4,23 @@
m4_define(`EN')
m4_define(`DE_FILE', `support-de.html')
+
+m4_define(`TITLE', `Professional Support')
+m4_define(`MAIN', `support')
+
PAGE_START
-<h1>Professional Support for Gpg4win</h1>
+<div id="intro">
+<h2>Professional Support for Gpg4win</h2>
+<p>The maintenance of the website is actually quite simply
+because many things are automized.
+What you should be (or should become) familiar with: a text editor,
+HTML, ssh and Subversions.</p>
+</div>
+<div id="main">
+<h2>Identify the problem</h2>
+
<p>
The support available through <a href="community.html">mailing lists,
web forums and bug tracker</a>
@@ -17,6 +30,7 @@
Naturally, timely and exhaustive answers can not be guaranteed.
</p>
+<h2>Find a solution</h2>
<p>
In case timely answers, quick software modification or general
consulting for using Gpg4win (installation, configuration etc.) is
@@ -29,12 +43,13 @@
customer so that we do not show a price table here.
</p>
+<h2>Request offer</h2>
<p>
Please contact us with the contact
-<!--form below or-->
via email to <a href="mailto:gpg4win-professional at intevation.de">gpg4win-professional at intevation.de</a>
-if you plan to buy professional support from the three companies named above.
-Please describe your needs (e.g. which of the Gpg4win
+if you plan to buy professional support from the three companies named above.</p>
+
+<p>Please describe your needs (e.g. which of the Gpg4win
applications you want support for, which crypto-workflows you have or
want to establish), the number of users, your IT infrastructure (e.g.
which Windows versions, terminal servers, virtual servers), which
@@ -46,87 +61,18 @@
clarify what you need.
</p>
-<!--
-<h2>Request offer</h2>
-
-<p>
-Fill out this request form to receive an individual offer.
+<h2>Kind of support</h2>
+<p><b>Professional support for using Gpg4win</b>:<br>
+You have, for instance, a problem with the configuration in your
+company or you need support for your use of Gpg4win?
+Then we offer you our technical support.
</p>
-<form action="support-de.html" method="get">
-
-<table cellpadding="10">
-<tr valign="top">
-
- <td><b>Kind of support</b></td>
- <td>
- I am interested in ...
- <p>
- <input type="radio" name="product" value="support"
- checked>professional support for using <b>Gpg4win 2.0.0</b>.<br>
- (You have, for instance, a problem with the configuration in your
- company or you need support for your use of Gpg4win?
- Then we offer you our technical support.)
- </p>
- <p>
- <input type="radio" name="product" value="development"
- >further development of <b>Gpg4win 2.0.0</b>.<br>
- (You miss an important feature in Gpg4win? You have
- ideas for the further development of Gpg4win2?
- Then please contact us! We will make you an individual
- offer.)
- </p>
- </td>
-</tr>
-<tr valign="top">
- <td><b>Company / Organization</b></td>
- <td><input name="company" type="text" size="50" maxlength="50"></td>
-</tr>
-<tr valign="top">
- <td><b>Address</b></td>
- <td>
- <textarea name="address" cols="50" rows="4"></textarea>
- </td>
-</tr>
-<tr valign="top">
- <td><b>Contact person</b></td>
- <td><input name="name" type="text" size="50" maxlength="50"></td>
-</tr>
-<tr valign="top">
- <td><b>Email</b></td>
- <td><input name="email" type="text" size="50" maxlength="50"></td>
-</tr>
-<tr valign="top">
- <td><b>Telephone</b></td>
- <td><input name="phone" type="text" size="50" maxlength="50"></td>
-</tr>
-<tr valign="top">
- <td><b>Preferred contact method</b></td>
- <td>
- <input type="radio" name="preferred_contact" value="email" checked><b>Email</b>
- <input type="radio" name="preferred_contact" value="postal"><b>By Post</b>
- <input type="radio" name="preferred_contact" value="phone"><b>Telephone</b>
- </td>
-</tr>
-<tr valign="top">
- <td><b>Deductions</b></td>
- <td>
- <input type="checkbox" name="discount" value="public">Public/non-profit organization (administration, university, etc)<br>
- <input type="checkbox" name="discount" value="naming">Naming as customer (public naming as customer permitted)<br>
- </td>
-
-</tr>
-<tr valign="top">
- <td><b>Comment</b></td>
- <td>
- <textarea name="comment" cols="50" rows="10"></textarea>
- </td>
-</tr>
-</table>
-
-<p align="center">
- <input type="submit" value="Send Request for Offer">
+<p><b>Further development of Gpg4win</b>:<br>
+You miss an important feature in Gpg4win? You have
+ideas for the further development of Gpg4win?
+Then please contact us! We will make you an individual offer.
</p>
-
-</form>
--->
+
+
+</div>
Modified: trunk/doc/website/template.m4
===================================================================
--- trunk/doc/website/template.m4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/template.m4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,12 +4,15 @@
m4_dnl ------------------------------------------------------------
m4_dnl Macros to use in Pages
-
m4_include(`versions.m4')
+m4_define(`I18N',`m4_ifdef(`$1',`$2')')
+
m4_define(`LANG_LINK',`m4_ifdef(`$1',`$2',`m4_ifelse(`$3',`EN_FILE',`<strike>$2</strike>',`$3',`DE_FILE',`<strike>$2</strike>',`<a href="$3">$2</a>')')')
-m4_define(`I18N',`m4_ifdef(`$1',`$2')')
+m4_define(`MENU', `m4_ifelse(`$4',`$5', `m4_ifelse(`$6', `1', `<li
+class="active"><a href="$1-de.html">$2</a>', `<li class="active"><a
+href="$1.html">$3</a>')', `m4_ifelse(`$6', `1', `<li><a href="$1-de.html">$2</a>', `<li><a href="$1.html">$3</a>')')')
m4_define(`PAGE_TITLE',`m4_define(`__TMPL_PAGE_TITLE',`$1')')
m4_define(`PAGE_ROOT',`m4_define(`__TMPL_ROOT',`$1')')
Modified: trunk/doc/website/template_header.m4
===================================================================
--- trunk/doc/website/template_header.m4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/template_header.m4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -7,61 +7,119 @@
I18N(`EN',`Secure E-Mail and File Encryption using GnuPG for Windows')`'m4_dnl
I18N(`DE',`Sichere E-Mail- und Datei-Verschlüsselung mit GnuPG für Windows'))
-m4_ifdef(`__TMPL_PAGE_TITLE',,`m4_define(`__TMPL_PAGE_TITLE',`Gpg4win - '__TITLE)')
+m4_ifdef(`__TMPL_PAGE_TITLE',,`m4_define(`__TMPL_PAGE_TITLE',`Gpg4win - 'TITLE)')
m4_define(`LINK',
`m4_ifelse($1, NO_LINK_FOR,
- `<b>$2</b><br />',
- `<a href="$1">$2</a><br />')')
+ `$2',
+ `<a href="$1">$2</a>')')
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="keywords" content="Gpg4win, GnuPG, WinPT, GPA, GPGol, GPGee, Claws Mail, E-Mail, Email, Windows, WinXP, XP, 2000, PGP, GPG, GnuPP, OpenPGP, Outlook, I18N(`EN', `Encryption, Secure') I18N(`DE', `Verschlüsselung, sicher, sichere, Sicherheit')">
+ <link rel="stylesheet" type="text/css" href="__TMPL_ROOT`'gpg4win.css">
+ <link rel="shortcut icon" href="__TMPL_ROOT`'favicon.png" type="image/png" />
+ <title>__TMPL_PAGE_TITLE</title>
+ </head>
+ <body>
+ <a name="top"></a>
+ <div class="wrapper">
+ <div class="header">
+ <div class="language_select">
+ <img src="img/english.png"> LANG_LINK(`EN',`English', EN_FILE) |
+ <img src="img/german.png"> LANG_LINK(`DE',`Deutsch', DE_FILE)
+ </div>
+ </div>
+ m4_ifdef(`EN_FILE', `m4_define(`LANG_DE', `1')', `m4_define(`LANG_DE', `0')')
+ <div id="menu">
+ <ul>
+ <li class="mlogo">
+ m4_ifelse(LANG_DE, `1', `<a href="index-de.html"></a>', `<a href="index.html"></a>')
+ </li>
+ MENU(`about', `Über Gpg4win', `About Gpg4win', `about', MAIN, LANG_DE)
+ <ul>
+ MENU(`about', `Über Gpg4win', `About Gpg4win', `about', SUB, LANG_DE)
+ MENU(`features', `Funktionen', `Features', `features', SUB, LANG_DE)
+ MENU(`screenshots', `Screenshots', `Screenshots', `screenshots', SUB, LANG_DE)
+ <li class="subcap"></li>
+ </ul>
+ </li>
+ MENU(`documentation', `Dokumentation', `Documentation', `using', MAIN, LANG_DE)
+ </li>
+ MENU(`community', `Gemeinschaft', `Community', `community', MAIN, LANG_DE)
+ <ul>
+ MENU(`community', `Gemeinschaft', `Community', `community', SUB, LANG_DE)
+ MENU(`contribute', `Zu Gpg4win beitragen', `Contribute to Gpg4win', `contribute', SUB, LANG_DE)
+ <li class="subcap"></li>
+ </ul>
+ </li>
+ MENU(`support', `Support', `Support', `support', MAIN, LANG_DE)
+ </li>
+ <li class="mdonate">
+ m4_ifelse(LANG_DE, `1', `<a href="donate-de.html">Spenden!</a>', `<a href="donate.html">Donate</a>')
+ </li>
+ </ul>
+ </div>
+ m4_include(`header.m4')
+ <div class="content">
+ m4_divert(999)
+ <br clear="all" />
+ </div>
+ </div>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="keywords" content="Gpg4win, GnuPG, WinPT, GPA, GPGol, GPGee, Claws Mail, E-Mail, Email, Windows, WinXP, XP, 2000, PGP, GPG, GnuPP, OpenPGP, Outlook, I18N(`EN', `Encryption, Secure') I18N(`DE', `Verschlüsselung, sicher, sichere, Sicherheit')">
- <link rel="stylesheet" type="text/css" href="__TMPL_ROOT`'gpg4win.css">
- <title>__TMPL_PAGE_TITLE</title>
- </head>
- <body>
- <div id="header">
- <table id="navbar">
- <tr valign="bottom">
- <td style="width:172px; text-align: left; padding-bottom: 8px;">
- <a href="I18N(`EN', `index.html') I18N(`DE', `index-de.html')"
- ><img src="pix/logo.png" alt="Gpg4win"></a>
- </td>
- <td style="text-align: left;">
- <h1>__TITLE</h1>
- </td>
- <td>
- LANG_LINK(`EN',`english', EN_FILE) |
- LANG_LINK(`DE',`deutsch', DE_FILE)
- </td>
- </tr>
- </table>
- <table id="bigbar">
- <tr><td id="vertable" style="white-space: nowrap;">
- I18N(`EN',`Version VERSION (<a href="change-history.html">Change History</a>) includes:')
- I18N(`DE',`Version VERSION (<a href="change-history-de.html">Änderungshistorie</a>) enthält:')
- <pre class="swlist">SOFTWARE</pre>
- </td>
- <td class="center">
- <a href="DLPAGE" class="dlbutton">Download<br>
- <span class="version">Gpg4win VERSION <small>(DL_DATE)</small><br>
- </span>
- <span class="version">Gpg4win 2.1.0-rc2 <small>(2011-02-04)</small><br>
- </span>
- </a>
- <a href="I18N(`EN', `./package-integrity.html') I18N(`DE', `./package-integrity-de.html')"
- >SHA1/OpenPGP-Sig</a>
- </td></tr>
- </table>
+ <div id="footer">
+ <div id="sitemap">
+ <ul>
+ <li><a href="index-de.html"><img src="img/logo_footer.png" alt="" /></a></li>
+ <li><a href="download-de.html">Download</a></li>
+ </ul>
+ <ul>
+ <li><b>
+ m4_ifelse(LANG_DE, `1', `Über Gpg4win', `About Gpg4win')
+ </b></li>
+ MENU(`about', `Über Gpg4win', `About Gpg4win', `about', MAIN, LANG_DE)
+ MENU(`features', `Funktionen', `Features', `features', MAIN, LANG_DE)
+ MENU(`screenshots', `Screenshots', `Screenshots', `screenshots', MAIN, LANG_DE)
+ </ul>
+ <ul>
+ <li><b>
+ m4_ifelse(LANG_DE, `1', `Dokumentation', `Documentation')
+ </b></li>
+ MENU(`documentation', `Dokumentation', `Documentation', `documentation', SUB, LANG_DE)
+ </ul>
+ <ul>
+ <li><b>
+ m4_ifelse(LANG_DE, `1', `Gemeinschaft', `Community')
+ </b></li>
+ MENU(`community', `Gemeinschaft', `Community', `community', SUB, LANG_DE)
+ MENU(`contribute', `Zu Gpg4win beitragen', `Contribute to Gpg4win', `contribute', SUB, LANG_DE)
+ MENU(`reporting-bugs', `- Problemen melden', `- Reporting Bugs', `reporting-bugs', SUB, LANG_DE)
+ MENU(`build-installer', `- Bau von Gpg4win', `- Build of Gpg4win', `build-installer', SUB, LANG_DE)
+ </li>
+ m4_ifelse(LANG_DE, `1', `<li><a href="localize-gpg4win.html">- Gpg4win übersetzen</a></li>', `<li><a href="localize-gpg4win.html">- Translate Gpg4win</a></li>')
+ </ul>
+ <ul>
+ <li><b>Support</b></li>
+ MENU(`support', `Professioneller Support', `Professional Support', `support', MAIN, LANG_DE)
+ </ul>
+ <ul>
+ <li><b>
+ m4_ifelse(LANG_DE, `1', `Diverses', `Misc')
+ </b></li>
+ MENU(`donate', `Spenden', `Donate', `donate', SUB, LANG_DE)
+ MENU(`license', `Lizenz', `License', `license', SUB, LANG_DE)
+ 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>
+ MENU(`contributors', `Mitwirkende', `Contributors', `contributors', SUB, LANG_DE)
+ MENU(`impressum', `Impressum', `Impressum', `impressum', SUB, LANG_DE)
+ </ul>
</div>
-m4_include(I18N(`DE', `template_link_boxes_de.m4')`'m4_dnl
-I18N(`EN', `template_link_boxes_en.m4'))
- <div id="main">
-m4_divert(999)
- </div>
- </body>
+ </div>
+
+ </body>
</html>
m4_divert
Deleted: trunk/doc/website/template_link_boxes_de.m4
===================================================================
--- trunk/doc/website/template_link_boxes_de.m4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/template_link_boxes_de.m4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -1,45 +0,0 @@
-m4_dnl -*-html-*-
-m4_dnl THIS IS INCLUDED BY `template.m4'
-m4_dnl DONT USE THIS FILE DIRECTLY
-
-<div id="boxes">
-<div class="box">
- <h1>Navigation</h1>
- LINK(`index-de.html', `Hauptseite')
- LINK(`about-de.html', `Über Gpg4win')
- LINK(`download-de.html', `Download')
- LINK(`documentation-de.html', `Dokumentation')
- LINK(`community-de.html', `Gemeinschaft (Kontakt)')
- LINK(`contribute-de.html', ` - Mitmachen')
- LINK(`reporting-bugs-de.html', ` - Probleme melden')
- <a href="http://wald.intevation.org/projects/gpg4win/"> - Entwicklungsseite</a><br>
- LINK(`support-de.html', `Professioneller Support')
- LINK(`links-de.html', `Verweise')
- LINK(`impressum-de.html', `Impressum')
-</div>
-<div class="box">
- <h1>Sonstiges</h1>
- LINK(`Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win.html', `Kurzstudie: "Nachhaltige Freie Software: Vom Projekt zur Dauertätigkeit am Beispiel Gpg4win"')
-</div>
-<div align="center">
- <p/>
- <b>Unterstützen Sie Gpg4win und spenden Sie jetzt:</b><br>
- <form action="https://www.paypal.com/de/cgi-bin/webscr" method="post">
- <input type="hidden" name="cmd" value="_donations">
- <input type="hidden" name="business" value="paypal at intevation.de">
- <input type="hidden" name="undefined_quantity" value="1">
- <input type="hidden" name="item_name" value="Gpg4win">
- <input type="hidden" name="item_number" value="1000">
- <input type="hidden" name="no_shipping" value="1">
- <input type="hidden" name="cn" value="Kommentar an das Gpg4win-Entwicklerteam (Lob/Kritik)">
- <input type="hidden" name="currency_code" value="EUR">
- <input type="hidden" name="bn" value="PP-BuyNowBF">
- <input type="image" src="https://www.paypal.com/de_DE/DE/i/btn/btn_donate_LG.gif"
- border="0" name="submit" alt="Jetzt einfach, schnell und sicher online spenden - mit PayPal.">
- <input type="hidden" name="on0" value="Veröffentlichung der Spende zugestimmt?">
- <input type="hidden" name="os0" value="Nein">
- <br/>
- <input type="checkbox" name="os0" value="Ja" checked>Spende <a href="donate-de.html">hier</a> veröffentlichen
- </form>
-</div>
-</div>
Deleted: trunk/doc/website/template_link_boxes_en.m4
===================================================================
--- trunk/doc/website/template_link_boxes_en.m4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/template_link_boxes_en.m4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -1,47 +0,0 @@
-m4_dnl -*-html-*-
-m4_dnl THIS IS INCLUDED BY `template.m4'
-m4_dnl DONT USE THIS FILE DIRECTLY
-
-<div id="boxes">
-<div class="box">
- <h1>Navigation</h1>
- LINK(`index.html', `Home')
- LINK(`about.html', `About Gpg4win')
- LINK(`download.html', `Download')
- LINK(`documentation.html', `Documentation')
- LINK(`community.html', `Community (Contact)')
- LINK(`contribute.html', ` - Getting involved')
- LINK(`reporting-bugs.html', ` - Reporting problems')
- <a href="http://wald.intevation.org/projects/gpg4win/"> - Development Site</a><br>
- LINK(`support.html', `Professional Support')
- LINK(`links.html', `Links')
- LINK(`impressum.html', `Impressum')
-</div>
-<div class="box">
- <h1>Miscellaneous</h1>
- LINK(`ShortStudy-Sustainable-FS-example-Gpg4win.html', `Short Study: "Sustainable Free Software:
- From project to permanent activity, using the example Gpg4win"')
-</div>
-<div align="center">
- <p/>
- <b>Please support Gpg4win and<br> make your donation now:</b><br>
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input type="hidden" name="cmd" value="_donations">
- <input type="hidden" name="business" value="paypal at intevation.de">
- <input type="hidden" name="lc" value="US">
- <input type="hidden" name="undefined_quantity" value="1">
- <input type="hidden" name="item_name" value="Gpg4win">
- <input type="hidden" name="item_number" value="1000">
- <input type="hidden" name="no_shipping" value="1">
- <input type="hidden" name="cn" value="Comment to Gpg4win developer team (praise/criticism)">
- <input type="hidden" name="currency_code" value="EUR">
- <input type="hidden" name="bn" value="PP-BuyNowBF">
- <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif"
- border="0" name="submit" alt="Pay with PayPal">
- <input type="hidden" name="on0" value="Allowed to publish of your donation?">
- <input type="hidden" name="os0" value="No">
- <br/>
- <input type="checkbox" name="os0" value="Yes" checked>Publish my donation <a href="donate.html">here</a>
- </form>
-</div>
-</div>
Modified: trunk/doc/website/versions.m4
===================================================================
--- trunk/doc/website/versions.m4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/versions.m4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -1,32 +1,32 @@
-m4_define(`VERSION',`2.0.4')
+m4_define(`VERSION',`2.1.0')
m4_define(`DOWNLOAD_URL',`http://ftp.gpg4win.org/gpg4win-VERSION.exe')
-m4_define(`DL_SIZE',`34 MByte')
+m4_define(`DL_SIZE',`38 MByte')
m4_define(`LDOWNLOAD_URL',`http://ftp.gpg4win.org/gpg4win-light-VERSION.exe')
-m4_define(`LDL_SIZE',`12 MByte')
-m4_define(`DL_DATE',`2010-07-28')
-m4_define(`SHA1_SRC',`346cf3bbd91310c05df062e2ded3ce726b22fae6')
-m4_define(`SHA1_EXE',`4c9cb8f046eceb68e7912c004a7345365a151f69')
-m4_define(`SHA1_EXL',`db644790aa411f1744bb1d94e52311b8c6bf4a8e')
-m4_define(`SHA1_EXS',`d45df4083d076c5907a5d3b2441d9068f403d213')
-m4_define(`MD5_SRC',`b41142bd185b1f2478ffc11939605a8c')
-m4_define(`MD5_EXE',`4446661096186aa92ccd8b2e25a5921b')
-m4_define(`MD5_EXL',`1b71fe7b408d875a5eebeefee89a4317')
-m4_define(`MD5_EXS',`1e6e6fbbce6e3c35b8b72ffe1817bdff')
-m4_define(`LEN_SRC',`6901636')
-m4_define(`LEN_EXE',`35928792')
-m4_define(`LEN_EXL',`12406071')
-m4_define(`LEN_EXS',`265226807')
+m4_define(`LDL_SIZE',`15 MByte')
+m4_define(`DL_DATE',`2011-03-15')
+m4_define(`SHA1_SRC',`c56c27502c664c38935c1589cd1315dc6de9beae')
+m4_define(`SHA1_EXE',`f619313cb42241d6837d20d24a814b81a1fe7f6d')
+m4_define(`SHA1_EXL',`5a3477fa76eac00e96f171ef619fb3be5ba3c512')
+m4_define(`SHA1_EXS',`dabb1b978652db258bb6099e80adc56a5de25b7c')
+m4_define(`MD5_SRC',`99e7e89fbee42b3012b7873f4b1abd5a')
+m4_define(`MD5_EXE',`ad6245f3238922bb7afdc4a6d3402a65')
+m4_define(`MD5_EXL',`5a2c9390a88df06938aa5ed0dff197e1')
+m4_define(`MD5_EXS',`ccc57a8962fab6a7641c9fe68082e9c0')
+m4_define(`LEN_SRC',`6002513')
+m4_define(`LEN_EXE',`39332992')
+m4_define(`LEN_EXL',`15465168')
+m4_define(`LEN_EXS',`271428912')
m4_define(`DLPAGE',`I18N(`EN',`download.html')`'I18N(`DE',`download-de.html')')
m4_define(`MIRROR_IE_URL',`http://ftp.heanet.ie/mirrors/ftp.gpg4win.org/')
-m4_define(`SOFTWARE',`
-I18N(`EN', `<a href="http://www.gnupg.org/">GnuPG</a>')I18N(`DE', `<a href="http://www.gnupg.de/">GnuPG</a>') 2.0.14
-I18N(`EN', `<a href="http://docs.kde.org/stable/en/kdepim/kleopatra/">Kleopatra</a>')I18N(`DE', `<a href="http://docs.kde.org/stable/de/kdepim/kleopatra/">Kleopatra</a>') 2.0.14-svn1098530 (20100303)
-I18N(`EN', `<a href="http://www.gnupg.org/related_software/gpa/index.html">GPA</a>')I18N(`DE', `<a href="http://www.gnupg.de/related_software/gpa/index.html">GPA</a>') 0.9.0
-<a href="http://www.g10code.de/p-gpgol.html">GpgOL</a> 1.1.1
-<a href="http://cvs.gnupg.org/cgi-bin/viewcvs.cgi/?root=GpgEX">GpgEX</a> 0.9.5
-<a href="http://www.claws-mail.org/">Claws Mail</a> 3.7.4cvs1
-I18N(`EN', `<a href="doc/de/gpg4win-compendium.html">Gpg4win Compendium</a> (German!)')I18N(`DE', `<a href="doc/de/gpg4win-compendium.html">Gpg4win-Kompendium</a>') 3.0.0
-I18N(`EN', `<a href="handbuecher/novices.html">Gpg4win for Novices</a> 1.0.0')')
+m4_define(`SOFTWAREOVERVIEW',`
+I18N(`EN', `<a href="http://www.gnupg.org/">GnuPG</a>')I18N(`DE', `<a href="http://www.gnupg.de/">GnuPG</a>') 2.0.17
+I18N(`EN', `<a href="http://docs.kde.org/stable/en/kdepim/kleopatra/">Kleopatra</a>')I18N(`DE', `<a href="http://docs.kde.org/stable/de/kdepim/kleopatra/">Kleopatra</a>') 2.1.0 (2011-02-04)
+I18N(`EN', `<a href="http://www.gnupg.org/related_software/gpa/index.html">GPA</a>')I18N(`DE', `<a href="http://www.gnupg.de/related_software/gpa/index.html">GPA</a>') 0.9.1-svn1024
+<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')
+')
m4_define(`COMPENDIUM_VERSION_DE',`3.0.0')
m4_define(`COMPENDIUM_DATE_DE',`2010-05-21')
Modified: trunk/doc/website/website-maintenance-de.htm4
===================================================================
--- trunk/doc/website/website-maintenance-de.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/website-maintenance-de.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,51 +4,48 @@
m4_define(`DE')
m4_define(`EN_FILE', `website-maintenance.html')
-PAGE_START
-<h1>Website von Gpg4win pflegen</h1>
+m4_define(`MAIN', `community')
+m4_define(`TITLE', `Website pflegen')
-Die Pflege der Website ist eigentlich recht einfach, da
-vieles automatisiert ist.
-
-<p>
-Was man beherrschen sollte: Irgendeinen Text-Editor, HTML, ssh und
-Subversions.
+PAGE_START
+<div id="intro">
+<h2>Website von Gpg4win pflegen</h2>
+<p>Eine regelmäßige Aufgabe ist die Aktualisierung der
+Gpg4win-Website. Die Pflege ist einfach, da
+vieles automatisiert ist. Was man beherrschen sollte:
+einen Text-Editor, HTML, SSH und SVN.
</p>
+</div>
-<p>
-Typische Aufgaben:
+<div id="main">
+<h2>Typische Aufgaben</h2>
+<p>Typische Aufgaben der Website-Pflege sind:
<ul>
-<li> Version von Gpg4win aktualisieren (gelegentlich, ca. 15 Minuten)
-<li> Tippfehler beseitigen (immer wenn man selbst oder jemand anderes etwas findet, wenige Minuten)
+<li> Version von Gpg4win aktualisieren (gelegentlich, Dauer: ca. 15 Minuten)
+<li> Tippfehler beseitigen (immer wenn man selbst oder jemand anderes etwas findet, Dauer: wenige Minuten)
</ul>
</p>
-<h2>Zunächst mal ganz anonym reinschnuppern</h2>
+<h2>Zunächst anonym reinschnuppern</h2>
<ol>
-<li> Die Quellen zur Website anonyme (also ohne Schreibrechte) holen:<br>
- <em>svn checkout https://svn.wald.intevation.org/svn/gpg4win/trunk/ gpg4win-trunk-anon</em>
+<li> Die Quellen zur Website anonym (also ohne Schreibrechte) auschecken:<br>
+ <code>svn checkout
+https://svn.wald.intevation.org/svn/gpg4win/trunk/doc/website/</code>
-<li> Das gesamte Paket initial konfigurieren:<br>
- <em>
- cd gpg4win-trunk-anon<br>
- ./autogen.sh<br>
- ./configure --enable-maintainer-mode --host=i586-mingw32msvc<br>
- </em>
-
<li> Die Website lokal bauen:<br>
- <em>make -f buildhtml.mk</em><br>
+ <code>make -f buildhtml.mk</code><br>
und im Browser anschauen (z.B. Datei index-de.html).
-<li> Die Datei README lesen, nach belieben Änderungen vornehmen und die
+<li> Die README-Datei der Website lesen, nach belieben Änderungen vornehmen und die
Website dann wieder neu bauen und anschauen.
</ol>
<h2>Was man vorbereitend nur einmal machen muss um aktiver Mitentwickler zu werden</h2>
-Ein vorheriges "Hallo" auf einer der Gpg4win Mailing Listen
-und dass man gerne mitmachen möchte ist natürlich immer sinnvoll.
+Ein vorheriges "Hallo" auf einer der Gpg4win-Mailingliste
+und den Wunsch, dass man gerne mitmachen möchte ist natürlich immer sinnvoll.
<ol>
<li> Auf <a href="http://wald.intevation.de">wald.intevation.de</a> ein
@@ -66,15 +63,9 @@
<a href="http://wald.intevation.org/account/">hochladen</a>.
<li> Die Quellen zur Website holen:<br>
- <em>svn checkout svn+ssh://USER@svn.wald.intevation.org/gpg4win/trunk/ gpg4win-trunk</em><br>
- wobei USER das Benutzerkonto auf wald.intevation.de ist.
+ <code>svn checkout svn+ssh://USER@svn.wald.intevation.org/gpg4win/trunk/doc/website</code><br>
+ wobei USER der Benutzername auf wald.intevation.de ist.
-<li> Das gesamte Paket initial konfigurieren:<br>
- <em>
- cd gpg4win-trunk<br>
- ./autogen.sh<br>
- ./configure --enable-maintainer-mode --host=i586-mingw32msvc<br>
- </em>
</ol>
@@ -82,18 +73,18 @@
<ol>
<li> Gewünschte Änderungen in dem per SVN geholten Verzeichnis
- <em>gpg4win-trunk/doc/website</em> durchführen.
- Zum besseren Verständnis ggf. die dort liegende Datei <em>REAMDE</em> vorher
+ <code>trunk/doc/website</code> durchführen.
+ Zum besseren Verständnis ggf. die dort liegende Datei <code>REAMDE</code> vorher
durchlesen.
<li> Lokale Version zum Anschauen herstellen:<br>
- <em>make -f buildhtml.mk</em><br>
+ <code>make -f buildhtml.mk</code><br>
und im Browser anschauen.
<li> Sind die Änderungen in Ordnung, sollte man sie noch mal prüfen:<br>
- <em>svn diff | less</em><br>
- und können dann mit möglichst sinnvollen Kommentare ins SVN Repository
+ <code>svn diff | less</code><br>
+ und können dann mit möglichst sinnvollen Kommentare ins SVN-Repository
hochgeladen werden:<br>
- <em>svn commit</em><br>
+ <code>svn commit</code><br>
<li> Der letzte Schritt ist das online schalten:<br>
- <em>make -f buildhtml.mk online</em><br>
+ <code>make -f buildhtml.mk online</code><br>
</ol>
-
+</div>
Modified: trunk/doc/website/website-maintenance.htm4
===================================================================
--- trunk/doc/website/website-maintenance.htm4 2011-03-07 09:29:45 UTC (rev 1644)
+++ trunk/doc/website/website-maintenance.htm4 2011-03-15 08:22:55 UTC (rev 1645)
@@ -4,26 +4,31 @@
m4_define(`EN')
m4_define(`DE_FILE', `website-maintenance-de.html')
+
+m4_define(`MAIN', `community')
+m4_define(`TITLE', `Website maintenance')
+
PAGE_START
-<h1>Maintaining the Gpg4win website</h1>
-
-The maintenance of the website is actually quite simply
+<div id="intro">
+<h2>Maintaining the Gpg4win website</h2>
+<p>The maintenance of the website is actually quite simply
because many things are automized.
-
-<p>
What you should be (or should become) familiar with: a text editor,
-HTML, ssh and Subversions.
-</p>
+HTML, ssh and Subversions.</p>
+</div>
-<p>
-Typical tasks:
+<div id="main">
+
+<h2>Typical tasks</h1>
+
+<p>Typical tasks of maintaining the website are:</p>
<ul>
-<li> Update version of Gpg4win (occasioanlly, ca. 15 minutes)
-<li> Fix typos (whenever you or someone else finds one, few minutes)
+<li> Update version of Gpg4win (occasioanlly, duration: ca. 15 minutes)
+<li> Fix typos (whenever you or someone else finds one, duration: few minutes)
</ul>
-</p>
+
<h2>Anonymously take a first look</h2>
<ol>
@@ -100,3 +105,4 @@
<li> The last step is to put the new version online:<br>
<em>make -f buildhtml.mk online</em><br>
</ol>
+</div>
More information about the Gpg4win-commits
mailing list