[Gpg4win-commits] [git] Gpg4win - branch, website, updated. gpg4win-2.1.0-183-gab92046
by Werner Koch
cvs at cvs.gnupg.org
Fri Nov 22 09:44:32 CET 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 ab920466b49b17a8e39a643e4c94e2041bc91e34 (commit)
from 600614feae2675f81cefd9851f2a94c198765ca0 (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 ab920466b49b17a8e39a643e4c94e2041bc91e34
Author: Werner Koch <wk at gnupg.org>
Date: Fri Nov 22 09:43:25 2013 +0100
Add Piwik tracking code and privacy policy pages.
diff --git a/.gitignore b/.gitignore
index 4453b7d..e046baf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,3 +122,5 @@ src/mingwm10.dll
/web/website-maintenance-de.html
/web/website-maintenance.html
/web/www.gpg4win.org.tar.gz
+/web/privacy-policy-de.html
+/web/privacy-policy.html
diff --git a/web/privacy-policy-de.htm4 b/web/privacy-policy-de.htm4
new file mode 100644
index 0000000..97bf1cc
--- /dev/null
+++ b/web/privacy-policy-de.htm4
@@ -0,0 +1,46 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`DE')
+m4_define(`EN_FILE', `privacy-policy.html')
+
+m4_define(`TITLE', `Datenschutzerklärung')
+m4_define(`MAIN', `privacy-policy')
+
+PAGE_START
+
+<div id="main">
+<h2>Datenschutzerklärung</h2>
+<p>
+Diese Website benutzt Piwik, ein auf Freier Software basierendes
+Webanalyse System, um die Besucher dieser Website statistisch zu
+erfassen. Piwik zeichnet den Herkunftsstaat, die Art des Webbrowsers,
+das benutzte Betriebssystem sowie die Navigation zwischen den Seiten
+auf. Dies hilft uns die Qualität unserer Webseiten zu messen und diese
+gegebenenfalls zu verbessern.
+</p>
+
+<p>
+Die benutzte Piwik Installation ist identisch zu der
+der <a href="http://www.gnupg.org">GnuPG</a> Websites and fasst Daten
+mit denen der GnuPG Websites zusammen. The Datenschutzerklärung der
+GnuPG Websites is identisch zu der hiesigen.
+</p>
+
+<p>
+Unser Piwik System beachtet den Datenschutz und teil-anonymisiert die
+IP Adresse der Besucher. Dies bedeutet, daß keine personenbezogenen
+Informationen abspeichert werden, obgleich Datensätze zu jedem Besuch
+erzeugt und abgespeichert werden.
+</p>
+
+<p>
+Piwik respektiert die "<a href="http://donottrack.us/">Do Not
+Track</a>" Option, welche von einigen Webbrowsern angeboten wird. Ist
+diese Option aktiv, so wird Piwik keine Daten aus dem Besuch dieser
+Website erheben oder abspeichern. Mehr Information zu den
+Datenschutzfunktionen von Piwik finden Sie auf
+<a href="http://piwik.org/privacy/">deren Website</a>.
+</p>
+</div>
diff --git a/web/privacy-policy.htm4 b/web/privacy-policy.htm4
new file mode 100644
index 0000000..e780ba3
--- /dev/null
+++ b/web/privacy-policy.htm4
@@ -0,0 +1,44 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`EN')
+m4_define(`DE_FILE', `privacy-policy-de.html')
+
+m4_define(`TITLE', `Privacy Policy')
+m4_define(`MAIN', `privacy-policy')
+
+PAGE_START
+
+<div id="main">
+<h2>Privacy Policy</h2>
+<p>
+This website uses Piwik, a Free Software web analytics system, to
+monitor traffic on our Web sites. Piwik records the general
+geographical vicinity of visitors as well as their browser and
+operating system, and records their navigation within the sites. This
+helps us gauge the impact of our materials and improve our work.
+</p>
+
+<p>
+The Piwik installation is the same as used for
+the <a href="http://www.gnupg.org">GnuPG</a> websites and thus
+aggregates data with visits to the GnuPG sites. The privacy policy of
+the GnuPG sites is identical to the one used for
+this <emph>Gpg4win</emph> site.
+
+</p>
+
+<p>
+Our Piwik system preserves privacy by anonymizing visitors´ IP
+addresses. This means that we will not store any personally
+identifiable information about you, even though your visit produces a
+record that our site was visited by someone.
+</p>
+
+<p>
+Piwik also respects the "<a href="http://donottrack.us/">Do Not Track</a>" preference offered by some
+browsers, so if you have this option set, Piwik will ignore your visit
+entirely. Details of how Piwik protects privacy are on <a href="http://piwik.org/privacy/">their website</a>.
+</p>
+</div>
diff --git a/web/template_header.m4 b/web/template_header.m4
index 07fb6a0..c679b5b 100644
--- a/web/template_header.m4
+++ b/web/template_header.m4
@@ -42,6 +42,7 @@ m4_define(`LINK',
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)
+ MENU(`privacy-policy', `Datenschutzerklärung', `Privacy Policy', `privacy-policy', SUB, LANG_DE)
<li class="subcap"></li>
</ul>
</li>
@@ -82,6 +83,7 @@ m4_define(`LINK',
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)
+ MENU(`privacy-policy', `Datenschutzerklärung', `Privacy Policy', `privacy-policy', MAIN, LANG_DE)
</ul>
<ul>
<li><b>
@@ -125,6 +127,26 @@ m4_define(`LINK',
</div>
</div>
- </body>
+ <script type="text/javascript">
+ var _paq = _paq || [];
+ _paq.push(["trackPageView"]);
+ _paq.push(["enableLinkTracking"]);
+
+ (function() {
+ var u=(("https:" == document.location.protocol) ? "https" : "http")
+ + "://alberti.gnupg.org/piwik/";
+ _paq.push(["setTrackerUrl", u+"piwik.php"]);
+ _paq.push(["setSiteId", "5"]);
+ var d=document,
+ g=d.createElement("script"),
+ s=d.getElementsByTagName("script")[0];
+ g.type="text/javascript";
+ g.defer=true;
+ g.async=true;
+ g.src=u+"piwik.js";
+ s.parentNode.insertBefore(g,s);
+ })();
+ </script>
+ </body>
</html>
m4_divert
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 ++
web/privacy-policy-de.htm4 | 46 ++++++++++++++++++++++++++++++++++++++++++++
web/privacy-policy.htm4 | 44 ++++++++++++++++++++++++++++++++++++++++++
web/template_header.m4 | 24 ++++++++++++++++++++++-
4 files changed, 115 insertions(+), 1 deletion(-)
create mode 100644 web/privacy-policy-de.htm4
create mode 100644 web/privacy-policy.htm4
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list