[Gpg4win-commits] r899 - in trunk: . doc doc/manual include po src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Sep 3 18:42:54 CEST 2008
Author: werner
Date: 2008-09-03 18:42:51 +0200 (Wed, 03 Sep 2008)
New Revision: 899
Added:
trunk/src/inst-compendium_de.nsi
trunk/src/uninst-compendium_de.nsi
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/doc/ChangeLog
trunk/doc/manual/Makefile.am
trunk/doc/manual/gpg4win-compendium-de.tex
trunk/include/config.nsi.in
trunk/po/POTFILES.in
trunk/po/ar.po
trunk/po/de.po
trunk/po/es.po
trunk/po/fr.po
trunk/po/ru.po
trunk/src/Makefile.am
trunk/src/gpg4win.nsi
trunk/src/inst-sections.nsi
trunk/src/installer-finish.nsi
Log:
Installed the new compendium.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/ChangeLog 2008-09-03 16:42:51 UTC (rev 899)
@@ -1,3 +1,14 @@
+2008-09-03 Werner Koch <wk at g10code.com>
+
+ * configure.ac: Remove man_novice_de and man_advanced_de. Add
+ compendium_de.
+
+ * src/gpg4win.nsi: Do not include it in the light installer.
+ * src/uninst-compendium_de.nsi: New.
+ * src/inst-compendium_de.nsi: New.
+ * src/inst-sections.nsi: Include them.
+ * src/installer-finish.nsi: Ditto.
+
2008-09-02 Emanuel Schuetze <emanuel.schuetze at intevation.de>
* packages/packages.current: Update kdelibs, kdesupport and kleopatra.
@@ -2,7 +13,12 @@
+2008-08-28 Werner Koch <wk at g10code.com>
+
+ * src/gpg4win.nsi: Include gpgex in the light build.
+
2008-08-19 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
- * configure.ac: Added COMPENDIUM_VERSION_DE and COMPENDIUM_DATE_DE for the
- new compendium document, also turning to version 3.0.0-beta for the
- compendium documentation as it is the third generation.
+ * configure.ac: Added COMPENDIUM_VERSION_DE and COMPENDIUM_DATE_DE
+ for the new compendium document, also turning to version
+ 3.0.0-beta for the compendium documentation as it is the third
+ generation.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/configure.ac 2008-09-03 16:42:51 UTC (rev 899)
@@ -210,10 +210,8 @@
GPG4WIN_SPKG([libetpan], [pthreads-w32])
GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
gpgme pthreads-w32 crypt regex libetpan gnutls])
-# The Eudora license (the one for the EMS API) is still not acceptable.
-#GPG4WIN_SPKG([eudoragpg])
-GPG4WIN_IPKG([man_novice_de])
-GPG4WIN_IPKG([man_advanced_de])
+
+GPG4WIN_IPKG([compendium_de])
GPG4WIN_IPKG([man_novice_en])
#GPG4WIN_IPKG([man_advanced_en])
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/doc/ChangeLog 2008-09-03 16:42:51 UTC (rev 899)
@@ -1,3 +1,11 @@
+2008-09-03 Werner Koch <wk at g10code.com>
+
+ * manual/Makefile.am (pkgdata_DATA): Remove einsteiger.pdf and
+ durchblicker.pdf.
+ (all-local): Ditto.
+ (%.html.d): New.
+ (all-local): Build compendium html version.
+
2008-08-21 Emanuel Schuetze <emanuel.schuetze at intevation.de>
* manual/gpg4win-compendium-de.tex, manual/fdl-book.tex:
Modified: trunk/doc/manual/Makefile.am
===================================================================
--- trunk/doc/manual/Makefile.am 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/doc/manual/Makefile.am 2008-09-03 16:42:51 UTC (rev 899)
@@ -135,17 +135,20 @@
# advanced.tex
CLEANFILES = $(eps_files_bb) $(png_files_eps) \
- *.dvi *.pdf *.pdf *.toc *.log *.aux *.out
+ *.dvi *.pdf *.pdf *.toc *.log *.aux *.out \
+ gpg4win-compendium-de.html.d/*
DISTCLEANFILES = version.tex $(eps_files_png)
-pkgdata_DATA = gpg4win-compendium-de.pdf einsteiger.pdf durchblicker.pdf novices.pdf
+pkgdata_DATA = gpg4win-compendium-de.pdf novices.pdf
# advanced.pdf
BUILT_SOURCES = $(eps_files_bb) $(png_files_eps) $(eps_files_png)
-all-local: gpg4win-compendium-de.pdf einsteiger.pdf durchblicker.pdf novices.pdf
+all-local: gpg4win-compendium-de.pdf novices.pdf \
+ gpg4win-compendium-de.html.d
# advanced.pdf
+
gpg4win-compendium-de.pdf : $(eps_files_bb) $(png_files_eps) $(eps_files_png)
gpg4win-compendium-de.dvi : version.tex macros.tex $(eps_files_bb)
gpg4win-compendium-de.html : version.tex macros.tex $(eps_files_png)
@@ -162,19 +165,22 @@
#advanced.dvi : version.tex macros-en.tex $(eps_files_bb)
#advanced.html : version.tex macros-en.tex $(eps_files_png)
-htmlversion: gpg4win-compendium-de.html einsteiger.html durchblicker.html novices.html
-# advanced.html
+# Note: This is only used for the old manuals.
+htmlversion: einsteiger.html durchblicker.html novices.html
rm -rf html
mkdir html
- cp gpg4win-compendium-de*.html einsteiger*.html durchblicker*.html novices*.html html/
- cp $(web_png_files) $(png_files) $(eps_files_png) gpg4win-logo.png html/
+ cp einsteiger*.html durchblicker*.html novices*.html html/
+ cp $(web_png_files) $(png_files) $(eps_files_png) \
+ gpg4win-logo.png html/
-online: htmlversion
+online: htmlversion gpg4win-compendium-de.html.d
set -e; \
echo "Going to put current manuals online for www.gpg4win.org ..."; \
user=`svn info | sed -n '/^URL:/ s,.*svn+ssh://\\([^@]*\\).*,\\1,p'`;\
( cd html ; rsync -v * \
$${user}@wald.intevation.org:/gpg4win/htdocs/handbuecher/ )
+ ( cd gpg4win-compendium-de.html.d ; rsync -v * \
+ $${user}@wald.intevation.org:/gpg4win/htdocs/handbuecher/ )
preview: htmlversion
set -e; \
@@ -203,3 +209,21 @@
%.html : %.tex
hyperlatex $<
+
+
+# The html.d directories are used to collect all relevant files for
+# the NSI scripts. Fixme: We should better use proper installation
+# directories with the internal packages as well.
+%.html.d-stamp : %.html
+ @rm -f $@.tmp
+ @touch $@.tmp
+ -rm -rf $@
+ mkdir $@
+ (src=$$(echo $@ | sed 's/.html.d$$/.tex/'); \
+ echo $@ | sed 's/.d$$//'; \
+ LC_CTYPE=C sed -n 's/.*\\xname{\([^}]*\).*/\1.html/p' $$src;\
+ LC_CTYPE=C sed -n 's/.*\\IncludeImage\[.*\]){\([^}]*\).*/\1.png/p' \
+ $$src;\
+ LC_CTYPE=C sed -n 's/.*\\IncludeImage{\([^}]*\).*/\1.png/p' $$src \
+ ) | sort | uniq | xargs $(INSTALL_DATA) -t $@
+ @mv -f $@.tmp $@
Modified: trunk/doc/manual/gpg4win-compendium-de.tex
===================================================================
--- trunk/doc/manual/gpg4win-compendium-de.tex 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/doc/manual/gpg4win-compendium-de.tex 2008-09-03 16:42:51 UTC (rev 899)
@@ -35,6 +35,7 @@
\newcommand{\Email}{E-Mail}
\newcommand{\EchelonUrl}{http://www.heise.de/tp/r4/artikel/6/6928/1.html}
\newcommand\margin[1]{\marginline {\sffamily\scriptsize #1}}
+% Note: Do not include more than one image on a source line.
\newcommand{\IncludeImage}[2][]{\texorhtml{%
\includegraphics[#1]{#2}%
}{%
@@ -110,7 +111,8 @@
%
% on _startpage_: show short(!) toc (only part+chapter)
\setcounter {htmlautomenu}{1}
- % chapters should be <H1>, Sections <H2> etc. (see hyperlatex package book.hlx)
+ % chapters should be <H1>, Sections <H2> etc.
+ % (see hyperlatex package book.hlx)
\setcounter{HlxSecNumBase}{-1}
% show _numbers_ of parts, chapters and sections in toc
\setcounter {secnumdepth}{1}
@@ -290,7 +292,7 @@
\item[GpgEX:] GPG Explorer eXtension (GpgEX) ist eine Erweiterung für
den Windows Explorer, die es ermöglicht, Dateien über das
Kontextmenü zu verschlüsseln.
- \item[GPA:] Der GNU Privacy Assistent (GPA) ist neben Kleoaptra ein
+ \item[GPA:] Der GNU Privacy Assistent (GPA) ist neben Kleopatra ein
alternatives Programm zum Verwalten von OpenPGP Schlüsseln.
\item[Claws Mail:] Claws Mail ist ein vollständiges
\Email{}-Programm mit sehr guter Unterstützug für GnuPG.
@@ -4352,9 +4354,9 @@
Geheimbotschaften entschlüsseln.
Das Geheimnis dieser mathematischen Verbindung müssen Sie nicht
-unbedingt kennen -- Gpg4win funktioniert für Sie auch so. Man kann diese komplexe
-mathematische Methode aber auch als Normalsterblicher und
-Nichtmathematiker verstehen. Sie müssen eigentlich nur einfache
+unbedingt kennen -- Gpg4win funktioniert für Sie auch so. Man kann
+diese komplexe mathematische Methode aber auch als Normalsterblicher
+und Nichtmathematiker verstehen. Sie müssen eigentlich nur einfache
Additionen ($2 + 3$) und Multiplikationen ($5 * 7$) beherrschen.
Allerdings in einer ganzen anderen Rechenmethode als der, die Sie im
Alltag benutzen. Es gehört sowohl zur Sicherheitsphilosophie der
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/include/config.nsi.in 2008-09-03 16:42:51 UTC (rev 899)
@@ -246,10 +246,8 @@
!define gpg4win_pkg_kleopatra_src @gpg4win_pkg_kleopatra_src@
# Internal packages.
- at HAVE_PKG_MAN_NOVICE_DE@
+ at HAVE_PKG_COMPENDIUM_DE@
- at HAVE_PKG_MAN_ADVANCED_DE@
-
@HAVE_PKG_MAN_NOVICE_EN@
# @HAVE_PKG_MAN_ADVANCED_EN@
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/po/POTFILES.in 2008-09-03 16:42:51 UTC (rev 899)
@@ -16,4 +16,5 @@
src/inst-man_advanced_en.nsi
src/inst-man_novice_de.nsi
src/inst-man_novice_en.nsi
+src/inst-compendium_de.nsi
src/inst-winpt.nsi
Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/po/ar.po 2008-09-03 16:42:51 UTC (rev 899)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Gpg4Win\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-08-11 21:23+0200\n"
+"POT-Creation-Date: 2008-09-03 18:38+0200\n"
"PO-Revision-Date: 2008-03-11 23:52+0200\n"
"Last-Translator: Ahmad Gharbeia <ahmad at gharbeia.org>\n"
"Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -23,12 +23,12 @@
msgid "An instance of this installer is already running."
msgstr "ÊÚãá ÓíÑæÑÉ ÃÎÑì ãä åÐÇ ÇáãõËÈøöÊ ÈÇáÝÚá."
-#: src/gpg4win.nsi:117
+#: src/gpg4win.nsi:113
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "ãÑÍÈÇ Ýí ÊËÈíÊ Gpg4win"
-#: src/gpg4win.nsi:121
+#: src/gpg4win.nsi:117
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -40,17 +40,17 @@
"ÇáÈíÇäÇÊ æ ÇáÊæÞíÚ ÇáÑÞãíº æ åæ íÔÊãá Úáì æÓíáÉ ãÊÞÏãÉ áÅÏÇÑÉ ÇáãÝÇÊíÍ¡ "
"æíÊæÇÝÞ ãÚ ãÚíÇÑ ÇáÅäÊÑäÊ OpenPGP ÇáãÞÊÑÍ ßãÇ æõÕöÝ Ýí RFC2440."
-#: src/gpg4win.nsi:127
+#: src/gpg4win.nsi:123
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "åÐå ÇáÅÕÏÇÑÉ ${VERSION} ãä Gpg4win"
-#: src/gpg4win.nsi:130
+#: src/gpg4win.nsi:126
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "ÅÕÏÇÑÉ ÇáãáÝ ${PROD_VERSION}"
-#: src/gpg4win.nsi:133
+#: src/gpg4win.nsi:129
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "ÊÇÑíÎ ÇáÅÕÏÇÑ ${_BUILD_ISODATE}"
@@ -455,6 +455,22 @@
msgid "Show the online manual of Gpg4Win for novice users"
msgstr "ÇÚÑÖ Ïáíá Gpg4Win Úáì ÇáæÈ ááãÓÊÎÏãíä ÇáãÈÊÏÆíä"
+#: src/inst-compendium_de.nsi:39
+#, fuzzy
+msgctxt "DESC_Name_compendium_de"
+msgid "Gpg4win Kompendium"
+msgstr "æËÇÆÞ Gpg4win"
+
+#: src/inst-compendium_de.nsi:42
+msgctxt "DESC_SEC_compendium_de"
+msgid "Gpg4win compendium (German)"
+msgstr ""
+
+#: src/inst-compendium_de.nsi:45
+msgctxt "DESC_Menu_compendum_de"
+msgid "Show the German Gpg4win compendium (PDF)"
+msgstr ""
+
#: src/inst-winpt.nsi:46
msgctxt "DESC_SEC_winpt"
msgid "Windows Privacy Tray"
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/po/de.po 2008-09-03 16:42:51 UTC (rev 899)
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-08-11 21:23+0200\n"
-"PO-Revision-Date: 2008-05-28 11:48+0200\n"
+"POT-Creation-Date: 2008-09-03 18:38+0200\n"
+"PO-Revision-Date: 2008-09-03 18:40+0200\n"
"Last-Translator: Marcus Brinkmann <mb at g10code.com>\n"
"Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -20,12 +20,12 @@
msgid "An instance of this installer is already running."
msgstr "Ein Exemplar dieses Installers läuft bereits."
-#: src/gpg4win.nsi:117
+#: src/gpg4win.nsi:113
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Willkommen bei der Installation von Gpg4win"
-#: src/gpg4win.nsi:121
+#: src/gpg4win.nsi:117
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -36,17 +36,17 @@
"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation sowie "
"zum sicheren Speichern von Daten."
-#: src/gpg4win.nsi:127
+#: src/gpg4win.nsi:123
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "Dies ist Gpg4win Version ${VERSION}"
-#: src/gpg4win.nsi:130
+#: src/gpg4win.nsi:126
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "Dateiversion ${PROD_VERSION}"
-#: src/gpg4win.nsi:133
+#: src/gpg4win.nsi:129
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "Releasedatum ${_BUILD_ISODATE}"
@@ -528,6 +528,21 @@
msgid "Show the online manual of Gpg4Win for novice users"
msgstr "Das englische Online-Handbuch von Gpg4Win für den Einsteiger anzeigen"
+#: src/inst-compendium_de.nsi:39
+msgctxt "DESC_Name_compendium_de"
+msgid "Gpg4win Kompendium"
+msgstr "Gpg4win Kompendium"
+
+#: src/inst-compendium_de.nsi:42
+msgctxt "DESC_SEC_compendium_de"
+msgid "Gpg4win compendium (German)"
+msgstr "Gpg4win Kompendium (deutsch)"
+
+#: src/inst-compendium_de.nsi:45
+msgctxt "DESC_Menu_compendum_de"
+msgid "Show the German Gpg4win compendium (PDF)"
+msgstr "Das deutsche Gpg4win Kompendium anzeigen"
+
#: src/inst-winpt.nsi:46
msgctxt "DESC_SEC_winpt"
msgid "Windows Privacy Tray"
Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/po/es.po 2008-09-03 16:42:51 UTC (rev 899)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-08-11 21:23+0200\n"
+"POT-Creation-Date: 2008-09-03 18:38+0200\n"
"PO-Revision-Date: 2008-01-30 17:07+0100\n"
"Last-Translator: Diego Escalante Urrelo <diegoe at gnome.org>\n"
"Language-Team: Spanish <diegoe at gnome.org>\n"
@@ -20,12 +20,12 @@
msgid "An instance of this installer is already running."
msgstr "Una instancia del instalador ya está ejecutándose."
-#: src/gpg4win.nsi:117
+#: src/gpg4win.nsi:113
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Bienvenido a la instalación de Gpg4win"
-#: src/gpg4win.nsi:121
+#: src/gpg4win.nsi:117
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -38,17 +38,17 @@
"Incluye un gestor de llaves avanzado y cumple con la propuesta de estándar "
"de Internet: OpenGPG, descrito en el RFC2440."
-#: src/gpg4win.nsi:127
+#: src/gpg4win.nsi:123
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "Este es Gpg4win versión ${VERSION}"
-#: src/gpg4win.nsi:130
+#: src/gpg4win.nsi:126
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "versión del archivo ${PROD_VERSION}"
-#: src/gpg4win.nsi:133
+#: src/gpg4win.nsi:129
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "fecha de publicación ${_BUILD_ISODATE}"
@@ -468,6 +468,22 @@
msgid "Show the online manual of Gpg4Win for novice users"
msgstr "Mostrar el manual en línea de Gpg4Win para principiantes"
+#: src/inst-compendium_de.nsi:39
+#, fuzzy
+msgctxt "DESC_Name_compendium_de"
+msgid "Gpg4win Kompendium"
+msgstr "Documentación de Gpg4win"
+
+#: src/inst-compendium_de.nsi:42
+msgctxt "DESC_SEC_compendium_de"
+msgid "Gpg4win compendium (German)"
+msgstr ""
+
+#: src/inst-compendium_de.nsi:45
+msgctxt "DESC_Menu_compendum_de"
+msgid "Show the German Gpg4win compendium (PDF)"
+msgstr ""
+
#: src/inst-winpt.nsi:46
msgctxt "DESC_SEC_winpt"
msgid "Windows Privacy Tray"
Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/po/fr.po 2008-09-03 16:42:51 UTC (rev 899)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ngoinabox\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-08-11 21:23+0200\n"
+"POT-Creation-Date: 2008-09-03 18:38+0200\n"
"PO-Revision-Date: 2008-03-10 16:46+0100\n"
"Last-Translator: Fabian Rodriguez <magicfab at member.fsf.org>\n"
"Language-Team: FRENCH <aep.lists at it46.se>\n"
@@ -20,12 +20,12 @@
msgid "An instance of this installer is already running."
msgstr "Une instance de cet installateur fonctionne déjà."
-#: src/gpg4win.nsi:117
+#: src/gpg4win.nsi:113
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Bienvenue à l'installation de Gpg4win"
-#: src/gpg4win.nsi:121
+#: src/gpg4win.nsi:117
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -39,17 +39,17 @@
"est conforme avec l'OpenPGP proposé Internet standard as described in "
"RFC2440."
-#: src/gpg4win.nsi:127
+#: src/gpg4win.nsi:123
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "This is Gpg4win version ${VERSION}"
-#: src/gpg4win.nsi:130
+#: src/gpg4win.nsi:126
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "file version ${PROD_VERSION}"
-#: src/gpg4win.nsi:133
+#: src/gpg4win.nsi:129
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "release date ${_BUILD_ISODATE}"
@@ -474,6 +474,22 @@
msgid "Show the online manual of Gpg4Win for novice users"
msgstr "Montrez le guide en ligne de Gpg4Win pour des utilisateurs de débutant"
+#: src/inst-compendium_de.nsi:39
+#, fuzzy
+msgctxt "DESC_Name_compendium_de"
+msgid "Gpg4win Kompendium"
+msgstr "Guides pour l'installation du logiciel Gpg4win"
+
+#: src/inst-compendium_de.nsi:42
+msgctxt "DESC_SEC_compendium_de"
+msgid "Gpg4win compendium (German)"
+msgstr ""
+
+#: src/inst-compendium_de.nsi:45
+msgctxt "DESC_Menu_compendum_de"
+msgid "Show the German Gpg4win compendium (PDF)"
+msgstr ""
+
#: src/inst-winpt.nsi:46
msgctxt "DESC_SEC_winpt"
msgid "Windows Privacy Tray"
Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/po/ru.po 2008-09-03 16:42:51 UTC (rev 899)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Gpg4Win Installer\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-08-11 21:23+0200\n"
+"POT-Creation-Date: 2008-09-03 18:38+0200\n"
"PO-Revision-Date: 2008-04-22 11:57+0200\n"
"Last-Translator: Sergei Smirnov <moscow at hro.org>\n"
"Language-Team: Human Rights Network <moscow at hro.org>\n"
@@ -21,12 +21,12 @@
msgid "An instance of this installer is already running."
msgstr "Óñòàíîâêà ïðîãðàììû óæå çàïóùåíà."
-#: src/gpg4win.nsi:117
+#: src/gpg4win.nsi:113
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Äîáðî ïîæàëîâàòü â ïðîãðàììó óñòàíîâêè Gpg4win!"
-#: src/gpg4win.nsi:121
+#: src/gpg4win.nsi:117
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -40,17 +40,17 @@
"øèôðîâàëüíûìè êëþ÷àìè è ñîâìåñòèìà ñî ñòàíäàðòîì OpenPGP, îïèñàííûì â "
"äîêóìåíòå RFC2440."
-#: src/gpg4win.nsi:127
+#: src/gpg4win.nsi:123
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "Âåðñèÿ Gpg4win ${VERSION}"
-#: src/gpg4win.nsi:130
+#: src/gpg4win.nsi:126
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "Âåðñèÿ ôàéëà ${PROD_VERSION}"
-#: src/gpg4win.nsi:133
+#: src/gpg4win.nsi:129
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "Äàòà ðåëèçà ${_BUILD_ISODATE}"
@@ -463,6 +463,22 @@
msgid "Show the online manual of Gpg4Win for novice users"
msgstr "Ïîêàçàòü îíëàéíîâûå èíñòðóêöèè Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ"
+#: src/inst-compendium_de.nsi:39
+#, fuzzy
+msgctxt "DESC_Name_compendium_de"
+msgid "Gpg4win Kompendium"
+msgstr "Äîêóìåíòàöèÿ Gpg4win"
+
+#: src/inst-compendium_de.nsi:42
+msgctxt "DESC_SEC_compendium_de"
+msgid "Gpg4win compendium (German)"
+msgstr ""
+
+#: src/inst-compendium_de.nsi:45
+msgctxt "DESC_Menu_compendum_de"
+msgid "Show the German Gpg4win compendium (PDF)"
+msgstr ""
+
#: src/inst-winpt.nsi:46
msgctxt "DESC_SEC_winpt"
msgid "Windows Privacy Tray"
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/src/Makefile.am 2008-09-03 16:42:51 UTC (rev 899)
@@ -51,6 +51,7 @@
inst-libksba.nsi uninst-libksba.nsi \
inst-adns.nsi uninst-adns.nsi \
inst-libpng.nsi uninst-libpng.nsi \
+ inst-compendium_de.nsi uninst-compendium_de.nsi \
inst-man_advanced_de.nsi uninst-man_advanced_de.nsi \
inst-man_advanced_en.nsi uninst-man_advanced_en.nsi \
inst-man_novice_de.nsi uninst-man_novice_de.nsi \
@@ -333,7 +334,8 @@
# Supported internal packages. Internal packages do not require any
# special support. Thus, this variable is actually unused, and no
# rules are added in gpg4win.mk.
-gpg4win_ipkgs = man_novice_de man_advanced_de man_novice_en man_advanced_en
+gpg4win_ipkgs = man_novice_de man_advanced_de man_novice_en man_advanced_en \
+ compendium_de
# Now do the bunch of the work. This is a bunch of dirty magic to
Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/src/gpg4win.nsi 2008-09-03 16:42:51 UTC (rev 899)
@@ -27,15 +27,11 @@
# For the "light" version of the package, we explicitely disable some
# of the packages right after including config.nsi.
!ifdef GPG4WIN_LIGHT
-!undef HAVE_PKG_MAN_NOVICE_DE
+!undef HAVE_PKG_COMPENDIUM_DE
!undef HAVE_PKG_MAN_NOVICE_EN
-!undef HAVE_PKG_MAN_ADVANCED_DE
!ifdef HAVE_PKG_KLEOPATRA
!undef HAVE_PKG_KLEOPATRA
!endif
-!ifdef HAVE_PKG_GPGEX
-!undef HAVE_PKG_GPGEX
-!endif
!ifdef HAVE_PKG_KDELIBS
!undef HAVE_PKG_KDELIBS
!endif
@@ -62,8 +58,8 @@
!define VERSION "${_VERSION}"
!define PROD_VERSION "${_BUILD_FILEVERSION}"
!define COMPANY "g10 Code GmbH"
-!define COPYRIGHT "Copyright (C) 2007 g10 Code GmbH"
-!define DESCRIPTION "Gpg4win: The GNU Privacy Guard and tools for Windows"
+!define COPYRIGHT "Copyright (C) 2008 g10 Code GmbH"
+!define DESCRIPTION "Gpg4win: The GNU Privacy Guard and Tools for Windows"
!define INSTALL_DIR "GnuPG"
Added: trunk/src/inst-compendium_de.nsi
===================================================================
--- trunk/src/inst-compendium_de.nsi 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/src/inst-compendium_de.nsi 2008-09-03 16:42:51 UTC (rev 899)
@@ -0,0 +1,46 @@
+# inst-compendium_de.nsi - Installer snippet -*- coding: latin-1; -*-
+# Copyright (C) 2008 g10 Code GmbH
+#
+# This file is part of Gpg4win.
+#
+# 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, see <http://www.gnu.org/licenses/>.
+
+
+!ifdef prefix
+!undef prefix
+!endif
+
+
+${MementoSection} "$(DESC_Name_compendium_de)" SEC_compendium_de
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ # No need to include anything as the manuals are part of gpg4win
+!else
+
+ SetOutPath "$INSTDIR\share\gpg4win"
+ File "${BUILD_DIR}/../doc/manual/gpg4win-compendium-de.pdf"
+ SetOutPath "$INSTDIR\share\gpg4win\html-de"
+ File "${BUILD_DIR}/../doc/manual/gpg4win-compendium-de.html.d/*"
+!endif
+${MementoSectionEnd}
+
+
+LangString DESC_Name_compendium_de ${LANG_ENGLISH} \
+ "Gpg4win Kompendium"
+
+LangString DESC_SEC_compendium_de ${LANG_ENGLISH} \
+ "Gpg4win compendium (German)"
+
+LangString DESC_Menu_compendum_de ${LANG_ENGLISH} \
+ "Show the German Gpg4win compendium (PDF)"
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/src/inst-sections.nsi 2008-09-03 16:42:51 UTC (rev 899)
@@ -160,6 +160,9 @@
!ifdef HAVE_PKG_MAN_ADVANCED_EN
!include "inst-man_advanced_en.nsi"
!endif
+!ifdef HAVE_PKG_COMPENDIUM_DE
+!include "inst-compendium_de.nsi"
+!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
!include "inst-man_novice_de.nsi"
!endif
@@ -177,6 +180,9 @@
!ifdef HAVE_PKG_MAN_NOVICE_DE
!include "uninst-man_novice_de.nsi"
!endif
+!ifdef HAVE_PKG_COMPENDIUM_DE
+!include "uninst-compendium_de.nsi"
+!endif
!ifdef HAVE_PKG_MAN_ADVANCED_EN
!include "uninst-man_advanced_en.nsi"
!endif
@@ -419,6 +425,17 @@
calc_defaults_claws_mail_done:
!endif
+!ifdef HAVE_PKG_COMPENDIUM_DE
+ g4wihelp::config_fetch_bool "inst_compendium_de"
+ StrCmp $R0 "1" 0 calc_defaults_compendium_de_not_one
+ !insertmacro SelectSection ${SEC_compendium_de}
+ Goto calc_defaults_compendium_de_done
+ calc_defaults_compendium_de_not_one:
+ StrCmp $R0 "0" 0 calc_defaults_compendium_de_done
+ !insertmacro UnselectSection ${SEC_compendium_de}
+calc_defaults_compendium_de_done:
+!endif
+
!ifdef HAVE_PKG_MAN_NOVICE_DE
g4wihelp::config_fetch_bool "inst_man_novice_de"
StrCmp $R0 "1" 0 calc_defaults_man_novice_de_not_one
@@ -911,6 +928,9 @@
!ifdef HAVE_PKG_MAN_ADVANCED_EN
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_man_advanced_en} $(DESC_SEC_man_advanced_en)
!endif
+!ifdef HAVE_PKG_COMPENDIUM_DE
+ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_compendium_de} $(DESC_SEC_compendium_de)
+!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_man_novice_de} $(DESC_SEC_man_novice_de)
!endif
@@ -1021,6 +1041,17 @@
no_man_advanced_en_menu:
!endif
+!ifdef HAVE_PKG_COMPENDIUM_DE
+ SectionGetFlags ${SEC_compendium_de} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_compendium_de_menu
+ CreateShortCut \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_compendium_de).lnk" \
+ "$INSTDIR\share\gpg4win\html-de\gpg4win-compendium-de.html" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_de)
+ no_compendium_de_menu:
+!endif
+
!ifdef HAVE_PKG_MAN_NOVICE_DE
SectionGetFlags ${SEC_man_novice_de} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
@@ -1077,6 +1108,7 @@
Delete "$DESKTOP\Sylpheed.lnk"
Delete "$DESKTOP\Claws-Mail.lnk"
Delete "$DESKTOP\Claws-Mail Manual.lnk"
+ Delete "$DESKTOP\$(DESC_Name_compendium_de).lnk"
Delete "$DESKTOP\$(DESC_Name_man_novice_de).lnk"
Delete "$DESKTOP\$(DESC_Name_man_novice_en).lnk"
Delete "$DESKTOP\$(DESC_Name_man_advanced_de).lnk"
@@ -1084,6 +1116,7 @@
Delete "$DESKTOP\GnuPG FAQ.lnk"
Delete "$DESKTOP\Gpg4Win README.lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\Claws-Mail Manual.lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de).lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_de).lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_en).lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_advanced_de).lnk"
@@ -1163,6 +1196,17 @@
no_man_advanced_en_desktop:
!endif
+!ifdef HAVE_PKG_COMPENDIUM_DE
+ SectionGetFlags ${SEC_compendium_de} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_compendium_de_desktop
+ CreateShortCut \
+ "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de).lnk" \
+ "$INSTDIR\share\gpg4win\html-de\gpg4win-compendium-de.html" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_de)
+ no_compendium_de_desktop:
+!endif
+
!ifdef HAVE_PKG_MAN_NOVICE_DE
SectionGetFlags ${SEC_man_novice_de} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
@@ -1206,6 +1250,7 @@
# We better delete also the name we used prior to 1.0.3
Delete "$QUICKLAUNCH\Sylpheed.lnk"
Delete "$QUICKLAUNCH\Claws-Mail.lnk"
+ Delete "$QUICKLAUNCH\$(DESC_Name_compendium_de).lnk"
Delete "$QUICKLAUNCH\$(DESC_Name_man_novice_de).lnk"
Delete "$QUICKLAUNCH\$(DESC_Name_man_advanced_de).lnk"
Delete "$QUICKLAUNCH\GPGee Manual.lnk"
Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/src/installer-finish.nsi 2008-09-03 16:42:51 UTC (rev 899)
@@ -90,6 +90,9 @@
Delete "$DESKTOP\Claws-Mail.lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\Claws-Mail Manual.lnk"
!endif
+!ifdef HAVE_PKG_COMPENDIUM_DE
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de).lnk"
+!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_de).lnk"
!endif
@@ -125,6 +128,9 @@
!ifdef HAVE_PKG_CLAWS_MAIL
Delete "$QUICKLAUNCH\Claws-Mail.lnk"
!endif
+!ifdef HAVE_PKG_COMPENDIUM_DE
+ Delete "$QUICKLAUNCH\$(DESC_Name_compendium_de).lnk"
+!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
Delete "$QUICKLAUNCH\$(DESC_Name_man_novice_de).lnk"
!endif
Added: trunk/src/uninst-compendium_de.nsi
===================================================================
--- trunk/src/uninst-compendium_de.nsi 2008-09-03 09:48:36 UTC (rev 898)
+++ trunk/src/uninst-compendium_de.nsi 2008-09-03 16:42:51 UTC (rev 899)
@@ -0,0 +1,39 @@
+# uninst-compendium_de.nsi - Installer snippet. -*- coding: latin-1; -*-
+# Copyright (C) 2008 g10 Code GmbH
+#
+# This file is part of Gpg4win.
+#
+# 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, see <http://www.gnu.org/licenses/>.
+
+
+!ifdef prefix
+!undef prefix
+!endif
+
+; Uninstaller section.
+Section "-un.compendium_de"
+!ifdef SOURCES
+ #Push "${gpg4win_pkg_compendium_de}"
+ #Call un.SourceDelete
+!else
+
+ Delete "$INSTDIR\share\gpg4win\html-de\*"
+ RMDir "$INSTDIR\share\gpg4win\html-de"
+ Delete "$INSTDIR\share\gpg4win\gpg4win-compendium-de.pdf"
+ RMDir "$INSTDIR\share\gpg4win"
+ RMDir "$INSTDIR\share"
+ RMDir "$INSTDIR"
+
+!endif
+SectionEnd
More information about the Gpg4win-commits
mailing list