[Gpg4win-commits] r1038 - in trunk: . po src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Nov 12 12:39:33 CET 2008
Author: werner
Date: 2008-11-12 12:39:33 +0100 (Wed, 12 Nov 2008)
New Revision: 1038
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/configure.ac
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-gpg4win.nsi
trunk/src/installer.nsi
Log:
Add option --enable-fast-makensis.
Fixed a few other minor problems.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-12 10:20:43 UTC (rev 1037)
+++ trunk/ChangeLog 2008-11-12 11:39:33 UTC (rev 1038)
@@ -1,3 +1,11 @@
+2008-11-12 Werner Koch <wk at g10code.com>
+
+ * configure.ac: Add option --enable-fast-makensis.
+ * src/Makefile.am: Use EXTRA_MAKENSIS_FLAGS with makensis.
+ * src/gpg4win.nsi: Make use of DISABLE_LZMA.
+
+ * src/installer.nsi (MUI_LANGDLL_INFO): Uncomment the define.
+
2008-11-11 Werner Koch <wk at g10code.com>
Release 1.9.11.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-11-12 10:20:43 UTC (rev 1037)
+++ trunk/NEWS 2008-11-12 11:39:33 UTC (rev 1038)
@@ -3,6 +3,27 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
+Noteworthy changes in version 1.9.12
+-------------------------------------------------
+
+(en) This is a BETA version of the new Gpg4win/2 architecture.
+ This version shall not be used in a production environment.
+(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
+ Diese Version soll nicht in einer Produktivumgebung
+ eingesetzt werden.
+
+~~~~~~~~~~~~~~~
+GnuPG: 2.0.10-svn
+DirMngr: 1.0.3-svn310
+Kleopatra:
+GPA: 0.8.0
+GpgOL: 0.10.1
+GpgEX: 0.9.1
+Claws-Mail: 3.6.1cvs20
+Kompendium: 3.0.0-beta
+~~~~~~~~~~~~~~~
+
+
Noteworthy changes in version 1.9.11 (2008-11-11)
-------------------------------------------------
@@ -17,7 +38,7 @@
DirMngr: 1.0.3-svn310
Kleopatra: 20081111
GPA: 0.8.0
-GpgOL: 0.10.16
+GpgOL: 0.10.1
GpgEX: 0.9.1
Claws-Mail: 3.6.1cvs20
Kompendium: 3.0.0-beta
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-11-12 10:20:43 UTC (rev 1037)
+++ trunk/configure.ac 2008-11-12 11:39:33 UTC (rev 1038)
@@ -25,8 +25,8 @@
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
# Right after a release the make target "copy-news" is to be called!
-m4_define([my_version], [1.9.11-beta])
-m4_define([my_issvn], [no])
+m4_define([my_version], [1.9.12])
+m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
||echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
@@ -127,7 +127,18 @@
AC_MSG_RESULT($light_installer)
AM_CONDITIONAL(BUILD_LIGHT_INSTALLER, test "$build_light_installer" = yes)
+AC_ARG_ENABLE(fast-makensis,
+ AC_HELP_STRING([--enable-fast-makensis],
+ [Use a less efficient compressor to speed up building]),
+ use_fast_makensis=$enableval,
+ use_fast_makensis=no)
+AC_MSG_RESULT($light_installer)
+if test "$use_fast_makensis" = yes; then
+ EXTRA_MAKENSIS_FLAGS="${EXTRA_MAKENSIS_FLAGS} -DDISABLE_LZMA=1"
+fi
+AC_SUBST(EXTRA_MAKENSIS_FLAGS)
+
# Required tools.
AC_PROG_CC
AC_PROG_CPP
Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po 2008-11-12 10:20:43 UTC (rev 1037)
+++ trunk/po/ar.po 2008-11-12 11:39:33 UTC (rev 1038)
@@ -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-11-11 17:52+0100\n"
+"POT-Creation-Date: 2008-11-11 18:53+0100\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"
@@ -402,12 +402,12 @@
msgid "GnuPG for Outlook"
msgstr "þGnuPG áÃæÊáæß"
-#: src/inst-kleopatra.nsi:304
+#: src/inst-kleopatra.nsi:302
msgctxt "DESC_SEC_kleopatra"
msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
msgstr ""
-#: src/inst-kleopatra.nsi:308
+#: src/inst-kleopatra.nsi:306
msgctxt "DESC_Menu_kleopatra"
msgid "Run the Kleopatra key management tool."
msgstr "ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ ßáíæÈÇÊÑÇ."
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2008-11-12 10:20:43 UTC (rev 1037)
+++ trunk/po/de.po 2008-11-12 11:39:33 UTC (rev 1038)
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: gpg4win 2.0\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-11-11 17:52+0100\n"
-"PO-Revision-Date: 2008-10-27 20:16+0100\n"
+"POT-Creation-Date: 2008-11-11 18:53+0100\n"
+"PO-Revision-Date: 2008-11-12 10:39+0100\n"
"Last-Translator: Werner Koch <wk at g10code.com>\n"
"Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -371,7 +371,7 @@
#: src/inst-claws-mail.nsi:26
msgctxt "T_SetDefaultClient"
msgid "Do you want to make Claws Mail your default mail client?"
-msgstr ""
+msgstr "Möchten Sie Claws-Mail als Ihr E-Mail-Standardprogramm auswählen?"
#: src/inst-claws-mail.nsi:82
msgctxt "DESC_SEC_claws_mail"
@@ -409,14 +409,12 @@
msgid "GNU Privacy Assistant"
msgstr ""
"GNU Privacy Assistent (GPA) ist ein Programm zum Verwalten von Schlüsseln "
-"welches für mehrere Plattformen verfügbar ist. Es kann zusammen oder "
-"anstatt von WinPT benutzt werden."
+"welches für mehrere Plattformen verfügbar ist."
#: src/inst-gpa.nsi:75
-#, fuzzy
msgctxt "DESC_Menu_gpa"
msgid "Run the GNU Privacy Assistant key management tool."
-msgstr "Das Schlüsselverwaltungsprogramm Kleopatra aufrufen."
+msgstr "Das Schlüsselverwaltungsprogramm GPA aufrufen."
#: src/inst-gpg4win.nsi:70
msgctxt "DESC_Menu_gpg4win_readme"
@@ -469,14 +467,14 @@
"GnuPG für Outlook (GpgOL) is eine Erweiterung für Outlook 2003, die "
"verwendet wird um Nachrichten mit OpenPGP oder S/MIME zu verschlüsseln."
-#: src/inst-kleopatra.nsi:304
+#: src/inst-kleopatra.nsi:302
msgctxt "DESC_SEC_kleopatra"
msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
msgstr ""
"Schlüsselmanager für OpenPGP und X.509 (S/MIME) sowie einheitliche "
"Benutzerführung für alle Krypto-Operationen."
-#: src/inst-kleopatra.nsi:308
+#: src/inst-kleopatra.nsi:306
msgctxt "DESC_Menu_kleopatra"
msgid "Run the Kleopatra key management tool."
msgstr "Das Schlüsselverwaltungsprogramm Kleopatra aufrufen."
Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po 2008-11-12 10:20:43 UTC (rev 1037)
+++ trunk/po/es.po 2008-11-12 11:39:33 UTC (rev 1038)
@@ -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-11-11 17:52+0100\n"
+"POT-Creation-Date: 2008-11-11 18:53+0100\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"
@@ -414,12 +414,12 @@
msgid "GnuPG for Outlook"
msgstr "GnuPG para Outlook (GpgOL)"
-#: src/inst-kleopatra.nsi:304
+#: src/inst-kleopatra.nsi:302
msgctxt "DESC_SEC_kleopatra"
msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
msgstr ""
-#: src/inst-kleopatra.nsi:308
+#: src/inst-kleopatra.nsi:306
msgctxt "DESC_Menu_kleopatra"
msgid "Run the Kleopatra key management tool."
msgstr "Ejecutar la herramienta de gestión de llaves Kleopatra."
Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po 2008-11-12 10:20:43 UTC (rev 1037)
+++ trunk/po/fr.po 2008-11-12 11:39:33 UTC (rev 1038)
@@ -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-11-11 17:52+0100\n"
+"POT-Creation-Date: 2008-11-11 18:53+0100\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"
@@ -418,12 +418,12 @@
msgid "GnuPG for Outlook"
msgstr "GnuPG pour Outlook"
-#: src/inst-kleopatra.nsi:304
+#: src/inst-kleopatra.nsi:302
msgctxt "DESC_SEC_kleopatra"
msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
msgstr ""
-#: src/inst-kleopatra.nsi:308
+#: src/inst-kleopatra.nsi:306
msgctxt "DESC_Menu_kleopatra"
msgid "Run the Kleopatra key management tool."
msgstr "Courez l'outil de gestion de clé de Kleopatra."
Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po 2008-11-12 10:20:43 UTC (rev 1037)
+++ trunk/po/ru.po 2008-11-12 11:39:33 UTC (rev 1038)
@@ -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-11-11 17:52+0100\n"
+"POT-Creation-Date: 2008-11-11 18:53+0100\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"
@@ -410,12 +410,12 @@
msgid "GnuPG for Outlook"
msgstr "GnuPG äëÿ MS Outlook"
-#: src/inst-kleopatra.nsi:304
+#: src/inst-kleopatra.nsi:302
msgctxt "DESC_SEC_kleopatra"
msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
msgstr ""
-#: src/inst-kleopatra.nsi:308
+#: src/inst-kleopatra.nsi:306
msgctxt "DESC_Menu_kleopatra"
msgid "Run the Kleopatra key management tool."
msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé Kleopatra."
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-11-12 10:20:43 UTC (rev 1037)
+++ trunk/src/Makefile.am 2008-11-12 11:39:33 UTC (rev 1038)
@@ -458,14 +458,15 @@
README.en.txt \
README.de.txt installer-options.ini versioninfo.txt
$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
- -DSRCDIR=$(srcdir) $(srcdir)/gpg4win.nsi
+ -DSRCDIR=$(srcdir) $(EXTRA_MAKENSIS_FLAGS) $(srcdir)/gpg4win.nsi
gpg4win-light-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final \
g4wihelp.dll gpgwrap.exe gpgwrap-2.exe kleowrap.exe \
README.en.txt \
README.de.txt installer-options.ini versioninfo.txt
$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
- -DSRCDIR=$(srcdir) -DGPG4WIN_LIGHT=1 $(srcdir)/gpg4win.nsi
+ -DSRCDIR=$(srcdir) $(EXTRA_MAKENSIS_FLAGS) \
+ -DGPG4WIN_LIGHT=1 $(srcdir)/gpg4win.nsi
gpg4win-$(VERSION).wix: gpg4win.nsi $(common_nsi) stamps/stamp-final \
gpgwrap.exe gpgwrap-2.exe kleowrap.exe README.en.txt \
@@ -494,7 +495,7 @@
gpg4win-src-$(VERSION).exe: gpg4win-src.nsi $(common_nsi) stamps/stamp-final \
stamps/stamp-dist-self installer-options.ini
$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
- -DSRCDIR=$(srcdir) $(srcdir)/gpg4win-src.nsi
+ -DSRCDIR=$(srcdir) $(EXTRA_MAKENSIS_FLAGS) $(srcdir)/gpg4win-src.nsi
g4wihelp.dll: g4wihelp.c exdll.h
$(CC) -I. -shared -O2 -o g4wihelp.dll $(srcdir)/g4wihelp.c \
Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi 2008-11-12 10:20:43 UTC (rev 1037)
+++ trunk/src/gpg4win.nsi 2008-11-12 11:39:33 UTC (rev 1038)
@@ -94,12 +94,13 @@
# Select the best compression algorithm available. The dictionary
# size is the default (8 MB).
+!ifndef DISABLE_LZMA
!ifndef SOURCES
SetCompressor lzma
# SetCompressorDictSize 8
!endif
+!endif
-
# Now include the generic parts.
!define HAVE_STARTMENU
!include "installer.nsi"
Modified: trunk/src/inst-gpg4win.nsi
===================================================================
--- trunk/src/inst-gpg4win.nsi 2008-11-12 10:20:43 UTC (rev 1037)
+++ trunk/src/inst-gpg4win.nsi 2008-11-12 11:39:33 UTC (rev 1038)
@@ -44,8 +44,8 @@
# WriteRegStr HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" "Install Directory" $INSTDIR
# We used to determine the language using a Registry entry.
- # Although we don't want to delete the user's Lang Resgistry Setting
- # becuase he might have have selected a different language than his
+ # Although we don't want to delete the user's Lang Registry Setting
+ # because he might have have selected a different language than his
# default. We delete the global Lang of the installation.
DeleteRegValue HKLM "Software\GNU\GnuPG" "Lang"
Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi 2008-11-12 10:20:43 UTC (rev 1037)
+++ trunk/src/installer.nsi 2008-11-12 11:39:33 UTC (rev 1038)
@@ -123,8 +123,8 @@
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
# No Umlaute, please!
-#define MUI_LANGDLL_INFO "Please choose a language for the setup. "\
- "Bitte Sprache des Setups angeben."
+!define MUI_LANGDLL_INFO "Please choose a language for the setup.$\r$\n\
+Bitte Sprache des Setups angeben."
# The list of wizard pages.
More information about the Gpg4win-commits
mailing list