[Gpg4win-commits] [git] Gpg4win - branch, website, updated. gpg4win-2.1.0-172-g911f3ab
by Emanuel Schuetze
cvs at cvs.gnupg.org
Wed Oct 2 13:15:10 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, website has been updated
via 911f3abf312a6baaea0abdb099b042acb2a3f0c3 (commit)
via 88ebb4b0ff9327f84d81415d4a7dce2da7f814d4 (commit)
via 817a90ce9a38c2031920ae36bce4a22218a355ed (commit)
via 8898ed997fa95ac1e36b95d251b1f2ed7faf32b2 (commit)
from a2b7ae3459f35cde472b58cefb7e3d1afddee87e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 911f3abf312a6baaea0abdb099b042acb2a3f0c3
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Wed Oct 2 12:42:26 2013 +0200
Updated impressum/legal notice page.
diff --git a/web/impressum-de.htm4 b/web/impressum-de.htm4
index db43ead..df273ec 100644
--- a/web/impressum-de.htm4
+++ b/web/impressum-de.htm4
@@ -13,9 +13,11 @@ 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.
+Intevation und g10 Code sind die verantwortlichen Unternehmen für die
+Gpg4win-Entwicklung.
+Die Gpg4win Webseiten, der Downloadserver sowie die Mailinglisten und
+die Wald-Entwicklungsplattform werden von der Intevation GmbH
+bereitgestellt.
Die inhaltliche Gestaltung erfolgte und erfolgt durch die wechselnden
aktiven Mitglieder der Gpg4win-Initiative.
</p>
@@ -27,20 +29,38 @@ aktiven Mitglieder der Gpg4win-Initiative.
Neuer Graben 17<br>
49074 Osnabrück<br>
Deutschland<br>
-<a href="http://www.intevation.de">www.intevation.de</a><br>
+Web: <a href="http://www.intevation.de">www.intevation.de</a><br>
+Mail: <a
+href="mailto:gpg4win-professional at intevation.de">gpg4win-professional at intevation.de</a>
+<i>(Nur kostenpflichtiger Support!)*</i><br>
+Tel: +49 541 335083-0 <i>(Nur kostenpflichtiger Support!)*</i>
+</p>
+<p><i>*) Für kostenfreie Unterstützung nutzen
+Sie die <a href="community-de.html">Gpg4win-Gemeinschaft</a>.</i></p>
+
+<p>
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>
+Umsatzsteuer-Identifikation: de 204 854 484
+</p>
+
+<p>
+Bankverbindung und Gpg4win-Spendenmöglichkeiten unter <a
+href="donate-de.html">Spenden</a>.
</p>
+
<h2>g10 Code GmbH</h2>
<p>
Hüttenstr. 61<br>
40699 Erkrath<br>
Deutschland<br>
-<a href="http://www.g10code.com">www.g10code.com</a><br>
+<a href="http://www.g10code.com">www.g10code.com</a>
+</p>
+
+<p>
Vertretungsberechtigt: Werner Koch<br>
Registereintrag: HR B 14459, Amtsgericht Wuppertal<br>
-Umsatzsteuer-Identifikation: de 215605608<br>
+Umsatzsteuer-Identifikation: de 215605608
</p>
</div>
diff --git a/web/impressum.htm4 b/web/impressum.htm4
index 897685f..72dc85c 100644
--- a/web/impressum.htm4
+++ b/web/impressum.htm4
@@ -11,34 +11,54 @@ m4_define(`MAIN', `misc')
PAGE_START
<div id="intro">
-<h2>Impressum / Legal notice</h2>
+<h2>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.
-The content has been created and is being maintained by the changing
-active team members of the Gpg4win project.
+Intevation and g10 Code are the companies responsible for the
+development of Gpg4win.
+The web pages, the download server as well as the mailing lists and
+the wald development platform are hosted by Intevation GmbH.
+The web content has been created and is being maintained by the changing
+active team members of the Gpg4win initiative.
</p>
</div>
<div id="main">
<h2>Intevation GmbH</h2>
-<p>Neuer Graben 17<br>
+<p>
+Neuer Graben 17<br>
49074 Osnabrück<br>
Germany<br>
-<a href="http://www.intevation.net">www.intevation.net</a><br>
+Web: <a href="http://www.intevation.net">www.intevation.net</a><br>
+Mail: <a
+href="mailto:gpg4win-professional at intevation.de">gpg4win-professional at intevation.de</a>
+<i>(Only paid service!)*</i><br>
+Tel: +49 541 335083-0 <i>(Only paid service!)*</i>
+</p>
+<p><i>*) For free support ask the <a href="community-de.html">Gpg4win
+Community</a> please.</i></p>
+
+<p>
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>
</p>
+<p>
+For bank details and Gpg4win donation options read <a
+href="donate.html">donation page</a>.
+</p>
+
<h2>g10 Code GmbH</h2>
-<p>Hüttenstr. 61<br>
+<p>
+Hüttenstr. 61<br>
40699 Erkrath<br>
Germany<br>
-<a href="http://www.g10code.com">www.g10code.com</a><br>
+<a href="http://www.g10code.com">www.g10code.com</a>
+</p>
+
+<p>
Authorised: Werner Koch<br>
Registered as: HR B 14459, Amtsgericht Wuppertal<br>
VAT ID: de 215605608<br>
diff --git a/web/template_header.m4 b/web/template_header.m4
index 23f80a3..07fb6a0 100644
--- a/web/template_header.m4
+++ b/web/template_header.m4
@@ -120,7 +120,7 @@ m4_define(`LINK',
`<li><a href="ShortStudy-Sustainable-FS-example-Gpg4win.html">Short Study Gpg4win</a></li>')
MENU(`links', `Links', `Links', `links', SUB, LANG_DE)
MENU(`contributors', `Mitwirkende', `Contributors', `contributors', SUB, LANG_DE)
- MENU(`impressum', `Impressum', `Impressum', `impressum', SUB, LANG_DE)
+ MENU(`impressum', `Impressum', `Legal Notice', `impressum', SUB, LANG_DE)
</ul>
</div>
</div>
commit 88ebb4b0ff9327f84d81415d4a7dce2da7f814d4
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Wed Oct 2 12:41:42 2013 +0200
Added flattr and bank details as new donation options.
diff --git a/web/donate-de.htm4 b/web/donate-de.htm4
index 05d7567..0332813 100644
--- a/web/donate-de.htm4
+++ b/web/donate-de.htm4
@@ -64,7 +64,7 @@ m4_include(`SPONSORS')
<div id="sidebar">
<h3>Spenden Sie jetzt!</h3>
-<p>
+<p><b>... per PayPal:</b>
<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">
@@ -82,10 +82,22 @@ m4_include(`SPONSORS')
<input name="return" value="http://gpg4win.de/donate-de.html" type="hidden">
<input name="cbt" value="Zurück zu Gpg4win" type="hidden">
<br>
-
<input name="os0" value="Ja" checked="checked" type="checkbox">Spendernamen veröffentlichen
- </form>
+</form>
+</p>
+
+<p><b>... per Flattr:</b></p>
+<p>
+<script id='fbkq7vh'>(function(i){var f,s=document.getElementById(i);f=document.createElement('iframe');f.src='http://api.flattr.com/button/view/?uid=intevation&button=compact&url=http://www.gpg4win.org';f.title='Flattr';f.height=20;f.width=110;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})('fbkq7vh');</script>
+</p>
+
+<p><b>... per Banküberweisung:</b>
+<pre>Intevation GmbH
+IBAN: DE33265400700539200600
+BIC (SWIFT): COBADEFF265
+</pre>
+<p><small><a href="mailto:gpg4win-professional at intevation.de">Kontaktieren
+Sie uns</a>, wenn Sie eine Rechnung benötigen.</small></p>
</p>
-<form action="">
</div>
diff --git a/web/donate.htm4 b/web/donate.htm4
index 17f3f6d..f1a758e 100644
--- a/web/donate.htm4
+++ b/web/donate.htm4
@@ -62,7 +62,7 @@ m4_include(`SPONSORS')
<div id="sidebar">
<h3>Make your donation now!</h3>
-<p>
+<p><b>... by PayPal:</b>
<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">
@@ -81,8 +81,24 @@ m4_include(`SPONSORS')
<input name="image_url" value="http://gpg4win.org/img/logo.png" type="hidden">
<input name="return" value="http://gpg4win.org/donate.html" type="hidden">
<input name="cbt" value="Back to Gpg4win" type="hidden">
-
<br>
<input name="os0" value="Yes" checked="checked" type="checkbox">Publish my sponsor name</a>
</form>
+</p>
+
+<p><b>... by Flattr:</b></p>
+<p>
+<script id='fbkq7vh'>(function(i){var f,s=document.getElementById(i);f=document.createElement('iframe');f.src='http://api.flattr.com/button/view/?uid=intevation&button=compact&url=http://www.gpg4win.org';f.title='Flattr';f.height=20;f.width=110;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})('fbkq7vh');</script>
+</p>
+
+<p><b>... by bank transfer:</b>
+<pre>Intevation GmbH
+IBAN: DE33265400700539200600
+BIC (SWIFT): COBADEFF265
+</pre>
+<p><small>Please <a
+href="mailto:gpg4win-professional at intevation.de">contact us
+</a> if you need an invoice.</small></p>
+</p>
+
</div>
commit 817a90ce9a38c2031920ae36bce4a22218a355ed
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Wed Oct 2 10:37:44 2013 +0200
Updated about page.
diff --git a/web/about-de.htm4 b/web/about-de.htm4
index b26f527..d045669 100644
--- a/web/about-de.htm4
+++ b/web/about-de.htm4
@@ -54,7 +54,7 @@ installiert werden k
<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
+ <p>Eine Programmerweiterung für Microsoft Outlook 2003/2007/2010/2013
(E-Mail-Verschlüsselung).</p>
</li>
<li><b>GpgEX</b>
@@ -73,17 +73,12 @@ Fortgeschrittene). Verf
<a name="requirements"></a>
<h2>Systemvorausetzungen</h2>
-<p>Gpg4win ist lauffähig unter Windows XP, Vista und 7. 32 und 64bit Systeme werden
+<p>Gpg4win ist lauffähig unter Windows XP, Vista, 7 und 8. 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>
+<p>Das Outlook-Plugin GpgOL ist kompatibel mit Microsoft Outlook 2003,
+2007, 2010 und 2013. Der Einsatz von MS Exchange Server wird nur in Outlook 2010 und
+2013 unterstützt.</p>
<h2>Das Ziel der Gpg4win-Initiative</h2>
diff --git a/web/about.htm4 b/web/about.htm4
index 48b74c1..9f15cd2 100644
--- a/web/about.htm4
+++ b/web/about.htm4
@@ -51,10 +51,10 @@ Free Software components:
<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>
+ <p>A plugin for Microsoft Outlook 2003/2007/2010/2013 (email encryption).</p>
</li>
<li><b>GpgEX</b>
-<p>A plugin for Microsoft Explorer 32bit (file encryption).</p>
+<p>A plugin for Microsoft Explorer (file encryption).</p>
</li>
<li><b>Claws Mail</b>
<p>A complete email application with crypto support.</p>
@@ -67,17 +67,13 @@ available in English and German.</p>
<a name="requirements"></a>
<h2>System Requirements</h2>
-<p>Gpg4win runs on Windows XP, Vista and 7. Both 32 and
+<p>Gpg4win runs on Windows XP, Vista, 7 and 8. 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>The Outlook plugin GpgOL is compatible with Microsoft Outlook 2003,
+2007, 2010 and 2013. GpgOL supports MS Exchange Server in Outlook 2010
+and 2013 only.</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
commit 8898ed997fa95ac1e36b95d251b1f2ed7faf32b2
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Wed Oct 2 10:37:30 2013 +0200
Added new sponsor.
diff --git a/web/SPONSORS b/web/SPONSORS
index bc9e2f0..ade324a 100644
--- a/web/SPONSORS
+++ b/web/SPONSORS
@@ -13,6 +13,7 @@ Armando Villani
Austin Schibler
Ben Gerber
Benjamin Fuchs
+Benjamin Wagner
Bernhard Buhrer
Bruce Cran
Carsten Krüger
@@ -131,4 +132,4 @@ Wilhelm Steinkemper
Wolfgang Behrens
Xtec Systems
-(2013-09-23)
+(2013-09-30)
-----------------------------------------------------------------------
Summary of changes:
web/SPONSORS | 3 ++-
web/about-de.htm4 | 15 +++++----------
web/about.htm4 | 16 ++++++----------
web/donate-de.htm4 | 20 ++++++++++++++++----
web/donate.htm4 | 20 ++++++++++++++++++--
web/impressum-de.htm4 | 34 +++++++++++++++++++++++++++-------
web/impressum.htm4 | 40 ++++++++++++++++++++++++++++++----------
web/template_header.m4 | 2 +-
8 files changed, 105 insertions(+), 45 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list