[Gpg4win-commits] [git] Gpg4win - branch, website, updated. gpg4win-2.1.0-279-g4fe2d5a

by Jochen Saalfeld cvs at cvs.gnupg.org
Mon Sep 4 15:16:10 CEST 2017


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  4fe2d5ac65a62040795e4fdd61f4cbdd9842b1e8 (commit)
       via  06810eb78b7c03ef23b9efb456efe640420c0160 (commit)
      from  5114b3c780a22c9b96d95cd83d8cee31a179d3b6 (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 4fe2d5ac65a62040795e4fdd61f4cbdd9842b1e8
Author: Jochen Saalfeld <privat at jochen-saalfeld.de>
Date:   Mon Sep 4 15:16:01 2017 +0200

    fixing typo

diff --git a/web/index-de.htm4 b/web/index-de.htm4
index b2a7b11..7c25d43 100644
--- a/web/index-de.htm4
+++ b/web/index-de.htm4
@@ -14,7 +14,7 @@ PAGE_START
     <span></span>
     <h2>Gpg4win - eine sichere Lösung...</h2>
     <p>
-    ... zum Verschlüsseln und Signieren von E-Mails, Dateien und Ordner unter Windows.
+    ... zum Verschlüsseln und Signieren von E-Mails, Dateien und Ordnern 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!

commit 06810eb78b7c03ef23b9efb456efe640420c0160
Author: Jochen Saalfeld <privat at jochen-saalfeld.de>
Date:   Mon Sep 4 15:15:20 2017 +0200

    moving html translations to old, updating pdfs

diff --git a/web/documentation-de.htm4 b/web/documentation-de.htm4
index 81b7d62..121c292 100644
--- a/web/documentation-de.htm4
+++ b/web/documentation-de.htm4
@@ -36,10 +36,10 @@ Gpg4win-Entwickler-Mailingliste</a> (Lesen sie auch <a
 href="localize-gpg4win.html">Gpg4win into your language</a>).</p>
 
 <p>Nach der Installation des Softwarepaktes Gpg4win ist das Kompendium (in
-der PDF- und HTML-Fassung, deutsch und english) über das Startmenü im Ordner
+der PDF-Fassung, deutsch und english) über das Startmenü im Ordner
 <em>Gpg4win->Dokumentation</em> verfügbar.</p>
 
-Die aktuelle PDF- und HTML-Version des Gpg4win-Kompendiums finden
+Die aktuelle PDF-Version des Gpg4win-Kompendiums finden
 Sie hier:
 <div class="dlbutton2">
  <img src="img/dl_arrow.png" alt="" />
@@ -49,20 +49,17 @@ Veröffentlicht: COMPENDIUM_DATE_DE</small></span>
 </a>
 </div>
 
-<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>
-
-
-
 <h2 style="clear:left;">Alte Dokumentationen</h2>
 <p>Beachten Sie: Mit Gpg4win2 und dem Gpg4win-Kompendium sind
 alle folgenden, bisherigen Gpg4win-Handbücher <b>veraltet</b> (und
 werden nicht mehr aktualisiert):
 
 <dl>
+  <dt><b>Gpg4win Kompendium 3.0 (HTML Version)</b></dt>
+  <dd>Last Version: 3.0.0 (2010-05-21)<br>
+    <a href="./doc/de/gpg4win-compendium.html">HTML Version</a>
+  </dd>
+
   <dt><b>Gpg4win für Einsteiger</b></dt>
   <dd>Letzte Version: 2.0.2 (2006-05-30)<br>
     <a href="http://wald.intevation.org/frs/?group_id=11">Alle
diff --git a/web/documentation.htm4 b/web/documentation.htm4
index dde5eb5..9d0f23c 100644
--- a/web/documentation.htm4
+++ b/web/documentation.htm4
@@ -41,11 +41,11 @@ href="localize-gpg4win.html">How to translate all of Gpg4win into
 your language</a>.
 </p>
 
-<p>After installation of the Gpg4win package, the Compendium (in PDF
-and HTML version, English and German) is available via start menu in
+<p>After installation of the Gpg4win package, the Compendium (in PDF version,
+English and German) is available via start menu in
 the folder <em>Gpg4win->Documentation</em>.</p>
 
