From 4e1a0eac3e38e86e371b7dd0f20552de988196df Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 5 Apr 2005 17:10:28 +0000
Subject: [PATCH] Typo fixes

---
 doc/README.W32           | 2 +-
 po/ChangeLog             | 5 +++++
 po/de.po                 | 4 ++--
 scripts/mk-w32-dist      | 4 ++--
 scripts/w32installer.nsi | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/doc/README.W32 b/doc/README.W32
index 2c40d96d3..5f09e0806 100644
--- a/doc/README.W32
+++ b/doc/README.W32
@@ -23,7 +23,7 @@ Below the Installation directory, you will find directories named
 "Doc", "gnupg.nls" and "Src".  The latter will be used for distributed
 patched, if any, and to store the source file if they have been
 included in this package.  The source files usually require further
-unpacking using a the TAR utility.
+unpacking using the TAR utility.
 
 
 Internationalization support:
diff --git a/po/ChangeLog b/po/ChangeLog
index a8c3a54b7..1b2d03adc 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-30  Werner Koch  <wk@g10code.com>
+
+	* de.po: Fixed typo in "|AN|New Admin PIN"; the leading bar was
+	missing.
+
 2005-03-07  Werner Koch  <wk@g10code.com>
 
 	* de.po: Updated. Translation is still in the works, though.
diff --git a/po/de.po b/po/de.po
index 2e607e6cb..88466ed64 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: gnupg-1.4.1\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
 "POT-Creation-Date: 2005-03-15 16:35+0100\n"
-"PO-Revision-Date: 2005-03-15 16:41+0100\n"
+"PO-Revision-Date: 2005-03-30 10:45+0200\n"
 "Last-Translator: Walter Koch <koch@u32.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "|A|Admin-PIN"
 
 #: g10/app-openpgp.c:1018
 msgid "|AN|New Admin PIN"
-msgstr "AN|Neue Admin-PIN"
+msgstr "|AN|Neue Admin-PIN"
 
 #: g10/app-openpgp.c:1018
 msgid "|N|New PIN"
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
index e81939f1e..f9b7a0b61 100755
--- a/scripts/mk-w32-dist
+++ b/scripts/mk-w32-dist
@@ -286,11 +286,11 @@ if [ -n "$topdir" ]; then
 
   # Now run the installer
   echo "invoking installer as:"
-  echo makensis  -nocd -DVERSION="${version}" \
+  echo makensis -v0  -nocd -DVERSION="${version}" \
            -DPROD_VERSION="${prod_version}" \
            -DGNUPG_SRCDIR="${srcdir}" ${winpt_defs} ${src_defs} \
            ${patches_defs} ${srcdir}/scripts/w32installer.nsi
-  BUILDINFO=$buildinfo makensis  -nocd -DVERSION="${version}" \
+  BUILDINFO=$buildinfo makensis -v0 -nocd -DVERSION="${version}" \
            -DPROD_VERSION="${prod_version}" \
            -DGNUPG_SRCDIR="${srcdir}" ${winpt_defs} ${src_defs} \
            ${patches_defs} ${srcdir}/scripts/w32installer.nsi
diff --git a/scripts/w32installer.nsi b/scripts/w32installer.nsi
index ebb414f3d..595dd94c5 100644
--- a/scripts/w32installer.nsi
+++ b/scripts/w32installer.nsi
@@ -250,7 +250,7 @@ Section /o "Source" SecSource
   File "libiconv-${LIBICONV_VERSION}.tar"
 
 !ifdef WITH_WINPT
-  File "winpt-$(WINPT_VERSION}.tar"
+  File "winpt-${WINPT_VERSION}.tar"
 !endif ; WITH_WINPT
 
 SectionEnd ; Section Source
@@ -399,7 +399,7 @@ Section "Uninstall"
 
   Delete "$INSTDIR\Src\gnupg-${VERSION}.tar"
   Delete "$INSTDIR\Src\libiconv-${LIBICONV_VERSION}.tar"
-  Delete "$INSTDIR\Src\winpt-$(WINPT_VERSION}.tar"
+  Delete "$INSTDIR\Src\winpt-${WINPT_VERSION}.tar"
   Delete "$INSTDIR\Src\*.diff"
 
   Delete "$INSTDIR\uninst-gnupg.exe"