[Gpg4win-commits] r256 - in trunk: . doc doc/manual-de doc/website
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Apr 5 10:40:35 CEST 2006
Author: werner
Date: 2006-04-05 10:40:35 +0200 (Wed, 05 Apr 2006)
New Revision: 256
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/doc/ChangeLog
trunk/doc/manual-de/einsteiger.tex
trunk/doc/manual-de/sc-gpgol-options.png
trunk/doc/website/build-history.awk
trunk/doc/website/buildhtml.mk
Log:
More tweaks to the change history
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-04-04 23:51:18 UTC (rev 255)
+++ trunk/ChangeLog 2006-04-05 08:40:35 UTC (rev 256)
@@ -1,3 +1,7 @@
+2006-04-05 Werner Koch <wk at g10code.com>
+
+ * NEWS: Recoded to latin1.
+
2006-04-04 Werner Koch <wk at g10code.com>
* NEWS: Reformatted.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-04-04 23:51:18 UTC (rev 255)
+++ trunk/NEWS 2006-04-05 08:40:35 UTC (rev 256)
@@ -1,4 +1,4 @@
-# NEWS for gpg4win -*- coding: utf-8 -*-
+# NEWS for gpg4win -*- coding: latin1 -*-
#
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
@@ -17,12 +17,12 @@
(en) New: A installer page allows to install start-links for the
desktop.
-(de) Neu: Eine Seite im Installer erlaubt es, Start-Links für
+(de) Neu: Eine Seite im Installer erlaubt es, Start-Links für
den Desktop mitzuinstallieren.
(en) No splash screen anymore. Instead, the logo now integrates into
installer dialog.
-(de) Kein Splash-Screen mehr. Dafür Logo in Installer-Dialog eingebaut.
+(de) Kein Splash-Screen mehr. Dafür Logo in Installer-Dialog eingebaut.
~~~~~~~~~~~~~~~
GnuPG: 1.4.3rc2
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2006-04-04 23:51:18 UTC (rev 255)
+++ trunk/doc/ChangeLog 2006-04-05 08:40:35 UTC (rev 256)
@@ -1,6 +1,18 @@
+2006-04-05 Werner Koch <wk at g10code.com>
+
+ * website/buildhtml.mk (change-history.htm4): Don't use recode. A
+ simple recode to latin1 won't anyway work with all source
+ encodings and thus we stay with latin1 for the NEWS file for now.
+
+ * website/build-history.awk: Register encoding.
+
+ * manual-de/einsteiger.tex (Appendix A): Describe Prefer HTML
+ Version.
+ * manual-de/sc-gpgol-options.png: Updated.
+
2006-04-04 Werner Koch <wk at g10code.com>
- * manual-de/einsteiger.tex: Use consist capitalization "Gpg4win".
+ * manual-de/einsteiger.tex: Use consistent capitalization "Gpg4win".
* manual-de/durchblicker.tex: Ditto.
* manual-de/einsteiger.tex (Umstieg von anderen GnuPG Programmen):
Modified: trunk/doc/manual-de/einsteiger.tex
===================================================================
--- trunk/doc/manual-de/einsteiger.tex 2006-04-04 23:51:18 UTC (rev 255)
+++ trunk/doc/manual-de/einsteiger.tex 2006-04-05 08:40:35 UTC (rev 256)
@@ -1358,6 +1358,10 @@
schnellen Rechnern eingesetzt werden und funktioniert z.Z. nur
eingeschränkt.
+Die Option "`Wenn möglich, HTML Version anzeigen"' kann benutzt
+werden, um die HTML Version einer Nachricht anzuzeigen. Im Normalfall
+oder falls keine HTML Version vorhanden ist, wird die Text Version
+angezeigt.
Alle Optionen sind nach einer Neuinstallation bereits sinnvoll vorbelegt. Um
aber verschlüsselte Nachrichten versenden zu können, sollten Sie
Modified: trunk/doc/manual-de/sc-gpgol-options.png
===================================================================
(Binary files differ)
Modified: trunk/doc/website/build-history.awk
===================================================================
--- trunk/doc/website/build-history.awk 2006-04-04 23:51:18 UTC (rev 255)
+++ trunk/doc/website/build-history.awk 2006-04-05 08:40:35 UTC (rev 256)
@@ -1,4 +1,5 @@
-# build-history.awk - Build a history HTML page from a NEWS file
+# build-history.awk - Build a history HTML -*- coding: latin1 *-*
+# page from the NEWS file
# Copyright (C) 2006 g10 Code GmbH
#
# This program is free software; you can redistribute it and/or
@@ -41,7 +42,7 @@
# ignored. Paragraphs are indicated by the language tags. A new
# revision history starts with the "Noteworthy .." line; the release
# date is expected in parentheses on that line. If it is not given the
-# section won't be rendered. The NEWS file shall be utf-8 encoded.
+# section won't be rendered.
BEGIN {
@@ -50,6 +51,7 @@
in_section = 0;
in_para = 0;
in_vers = 0;
+ any_para = 0;
version = "";
reldate = "";
@@ -71,6 +73,8 @@
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 ]";
print header_text[lang];
}
@@ -86,6 +90,7 @@
in_section = 0;
in_para = 0;
in_vers = 0;
+ any_para = 0;
}
@@ -93,29 +98,29 @@
if ($0 !~ /^Noteworthy/)
next;
version = $5;
+ reldate = "";
if (index ($0, "(")) {
sub (/^.*\(/, "");
sub (/\).*$/, "");
reldate = $0;
+ print "<h2>Version " version " " release_text[lang] " " reldate "</h2>"
} else {
- if (lang == "en")
- reldate = "[ in progress; not yet released ]";
- if (lang == "de")
- reldate = "[ in Arbeit; bisher noch nicht veröffentlicht ]";
+ reldate = noreldate_text[lang];
+ print "<h2>Version " version " " reldate "</h2>"
}
in_section = 1;
in_para = 0;
in_vers = 0;
+ any_para = 0;
- print "<h2>Version " version " " release_text[lang] " " reldate "</h2>"
- print "<ul>"
next;
}
in_section && $0 ~ /^\([a-zA-Z]+\)/ {
in_para = 0;
- if ( $0 ~ ("(" lang ")" ) ) {
+ if ( $0 ~ ("^\\(" lang "\\)" ) ) {
in_para = 1;
+ any_para = 1;
print "<li>"
print substr ($0, 5);
}
@@ -123,7 +128,7 @@
}
in_section && !in_vers && /^~~~/ {
- if (in_para)
+ if (in_para && any_para)
print "</ul>"
in_para = 0;
in_vers = 1;
@@ -148,7 +153,7 @@
END {
- if (in_para)
+ if (in_para && any_para)
print "</ul>"
print "PAGE_BOXES"
}
Modified: trunk/doc/website/buildhtml.mk
===================================================================
--- trunk/doc/website/buildhtml.mk 2006-04-04 23:51:18 UTC (rev 255)
+++ trunk/doc/website/buildhtml.mk 2006-04-05 08:40:35 UTC (rev 256)
@@ -39,10 +39,10 @@
done
change-history.htm4: build-history.awk ../../NEWS
- recode utf8..latin1 < ../../NEWS | awk -f build-history.awk > $@
+ awk -f build-history.awk < ../../NEWS > $@
change-history-de.htm4: build-history.awk ../../NEWS
- recode utf8..latin1 < ../../NEWS | awk -f build-history.awk -v lang=de > $@
+ awk -f build-history.awk -v lang=de < ../../NEWS > $@
online: all
echo "Going to put current contents online for www.gpg4win.org ..."
More information about the Gpg4win-commits
mailing list