-The current PDF and HTML versions of the Gpg4win-Compendium are also available here:
+The current PDF version of the Gpg4win-Compendium are also available here:
 <div class="dlbutton2">
 <img src="img/dl_arrow.png" alt="" />
 <a href="DOWNLOAD_URL_COMPENDIUM_EN">Gpg4win Compendium COMPENDIUM_VERSION_EN (PDF, English)<br>
@@ -54,13 +54,6 @@ Released: COMPENDIUM_DATE_EN</small></span>
 </a>
 </div>
 
-<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>
-
-
 
 <h2>Old Documentation</h2>
 <p>Please note: With Gpg4win2 and the Gpg4win Compendium,
@@ -68,14 +61,16 @@ all following Gpg4win manuals are now <b>out of date</b> (and will no
 longer be updated):
 
 <dl>
+  <dt><b>Gpg4win Compendium 3.0 (HTML Version)</b></dt>
+  <dd>Last Version: 3.0.0 (2010-09-21)<br>
+    <a href="./doc/en/gpg4win-compendium.html">HTML Version</a>
+  </dd>
   <dt><b>Gpg4win for Novices</b> (English translation of "Gpg4win für Einsteiger")</dt>
   <dd>Last version: 1.0.0 (2006-11-30)<br>
    <a href="http://wald.intevation.org/frs/?group_id=11">All
 PDF versions</a> | <a
 href="http://gpg4win.de/handbuecher/novices.html">Last HTML version</a>
   </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
diff --git a/web/versions.m4 b/web/versions.m4
index ba4c220..6bb09d6 100644
--- a/web/versions.m4
+++ b/web/versions.m4
@@ -31,15 +31,15 @@ I18N(`EN', `<a href="http://www.gnupg.org/">GnuPG</a>')I18N(`DE', `<a href="http
 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.de.html">GPA</a>') 0.9.10
 <a href="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgol.git;a=summary">GpgOL</a> 1.4.0
 <a href="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgex.git;a=summary">GpgEX</a> 1.0.4
-<a href="doc/de/gpg4win-compendium.html">Kompendium (de)</a> 3.0.0
+<a href="doc/de/gpg4win-compendium.html">Kompendium (de)</a> 4.0.0
 <a href="doc/en/gpg4win-compendium.html">Compendium (en)</a> 3.0.0
 ')
 
-m4_define(`COMPENDIUM_VERSION_DE',`3.0.0')
-m4_define(`COMPENDIUM_DATE_DE',`2010-05-21')
-m4_define(`DOWNLOAD_URL_COMPENDIUM_DE',`http://wald.intevation.org/frs/download.php/744/gpg4win-compendium-de-3.0.0.pdf')
-m4_define(`DL_SIZE_COMPENDIUM_DE',`3.2 MByte')
+m4_define(`COMPENDIUM_VERSION_DE',`4.0.0')
+m4_define(`COMPENDIUM_DATE_DE',`2017-06-23')
+m4_define(`DOWNLOAD_URL_COMPENDIUM_DE',`https://files.gpg4win.org/doc/gpg4win-compendium-de.pdf')
+m4_define(`DL_SIZE_COMPENDIUM_DE',`2.8 MByte')
 m4_define(`COMPENDIUM_VERSION_EN',`3.0.0')
 m4_define(`COMPENDIUM_DATE_EN',`2013-08-02')
-m4_define(`DOWNLOAD_URL_COMPENDIUM_EN',`http://wald.intevation.org/frs/download.php/1385/gpg4win-compendium-en-3.0.0.pdf')
+m4_define(`DOWNLOAD_URL_COMPENDIUM_EN',`https://files.gpg4win.org/doc/gpg4win-compendium-en.pdf')
 m4_define(`DL_SIZE_COMPENDIUM_EN',`3.6 MByte')

-----------------------------------------------------------------------

Summary of changes:
 web/documentation-de.htm4 | 17 +++++++----------
 web/documentation.htm4    | 19 +++++++------------
 web/index-de.htm4         |  2 +-
 web/versions.m4           | 12 ++++++------
 4 files changed, 21 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org



More information about the Gpg4win-commits mailing list