No OneTemporary
Actions

Size

173 KB

Subscribers

None

View Options

This document is not UTF8. It was detected as ISO-8859-1 (Latin 1) and converted to UTF8 for display.

	diff --git a/ChangeLog b/ChangeLog
	index db360dfd..7d764b0d 100644
	--- a/ChangeLog
	+++ b/ChangeLog
	@@ -1,2434 +1,2436 @@
	2008-05-28 Werner Koch <wk@g10code.com>

	+ * src/inst-kleopatra.nsi: Update description in installer.
	+
	* src/inst-kdelibs.nsi: Install kbuildsycoca4 into bin/.
	* src/uninst-kdelibs.nsi: Uninstall it.
	* src/kleowrap.c (run_kbuildsycoca): Execute kbuildsycoca4 via bin/.

	* patches/gpa/01-no-uiserver.patch: Remove.

	* patches/gpgol/01-last-minute.patch: Remove.

	* packages/packages.current: Update gpgol and gpa.

	2008-05-27 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update kdelibs packages.

	2008-05-27 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update gnupg2, dirmngr, oxygen-icons,
	qt, kdesupport, kdelibs, and kleopatra.
	* src/inst-kdelibs.nsi, src/uninst-kdelibs.nsi,
	src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi, src/inst-qt.nsi,
	src/uninst-qt.nsi, src/inst-oxygen-icons.nsi,
	src/uninst-oxygen-icons.nsi: Update.

	2008-05-25 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update libassuan.

	2008-05-21 Marcus Brinkmann <marcus@ulysses.g10code.com>

	* patches/gnupg2/02-p12-hack.patch: New file.
	* Makefile.am (EXTRA_DIST): Add this patch.

	2008-05-13 Marcus Brinkmann <marcus@ulysses.g10code.com>

	Release 1.9.1 beta version.

	* packages/packages.current: Update kdelibs and kleopatra.
	* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Install and
	remove libkleopatraclientcore.dll.

	2008-05-09 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update gpgme and gnupg2.

	* src/inst-gnupg2.nsi: Add gpg2keys_knds.

	2008-05-08 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update adns.

	* configure.ac: Don't let gpgme depend on qt.

	* src/inst-gpa.nsi: Mape tips installation optional.

	* src/Makefile.am (gpg4win_pkg_gnupg2_configure): Add --with-adns.
	(gpg4win_pkg_gpgme_configure): Build qt and glib versions only if
	the packages are available.

	2008-05-08 Marcus Brinkmann <marcus@ulysses.g10code.com>

	* Makefile.am (EXTRA_DIST): Add
	patches/claws-mail-3.4.0/04-gnutls.patch.

	* packages/packages.current: Update kleopatra checksum.

	2008-05-07 Marcus Brinkmann <marcus@ulysses.g10code.com>

	* packages/packages.current: Update kleopatra and kdelibs.
	* src/inst-kleopatra.nsi: Add kwatchgnupg.
	* src/uninst-kleopatra.nsi: Remove kwatchgnupg.

	2008-05-07 Werner Koch <wk@g10code.com>

	* patches/gpgol/01-last-minute.patch: New.

	2008-05-06 Werner Koch <wk@g10code.com>

	* patches/gpgol/01-always-decrypt.patch: Remove.
	* packages/packages.current: Update gpgme and gpgol.

	2008-04-30 Werner Koch <wk@g10code.com>

	* packages/packages.current: Add adns.
	* configure.ac: Add support for adns.
	* src/uninst-libadns.nsi, src/inst-libadns.nsi: New.
	* include/config.nsi.in, src/Makefile.am, src/inst-sections.nsi:
	Add adns.

	2008-04-28 Marcus Brinkmann <marcus@ulysses.g10code.com>

	* packages/packages.current: Update kdelibs and kleopatra.
	* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Update.

	2008-04-25 Marcus Brinkmann <marcus@ulysses.g10code.com>

	* packages/packages.current: Add libgsasl, libtasn1, opencdk,
	gnutls.
	* configure.ac: Add support for libgsasl, libtasn1, opencdk and
	gnutls source packages.
	* include/config.nsi.in: Likewise.
	* inst-libgsasl.nsi, uninst-libgsasl.nsi, inst-libtasn1.nsi,
	uninst-libtasn1.nsi, inst-opencdk.nsi, uninst-opencdk.nsi,
	inst-gnutls.nsi, uninst-gnutls.nsi: New files.
	* src/Makefile.am (EXTRA_DIST): Add these files.
	(gpg4win_spkgs): Add libgsasl, libtasn1, opencdk, gnutls.
	(gpg4win_pkg_gnutls_configure): New variable.
	(gpg4win_pkg_claws_configure): Enable pthread and gnutls.
	* patches/claws-mail-3.4.0/04-gnutls.patch: New file.

	* packages/packages.current: Update libetpan and claws-mail.
	* src/inst-libetpan.nsi: Update to latest version.
	* src/Makefile.am (gpg4win_pkg_claws_mail_configure): Add
	--disable-network-manager-support.
	* configure.ac: Remove support or sylpheed-claws (replaced by
	claws-mail).
	* Makefile.am (EXTRA_DIST): Remove all sylpheed-claws patches and
	add the claws-mail-3.4.0 patches. Add libetpan-0.54 patches.
	* include/config.nsi.in: Remove support for sylpheed.
	* src/Makefile.am: Likewise.
	* src/inst-sections.nsi: Likewise.
	* src/inst-sylpheed-claws.nsi, src/uninst-sylpheed-claws.nsi:
	Removed.

	s2008-04-23 Werner Koch <wk@g10code.com>

	Release 1.9.0 beta version.

	* src/Makefile.am (EXTRA_DIST): Add Memento.nsh and dirmngr.conf.

	* patches/gpa/01-no-uiserver.patch: New.

	* autogen.sh <build-w32>: Pass --enable-maintainer-mode.

	* patches/gnupg2/01-version.patch.in: New.
	* configure.ac (AC_CONFIG_FILES): Patch the version of GnuPG.
	(AC_CONFIG_COMMANDS): New.

	2008-04-22 Marcus Brinkmann <marcus@ulysses.g10code.com>

	* packages/packages.current: Update gpgme.

	* packages/packages.current: Update kdelibs and kleopatra.

	2008-04-22 Werner Koch <wk@g10code.com>

	* src/installer.nsi (PrintBetaWarning): New.
	(PrintNonAdminWarning): Call it.

	2008-04-21 Werner Koch <wk@g10code.com>

	* patches/gnupg2-2.0.9/05-w32-http.patch: New.
	* patches/gnupg2-2.0.9/04-ks-w32init.patch: New.
	* Makefile.am (EXTRA_DIST): Add new patches. Correct name of
	gpgol/01-always-encrypt.patch.

	2008-04-18 Werner Koch <wk@g10code.com>

	* patches/gpgol/01-always-encrypt.patch: New.

	2008-04-16 Werner Koch <wk@g10code.com>

	* src/inst-winpt.nsi: Do not select by default.

	2008-04-08 Werner Koch <wk@g10code.com>

	* patches/gnupg2-2.0.9/03-i18n+etc.patch: New.
	* patches/gnupg2-2.0.9/02-de.po-fix: Update.

	2008-04-02 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update GpgOL.

	* patches/gnupg2-2.0.9/02-de.po-fix.patch: New.

	2008-04-01 Werner Koch <wk@g10code.com>

	* configure.ac (AC_INIT): Fix quoting.

	* patches/gnupg2-2.0.9/01-close-all-handle.patch: New.

	2008-04-01 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update kdelibs and kleopatra.

	2008-03-26 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update GnuPG-1 to 1.4.9.

	2008-03-26 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update gpgex to 0.9.0.
	* src/inst-gpgex.nsi, src/uninst-gpgex.nsi: Handle translations
	ar, es and ru.

	2008-03-26 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update to GnuPG 2.0.9.
	* Makefile.am (EXTRA_DIST): Remove gnupg-2.0.8 patches.

	* src/inst-gnupg2.nsi: Install the help files.
	* src/uninst-gnupg2.nsi: Remove them.
	* src/inst-gnupg.nsi: Now delete the Lang Registry entry becuase
	GnuPG 2.0.9 does not need it anymore.

	2008-03-25 Werner Koch <wk@g10code.com>

	* src/inst-gnupg.nsi: Write the language code for use by gettext
	into the Registry.

	2008-03-25 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update libassuan.

	2008-03-25 Werner Koch <wk@g10code.com>

	* src/inst-dirmngr.nsi: Create empty extra-certs directory.
	* src/uninst-dirmngr.nsi: Delete it.

	2008-03-25 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update w32pth.

	2008-03-21 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update w32pth and libassuan.

	* packages/packages.current: Update gpa, libassuan, w32pth, gpa,
	kleopatra.

	2008-03-20 Werner Koch <wk@g10code.com>

	* src/potomo: New.
	* src/Makefile.am (gpg4win_pkg_gnupg_post_install): Remove mo file
	creation.
	(gpg4win_pkg_gnupgw_post_install): Convert po files.
	(EXTRA_DIST): Include potomo.
	* src/inst-gnupg2.nsi: Install all available mo files.
	* src/inst-gnupg2.nsi: Do not install com-certs.pem.

	2008-03-19 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update GpgOL.

	2008-03-18 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update kleopatra and kdelibs.

	* src/make-msi.pl (lang_to_lcid): Support more languages.
	(gpg4win_nsis_stubs): Likewise.
	* make-msi.guids: Updated.

	2008-03-18 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update GpgOL.

	2008-03-17 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update kleopatra and kdelibs.

	2008-03-12 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-atk.nsi: Install message catalogs for ar, es, fr and ru.
	* src/inst-glib.nsi: Likewise.
	* src/inst-gtk+.nsi: Likewise. Also install gtk20-properties.mo.
	* src/uninst-atk.nsi: Uninstall them.
	* src/uninst-glib.nsi: Likewise.
	* src/uninst-gtk+.nsi: Likewise.

	2008-03-11 Marcus Brinkmann <marcus@g10code.de>

	* src/gpg4win.nsi: Add gpg2 and its buddies to the light installer.

	2008-03-11 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update GpgOL.

	2008-03-10 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update gpa.
	* src/inst-gpa.nsi: Install other languages AR, ES, FR and RU.
	* src/uninst-gpa.nsi: Deinstall those languages.

	* AUTHORS: Add translators.
	* src/inst-sections.nsi (.onInit): Insert macro MUI_LANGDLL_DISPLAY.
	[DEBUG]: Define MUI_LANGDLL_ALWAYSSHOW.
	(un.onInit): New function.
	* src/installer.nsi: Include ../po/catalogs.nsi with PO_HEADER
	defined to include MUI language files. Insert macro
	MUI_RESERVEFILE_LANGDLL.
	(MUI_LANGDLL_REGISTRY_ROOT, MUI_LANGDLL_REGISTRY_KEY)
	(MUI_LANGDLL_REGISTRY_VALUENAME): New symbols.
	(MUI_LANGDLL_ALLLANGUAGES) [DEBUG]: New symbol.

	2008-03-10 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update GpgOL.

	2008-03-07 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update GpgOL.

	2008-03-05 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update kdelibs and kleopatra.

	2008-02-28 Marcus Brinkmann <marcus@g10code.de>

	* src/kleowrap.c: Use CreateProcess instead of spawn for ksycoca
	to suppress console window.

	2008-02-27 Marcus Brinkmann <marcus@g10code.de>

	* src/kleowrap.c: Include errno.h.
	(run_kbuildsycoca): New function by Frank Osterfeld.
	(main): Invoke it.

	* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Move plugins
	to INSTDIR.
	* src/inst-kdelibs.nsi, src/uninst-kdelibs.nsi: Likewise.

	2008-02-26 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Fix last change.

	* packages/packages.current: Update gpgol, kdelibs, kleopatra.
	* src/inst-kdelibs.nsi, src/uninst-kdelibs.nsi,
	src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Update.

	* patches/winpt/01-gpg-path.patch: New file.
	* Makefile.am (EXTRA_DIST): Add this file.

	2008-02-19 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update gpgex.

	* src/kleowrap.c: Change working directory.

	* src/kleowrap.c: New file.
	* src/kleopatra.bat: Removed.
	* src/Makefile.am (EXTRA_DIST): Remove kleopatra.bat, add
	kleowrap.c.
	(CLEANFILES): Add kleowrap.exe.
	(gpg4win-$(VERSION).exe, gpg4win-light-$(VERSION).exe,
	(gpg4win-$(VERSION).wix, gpg4win-light-$(VERSION).wix): Add
	kleowrap.exe as dependency.
	(gpgwrap.exe): Use make magic.
	(kleowrap.exe): New target.
	* src/inst-kleopatra.nsi: Install kleowrap.exe as kleopatra.exe,
	and do not install kleopatra.bat.
	* src/uninst-kleopatra.nsi: Uninstall kleopatra.exe instead of
	kleopatra.bat.
	* src/inst-sections.nsi (no_desktop): Replace kleopatra.bat by
	kleopatra.exe.

	2008-02-18 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update kdelibs and kleopatra.

	2008-02-18 Werner Koch <wk@g10code.com>

	* src/installer.nsi: Take the README file from share/gpg4win.
	This is required because we now make sure that the last output
	directory is now the top directory.

	* packages/packages.current: Update GpgOL.

	2008-02-16 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Undo update of kdelibs and kleopatra.

	* packages/packages.current: Update dirmngr, gpgme, gpa, gnupg,
	w32pth, kdelibs, and kleopatra.

	2008-02-15 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update pinentry, gnupg and gpgme.

	2008-02-12 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update libksba.

	2008-02-09 Marcus Brinkmann <marcus@g10code.de>

	* patches/gnupg-1.4.8/01-gpgconf-list.patch: New file.
	* patches/gnupg2-2.0.8/06-gpgconf-list.patch: New file.
	* Makefile.am (EXTRA_DIST): Add these.

	2008-02-08 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update kleopatra.
	* src/inst-kdelibs.nsi: Move kcmdwrapper.exe to bin.
	* src/uninst-kdelibs.nsi: Uninstall it there.

	2008-02-06 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update GpgOL.

	2008-02-04 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update kleopatra and gpgex.

	2008-02-01 Marcus Brinkmann <marcus@g10code.de>

	* patches/gnupg2-2.0.8/05-gpgconf.patch: New file.
	* Makefile.am (EXTRA_DIST): Add patch.

	2008-01-30 Werner Koch <wk@g10code.com>

	* src/inst-final.nsi: New.
	* src/Makefile.am (EXTRA_DIST): Add it.
	* src/inst-gnupg2.nsi: Remove last fix due to the final section.

	2008-01-30 Marcus Brinkmann <marcus@g10code.de>

	* src/gpg4win.nsi: Fix last change.
	* src/gpg4win-src.nsi: Dito.

	* src/gpg4win.nsi (ABOUT_STR): Split up the string into several.
	(T_AboutGpg4win): Shorten it accordingly.
	(T_AboutGpg4winVersion, T_AboutGpg4winFileVersion)
	(T_AboutGpg4winReleaseDate): New translation strings.
	* src/gpg4win-src.nsi: Split up the string into several.
	(T_AboutGpg4winSrc): Shorten it accordingly.
	(T_AboutGpg4winSrcVersion, T_AboutGpg4winSrcFileVersion)
	(T_AboutGpg4winSrcReleaseDate): New translation strings.
	* src/installer.nsi: Quote welcome title and about string.
	* po/de.po: Update.

	* packages/packages.current: Update gpgme.

	2008-01-30 Werner Koch <wk@g10code.com>

	* src/inst-sections.nsi: Install GTK+ of gnupg2 is selected.

	* src/inst-gnupg2.nsi: Switch Outpath back to standard.

	* patches/gnupg2-2.0.8/patches/03-create-keyring.patch: Also do it
	for the trustdb.

	2008-01-29 Werner Koch <wk@g10code.com>

	* packages/packages.current: Updated GpgOL.

	* patches/gnupg2-2.0.8/04-import-export-spawn.patch: New file
	* patches/gnupg2-2.0.8/03-create-keyring.patch: New file.
	* Makefile.am (EXTRA_DIST): Add new files.

	2008-01-29 Marcus Brinkmann <marcus@g10code.de>

	* src/make-msi.pl (nsis_parse_line): Skip including the file
	Memento.nsh.

	2008-01-28 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update gpgme and kleopatra.

	2008-01-25 Marcus Brinkmann <marcus@g10code.de>

	* Makefile.am (EXTRA_DIST): Add
	patches/gnupg2-2.0.8/02-qualified.patch.
	* patches/gnupg2-2.0.8/02-qualified.patch: New file.

	2008-01-24 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-gpgee.nsi: Fix last change.

	* src/Memento.nsh: New file from nsis 2.28.

	2008-01-21 Marcus Brinkmann <marcus@g10code.de>

	* src/installer.nsi: Include Memento.nsh, define
	MEMENTO_REGISTRY_ROOT and MEMENTO_REGISTRY_KEY.
	* src/inst-sections.nsi: Call MementoSectionDone.
	(onInit): Call MementoSectionRestore.
	(onInstSuccess): Call MementoSectionSave.
	* src/inst-claws-mail.nsi, src/inst-eudoragpg.nsi,
	src/inst-gnupg.nsi, src/inst-gnupg2.nsi, src/inst-gpa.nsi,
	src/inst-gpgee.nsi, src/inst-gpgex.nsi, src/inst-gpgol.nsi,
	src/inst-kleopatra.nsi, src/inst-man_advanced_de.nsi,
	src/inst-man_advanced_en.nsi, src/inst-man_novice_de.nsi,
	src/inst-man_novice_en.nsi, src/inst-sylpheed-claws.nsi,
	src/inst-winpt.nsi: Replace Section/SectionEnd by Memento macro
	calls.
	* src/make-msi.pl (gpg4win_nsis_stubs): Support memento sections.

	2008-01-18 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update gpgol.
	* src/Makefile.am (gpg4win_pkg_gpgol_post_install): New macro.
	* src/inst-gpgol.nsi: Install the gpgol.pdf technical
	documentation.
	* src/uninst-gpgol.nsi: Uninstall it (and many directories).

	* packages/packages.current: Update kleopatra and kdelibs.

	2008-01-16 Marcus Brinkmann <marcus@g10code.de>

	* src/installer.nsi (MUI_WELCOME_TITLE, MUI_WELCOMEPAGE_TEXT):
	Define to ${WELCOME_TITLE_STR} and ${ABOUT_STR} respectively.
	(T_WelcomeTitle, T_About): Remove language strings.
	* src/gpg4win.nsi (WELCOME_TITLE_ENGLISH, WELCOME_TITLE_GERMAN)
	(ABOUT_GERMAN, ABOUT_ENGLISH): Removed macros.
	(WELCOME_TITLE_STR, ABOUT_STR): New macros.
	(T_WelcomeTitleGpg4win, T_AboutGpg4win): New language strings.
	* src/gpg4win-src.nsi (WELCOME_TITLE_ENGLISH, WELCOME_TITLE_GERMAN)
	(ABOUT_GERMAN, ABOUT_ENGLISH): Removed macros.
	(WELCOME_TITLE_STR, ABOUT_STR): New macros.
	(T_WelcomeTitleGpg4winSrc, T_AboutGpg4winSrc): New language strings.

	2008-01-15 Marcus Brinkmann <marcus@g10code.de>

	* patches/gnupg-2.0.8/01-agent-call-pinentry.patch: Rename to ...
	* patches/gnupg2-2.0.8/01-agent-call-pinentry.patch: ... this.
	* Makefile.am (EXTRA_DIST): Also here.

	* Makefile.am (EXTRA_DIST): Add
	patches/gnupg-2.0.8/01-agent-call-pinentry.patch.
	* patches/gnupg-2.0.8/01-agent-call-pinentry.patch: New file.

	* src/g4wihelp.c (service_create): Use LocalSystem for now.

	2008-01-13 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update kdelibs, kdesupport, kleopatra.

	* src/inst-kdelibs.nsi: Update to latest version.
	* src/inst-kdesupport.nsi: Update to latest version.
	* src/uninst-kdesupport.nsi: Update to latest version.
	* src/inst-kleopatra.nsi: Update to latest version.

	* src/inst-gnupg2.nsi: Fix last change.
	* src/uninst-gnupg2.nsi: Uninstall gpgconf-conf.skel.

	* src/uninst-qt.nsi: Uninstall qsqlited4.dll.

	2008-01-10 Marcus Brinkmann <marcus@g10code.de>

	* src/gpg4win.nsi: New variable bpdir.
	* src/gpg4win-src.nsi: Likewise.
	* src/inst-gnupg2.nsi: New variable source and install a skeleton
	file for gpgconf.conf.

	2008-01-08 Marcus Brinkmann <marcus@g10code.de>

	* src/pkg-to-nsi.pl: New file.

	* src/inst-kleopatra.nsi: Add missing files.
	* src/uninst-kleopatra.nsi: Likewise.

	2008-01-07 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update to 0.0.0-svn46.

	2008-01-04 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi,
	src/inst-oxygen-icons.nsi: Update to new version.
	* packages/packages.current: Update oxygen-icons and kleopatra.

	* packages/packages.current: Update gpgme to 1.1.6.

	* patches/gpgme/01-gpg2.patch: Update patch.

	2008-01-03 Werner Koch <wk@g10code.com>

	* src/inst-gnupg.nsi: Do not set gpgProgram but delete it.

	* patches/gpgme/01-gpg2.patch: New.
	* Makefile.am (EXTRA_DIST): Add it.

	* src/gpg4win.mk.in (SETVARS): Add new var PKGPBDIR.
	(SPKG_template) <stamps/stamp-$(1)-01-patch>: Allow for patches
	without the version name of the package.
	(MPKG_template) <stamps/stamp-$(1)-01-patch>: Ditto.

	* packages/packages.current: Fix pinentry name. Use gpgol svn 205.
	Update to gnupg 1.48 and 2.0.8.

	2008-01-02 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update pinentry to 0.7.5-cvs.

	* src/pkg-config (PREFIX): Suppress debug output.

	* src/Makefile.am (gpg4win_pkg_glib_post_install): Since we build
	the package from source, we need to fix up the pkg-config files in
	the runtime package directory.

	2007-12-21 Marcus Brinkmann <marcus@g10code.de>

	* src/uninst-kleopatra.nsi, src/inst-kleopatra.nsi: Update to
	latest version.

	* packages/packages.current: Update oxygen-icons and kleopatra.
	* src/inst-oxygen-icons.nsi, src/uninst-oxygen-icons.nsi: Update
	to latest version, but only install 16x16 icons (now all of them).

	2007-12-18 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update kleopatra to 20071214-3.
	* src/inst-kleopatra.nsi: Adjust path to GPGME libraries.

	2007-12-14 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update to gnupg-2.0.8rc1.

	2007-12-14 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Fix last change.

	2007-12-13 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update libassuan.

	2007-12-11 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update to qt 4.3.3.
	* src/inst-qt.nsi, src/uninst-qt.nsi: Update to qt 4.3.3.

	* src/inst-sections.nsi: Delete old start menu, desktop and
	quicklaunch links.

	2007-12-10 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update libgcrypt.

	2007-12-09 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update libetpan.

	* packages/packages.current: Update claws-mail.

	* src/Makefile.am (gpg4win_pkg_claws_mail_configure): Enable
	libetpan.
	* src/inst-sections.nsi: Include libetpan install scripts.
	* patches/claws-mail-3.1.0cvs70/01-w32-logo.patch,
	patches/claws-mail-3.1.0cvs70/02-w32-icon.patch,
	patches/claws-mail-3.1.0cvs70/03-smime-plugin.patch,
	patches/claws-mail-3.1.0cvs70/99-auto.patch: New files.
	* Makefile.am (EXTRA_DIST): Add claws-mail 3.1.0cvs70 patches.

	2007-12-07 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-sections.nsi: Install manuals in subdirectories for
	start menu and desktop.
	* src/installer-finish.nsi: Uninstall the manuals in those
	subdirectories.
	* src/installer.nsi: Add language strings for the subdirectory
	names.
	* po/de.po: Update.

	* packages/packages.current: Update kleopatra to 20071207.

	* src/inst-gpgex.nsi: Detect and uninstall a previously installed
	GPGee.

	2007-12-03 Marcus Brinkmann <marcus@g10code.de>

	* src/make-msi.pl (dump_all2): Hard code level for hidden packages
	to 1.

	2007-11-30 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update gpgex.

	2007-11-29 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update pinentry.
	* configure.ac: Merge duplicated pinentry entries.
	Make gnupg2 dependent on pinentry.

	2007-11-27 Marcus Brinkmann <marcus@g10code.de>

	* src/dirmngr.conf: New file.
	* src/inst-dirmngr.nsi: Install our version of dirmngr.conf.
	Remove /nonfatal from configuration files.

	2007-11-27 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update gnupg.

	2007-11-27 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update kleopatra.

	2007-11-26 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update dirmngr and gpgex.

	* src/inst-dirmngr.nsi: No longer create the cache directory.
	* src/inst-sections.pl: Correct upper/lowercase of WinPT link (for
	the msi converter).
	* src/make-msi.pl: Improve handling of shortcuts.
	* src/make-msi.guids: Update.
	* src/make-msi.bat: Remove duplicate entries.

	2007-11-26 Werner Koch <wk@g10code.com>

	* src/inst-kleopatra.nsi: Install libkmime.dll. Take libkleo from
	bin/.
	* src/uninst-kleopatra.nsi: Uninstall libkmime.dll.

	2007-11-26 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-dirmngr.nsi: No longer create the cache directory.

	* src/make-msi.pl:

	* packages/packages.current: Fix entry for kdelibs source.

	* src/make-msi.pl (dump_all): Start dirmngr service.
	* src/README-msi.txt: Add todo items.

	* src/Makefile.am (msi, gpg4win-$(VERSION).wix,
	(gpg4win-light-$(VERSION).wix): New targets.
	* src/make-msi.pl: Rewritten.
	* src/make-msi.guids: Include missing files.
	* src/inst-gpg4win.nsi: Give section an identifier.
	* src/README-msi.txt: Update.
	* src/gpg4win.nsi: Do not include pinentry in the light installer.
	* doc/README.de.txt, doc/README.en.txt: Document MSI package.
	* src/make-msi.bat: Support other languages and light installer.

	2007-11-23 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update gpgme to 1.1.6-svn1279.

	2007-11-23 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update kleopatra to version 20071122.

	2007-11-16 Marcus Brinkmann <marcus@g10code.de>

	* src/make-msi.guids: Include manual files.
	* src/make-msi.pl: Support manuals, and prefix output file names
	by src, because manuals are within gpg4win.

	2007-11-15 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-kleopatra.nsi: Use SRCDIR to find kleopatra.bat.
	* src/inst-qt.nsi: Use SRCDIR to find qt.conf and BUILD_DIR to
	find mingwm10.dll.
	* src/make-msi.guids: Add these files.
	* src/make-msi.pl (dump_all): Do not try to start the service yet.
	(collect_all): Support SRCDIR in File.
	* src/uninst-regex.nsi: Uninstall regex.dll.

	* src/inst-sections.nsi (CalcDepends): Add dependency for
	libetpan.
	* src/make-msi.guids: Add libetpan and claws.

	* Makefile.am (EXTRA_DIST): Add these patches.
	* packages/packages.current: Update claws mail. Download
	regex-bin package.
	* patches/claws-mail-3.0.2/01-w32-logo.patch,
	patches/claws-mail-3.0.2/02-w32-icon.patch,
	patches/claws-mail-3.0.2/03-smime-plugin.patch,
	patches/claws-mail-3.0.2/04-gettimeofday.patch,
	patches/claws-mail-3.0.2/99-auto.patch: New files.
	* configure.ac: Make regex a GNUWIN32 package.
	* src/inst-regex.nsi: Install regex.dll.
	* src/Makefile.am: Do not delete regex shared library.

	2007-11-14 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-kleopatra.nsi: Prefix kleopatra.bat by $BUILD_DIR.
	* src/make-msi.pl: Add INSTDIR\pub to PATH environment for gnupg.
	Handle /oname in File statements. Handle upgrades. Register
	DLLs. Register services.
	* src/make-msi.guids: Update.

	2007-11-13 Marcus Brinkmann <marcus@g10code.de>

	* src/make-msi.pl: New file.
	* src/make-msi.bat: New file.
	* src/make-msi.guids: New file.
	* src/gpl.rtf: New file.

	2007-11-12 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update to kleopatra 20071112.

	* packages/packages.current: Update to kleopatra 20071109.

	2007-11-08 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-gpgex.nsi: Add online documentation.
	* src/uninst-gpgex.nsi: Delete online documentation and other
	directories.

	* packages/packages.current: Update gpgex.

	2007-11-02 Werner Koch <wk@g10code.com>

	* src/g4wihelp.c (path_add): Remove debug stuff.

	* src/inst-kleopatra.nsi: Adjust location for some DLLs.

	2007-10-26 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Add libetpan.
	* configure.ac: Add libetpan package.
	* include/config.nsi.in: Add support for libetpan.
	* src/Makefile.am (EXTRA_DIST): Add inst-libetpan.nsi and
	uninst-libetpan.nsi.
	(gpg4win_spkgs): Add libetpan.
	(gpg4win_pkg_libetpan_configure): New variable.
	* src/uninst-libetpan.nsi, src/inst-libetpan.nsi: New files.
	* src/gpg4win.mk.in: Invoke configure with relative path to make
	it easier on some packages (in particular libetpan).
	(SETVRS): Add install bin directory to PATH.

	2007-10-29 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update to libgpg-error 1.6.

	2007-10-26 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update to libgcrypt 1.3.1.

	2007-10-22 Werner Koch <wk@g10code.com>

	* packages/packages.current: Updated gpgol.

	2007-10-18 Marcus Brinkmann <marcus@g10code.de>

	* src/g4wihelp.c (read_w32_registry_string): New function.
	(ENV_HK, ENV_REG): New macros.
	(path_add, path_remove): New functions.
	* src/gpg4win.nsi: Remove GpgEX from light installer.
	* src/installer.nsi (AddToPath, RemoveFromPath): Rewritten.

	2007-10-17 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-kleopatra.nsi: Add DESC_Menu_kleopatra language string.
	* src/inst-sections.nsi: Install kleopatra links.
	* src/installer-finish.nsi: Uninstall kleopatra.
	* configure.ac: Make pinentry dependent on gtk+ instead of glib.
	* src/Makefile.am (gpg4win_pkg_pinentry_configure): Revert last
	change.
	* src/inst-pinentry.nsi: Revert last change.

	2007-10-17 Werner Koch <wk@g10code.com>

	* src/inst-kdesupport.nsi: Remove libeay32.dll and ssleay32/dll;
	they seems not to be necessary and conflict with the GPL anyway.

	* src/inst-gpgol.nsi: s/GPGol/GpgOL/.

	* src/inst-pinentry.nsi: Install native pinentry.
	* src/Makefile.am: Disable pinnetry-gtk-2 for now.
	* configure.ac: Make pinentry depend on glib.

	2007-10-17 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac: Reenable oxygen-icons dependency.
	* src/inst-oxygen-icons.nsi: Only install action icons for now.
	* packages/packages.current: Reenable oxygen-icons.
	Update kleopatra and gpgex packages.

	2007-10-16 Marcus Brinkmann <marcus@g10code.de>

	* src/uninst-dirmngr.nsi: Remove etc files.
	* src/inst-dirmngr.nsi: Do not use wildcard.

	* src/uninst-qt.nsi: Uninstall qt.conf.

	* src/uninst-qt.nsi: Uninstall mingwm10.dll.
	* src/inst-kleopatra.nsi: Fix slash instead backslash error.
	* src/uninst-kdelibs.nsi: Remove directories share\config\ui and
	share\config instead share\ui. Remove directories
	share\kde4\services and share\kde4.
	* src/uninst-pinentry.nsi: Uninstall pinentry-w32.exe and
	pinentry-gtk-2.exe.
	* src/uninst-kleopatra.nsi: Uninstall kleopatra.bat.
	Remove directory share\apps\kleopatra.

	* packages/packages.current: Enable gpgex.

	2007-10-15 Marcus Brinkmann <marcus@g10code.de>

	* src/kleopatra.bat: New file.
	* src/inst-kleopatra.nsi: Install kleopatra.bat.
	* src/Makefile.am (EXTRA_DIST): Add qt.conf and kleopatra.bat.

	2007-10-14 Marcus Brinkmann <marcus@g10code.de>

	* src/Makefile.am (gpg4win_pkg_pinentry_configure): Enable
	pinentry gtk2 and add required configure flags for it.
	* src/inst-pinentry.nsi: Install pinentry-gtk-2.exe along with
	pinentry-w32.exe and make it the default.

	2007-10-12 Werner Koch <wk@g10code.com>

	* src/inst-kleopatra.nsi: Select by default. Do not install
	test_uiserver.
	* src/uninst-kleopatra.nsi: No need to remove test_uiserver.

	* src/inst-gpgee.nsi: Do not select by default.
	* src/inst-gpgex.nsi: Select by default.

	2007-10-11 Werner Koch <wk@g10code.com>

	* packages/packages.current: Update kleopatra. Update gpgol.
	Disable gpgex.

	* configure.ac (gpgol): Add libassuan as dependency.
	* src/Makefile.am (gpg4win_pkg_gpgol_configure): Add
	--with-libassuan-prefix.

	2007-10-10 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-kdelibs.nsi: Do not install libkdefx.dll.
	* packages/packages.current: Update gpgme, kdelibs and kleopatra.

	2007-10-09 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac: Fix last change.
	* packages/packages.current: Update gpgex.

	* configure.ac: Disable oxygen-icons for now.
	* packages/packages.current: Disable oxygen-icons for now. Update
	kleopatra.

	* src/Makefile.am (gpg4win_pkg_gpa_configure): Add search path for
	libassuan and gpg-error.

	2007-10-06 Werner Koch <wk@g10code.com>

	* packages/packages.current: Fixed gpgex filename to be .gz.

	2007-10-05 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update dirmngr.

	* packages/packages.current: Update libassuan.

	* packages/packages.current: Update gpgex and libassuan, and fix gnupg2.

	* packages/packages.current: Update gpgme, gpgex and kleopatra.

	2007-10-02 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update libassuan, gpgme, gnupg and kleopatra.

	2007-09-28 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update GPGME snapshot.

	* src/inst-kleopatra.nsi: Put kleopatra into bin for now.
	* src/uninst-kleopatra.nsi: Remove it from there.
	* src/inst-kdesupport.nsi: Put dbus-daemon into bin for now, and
	install missing config files.
	* src/uninst-kdesupport.nsi: Uninstall these files.

	2007-09-26 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-gnupg2.nsi: Put it in the read-only section.
	* src/inst-sections.nsi: Make kleopatra dependent on gnupg2, and
	gpgol dependent on kleopatra. Remove explicit dependencies on
	gnupg and gnupg2 from individual packages.
	* src/gpg4win.nsi: Remove kleopatra from light installer.

	2007-09-25 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-sections.nsi, src/inst-kleopatra.nsi,
	src/inst-gpgex.nsi: Some bug fixes.

	* configure.ac: Add check for kleopatra.
	* include/config.nsi.in: Add macros for kleopatra.
	* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: New files.
	* src/Makefile.am (gpg4win_bpkgs): Add kleopatra.
	(EXTRA_DIST): Add inst-kleopatra.nsi and uninst-kleopatra.nsi.
	* src/inst-sections.nsi: Add support for kleopatra.
	* packages/packages.current: Add kleopatra.

	* src/gpg4win.nsi: Disable kdelibs, kdesupport, oxygen-icons in
	light installer.
	* configure.ac: Add check for kdelibs.
	* include/config.nsi.in: Add macros for kdelibs.
	* src/inst-kdelibs.nsi, src/uninst-kdelibs.nsi: New files.
	* src/Makefile.am (gpg4win_bpkgs): Add kdelibs.
	(EXTRA_DIST): Add inst-kdelibs.nsi and uninst-kdelibs.nsi.
	* src/inst-sections.nsi: Add support for kdelibs.
	* packages/packages.current: Add kdelibs.

	* configure.ac: Add check for oxygen-icons.
	* include/config.nsi.in: Add macros for oxygen-icons.
	* m4/gpg4win.m4: Fix translit expression (dash must come first or last).
	* src/inst-oxygen-icons.nsi, src/uninst-oxygen-icons.nsi: New files.
	* src/Makefile.am (gpg4win_bpkgs): Add oxygen-icons.
	(EXTRA_DIST): Add inst-oxygen-icons.nsi and
	uninst-oxygen-icons.nsi.
	* src/inst-sections.nsi: Add support for oxygen-icons.
	* packages/download.sh (name): Add "link" option.
	* packages/packages.current: Add oxygen-icons.

	2007-09-24 Marcus Brinkmann <marcus@g10code.de>

	* src/Makefile.am (EXTRA_DIST): Add inst-kdesupport.nsi and
	src/uninst-kdesupport.nsi.
	(gpg4win_bpkgs): Add kdesupport.
	(gpg4win_pkg_kdesupport_post_install): New macro.
	* src/inst-kdesupport.nsi, src/uninst-kdesupport.nsi: New files.
	* src/inst-sections.nsi: Add kdesupport (also as a dependency for
	Qt).
	* packages/packages.current: Add kdesupport.
	* include/config.nsi.in: Add macros for kdesupport.
	* configure.ac: Check for kdesupport. Make qt dependent on it.

	* configure.ac: Check for mingwm10.dll.
	* src/gpg4win.mk.in: Fix clean-PKG for binary packages.
	* src/inst-qt.nsi: Install QtDBus4.dll. Do not install debug and
	source files.
	* src/uninst-qt.nsi: Likewise for uninstall.
	* packages/packages.current: Update Qt.

	2007-09-17 Werner Koch <wk@g10code.com>

	* configure.ac: Set version to 1.9.0-svn. Make gpgme depend on qt
	again.
	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Enable Qt again.
	* packages/packages.current: Disable gpgee, enable gpgex.

	2007-09-17 Werner Koch <wk@g10code.com>

	Released 0.9.92.

	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Disable Qt
	requirement.
	* configure.ac: Ditto.

	* packages/packages.current: Update gpgol to 0.9.92 and gpgme to a
	new snapshot. Disable gpgex, enable gpgee.

	2007-09-12 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update dirmngr.

	2007-09-11 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update gpgex.

	* packages/packages.current: Add gpgex, disable gpgee.

	* packages/packages.current: Bump gnupg to 2.0.7.

	* src/qt.conf: New file.
	* src/inst-qt.nsi: Install qt.conf.

	2007-09-10 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update gpgme and libassuan to
	snapshot pacakages.

	2007-09-07 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac: Add libassuan as dependency for GpgEX.
	* src/Makefile.am (gpg4win_pkg_gpgex_configure): Add gpg-error and
	libassuan configure options.

	* configure.ac: Add qt as dependency for GPGME.
	* src/inst-sections.nsi [HAVE_PKG_QT]: Make GPGME depending on Qt.
	* src/inst-gpgme.nsi: Change condition from !GPG4WIN_LIGHT to HAVE_PKG_QT.

	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Remove LDFLAGS,
	add --enable-w32-qt and work around Qt's lack of cross compilation
	support.
	* src/gpg4win.mk.in (stamps/stamp-$(1)-02-configure): Call
	configure through eval, so that configure options with spaces are
	quoted properly.
	* src/inst-gpgme.nsi [!GPG4WIN_LIGHT]: Install libgpgme-qt-11.dll.
	* src/uninst-gpgme.nsi: Uninstall libgpgme-qt-11.dll.

	2007-08-30 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac: Add gpgex.
	* include/config.nsi.in: Add gpgex.
	* src/Makefile.am (EXTRA_DIST): Add inst-gpgex.nsi and
	uninst-gpgex.nsi.
	(gpg4win_spkgs): Add gpgex.
	(gpg4win_pkg_gpgex_configure): New variable.
	* src/inst-sections.nsi: Add gpgex installer and uninstaller, as
	well as description.
	(CalcDefaults, CalcDepends): Add gpgex.

	2007-08-30 Marcus Brinkmann <marcus@g10code.de>

	* packages/download.sh: Implement new "name" command and remove
	"ren" command.
	* packages/packages.current: Add qt.
	* configure.ac: Add qt.
	* include/config.nsi.in: Add qt.
	* src/Makefile.am (EXTRA_DIST): Add inst-qt.nsi and uninst-qt.nsi.
	(gpg4win_bpkgs): Add qt.
	* src/uninst-qt.nsi, src/inst-qt.nsi: New files.
	* src/inst-sections.nsi: Run installer and uninstaller for qt.
	(CalcDepends): Handle qt.
	* src/gpg4win.nsi: Remove qt from light installer.

	2007-08-24 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-gnupg.nsi: Write compatibility key to registry for GPGee.

	2007-08-24 Werner Koch <wk@g10code.com>

	* packages/packages.current: Updated libassuan to 1.0.3.

	2007-08-23 Werner Koch <wk@g10code.com>

	* src/inst-dirmngr.nsi: Install examples files as default
	configuration.

	2007-08-20 Werner Koch <wk@g10code.com>

	* packages/packages.current: Add bzip2.

	* configure.ac: Check for RANLIB and AR. Look for bzip2. Make
	gnupg and gnupg2 depend on it.
	* src/Makefile.am (gpg4win_pkg_bzip2_make_args)
	(gpg4win_pkg_bzip2_make_args_inst): New.
	(EXTRA_DIST): Add bzip2.
	(gpg4win_pkg_gnupg_configure): New. Look for bzip2.
	* include/config.nsi.in: Add bzip2.
	* src/inst-bzip2.nsi: New.
	* src/uninst-bzip2.nsi: New.

	2007-08-16 Werner Koch <wk@g10code.com>

	Released 1.1.2.

	* src/inst-gnupg2.nsi: Allow overwriting of gpg-agent.
	* src/inst-libgpg-error.nsi: Allow overwriting of libgpg-error.dll.
	* src/inst-libgcrypt.nsi: Likewise.
	* src/inst-gpgme.nsi: Likewise.
	* src/inst-w32pth.nsi: Likewise.
	* src/inst-libiconv.nsi: Likewise.

	* packages/packages.current: Updated GnuPG2 and W32pth. Add
	Dirmngr. Add gpgme snapshot.

	2007-08-15 Marcus Brinkmann <marcus@g10code.de>

	* src/g4wihelp.c (config_init): Fix bug in argument parsing.

	2007-08-14 Marcus Brinkmann <marcus@g10code.de>

	* src/g4wihelp.c (config_lookup, config_fetch_bool): New functions.
	* src/inst-sections.nsi (CalcDefaults): New function.
	(.onInit): Call CalcDefaults.
	* src/inst-sections.nsi (CalcDepends): New function. Run it once.
	Support auto-config for link selection.
	* src/installer-finish.nsi: Support auto-config for start menu folder.

	* src/g4wihelp.c (service_create): Auto start service, install as
	local service.
	(service_start): Set argv to NULL if argc is zero.
	(service_stop): Wait until service is actually stopped. Implement
	the whole logic when to stop and when to wait.
	* src/installer.nsi: Print warning about shutting down dirmngr.
	Shutdown dirmngr.
	* src/inst-dirmngr.nsi: Remove code refactored into service_stop.
	Do not pass any arguments when starting the service. Use
	CreateDirectory instead of SetOutPath.
	* src/uninst-dirmngr.nsi: Remove code factored into service_stop.
	* src/inst-gnupg.nsi, src/inst-gnupg2.nsi, src/inst-gpa.nsi: Use
	CreateDirectory instead SetOutPath.

	* patches/claws-mail-3.0.0-rc2/03-smime-plugin.patch: Change
	license string to "GPL3+" to make Claws load it.

	* src/gpg4win.mk: Implement clean-PKG targets to allow rebuilding
	individual packages.

	2007-08-14 Werner Koch <wk@g10code.com>

	* packages/Makefile.am (packages.current.sig, upload): Remove.
	(EXTRA_DIST): Remove packages.key. Add packages.current.

	* packages/download.sh: Remove online downloading of
	packages.current.
	* packages/packages.current: Fix comment.

	2007-08-13 Marcus Brinkmann <marcus@g10code.de>

	* patches/claws-mail-3.0.0-rc2/04-cvs116.patch: New file.
	* Makefile.am (EXTRA_DIST): Add that patch.

	* NEWS: Add new entries.
	* README.wine: Remove obsolete file.

	* src/inst-gnupg2.nsi: Install config files.
	* src/inst-dirmngr.nsi: Likewise.
	* src/inst-gpa.nsi: Likewise.

	* src/g4wihelp.c (config_init, config_fetch): New functions.
	* src/inst-gnupg.nsi: Install gpg.conf AppData if configured.

	2007-08-10 Marcus Brinkmann <marcus@g10code.de>

	* patches/claws-mail-3.0.0-rc2/01-w32-logo.patch,
	patches/claws-mail-3.0.0-rc2/02-w32-icon.patch,
	patches/claws-mail-3.0.0-rc2/03-smime-plugin.patch,
	patches/claws-mail-3.0.0-rc2/99-auto.patch: New files.
	* Makefile.am (EXTRA_DIST): Add these patches.
	* packages/packages.current: Upgrade claws to 3.0.0-rc2.

	* m4/gpg4win.m4: Check for duplicate packages.

	2007-08-06 Werner Koch <wk@g10code.com>

	* src/gpgwrap.c (build_commandline): Terminate each itenm in the
	array. Problem found by Moritz Schulte.

	2007-08-04 Marcus Brinkmann <marcus@g10code.de>

	* src/g4wihelp.c (service_error, service_create, service_lookup,
	service_start, service_stop, service_delete): New functions.
	* src/inst-dirmngr.nsi: Register and start the service.
	* src/uninst-dirmngr.nsi: Stop and unregister the service.

	* src/inst-sections.nsi: Add dirmngr as dependency for gnupg2, and
	w32pth as dependency for dirmngr.

	* src/Makefile.am (gpg4win_pkg_gnupg2_configure): Add
	--with-pth-prefix.

	2007-07-10 Werner Koch <wk@g10code.com>

	Released 1.1.1.

	* src/Makefile.am (EXTRA_DIST): Remove $(common_nsi). Add all
	installer scripts explicitly.

	* Makefile.am (EXTRA_DIST): Removed old patches for Sylpheed.
	(AUTOMAKE_OPTIONS): Add no-dist-gzip.

	* src/gpg4win.nsi [GPG4WIN_LIGHT]: Undef gnupg2 and related libs.
	Undef the English novices manual.
	* src/installer-finish.nsi: Delete the link for the English novices
	manual and the claws manual.

	* src/uninst-sylpheed-claws.nsi: Delete the manual even when using
	the lighjt version. This is to allow updating with a light version.
	* src/uninst-claws-mail.nsi: Ditto.

	* src/installer-finish.nsi: Changed publisher name to "The Gpg4win
	Project".

	* src/gpg4win.nsi: Fixed capitalization of some Gpg4win strings.
	* src/gpg4win-src.nsi: Ditto.

	2007-07-09 Werner Koch <wk@g10code.com>

	* src/uninst-gnupg2.nsi: Need to remove com-certs.pem.

	* src/inst-gnupg2.nsi: Make it an optional package.
	Add description.
	* src/inst-sections.nsi: Include language macro for description.

	2007-07-09 Marcus Brinkmann <marcus@g10code.de>

	* patches/gpgol-0.9.91/01-gpgme.patch: New file.
	* Makefile.am (EXTRA_DIST): Add patches/gpgol-0.9.91/01-gpgme.patch.

	* packages/download.sh: Implement a new function "ren" for
	renaming.
	* packages/packages.current: Rename gnupg 2.

	* packages/packages.current: Update to GPGME 1.1.5.

	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Enable gpgsm.

	2007-07-05 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update to Gtk+ 2.10.13.

	* patches/claws-mail-2.10.0/03-w32-port.patch: Fix cut&paste bug.
	* patches/claws-mail-2.9.2/03-w32-port.patch: Likewise.
	Spotted by Colin Leroy.

	2007-07-04 Jan-Oliver Wagner <jan-oliver.wagner@intevation.de>

	* README: Added just another dependency that sometimes happen to miss.

	2007-07-03 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Update sylpheed entry to claws-mail.

	* configure.ac: Add dirmngr.
	* include/config.nsi.in: Add dirmngr.
	* src/Makefile.am (gpg4win_spkgs): Add dirmngr.
	(gpg4win_pkg_dirmngr_configure): New variable.
	* src/inst-dirmngr.nsi, src/uninst-dirmngr.nsi: New files.
	* src/inst-sections.nsi [HAVE_PKG_DIRMNGR]: Include installer
	and uninstaller snippet for dirmngr.

	* Makefile.am (EXTRA_DIST): Add
	patches/claws-mail-2.10.0/01-w32-logo.patch,
	patches/claws-mail-2.10.0/02-w32-icon.patch,
	patches/claws-mail-2.10.0/03-w32-port.patch,
	patches/claws-mail-2.10.0/04-smime-plugin.patch and
	patches/claws-mail-2.10.0/99-auto.patch.
	* patches/claws-mail-2.10.0/01-w32-logo.patch,
	patches/claws-mail-2.10.0/02-w32-icon.patch,
	patches/claws-mail-2.10.0/03-w32-port.patch,
	patches/claws-mail-2.10.0/04-smime-plugin.patch,
	patches/claws-mail-2.10.0/99-auto.patch: New files.

	2007-07-02 Marcus Brinkmann <marcus@g10code.de>

	* src/Makefile.am (gpg4win_pkg_claws_mail_configure): Fix config
	dir.

	* Makefile.am (EXTRA_DIST): Add
	patches/claws-mail-2.9.2/01-w32-logo.patch,
	patches/claws-mail-2.9.2/02-w32-icon.patch,
	patches/claws-mail-2.9.2/03-w32-port.patch,
	patches/claws-mail-2.9.2/04-smime-plugin.patch and
	patches/claws-mail-2.9.2/99-auto.patch.
	* patches/claws-mail-2.9.2/01-w32-logo.patch,
	patches/claws-mail-2.9.2/02-w32-icon.patch,
	patches/claws-mail-2.9.2/03-w32-port.patch,
	patches/claws-mail-2.9.2/04-smime-plugin.patch,
	patches/claws-mail-2.9.2/99-auto.patch: New files.

	* configure.ac: Add claws-mail.
	* include/config.nsi.in: Add claws-mail.
	* src/Makefile.am (gpg4win_spkgs): Add claws-mail.
	(gpg4win_pkg_claws_mail_configure): New variable.
	* src/inst-claws-mail.nsi, src/uninst-claws-mail.nsi: New files.
	* src/inst-sections.nsi [HAVE_PKG_CLAWS_MAIL]: Include installer
	and uninstaller snippet for claws-mail, handle claws-mail
	dependencies and add a menu item for it.

	2007-06-22 Werner Koch <wk@g10code.com>

	* src/inst-gnupg2.nsi: Install more files.
	* src/uninst-gnupg2.nsi: and uninstall them.

	* src/Makefile.am (gpg4win_pkg_gnupg_post_install): Remove
	underlined markup. Reported by Dirk Traulsen.

	2007-06-20 Werner Koch <wk@g10code.com>

	* src/inst-sections.nsi, src/Makefile.am, src/uninst-pinentry.nsi
	* src/inst-pinentry.nsi, include/config.nsi.in: Add new package
	pinentry.
	* src/Makefile.am (gpg4win_pkg_pinentry_configure): New.

	* src/Makefile.am (gpg4win-$(VERSION).exe): Add versioninfo.txt as
	dependency.
	(gpg4win-light-$(VERSION).exe): Ditto.

	2007-06-20 Marcus Brinkmann <marcus@g10code.de>

	* po: New directory.
	* m4/po.m4: New file, from gettext-0.16.1.
	* m4/progtest.m4: New file, from gettext-0.16.1.
	* m4/nls.m4: New file, from gettext-0.16.1.
	* Makefile.am (SUBDIRS): Add po.
	* configure.ac: Invoke AM_PO_SUBDIRS.
	(AC_CONFIG_FILES): Add po/Makefile.in.

	* src/installer.nsi: Do not insert MUI_LANGUAGE "German".
	* src/gpg4win.nsi, src/gpg4win-src.nsi: Add include dir
	${TOP_SRCDIR}/po. Include "../po/catalogs.nsi".
	* src/inst-gnupg.nsi: Move translation string DESC_Menu_gnupg_faq
	from here ...
	* src/inst-gpg4win.nsi: ... to here.

	* src/g4wihelp.nsi, src/installer.nsi, src/inst-eudoragpg.nsi,
	src/inst-gnupg.nsi, src/inst-gpa.nsi, src/inst-gpg4win.nsi,
	src/inst-gpgee.nsi, src/inst-gpgol.nsi,
	src/inst-man_advanced_de.nsi, src/inst-man_advanced_en.nsi,
	src/inst-man_novice_de.nsi, src/inst-man_novice_en.nsi,
	src/inst-sylpheed-claws.nsi, src/inst-winpt.nsi: Remove German
	translation.

	2007-06-18 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-w32pth.nsi: Install shared library.
	* src/uninst-w32pth.nsi: Uninstall shared library.

	* src/inst-gnupg2.nsi: Install gpgconf.exe.
	* src/uninst-gnupg2.nsi: Uninstall gpgconf.exe.

	* src/inst-sections.nsi: Add dependency management for GnuPG2.

	2007-06-15 Werner Koch <wk@g10code.com>

	* src/gpg4win.mk.in: Add cruel hack to support gnupg2.

	* src/Makefile.am: Use --silent with most configure runs.
	(gpg4win_pkg_gnupg2_post_install): New.

	* src/uninst-gnupg2.nsi, src/inst-libgnupg2.nsi: New.
	* src/uninst-libassun.nsi, src/inst-libassuan.nsi: New.
	* src/inst-libksba.nsi, src/uninst-libksba.nsi: New.
	* src/inst-libgcrypt.nsi, src/uninst-libgcrypt.nsi: New.
	* src/inst-sections.nsi: Include new installation scripts.a
	* include/config.nsi.in: Add definitions for new packages.

	* src/uninst-gnupg.nsi: Fix removal of gpgkeys helper.

	2007-06-12 Marcus Brinkmann <marcus@g10code.de>

	* src/gpgwrap.c (main): Call _spawnv, not execv.

	2007-05-25 Marcus Brinkmann <marcus@g10code.de>

	* src/uninst-gnupg.nsi: Fix path of gpgkeys helper programs.
	Remove pub directory.
	* src/uninst-gtk+.nsi: Fix path of directory to be removed.

	2007-05-24 Werner Koch <wk@g10code.com>

	Released 1.1.0.

	* configure.ac (PREVIEWHOST): New.
	(MANUALVERSION_NOVICES): Set to 1.0.0.

	2007-05-20 Marcus Brinkmann <marcus@g10code.de>

	* patches/glib-2.12.12/01-giowin32.patch,
	patches/glib-2.12.12/02-gspawn-w32.patch,
	patches/glib-2.12.12/03-gspawn-w32-fixup.patch: New files.
	* Makefile.am (EXTRA_DIST): Add these new files.

	* src/gpgwrap.c (build_commandline): New function.
	(main): Quote argument vector.

	* configure.ac: Comment advanced manual here as well.

	2007-05-19 Marcus Brinkmann <marcus@g10code.de>

	* autogen.sh: Fix test.
	* src/Makefile.am: Replace := by =.a

	* packages/download.sh: Require bash due to brace expansion.

	2007-05-18 Werner Koch <wk@g10code.com>

	* src/gpgwrap.c (main): Delimit the real path from the version
	using a semicolon.

	2007-05-17 Werner Koch <wk@g10code.com>

	* src/installer.nsi (AddToPath,RemoveFromPath): New.
	* src/inst-gpa.nsi: Install gpgwrap for gpa.
	* src/inst-gnupg.nsi: Install gpgwrap for gpg, gpgv and gpgsplit.

	* src/gpgwrap.c: New.

	* configure.ac: Check for strip.
	(AC_CONFIG_HEADER): New.
	* src/Makefile.am (g4wihelp.dll): Strip.
	(gpgwrap.exe): Build.

	2007-05-16 Werner Koch <wk@g10code.com>

	* src/inst-gtk+.nsi: Install new themes and the engines. Update
	to gtk 2.10.
	* src/uninst-gtk+.nsi: Likewise.

	* src/inst-pango.nsi: Adjust for Pango 1.16.

	* configure.ac: New package Cairo as reguired by the current Gtk+.
	* src/uninst-cairo.nsi, src/inst-cairo.nsi: New.
	* src/inst-sections.nsi: Install Cairo.
	* include/config.nsi.in: Ditto.

	* src/uninst-gnupg.nsi: Delete gnupg.nls directory.

	2007-03-09 Werner Koch <wk@g10code.com>

	Released 1.0.9.

	* src/Makefile.am: Fixed syntax error in gnupg post install.
	(EXTRA_DIST): Add english manual installation files.

	* packages/packages.current: Replaced sourceforge download site
	by the g10code mirror. Updated WinPT, GPA and GnupG.

	2007-02-26 Werner Koch <wk@g10code.com>

	* configure.ac: Require msgfmt.
	* src/inst-gnupg.nsi: Install the German translation.
	* src/Makefile.am (gpg4win_pkg_gnupg_post_install): Create mo files.

	2006-12-06 Werner Koch <wk@g10code.com>

	Released 1.0.8.

	* autogen.sh: Add option --force.

	* src/Makefile.am: GnuPG man pages are now below share.
	* src/inst-gnupg.nsi: Ditto

	2006-12-04 Werner Koch <wk@g10code.com>

	* src/Makefile.am (gpg4win_ipkgs): Add english manuals.

	* autogen.sh <build-w32>: Disable the english manuals for now.

	2006-11-30 Werner Koch <wk@g10code.com>

	* include/config.nsi.in: Add definitions for the english manuals.
	* configure.ac: Adjusted name of manual directory.
	* src/inst-man_novice_de.nsi: Ditto.
	* src/inst-man_advanced_de.nsi: Ditto.
	* src/inst-man_advanced_en.nsi: New.
	* src/inst-man_novice_en.nsi: New.
	* src/uninst-man_novice_en.nsi: New.
	* src/uninst-man_advanced_en.nsi: New.
	* src/inst-sections.nsi: Include the new installers sections.

	2006-10-13 Werner Koch <wk@g10code.com>

	Released 1.0.7.

	* patches/gnupg-1.4.5/01-uncompress.patch: New.

	2006-08-28 Werner Koch <wk@g10code.com>

	Released 1.0.6.

	* Makefile.am (EXTRA_DIST): Added missing patches for Claws.

	* packages/download.sh: Rewrote option parser. New option
	--no-sig-check.

	2006-08-04 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Replace sylpheed-claws 2.3.1 with
	2.4.0.
	* Makefile.am (EXTRA_DIST): Add
	patches/sylpheed-claws-2.4.0/01-w32-logo.patch,
	patches/sylpheed-claws-2.4.0/02-w32-icon.patch,
	patches/sylpheed-claws-2.4.0/03-plugins-symbols.patch,
	patches/sylpheed-claws-2.4.0/04-font-prefs.patch,
	patches/sylpheed-claws-2.4.0/05-textviewer.patch,
	patches/sylpheed-claws-2.4.0/99-auto.patch.

	2006-08-03 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac: Add libiconv as a dependency for gnupg.
	* src/inst-sections.nsi: Likewise here.

	2006-08-02 Marcus Brinkmann <marcus@g10code.de>

	* packages/packages.current: Add jpeg packages.
	* src/inst-sections.nsi: Add jpeg support.
	* src/Makefile.am (gpg4win_bpkgs): Add jpeg.
	* src/inst-jpeg.nsi, src/uninst-jpeg.nsi: New file.
	* include/config.nsi.in: Add defines for jpeg.
	* configure.ac: Add new GnuWin32 package jpeg. Add it as a
	dependency to sylpheed-claws.

	2006-08-02 Werner Koch <wk@g10code.com>

	Released 1.0.5.

	2006-07-25 Werner Koch <wk@g10code.com>

	Released 1.0.4.

	* src/installer-finish.nsi: Delete Sylpheed manual.

	* patches/gnupg-1.4.4/01-reopen-std.patch: New.
	* Makefile.am (EXTRA_DIST): Add new patch and removed old 1.4.2
	patch.

	2006-07-22 Timo Schulz <twoaday@g10code.de>

	* Makefile.am: Added new sylpheed patches.

	2006-07-14 Marcus Brinkmann <marcus@g10code.de>

	* patches/sylpheed-claws-2.3.1 (08-w32-logo.patch,
	09-w32-icon.patch, 99-auto.patch): New files.

	2006-07-12 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-sections.nsi: Install start menu and desktop link for
	the sylpheed manual.
	* src/inst-sylpheed-claws.nsi: Install manual.
	(DESC_Menu_sylpheed_pdf): New translation.
	* src/uninst-sylpheed-claws.nsi: Uninstall manual.

	2006-06-28 Werner Koch <wk@g10code.com>

	* Makefile.am (copy-news): New target.

	2006-06-27 Werner Koch <wk@g10code.com>

	* src/inst-sylpheed-claws.nsi: Renamed strings to Sylpheed-Claws.
	* src/installer-finish.nsi: Ditto.
	* src/inst-sections.nsi: Ditto.

	2006-06-26 Werner Koch <wk@g10code.com>

	Released 1.0.3.

	* Makefile.am (EXTRA_DIST): Added new Sylpheed patches. Removed
	old sylpheed patches.

	2006-05-30 Werner Koch <wk@g10code.com>

	Released 1.0.2.

	2006-05-29 Marcus Brinkmann <marcus@g10code.de>

	* Makefile.am (DIST): Add
	patches/sylpheed-claws-2.2.0/01-locale-dir.patch,
	patches/sylpheed-claws-2.2.0/02-fix-plugin-dir.patch,
	patches/sylpheed-claws-2.2.0/03-std-plugins.patch and
	patches/sylpheed-claws-2.2.0/04-pgpcore-def.patch.
	* patches/sylpheed-claws-2.2.0/01-locale-dir.patch,
	patches/sylpheed-claws-2.2.0/02-fix-plugin-dir.patch,
	patches/sylpheed-claws-2.2.0/03-std-plugins.patch,
	patches/sylpheed-claws-2.2.0/04-pgpcore-def.patch: New file.

	* Makefile.am (EXTRA_DIST): Add
	patches/glib-2.9.2-wk1/03-gspawn-w32-fixup.patch and
	patches/glib-2.9.2-wk1/04-gspawn-w32-buffering.patch.
	* patches/glib-2.9.2-wk1/03-gspawn-w32-fixup.patch: New file.
	* patches/glib-2.9.2-wk1/04-gspawn-w32-buffering.patch: New file.

	2006-04-27 Marcus Brinkmann <marcus@g10code.de>

	* src/Makefile.am (gpg4win_pkg_gnupg_post_install): New macro to
	generate man pages.
	* src/gpg4win.mk.in (stamps/stamp-$(1)-04-install): Invoke post
	install macro.
	* src/inst-gnupg.nsi: Install man pages.
	* src/uninst-gnupg.nsi: Uninstall man pages.

	2006-04-26 Werner Koch <wk@g10code.com>

	Released 1.0.1.

	2006-04-25 Werner Koch <wk@g10code.com>

	* src/Makefile.am (clean-local): Also remove the light installer.

	* src/installer.nsi (PrintNonAdminWarning): Use Quit instead of Abort.

	* src/uninst-glib.nsi: Delete console helper.

	* configure.ac: Define manual versions.

	* src/inst-sections.nsi: Do not install the GGPee manual in the QLB.

	2006-04-24 Werner Koch <wk@g10code.com>

	* src/Makefile.am (NEWS.tmp): New. Use it in the README files
	so that the comment lines are not visible.

	* packages/packages.current: Updated GPGee, WinPT and GPGol.

	2006-04-22 Marcus Brinkmann <marcus@g10code.de>

	* src/gpg4win.mk (stamps/stamp-final-$(1)): Depend on
	stamps/stamp-directories.

	* src/installer.nsi (T_InstOptLabelB): New string.
	(CustomPageOptions): Install new string.
	* src/installer-options.ini.in (Field 5): Add new field.
	(NumFields): Set to 5.
	* src/inst-sections.nsi: Do not install manuals and other
	documents in the quick launch bar. Do not install the README on
	the desktop.

	* src/Makefile.am (gpg4win_spkgs): Move man_novice_de and
	man_advanced_de to ...
	(gpg4win_ipkgs): ... here.
	* src/gpg4win.mk.in (IPKG_template): New template.
	Insert it for each internal package.

	2006-04-20 Werner Koch <wk@g10code.com>

	* src/installer.nsi: Pop up a message before shutting down winpt.

	2006-04-19 Werner Koch <wk@g10code.com>

	* src/installer.nsi: Abort installation if not run as Admin.

	2006-04-08 Marcus Brinkmann <marcus@g10code.de>

	* m4/gpg4win.m4 (GPG4WIN_IPKG): New macro for internal packages.
	* include/config.nsi.in (gpg4win_pkg_man_novice_de,
	gpg4win_pkg_man_novice_de_version, gpg4win_pkg_man_advanced_de,
	gpg4win_pkg_man_advanced_de_version): Removed.
	* src/installer.nsi [GPG4WIN_LIGHT]: Set the output filename for
	the light installer.
	* configure.ac: New option --enable-light-installer to control the
	new automake conditional BUILD_LIGHT_INSTALLER.
	Make packages man_novide_de and man_advanced_de included packages.
	* src/Makefile.am (gpg4win-light-$(VERSION).exe): New target.
	(all_src, all_light): New variables.
	(all-local): Use all_src and all_light.
	* src/gpg4win.nsi [GPG4WIN_LIGHT]: Undefine HAVE_PKG_MAN_NOVICE_DE
	and HAVE_PKG_MAN_ADVANCED_DE.

	2006-04-07 Werner Koch <wk@g10code.com>

	* configure.ac: Use new method to include the SVN revison. Now it
	is the actual global revision number.

	2006-04-06 Werner Koch <wk@g10code.com>

	Released 1.0.0.

	2006-04-05 Werner Koch <wk@g10code.com>

	* NEWS: Recoded to latin1.

	2006-04-04 Werner Koch <wk@g10code.com>

	* NEWS: Reformatted.

	2006-04-03 Werner Koch <wk@g10code.com>

	* src/inst-gnupg.nsi: Now that 1.4.3 has been released tehr eis no
	more need trying to install the http keyserver helper.

	2006-04-01 Timo Schulz <ts@g10code.com>

	* src/inst-sections.nsi: WinPT desktop link now
	directly starts the key manager.

	2006-03-29 Werner Koch <wk@g10code.com>

	Released 1.0.0rc1.

	* src/installer-options.ini: Renamed to ..
	* src/installer-options.ini.in: .. this.
	* configure.ac (BUILD_ISODATE): New.
	* include/config.nsi.in: Ditto.
	* src/gpg4win.nsi: Display it on the Welcome page

	2006-03-28 Werner Koch <wk@g10code.com>

	* src/installer.nsi (CustomPageOptions): Write Labels, so that
	they are translatable.
	(MUI_FINISHPAGE_LINK_LOCATION): Localized.
	* src/installer-options.ini: Add label field and removed static
	texts.

	2006-03-27 Werner Koch <wk@g10code.com>

	* src/installer-options.ini: Don't create a desktop link by default.

	* src/installer.nsi: Add a logo image. Add leave function.
	(CheckExistingVersion): New.
	(TrimNewLines): New.
	(PrintWinPTSFWarning): New.
	* src/inst-sections.nsi: Call it.
	Do not show the splash screen.
	* src/inst-gpg4win.nsi: Write a version file.
	* src/uninst-gpg4win.nsi: Delete version file

	2006-03-27 Marcus Brinkmann <marcus@g10code.de>

	* installer.nsi: Move custom page for installer options before
	start menu path selection. Do not allow to disable start menu
	creation at start meny path selection dialog. Only display start
	menu path selection dialog if start menu creation is desired.
	Rename opt.ini to installer-options.ini.
	(CheckIfStartMenuWanted): New function.
	* installer-finish.nsi: Delete desktop and quicklaunch shortcuts.
	* inst-sections.nsi: Rename opt.ini to installer-options.ini.
	Install desktop and quick launch bar shortcuts.
	* Makefile.am (EXTRA_DIST): Rename opt.ini to
	installer-options.ini.
	* installer-options.ini: New file.

	2006-03-21 Werner Koch <wk@g10code.com>

	* Makefile.am (EXTRA_DIST): No more need tositribute the GPA 0.7.2
	patch/

	* src/installer.nsi: Add a cutom option page.
	(StrStr): New. Taken from the NSIS reference manual.
	* src/opt.ini: New.

	2006-03-15 Jan-Oliver Wagner <jan-oliver.wagner@intevation.de>

	* src/inst-gpa.nsi: Fixed a typo.

	2006-03-13 Werner Koch <wk@g10code.com>

	* packages/Makefile.am (upload): New target for uploading the
	packages file.
	* packages/download.sh: Use http://www.gpg4win/org.

	2006-03-09 Werner Koch <wk@g10code.com>

	Released 0.8.0.

	* src/inst-sylpheed-claws.nsi: Don't select be Default.

	* include/config.nsi.in: Disabled Eudora.
	* src/inst-sections.nsi: Ditto.
	* src/Makefile.am: Ditto

	2006-03-08 Werner Koch <wk@g10code.com>

	* src/inst-sections.nsi: Play the tune only for the source installer.
	* src/installer.nsi: And don't reserve the tune file.

	2006-03-07 Werner Koch <wk@g10code.com>

	* configure.ac: Don't build Eudora due to license problems.

	2006-03-03 Marcus Brinkmann <marcus@g10code.de>

	* Makefile.am (EXTRA_DIST): Change
	patches/gpa-0.7.2/01-bin-open.patch to
	patches/gpa-0.7.2/01-keyserver-list.patch.
	* packages/packages.current: Use the right GPA 0.7.2.

	* patches/gpa-0.7.2/01-bin-open.patch: Rename to ...
	* patches/gpa-0.7.2/01-keyserver-list.patch: ... this. Remove
	binary open patch.

	* packages/packages.current: Use GPA 0.7.2.

	* packages/packages.current: Use libgpg-error 1.2 and GPGME 1.2.

	2006-02-28 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-atk.nsi: Fix outpath of library.

	2006-02-23 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-glib.nsi: Add glib20.mo.
	* src/uninst-glib.nsi: Remove glib20.mo.
	* src/inst-gtk+.nsi: Add gtk20.mo.
	* src/uninst-gtk+.nsi: Remove gtk20.mo.
	* src/inst-atk.nsi: Add atk10.mo.
	* src/uninst-atk.nsi: Remove atk10.mo.

	2006-02-15 Werner Koch <wk@gnupg.org>

	Released 0.7.0.

	* patches/gpa-0.7.2/01-bin-open.patch: New file.

	2006-02-15 Marcus Brinkmann <marcus@g10code.de>

	* patches/gpgme/03-w32-io.patch: New file.
	* patches/gpgme-1.1.1-cvs1152/03-w32-io.patch: New file.

	2006-02-14 Werner Koch <wk@gnupg.org>

	* README (Instructions): Add a list of required Debian packages.

	2006-01-31 Werner Koch <wk@g10code.com>

	* src/installer.nsi (InstallDir): Removed trailing backslashes.

	2006-01-26 Werner Koch <wk@g10code.com>

	Released 0.6.0.

	2006-01-25 Werner Koch <wk@g10code.com>

	* m4/gpg4win.m4 (GPG4WIN_BPKG_BINSRC): Kludge to allow
	"noinstaller" as an alternative to "bin".

	2006-01-23 Werner Koch <wk@g10code.com>

	* src/Makefile.am (README.en.txt, README.de.txt): New.
	(gpg4win-$(VERSION).exe): Depend on them.
	(CLEANFILES): Clean them up.

	* src/installer.nsi (T_LangCode): new.
	(MUI_FINISHPAGE_SHOWREADME): Use this intead of running the key
	manager. This makes sense becuase gpg4win needs to be insalled as
	Administartor but the Administrator should in general not use
	gpg4win.

	* src/inst-gpg4win.nsi: Install README.de.txt and README.en.txt.
	* src/uninst-gpg4win.nsi: Uninstall them.

	2006-01-20 Werner Koch <wk@g10code.com>

	* configure.ac: Create doc/log/Makefile.
	* src/inst-sections.nsi: Replaced splash image by new logo.
	* src/installer.nsi: Reserve that new file.
	(Icon, UninstallIcon): New.
	* src/gpg4win-splash.bmp: Removed.

	2006-01-19 Jan-Oliver Wagner <jan-oliver.wagner@intevation.de>

	* README.SVN: Extend sample configure call. Without the --host
	setting, configure will complain about missing dlltool.

	2006-01-13 Werner Koch <wk@g10code.com>

	* patches/glib-2.9.2-wk1/02-gspawn-w32.patch: New.

	2006-01-12 Werner Koch <wk@g10code.com>

	* src/inst-glib.nsi: Also install the console spawn helper.

	2006-01-10 Werner Koch <wk@g10code.com>

	* configure.ac: New option --disable-source-installer.
	* src/Makefile.am: Implement it.

	* src/installer.nsi: Insert directory page.

	2006-01-09 Werner Koch <wk@g10code.com>

	Released 0.5.1.

	* src/inst-gnupg.nsi: Install http and not curl version.

	* src/gpg4win.mk.in (stamps/stamp-directories): Touch versioninfo.

	* src/inst-gpg4win.nsi, src/uninst-gpg4win.nsi:
	* src/Makefile.am (stamps/stamp-dist-selft): Include ourself in the
	source installer.

	2006-01-06 Werner Koch <wk@g10code.com>

	* src/gpg4win.mk.in (VERSIONINFO_macro): New. Use it where
	appropriate.

	* configure.ac: Test for texi2dvi, dvipdf and sha1sum.

	* Makefile.am (SUBDIRS): Build doc prior to src.

	* src/inst-man_novice_de.nsi: Install einsteiger.pdf.
	* src/uninst-man_novice_de.nsi: Likewise.
	* src/inst-man_advanced_de.nsi: Install druchblicker.pdf
	* src/uninst-man_advanced_de.nsi: Likewise.

	2006-01-05 Werner Koch <wk@g10code.com>

	Released 0.5.0.

	* src/inst-winpt.nsi: Remove old mo installation hack.

	* src/Makefile.am (EXTRA_DIST): Add config.site.
	* Makefile.am (EXTRA_DIST): Update patches.

	* src/inst-sylpheed-claws.nsi, src/uninst-sylpheed-claws.nsi,
	* src/inst-gpa.nsi, src/uninst-gpa.nsi: Install language files.

	2006-01-04 Werner Koch <wk@g10code.com>

	* src/uninst-winpt.nsi: Deinstall the mo file.

	* src/uninst-gpgee.nsi: Fix Source uninstall.
	* src/uninst-glib.nsi, src/inst-glib.nsi, include/config.nsi.in:
	Adjusted for source build.

	* patches/glib-2.9.2-wk: New.

	* packages/packages.current: Switch to glib 2.9.2-wk1.

	2006-01-05 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac: Add libiconv and gettext as dependencies.

	2006-01-04 Marcus Brinkmann <marcus@g10code.de>

	* patches/glib/01-giowin32.patch,
	patches/glib-2.6.6/01-giowin32.patch,
	patches/glib-2.8.4/01-giowin32.patch: Flush write buffer in write
	thread before closing FD.

	* patches/glib/01-giowin32.patch,
	patches/glib-2.6.6/01-giowin32.patch,
	patches/glib-2.8.4/01-giowin32.patch: Notify write thread about fd
	close.

	2006-01-03 Marcus Brinkmann <marcus@g10code.de>

	* patches/glib-2.8.4/01-giowin32.patch: New file.

	2005-12-31 Marcus Brinkmann <marcus@g10code.de>

	* glib/02-windres.patch: New file.
	* glib-2.6.6/02-windres.patch: New file.

	* configure.ac (glib): Make it a source package.
	* src/Makefile.am (gpg4win_bpkgs): Move glib to ...
	(gpg4win_spkgs): ... here.
	* patches/glib/01-giowin32.patch: New file.
	* patches/glib-2.6.6/01-giowin32.patch: New file.
	* src/config.site: New file.
	* src/gpg4win.mk.in (tsdir): New variable.
	(SETVARS): Use $(idir), not ${idir}. Define CONFIG_SITE.

	2005-12-18 Marcus Brinkmann <marcus@g10code.de>

	* src/inst-sylpheed-claws.nsi: Install GPG plugins.
	* src/uninst-sylpheed-claws.nsi: Uninstall GPG plugins.

	* src/uninst-eudoragpg.nsi: Delete file
	$INSTDIR\share\eudoragpg\eudoragpg.html.

	2005-12-13 Werner Koch <wk@g10code.com>

	* packages/packages.current: Updated GPGee.
	* src/inst-gpgee.nsi: Adjusted for new location of packages.
	* m4/gpg4win.m4 (GPG4WIN_BPKG_BINSRC): Allow for -source suffix
	and uppercase package names.

	2005-12-12 Werner Koch <wk@g10code.com>

	* configure.ac: Test vor zcat.

	2005-12-09 Werner Koch <wk@g10code.com>

	* Makefile.am (SUBDIRS): Include doc dir.
	* configure.ac: Add new Makefiles.

	* doc/ChangeLog: New. Moved relevant entries to that file.

	2005-12-08 Werner Koch <wk@g10code.com>

	* packages/download.sh: Implemented CHK statement.
	* packages/packages.current: Add chk lines for all packages.

	2005-12-07 Werner Koch <wk@g10code.com>

	Released 0.3.1.

	2005-12-06 Werner Koch <wk@g10code.com>

	Released 0.3.0.

	2005-12-02 Werner Koch <wk@g10code.com>

	* packages/download.sh: New option --force. Default to skip
	already existing packages.

	2005-12-02 Timo Schulz <ts@g10code.com>

	* packages/download.sh: Update WinPT url.
	* packages/packages.keys: Add second release key for WinPT.

	2005-11-30 Werner Koch <wk@g10code.com>

	* src/inst-gpgol.nsi: Install German translation.
	* src/uninst-gpgol.nsi: Likewise.

	2005-11-29 Werner Koch <wk@g10code.com>

	* packages/packages.current: New. This is more or less a
	template; the version on the server may be updated without syncing
	it to this version.
	* packages/packages.keys: New.
	* packages/download.sh: Rewritten.

	* src/inst-sections.nsi (.onInstFailed, .onInstSuccess): New.
	(RunOnFinish): New function to run a key manager depending on the
	installed ones.
	* src/installer.nsi: Use a function to run the key manager on finish.

	2005-11-28 Werner Koch <wk@g10code.com>

	Released 0.2.1.

	* configure.ac: Append the revision number to the version suffix.

	* src/Makefile.am: Reduced verbosity level of makensis.

	* src/exdll.h: Adapted license to the NSIS one.
	(popstring): Add arg MAXLEN.
	* src/g4wihelp.c (playsound, stopsound): New.
	(splash_wndproc, showsplash): New.
	* src/inst-sections.nsi (.onInit): Use our new g4wihelp functions.
	(-startmenu): Translate the startmenu entries for the manuals.

	* src/installer.nsi (ReserveFile): Removed advsplash.

	* src/inst-gpa.nsi: Uppercase section name.

	* src/inst-man_novice_de.nsi, src/inst-man_advanced_de.nsi:
	Translate section name.

	* src/inst-gpgol.nsi: Try to register even on overwrite failure.

	2005-11-24 Werner Koch <wk@g10code.com>

	Released 0.2.0.

	* src/installer.nsi (PrintCloseOtherApps): New.

	2005-11-21 Werner Koch <wk@g10code.com>

	Released 0.1.0.

	* src/inst-sections.nsi: Disable uninstaller menu link.

	2005-11-18 Werner Koch <wk@g10code.com>

	* src/inst-sections.nsi: Add more dependencies to sylpheed.

	2005-11-17 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac: Add glib dependency for GPGME.
	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Add
	--enable-w32-glib and LDFLAGS.
	* src/inst-gpgme.nsi: Install libgpgme-glib-11.dll.
	* src/uninst-gpgme.nsi: Uninstall libgpgme-glib-11.dll.

	2005-11-17 Werner Koch <wk@g10code.com>

	* src/Makefile.am (EXTRA_DIST): Add loreley.mid as original source
	of the splash sound.

	Add packages pthreads-w32 and regex.

	* src/gpg4win.mk.in (MPKG_template): New.
	(pkgmkflags, pkgmkarg): New.
	(DEFLATE_macro): Use overwrite option for unzip.

	2005-11-16 Werner Koch <wk@g10code.com>

	* src/inst-crypt.nsi, src/uninst-crypt.nsi: New.
	* m4/gpg4win.m4 (GPG4WIN_BPKG_GNUWIN32_LIB): New.

	* src/uninst-sylpheed-claws.nsi, src/uninst-eudoragpg.nsi
	* src/inst-eudoragpg.nsi, src/inst-sylpheed-claws.nsi: New.
	* include/config.nsi.in: Add support for Sylpheed and EudorGPG.
	* src/Makefile.am (gpg4win_spkgs): Add them.
	(gpg4win_pkg_sylpheed_claws_configure): New.

	* src/inst-sections.nsi: Add them.
	* configure.ac: Add them.

	2005-11-15 Werner Koch <wk@g10code.com>

	* src/Makefile.am (EXTRA_DIST): Add g4wihelp.nsi.
	(CLEANFILES): Add g4wihelp.dll.

	* src/inst-gpgee.nsi: Use RegDLL and UnRegDLL. Print warning on
	registration failure. Use move approach for active extension.
	* src/inst-gpgol.nsi: Ditto.
	* src/uninst-gpgol.nsi: Use UnRegDLL and allow rebooting.
	* src/uninst-gpgee.nsi: Ditto.

	* src/installer.nsi: Moved inclusion of g4wihelp.nsi after the
	language definitions.

	* configure.ac (VERSION): Generate extended version information.
	* include/config.nsi.in: Define replacements
	* src/gpg4win.nsi, src/gpg4win-src.nsi: Use them for PROD_VERSION.

	* src/gpg4win-src.nsi: Add our build dir as plugindir.

	2005-11-14 Werner Koch <wk@g10code.com>

	* src/inst-sections.nsi (.onInit): Make sure that only one
	instance of the installer may run at the same time.
	* src/installer.nsi: Include g4wihelp.nsi.
	* src/g4wihelp.nsi: New.
	* src/g4wihelp.c: New.
	* src/exdll.h: New.

	2005-11-11 Marcus Brinkmann <marcus@g10code.de>

	* src/gpg4win.mk.in (stamps/stamp-$(1)-00-install): Don't strip.
	(stamps/stamp-$(1)-01-install-dev): Likewise.

	2005-11-08 Werner Koch <wk@g10code.com>

	* src/gpg4win.mk.in: Also strip DLLs; I am using stripped DLLs for
	months now.

	Released 0.0.2.

	* src/installer.nsi (T_WelcomeTitle): New.
	(MUI_WELCOMEPAGE_TITLE): New.
	(MUI_FINISHPAGE): Enhanced.

	* src/installer-finish.nsi (Uninstall): use a loop to delete the
	startmenu. Fixed Registry cleaning.

	* src/inst-sections.nsi (onInit): Make sure that only one
	installer is running.

	2005-11-07 Werner Koch <wk@g10code.com>

	* src/installer-finish.nsi: Fixed dereferencing of variable.

	* src/inst-sections.nsi, src/installer-finish.nsi: Ensure that the
	menu gets written for all users.

	* packages/download.sh: Add dummy manual pages.

	* src/installer.nsi: Move compression type to ...
	* src/gpg4win.nsi: .. here and ...
	* src/gpg4win-src.nsi: .. here. Use zlib for sources.

	* src/gpg4win-splash.bmp: New.
	* src/gpg4win-splash.wav: New.
	* src/installer.nsi: Reserve these files
	* src/inst-sections.nsi: Show silly splash screen.

	* include/config.nsi.in: Add dummy packages for the manuals.
	* src/uninst-man_advanced_de.nsi, src/uninst-man_novice_de.nsi
	* src/inst-man_advanced_de.nsi, src/inst-man_novice_de.nsi: Ditto.
	* src/Makefile.am (gpg4win_spkgs): Ditto.
	* src/inst-sections.nsi: Ditto.

	* src/installer-finish.nsi: Ditto.

	* src/inst-gnupg.nsi: Make section read-only.

	2005-11-04 Marcus Brinkmann <marcus@g10code.de>

	Released 0.0.1.

	* Makefile.am (EXTRA_DIST): Add missing backslash.
	* include/config.nsi.in (top_srcdir): Remove.
	* src/Makefile.am (gpg4win-src-$(VERSION).exe): Pass TOP_SRCDIR,
	SRCDIR and BUILD_DIR (absolute path) as defined values. Also, use
	$(srcdir) for nsi source file.
	(gpg4win-src-$(VERSION).exe): Likewise.
	* src/gpg4win.nsi: Change directory to build directory.
	Add include dirs ${TOP_SRCDIR} and ${SRCDIR}.
	* src/gpg4win-src.nsi: Likewise.
	* src/installer.nsi: Use ${TOP_SRCDIR} to access COPYING file.
	* src/gpg4win.mk (stamps/stamp-final): Depend on
	stamps/stamp-directories.

	2005-11-03 Werner Koch <wk@g10code.com>

	* include/config.nsi.in: Adjusted for WinPT being a source package now.

	* src/inst-winpt.nsi: Adjusted location of to be installed files.

	* src/Makefile.am (gpg4win_spkgs): Add winpt.
	(gpg4win_bpkgs): Remove winpt
	(gpg4win_pkg_winpt_configure): Added.

	* configure.ac (winpt): Made it a source package.

	* configure.ac: Bail out if a required tool is missing.

	2005-11-02 Werner Koch <wk@g10code.com>

	* README.SVN, autogen.sh: New.

	* Makefile.am (AUTOMAKE_OPTIONS): Add dist-bzip2.

	* packages/download.sh: Removed inclusion of config.h and defined
	WGET directly. This is required because the download script needs
	to be used before configure and thus we can't use configure to
	determine the to be used wget; the config.sh script was anyway
	missing.

	2005-10-26 Werner Koch <wk@g10code.com>

	* README: Add basic instructions on how to add new packages.

	* configure.ac: Add detection of GPGee and WinPT.
	* m4/gpg4win.m4 (GPG4WIN_BPKG_BINSRC): New.

	* include/config.nsi.in: Add defines for WinPT and GGee.
	* src/inst-winpt.nsi: New.
	* src/inst-gpgee.nsi: New.
	* src/uninst-winpt.nsi: New.
	* src/uninst-gpgee.nsi: New.
	* src/Makefile.am (gpg4win_bpkgs): Add WinPT and GPGee.
	* src/inst-sections.nsi: Ditto.
	* src/installer-finish.nsi: Ditto.
	* packages/download.sh (server_winpt): Add WinPT.
	(server_gpgee): Add temporary location for gpgee.
	(server_g10code): Add temporary location for gpg-error, gpgme,
	gpa and gpgol.

	2005-10-25 Werner Koch <wk@g10code.com>

	* src/installer.nsi: Don't put the version into the "Name" variable.

	2005-10-24 Marcus Brinkmann <marcus@g10code.de>

	* COPYING: New file.

	2005-10-23 Marcus Brinkmann <marcus@g10code.de>

	* src/gpg4win.mk.in (pdir): Call post_install with source dir as
	current directory.
	* configure.ac (VERSION): Check for dlltool.
	* src/Makefile.am (gpg4win_pkg_libiconv_post_install,
	gpg4win_pkg_gettext_post_install): New macros.
	* src/libiconv.def, src/libintl.def: New files.
	* src/inst-libgpg-error.nsi: Install mo files.
	* src/uninst-libgpg-error.nsi: Uninstall mo files.

	2005-10-22 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac: Add libiconv and gettext as dependencies for
	libgpg-error and gpa.
	* src/Makefile.am (gpg4win_pkg_libgpg_error_configure): New
	variable.

	* src/Makefile.am (common_nsi): Add uninstaller files.
	* src/uninst-atk.nsi, src/uninst-gettext.nsi, src/uninst-glib.nsi,
	src/uninst-gnupg.nsi, src/uninst-gpa.nsi, src/uninst-gpgme.nsi,
	src/uninst-gpgol.nsi, src/uninst-gtk+.nsi,
	src/uninst-libgpg-error.nsi, src/uninst-libiconv.nsi,
	src/uninst-libpng.nsi, src/uninst-pango.nsi,
	src/uninst-pkgconfig.nsi, src/uninst-zlib.nsi: New file.
	* src/inst-sections.nsi: Include the uninstallers in reverse
	order.
	* src/inst-gpgol.nsi: Register the gpgol DLL at installation, and
	(surprise!) unregister it at deinstallation.

	2005-10-21 Marcus Brinkmann <marcus@g10code.de>

	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Enable static
	library for gpgol.
	(gpg4win_pkg_gpgol_configure): Add gpg-error prefix.

	* src/inst-gnupg.nsi: Fix path of deleted files.

	* src/gpg4win.mk.in (pdir): Don't strip DLL files.

	2005-10-20 Marcus Brinkmann <marcus@g10code.de>

	* m4/gpg4win.m4 (GPG4WIN_DEFINE): New function. Use it to define
	feature symbols for NSI. Use m4_translit instead of m4_bpatsubst.
	New option --enable-debug.
	* include/config.nsi.in: Catch all this new information.
	* src/gpg4win.nsi (DEBUG): Define if [GPG4WIN_DEBUG].
	(HAVE_PKG_GPA): Don't define here.
	* src/inst-sections.nsi: Guard all package specific commands with
	feature macro checks. Calculate dependencies on .onInit, too.
	* src/gpg4win.mk.in (STRIP_macro): Quote $(DEBUG) strictly.

	* src/installer-finish.nsi: Add support for Add/Remove Programs.

	2005-10-20 Werner Koch <wk@g10code.com>

	* m4/gpg4win.m4 (GPG4WIN_FIND): Quote a file variable.
	(GPG4WIN_SPKG): Ditto.

	2005-10-20 Marcus Brinkmann <marcus@g10code.de>

	* src/gpg4win.nsi: Add start menu support.
	* src/inst-sections.nsi: Likewise.
	* src/installer.nsi: Likewise.
	* src/installer-finish.nsi: Likewise.

	* src/gpg4win.mk.in (GETVAR): Don't quote the first $.
	(STRIP_macro): New macro.
	(SPKG, BPKG): Use it here.

	* Makefile.am (EXTRA_DIST): New target.
	* include/Makefile.am (EXTRA_DIST): Change config.nsh.in to
	config.nsi.in.
	* src/Makefile.am (EXTRA_DIST): Remove pkg-config. Add nsi files.

	* src/inst-gpgol.nsi: Change libgpgol-0.9.3.dll to gpgol.dll.

	* src/gpg4win.mk.in (stamp/stamp-$(1)-02-configure): Add
	-mms-bitfields to CFLAGS.

	* src/gpg4win.mk.in (stamps/stamp-final): New target that replaces
	phony target final.

	2005-10-20 Werner Koch <wk@g10code.com>

	* src/*.nsi: Add a Latin-1 tag to make sure that Emacs uses the
	correct encoding.
	* doc/nsi-mode.el: Added for convenience.

	2005-10-20 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac: Check for makensis. Add gnupg as dependency for
	gpgme. Change config.sh into config.nsi.
	* include/config.sh.in: File removed.
	* src/gpg4win.sh: File removed.
	* include/config.nsi.in: New file.
	* include/Makefile.am (EXTRA_DIST): Change config.sh.in into
	config.nsi.in.
	* src/Makefile.am (gpg4win-$(VERSION).exe): New target.
	(gpg4win-src-$(VERSION).exe): New target.
	(all-local): Remove dependency on phony target all-gpg4win.
	(all-local): Add dependency on gpg4win-$(VERSION).exe and
	gpg4win-src-$(VERSION).exe.
	(clean-local): New rule for this target.
	* src/gpg4win.nsi, src/gpg4win-src.nsi, src/inst-atk.nsi,
	src/inst-gettext.nsi, src/inst-glib.nsi, src/inst-gnupg.nsi,
	src/inst-gpa.nsi, src/inst-gpgme.nsi, src/inst-gpgol.nsi,
	src/inst-gtk+.nsi, src/inst-libgpg-error.nsi,
	src/inst-libiconv.nsi, src/inst-libpng.nsi, src/inst-pango.nsi,
	src/inst-pkgconfig.nsi, src/inst-sections.nsi, src/inst-zlib.nsi,
	src/installer-finish.nsi, src/installer.nsi: New file.

	2005-10-18 Marcus Brinkmann <marcus@g10code.de>

	configure.ac: Enable libiconv and gettext dependencies for Gtk+.

	* src/Makefile.am: First real implementation.
	* src/gpg4win.mk.in: New file.
	* configure.ac: Activate libiconv and gettext.
	(AC_CONFIG_FILES): Add packages/Makefile and src/gpg4win.mk.
	* m4/gpg4win.m4 (GPG4WIN_BPKG_GNU): New macro.
	* include/config.sh.in: Add variables for libiconv and gettext.

	2005-10-15 Marcus Brinkmann <marcus@g10code.de>

	* m4/gpg4win.m4: New file.
	* include/config.sh: Add many package variables.
	* configure.ac: Call package detection macros.
	* Makefile.am (ACLOCAL_AMFLAGS): New variable.
	* src/gpg4win.sh: Use some of the new variables.

	* packages/download.sh: Fix downloading of Gtk source packages.


	Copyright 2005, 2006, 2007, 2008 g10 Code GmbH

	This file is free software; as a special exception the author gives
	unlimited permission to copy and/or distribute it, with or without
	modifications, as long as this notice is preserved.

	This file is distributed in the hope that it will be useful, but
	WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
	implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	diff --git a/po/ar.po b/po/ar.po
	index 16f99bf9..a516e6bc 100644
	--- a/po/ar.po
	+++ b/po/ar.po
	@@ -1,486 +1,490 @@
	# translation of ar.po to Arabic
	# Copyright (C) YEAR g10 Code GmbH
	# This file is distributed under the same license as the PACKAGE package.
	#
	# Khaled Hosny <khaledhosny@eglug.org>, 2008.
	# Ahmad Gharbeia <gharbeia@gmail.com>, 2008.
	msgid ""
	msgstr ""
	"Project-Id-Version: Gpg4Win\n"
	"Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
	-"POT-Creation-Date: 2008-05-09 19:09+0200\n"
	+"POT-Creation-Date: 2008-05-28 11:25+0200\n"
	"PO-Revision-Date: 2008-03-11 23:52+0200\n"
	"Last-Translator: Ahmad Gharbeia <ahmad@gharbeia.org>\n"
	"Language-Team: Arabic <doc@arabeyes.org>\n"
	"MIME-Version: 1.0\n"
	"Content-Type: text/plain; charset=CP1256\n"
	"Content-Transfer-Encoding: 8bit\n"
	"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 && "
	"n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5;\n"

	#: src/g4wihelp.nsi:21
	msgctxt "T_AlreadyRunning"
	msgid "An instance of this installer is already running."
	msgstr "ÊÚãá ÓíÑæÑÉ ÃÎÑì ãä åÐÇ ÇáãõËÈøöÊ ÈÇáÝÚá."

	#: src/gpg4win.nsi:117
	msgctxt "T_WelcomeTitleGpg4win"
	msgid "Welcome to the installation of Gpg4win"
	msgstr "ãÑÍÈÇ Ýí ÊËÈíÊ Gpg4win"

	#: src/gpg4win.nsi:121
	msgctxt "T_AboutGpg4win"
	msgid ""
	"GnuPG is GNU's tool for secure communication and data storage. It can be "
	"used to encrypt data and to create digital signatures. It includes an "
	"advanced key management facility and is compliant with the proposed OpenPGP "
	"Internet standard as described in RFC2440."
	msgstr ""
	"þGnuPG åæ ÃÏÇÉ Ìäæ ááÇÊÕÇáÇÊ æ ÇáÊÎÒíä ÇáÂãä ááÈíÇäÇÊ. íõãßä ÇÓÊÎÏÇãå áÊÚãíÉ "
	"ÇáÈíÇäÇÊ æ ÇáÊæÞíÚ ÇáÑÞãíº æ åæ íÔÊãá Úáì æÓíáÉ ãÊÞÏãÉ áÅÏÇÑÉ ÇáãÝÇÊíÍ¡ "
	"æíÊæÇÝÞ ãÚ ãÚíÇÑ ÇáÅäÊÑäÊ OpenPGP ÇáãÞÊÑÍ ßãÇ æõÕöÝ Ýí RFC2440."

	#: src/gpg4win.nsi:127
	msgctxt "T_AboutGpg4winVersion"
	msgid "This is Gpg4win version ${VERSION}"
	msgstr "åÐå ÇáÅÕÏÇÑÉ ${VERSION} ãä Gpg4win"

	#: src/gpg4win.nsi:130
	msgctxt "T_AboutGpg4winFileVersion"
	msgid "file version ${PROD_VERSION}"
	msgstr "ÅÕÏÇÑÉ ÇáãáÝ ${PROD_VERSION}"

	#: src/gpg4win.nsi:133
	msgctxt "T_AboutGpg4winReleaseDate"
	msgid "release date ${_BUILD_ISODATE}"
	msgstr "ÊÇÑíÎ ÇáÅÕÏÇÑ ${_BUILD_ISODATE}"

	#: src/gpg4win-src.nsi:76
	msgctxt "T_WelcomeTitleGpg4winSrc"
	msgid "Welcome to the installation of the Gpg4win sources"
	msgstr "ãÑÍÈÇ Ýí ÊËÈíÊ ãÕÇÏöÑ Gpg4win"

	#: src/gpg4win-src.nsi:80
	msgctxt "T_AboutGpg4winSrc"
	msgid ""
	"GnuPG is GNU's tool for secure communication and data storage. It can be "
	"used to encrypt data and to create digital signatures. It includes an "
	"advanced key management facility and is compliant with the proposed OpenPGP "
	"Internet standard as described in RFC2440."
	msgstr ""
	"þGnuPG åæ ÃÏÇÉ Ìäæ ááÇÊÕÇáÇÊ æ ÇáÊÎÒíä ÇáÂãä ááÈíÇäÇÊ. íõãßä ÇÓÊÎÏÇãå áÊÚãíÉ "
	"ÇáÈíÇäÇÊ æ ÇáÊæÞíÚ ÇáÑÞãíº æ åæ íÔÊãá Úáì æÓíáÉ ãÊÞÏãÉ áÅÏÇÑÉ ÇáãÝÇÊíÍ¡ "
	"æíÊæÇÝÞ ãÚ ãÚíÇÑ ÇáÅäÊÑäÊ OpenPGP ÇáãÞÊÑÍ ßãÇ æõÕöÝ Ýí RFC2440."

	#: src/gpg4win-src.nsi:86
	msgctxt "T_AboutGpg4winSrcVersion"
	msgid "This is Gpg4win version ${VERSION}"
	msgstr "åÐå ÇáÅÕÏÇÑÉ ${VERSION} ãä Gpg4win"

	#: src/gpg4win-src.nsi:89
	msgctxt "T_AboutGpg4winSrcFileVersion"
	msgid "file version ${PROD_VERSION}"
	msgstr "ÅÕÏÇÑÉ ÇáãáÝ ${PROD_VERSION}"

	#: src/gpg4win-src.nsi:92
	msgctxt "T_AboutGpg4winSrcReleaseDate"
	msgid "release date ${_BUILD_ISODATE}"
	msgstr "ÊÇÑíÎ ÇáÅÕÏÇÑ ${_BUILD_ISODATE}"

	#: src/installer.nsi:217
	msgctxt "T_LangCode"
	msgid "en"
	msgstr "ar"

	#: src/installer.nsi:220
	msgctxt "T_GPLHeader"
	msgid ""
	"This software is licensed under the terms of the GNU General Public License "
	"(GPL) which guarantees your freedom to share and change Free Software."
	msgstr ""
	"åÐå ÇáÈÑãÌíÉ ãÑÎÕÉ ÈÑÎÕÉ Ìäæ ÇáÚãæãíÉ ÇáÚÇãÉ (GPL) æÇáÊí ÊãäÍß ÍÑíÉ ãÔÇÑßÉ "
	"æÊÚÏíá ÇáÈÑãÌíÇÊ ÇáÍÑÉ."

	#: src/installer.nsi:225
	msgctxt "T_GPLShort"
	msgid ""
	"In short: You are allowed to run this software for any purpose. You may "
	"distribute it as long as you give the recipients the same rights you have "
	"received."
	msgstr ""
	"ÈÇÎÊÕÇÑ: ÊÓÊØíÚ ÊÔÛíá åÐå ÇáÈÑãÌíÉ áÃí ÛÑÖ. æíãßäß ÊæÒíÚåÇ ãÇ ÏãÊ ÊÚØí "
	"ÇáãÊáÞíä äÝÓ ÇáÍÞæÞ ÇáÊí ÍÕáÊ ÚáíåÇ."

	#: src/installer.nsi:230
	msgctxt "T_RunKeyManager"
	msgid "Run the key manager"
	msgstr "ÔÛøá ãÏíÑ ÇáãÝÇÊíÍ"

	#: src/installer.nsi:233
	msgctxt "T_MoreInfo"
	msgid "Click here for the project's homepage"
	msgstr "ÇäÞÑ åäÇ áÊÒæÑ ÕÝÍÉ ÇáãÔÑæÚ"

	#: src/installer.nsi:235
	msgctxt "T_MoreInfoURL"
	msgid "http://www.gpg4win.org"
	msgstr "http://www.gpg4win.org"

	#: src/installer.nsi:237
	msgctxt "T_ShowReadme"
	msgid "Show the README file"
	msgstr "ØÇáÚ ãáÝ README"

	#: src/installer.nsi:240
	msgctxt "T_NoKeyManager"
	msgid "No key manager has been installed, thus we can't run one now."
	msgstr "áã íõËÈøÊ Ãí ãÏíÑ ãÝÇÊíÍ¡ áÐÇ áÇ äÓÊØíÚ ÊÔÛíáå."

	#: src/installer.nsi:245
	msgctxt "DESC_Menu_manuals"
	msgid "Documentation"
	msgstr "ÇáÊæËíÞ"

	#: src/installer.nsi:249
	msgctxt "DESC_Desktop_manuals"
	msgid "Gpg4win Documentation"
	msgstr "æËÇÆÞ Gpg4win"

	#: src/installer.nsi:446
	msgctxt "T_InstallOptions"
	msgid "Install Options"
	msgstr "ÎíÇÑÇÊ ÇáÊËÈíÊ"

	#: src/installer.nsi:449
	msgctxt "T_InstallOptLinks"
	msgid "Start links"
	msgstr "æÕáÇÊ ÇáÈÏÁ"

	#: src/installer.nsi:451
	msgctxt "T_InstOptLabelA"
	msgid "Please select where Gpg4win shall install links:"
	msgstr "ÇÎÊÑ Ãíä íÊÚíä ËÈíÊ ÇáæÕáÇÊ:"

	#: src/installer.nsi:454
	msgctxt "T_InstOptLabelB"
	msgid "(Only programs will be linked into the quick launch bar.)"
	msgstr "(ÝÞØ ÇáÈÑãÌíÇÊ ÓíÑÈØ ÅáíåÇ Ýí ÔÑíØ ÇáÈÏÁ ÇáÓÑíÚ.)"

	#: src/installer.nsi:457
	msgctxt "T_InstOptFieldA"
	msgid "Start Menu"
	msgstr "ÞÇÆãÉ ÇÈÏÃ"

	#: src/installer.nsi:460
	msgctxt "T_InstOptFieldB"
	msgid "Desktop"
	msgstr "ÓØÍ ÇáãßÊÈ"

	#: src/installer.nsi:463
	msgctxt "T_InstOptFieldC"
	msgid "Quick Launch Bar"
	msgstr "ÔÑíØ ÇáÈÏÁ ÇáÓÑíÚ"

	#: src/installer.nsi:469
	msgctxt "T_FoundExistingVersion"
	msgid ""
	"Version $R1 has already been installed.\n"
	"Do you want to overwrite it with version ${VERSION}?"
	msgstr ""
	"ÇáÅÕÏÇÑÉ $R1 ãËÈÊÉ ÈÇáÝÚá.\n"
	"ÃÊÑíÏ ÇÓÊÈÏÇáåÇ ÈÇáÅÕÏÇÑÉ ${VERSION}¿"

	#: src/installer.nsi:472
	msgctxt "T_FoundExistingVersionB"
	msgid ""
	"A version of Gpg4Win has already been installed on the system. There will be "
	"no problem installing and thus overwriting this Version.\n"
	"\n"
	"Do you want to continue installing Gpg4win?"
	msgstr ""
	"Êã ÊËÈíÊ ÅÕÏÇÑÉ ãä Gpg4Win Úáì åÐÇ ÇáäÙÇã ãä ÞÈá. áÇ ãÔÇßá Ýí ÇáÊËÈíÊ "
	"æÇÓÊÈÏÇá Êáß ÇáÅÕÏÇÑÉ.\n"
	"\n"
	"ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win¿"

	#: src/installer.nsi:483
	msgctxt "T_FoundOldSeeManual"
	msgid ""
	"Please see the Gpg4win user manual to learn how to migrate existing keys "
	"from other GnuPG based installations to Gpg4win."
	msgstr ""
	"ãä ÝÖáß ØÇáÚ Ïáíá ãÓÊÎÏã Gpg4win áÊÞÑÃ Úä ØÑíÞÉ äÞá ÇáãÝÇÊíÍ ÇáãæÌæÏÉ ãä ÞÈá "
	"ãä ÊËÈíÊÇÊ ÓÇÈÞÉ ãÈäíÉ Úáì GnuPG Åáì Gpg4win."

	#: src/installer.nsi:488
	msgctxt "T_FoundOldGnuPP"
	msgid ""
	"An old installation of GnuPP (GNU Privacy Project) has been been detected. "
	"That software is not maintained anymore and thus should be removed.\n"
	"\n"
	"Do you want to continue installing Gpg4win and take care of the old "
	"installation later?"
	msgstr ""
	"æõÌöÏ ÊËÈíÊ ÞÏíã ãä GnuPP (ãÔÑæÚ ÎÕæÕíÉ Ìäæ). åÐå ÇáÈÑãÌíÇÊ áíÓÊ ÞíÏ ÇáÊØæíÑ "
	"ÈÚÏ ÇáÂä æíÌÈ ÅÒÇáÊåÇ.\n"
	"\n"
	"ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win æÇáÊÚÇãá ãÚ ÇáÊËÈíÊ ÇáÞÏíã áÇÍÞÇ¿"

	#: src/installer.nsi:497
	msgctxt "T_FoundOldGnuPT"
	msgid ""
	"An installation of GnuPT has been been detected. This may cause problems "
	"when used along with Gpg4win.\n"
	"\n"
	"Do you want to continue installing Gpg4win?"
	msgstr ""
	"æÌÏÊ ÊËÈíÊ ãä GnuPT. ÞÏ íÓÈÈ åÐÇ ãÔÇßá ÅÐÇ ÇÓÊÎÏã ãÚ Gpg4win.\n"
	"\n"
	"ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win¿"

	#: src/installer.nsi:504
	msgctxt "T_FoundOldWinPTSF"
	msgid ""
	"An old installation of the Sourceforge hosted WinPT has been been detected. "
	"That software is not maintained anymore and should be removed.\n"
	"\n"
	"Do you want to continue installing Gpg4win and take care of the old "
	"installation later?"
	msgstr ""
	"æõÌöÏ ÊËÈíÊ ÞÏíã ãä WinPT ÇáãÓÊÖÇÝ Ýí Sourceforge. áÇ ÊÎÖÚ åÐå ÇáÈÑãÌíÇÊ "
	"ááÊØæíÑ ÈÚÏ ÇáÂä æíÌÈ ÅÒÇáÊåÇ.\n"
	"\n"
	"ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win æÇáÊÚÇãá ãÚ ÇáÊËÈíÊ ÇáÞÏíã áÇÍÞÇ¿"

	#: src/installer.nsi:514
	msgctxt "T_FoundOldGnuPack"
	msgid ""
	"An installation of GnuPG-Pack has been been detected. You need to uninstall "
	"it before you can continue with Gpg4win installation.\n"
	"\n"
	"The installation will be aborted now!"
	msgstr ""
	"æõÌöÏ ÊËÈíÊ ãä GnuPG-Pack. ÊÍÊÇÌ Åáì ÅÒÇáÊå ÞÈá ÊËÈíÊ Gpg4win.\n"
	"\n"
	"ÓíæÞÝ ÇáÊËÈíÊ ÇáÂä!"

	#: src/installer.nsi:523
	msgctxt "T_BetaWarning"
	msgid ""
	"Note: This is a BETA version of Gpg4win.\n"
	"\n"
	"Beta versions are only intended for testing and shall not be used in a "
	"production environment."
	msgstr ""

	#: src/installer.nsi:530
	msgctxt "T_AdminNeeded"
	msgid ""
	"Warning: Administrator permissions required for a successful installation"
	msgstr "ÊÍÐíÑ: ÊÍÊÇÌ Åáì ÕáÇÍíÇÊ ÇáãÏíÑ áÅÊãÇã ÇáÊËÈíÊ"

	#: src/installer.nsi:534
	#, fuzzy
	msgctxt "T_CloseOtherApps"
	msgid ""
	"Please make sure that other applications are not running. In particular you "
	"should close Outlook and all Explorer windows. Gpg4win will try to install "
	"anyway but a reboot will be required then."
	msgstr ""
	"ÑÌÇÁ ÊÃßÏ ãä ÚÏã ÊÔÛíá Ãí ÊØÈíÞÇÊ ÃÎÑì. Úáíß ÎÕæÕÇ ÅÛáÇÞ ßá äæÇÝÐ ÃæÊáæß Ãæ "
	"ÅßÓÈáæÑÑ. ÓíÍÇæá Gpg4Win ÇáËÈíÊ Úáì Ãí ÍÇá áßä ÓÊÍÊÇÌ Åáì ÅÚÇÏÉ ÇáÊÔÛíá."

	#: src/installer.nsi:539
	msgctxt "T_ShuttingDownWinPT"
	msgid "Trying to shutdown a possible running instance of WinPT."
	msgstr "ÊÌÑí ãÍÇæáÉ ÅÛáÇÞ ÓíÑæÑÉ ãÍÊãáÉ ÚÇãáÉ ãä WinPT."

	#: src/installer.nsi:541
	msgctxt "T_ShuttingDownDirMngr"
	msgid "Trying to shutdown a possible running instance of DirMngr."
	msgstr "ÊÌÑí ãÍÇæáÉ ÅÛáÇÞ ÓíÑæÑÉ ãÍÊãáÉ ÚÇãáÉ ãä DirMngr."

	#: src/inst-claws-mail.nsi:53
	msgctxt "DESC_SEC_claws_mail"
	msgid "Claws Mail-User-Agent"
	msgstr "ÈÑãÌíÉ ÇáÈÑíÏ Claws"

	#: src/inst-claws-mail.nsi:56
	msgctxt "DESC_Menu_claws_mail"
	msgid "Run the Claws mailprogram."
	msgstr "ÔÛá ÈÑãÌíÉ ÇáÈÑíÏ Claws"

	#: src/inst-claws-mail.nsi:59
	msgctxt "DESC_Menu_claws_mail_pdf"
	msgid "Show the online manual of Claws Mail"
	msgstr "ÇÚÑÖ ßÊíøÈ ÈÑíÏ Claws Úáì ÇáæÈ"

	#: src/inst-eudoragpg.nsi:40
	msgctxt "DESC_SEC_eudoragpg"
	msgid "EudoraGPG is a plugin for the Eudora mail program"
	msgstr "þEudoraGPG åí ãáÍÞÉ áÈÑãÌíÉ ÇáÈÑíÏ Eudora"

	#: src/inst-gnupg2.nsi:118
	msgctxt "DESC_SEC_gnupg2"
	msgid "GNU Privacy Guard with S/MIME support"
	msgstr "ÍÇÑÓ ÎÕæÕíÉ Ìäæ ãÚ ÏÚã S/MIME"

	#: src/inst-gnupg.nsi:108
	msgctxt "DESC_SEC_gnupg"
	msgid "GNU Privacy Guard"
	msgstr "ÍÇÑÓ ÎÕæÕíÉ Ìäæ"

	#: src/inst-gpa.nsi:75
	msgctxt "DESC_SEC_gpa"
	msgid "GNU Privacy Assistant"
	msgstr "ãÓÇÚÏ ÎÕæÕíÉ Ìäæ"

	#: src/inst-gpa.nsi:78
	msgctxt "DESC_Menu_gpa"
	msgid ""
	"Run the GNU Privacy Assistant key management tool. This is an alternative to "
	"the WinPT key management tool."
	msgstr ""
	"ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ ãÓÇÚÏ ÎÕæÕíÉ Ìäæ. åÐå ÈÏíá áÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ "
	"WinPT."

	#: src/inst-gpg4win.nsi:43
	msgctxt "DESC_Menu_gpg4win_readme"
	msgid "General information on Gpg4Win"
	msgstr "ãÚáæãÇÊ ÚÇãÉ Úä Gpg4Win"

	#: src/inst-gpg4win.nsi:46
	msgctxt "DESC_Menu_gnupg_faq"
	msgid "Show the Frequently Asked Questions Document for GnuPG"
	msgstr "ØÇáÚ ÇáÃÓÆáÉ ÇáÔÇÆÚÉ Íæá GnuPG"

	#: src/inst-gpgee.nsi:65
	msgctxt "T_GPGee_RegFailed"
	msgid "Warning: Registration of the GPGee explorer extension failed."
	msgstr "ÊÍÐíÑ: ÝÔá ÊÓÌíá ÇãÊÏÇÏ GPGee áÅßÓÈáæÑÑ."

	#: src/inst-gpgee.nsi:68
	msgctxt "DESC_SEC_gpgee"
	msgid "GPG Explorer Extensions"
	msgstr "ÇãÊÏÇÏ GPG áÅßÓÈáæÑÑ"

	#: src/inst-gpgee.nsi:71
	msgctxt "DESC_Menu_gpgee_hlp"
	msgid "Show the online manual of GPGee"
	msgstr "ÇÚÑÖ ßÊíøÈ GPGee Úáì ÇáæÈ"

	#: src/inst-gpgex.nsi:80
	msgctxt "T_GpgEX_RegFailed"
	msgid "Warning: Registration of the GpgEX plugin failed."
	msgstr "ÊÍÐíÑ: ÝÔá ÊÓÌíá ãáÍÞÉ GpgEX."

	#: src/inst-gpgex.nsi:83
	msgctxt "DESC_SEC_gpgex"
	msgid "GnuPG Shell Extension"
	msgstr "ãáÍÞ GnuPG ááÕøóÏóÝÉ"

	#: src/inst-gpgol.nsi:57
	msgctxt "T_GpgOL_RegFailed"
	msgid "Warning: Registration of the GpgOL Outlook pluginfailed."
	msgstr "ÊÍÐíÑ: ÝÔá ÊÓÌíá ãáÍÞÉ GpgOL áÃæÊáæß."

	#: src/inst-gpgol.nsi:60
	msgctxt "DESC_SEC_gpgol"
	msgid "GnuPG for Outlook"
	msgstr "þGnuPG áÃæÊáæß"

	#: src/inst-kleopatra.nsi:195
	msgctxt "DESC_SEC_kleopatra"
	-msgid "Kleopatra"
	-msgstr "ßáíæÈÇÊÑÇ"
	+msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
	+msgstr ""

	-#: src/inst-kleopatra.nsi:198
	+#: src/inst-kleopatra.nsi:199
	msgctxt "DESC_Menu_kleopatra"
	msgid "Run the Kleopatra key management tool."
	msgstr "ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ ßáíæÈÇÊÑÇ."

	#: src/inst-man_advanced_de.nsi:39
	msgctxt "DESC_Name_man_advanced_de"
	msgid "Advanced Manual (German)"
	msgstr "ßÊíøÈ ÇáãÊÞÏãíä (ÈÇáÃáãÇäíÉ)"

	#: src/inst-man_advanced_de.nsi:42
	msgctxt "DESC_SEC_man_advanced_de"
	msgid "Gpg4Win Manual for the Advanced User (German)"
	msgstr "ßõÊíÈ Gpg4Win ááãÓÊÎÏãíä ÇáãÊÞÏãíä (ÈÇáÃáãÇäíÉ)"

	#: src/inst-man_advanced_de.nsi:45
	msgctxt "DESC_Menu_man_advanced_de"
	msgid "Show the German online manual of Gpg4Win for advanced users"
	msgstr "ÇÚÑÖ Ïáíá Gpg4Win ÈÇáÃáãÇäíÉ Úáì ÇáæÈ ááãÓÊÎÏãíä ÇáãÊÞÏãíä"

	#: src/inst-man_advanced_en.nsi:39
	msgctxt "DESC_Name_man_advanced_en"
	msgid "Advanced Manual"
	msgstr "Ïáíá ÇáãÊÞÏãíä"

	#: src/inst-man_advanced_en.nsi:42
	msgctxt "DESC_SEC_man_advanced_en"
	msgid "Gpg4Win Manual for the Advanced User"
	msgstr "Ïáíá Gpg4Win ááãÓÊÎÏãíä ÇáãÊÞÏãíä"

	#: src/inst-man_advanced_en.nsi:45
	msgctxt "DESC_Menu_man_advanced_en"
	msgid "Show the online manual of Gpg4Win for advanced users"
	msgstr "ÇÚÑÖ Ïáíá Gpg4Win Úáì ÇáæÈ ááãÓÊÎÏãíä ÇáãÊÞÏãíä"

	#: src/inst-man_novice_de.nsi:39
	msgctxt "DESC_Name_man_novice_de"
	msgid "Novice Manual (German)"
	msgstr "Ïáíá ÇáãÈÊÏÆíä (ÈÇáÃáãÇäíÉ)"

	#: src/inst-man_novice_de.nsi:42
	msgctxt "DESC_SEC_man_novice_de"
	msgid "Gpg4Win Manual for the Novice User (German)"
	msgstr "Ïáíá Gpg4Win ááãÓÊÎÏãíä ÇáãÈÊÏÆíä (ÈÇáÃáãÇäíÉ)"

	#: src/inst-man_novice_de.nsi:45
	msgctxt "DESC_Menu_man_novice_de"
	msgid "Show the German online manual of Gpg4Win for novice users"
	msgstr "ÇÚÑÖ Ïáíá Gpg4Win ÈÇáÃáãÇäíÉ Úáì ÇáæÈ ááãÓÊÎÏãíä ÇáãÈÊÏÆíä"

	#: src/inst-man_novice_en.nsi:39
	msgctxt "DESC_Name_man_novice_en"
	msgid "Novice Manual"
	msgstr "Ïáíá ÇáãÈÊÏÆíä"

	#: src/inst-man_novice_en.nsi:42
	msgctxt "DESC_SEC_man_novice_en"
	msgid "Gpg4Win Manual for the Novice User"
	msgstr "Ïáíá Gpg4Win ááãÓÊÎÏãíä ÇáãÈÊÏÆíä"

	#: src/inst-man_novice_en.nsi:45
	msgctxt "DESC_Menu_man_novice_en"
	msgid "Show the online manual of Gpg4Win for novice users"
	msgstr "ÇÚÑÖ Ïáíá Gpg4Win Úáì ÇáæÈ ááãÓÊÎÏãíä ÇáãÈÊÏÆíä"

	#: src/inst-winpt.nsi:46
	msgctxt "DESC_SEC_winpt"
	msgid "Windows Privacy Tray"
	msgstr "áæÍÉ ÎÕæÕíÉ æíäÏæÒ"

	#: src/inst-winpt.nsi:49
	msgctxt "DESC_Menu_winpt"
	msgid ""
	"Run the Windows Privacy Tray key management tool. This is a versatile key "
	"management and encryption tool."
	msgstr ""
	"ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ áæÍÉ ÎÕæÕíÉ æíäÏæÒ. åÐå ÃÏÇÉ ÅÏÇÑÉ ãÝÇÊíÍ æÊÚãíÉ "
	"ãÊÚÏÏÉ ÇáÇÓÊÚãÇáÇÊ."

	+#~ msgctxt "DESC_SEC_kleopatra"
	+#~ msgid "Kleopatra"
	+#~ msgstr "ßáíæÈÇÊÑÇ"
	+
	#~ msgctxt "DESC_SEC_sylpheed"
	#~ msgid "Sylpheed-Claws Mail-User-Agent"
	#~ msgstr "ÈÑãÌíÉ ÇáÈÑíÏ Sylpheed-Claws"

	#~ msgctxt "DESC_Menu_sylpheed"
	#~ msgid "Run the Sylpheed-Claws mailprogram."
	#~ msgstr "ÔÛá ÈÑãÌíÉ ÇáÈÑíÏ Sylpheed-Claws"

	#~ msgctxt "DESC_Menu_sylpheed_pdf"
	#~ msgid "Show the online manual of Sylpheed Claws"
	#~ msgstr "ÇÚÑÖ Ïáíá Sylpheed Claws Úáì ÇáæÈ"
	diff --git a/po/de.po b/po/de.po
	index 5854baf0..287d05f8 100644
	--- a/po/de.po
	+++ b/po/de.po
	@@ -1,567 +1,573 @@
	# German translations for gpg4win package.
	# Copyright (C) 2007 g10 Code GmbH
	# This file is distributed under the same license as the gpg4win package.
	#
	msgid ""
	msgstr ""
	"Project-Id-Version: gpg4win 1.1.1-svn417\n"
	"Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
	-"POT-Creation-Date: 2008-05-09 19:09+0200\n"
	-"PO-Revision-Date: 2008-04-22 15:44+0200\n"
	+"POT-Creation-Date: 2008-05-28 11:25+0200\n"
	+"PO-Revision-Date: 2008-05-28 11:26+0200\n"
	"Last-Translator: Marcus Brinkmann <mb@g10code.com>\n"
	"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
	"MIME-Version: 1.0\n"
	"Content-Type: text/plain; charset=ISO-8859-1\n"
	"Content-Transfer-Encoding: 8bit\n"
	"Plural-Forms: nplurals=2; plural=(n != 1);\n"

	#: src/g4wihelp.nsi:21
	msgctxt "T_AlreadyRunning"
	msgid "An instance of this installer is already running."
	msgstr "Ein Exemplar dieses Installers läuft bereits."

	#: src/gpg4win.nsi:117
	msgctxt "T_WelcomeTitleGpg4win"
	msgid "Welcome to the installation of Gpg4win"
	msgstr "Willkommen bei der Installation von Gpg4win"

	#: src/gpg4win.nsi:121
	msgctxt "T_AboutGpg4win"
	msgid ""
	"GnuPG is GNU's tool for secure communication and data storage. It can be "
	"used to encrypt data and to create digital signatures. It includes an "
	"advanced key management facility and is compliant with the proposed OpenPGP "
	"Internet standard as described in RFC2440."
	msgstr ""
	"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation sowie "
	"zum sicheren Speichern von Daten."

	#: src/gpg4win.nsi:127
	msgctxt "T_AboutGpg4winVersion"
	msgid "This is Gpg4win version ${VERSION}"
	msgstr "Dies ist Gpg4win Version ${VERSION}"

	#: src/gpg4win.nsi:130
	msgctxt "T_AboutGpg4winFileVersion"
	msgid "file version ${PROD_VERSION}"
	msgstr "Dateiversion ${PROD_VERSION}"

	#: src/gpg4win.nsi:133
	msgctxt "T_AboutGpg4winReleaseDate"
	msgid "release date ${_BUILD_ISODATE}"
	msgstr "Releasedatum ${_BUILD_ISODATE}"

	#: src/gpg4win-src.nsi:76
	msgctxt "T_WelcomeTitleGpg4winSrc"
	msgid "Welcome to the installation of the Gpg4win sources"
	msgstr "Willkommen bei der Installation der Gpg4win Quellen"

	#: src/gpg4win-src.nsi:80
	msgctxt "T_AboutGpg4winSrc"
	msgid ""
	"GnuPG is GNU's tool for secure communication and data storage. It can be "
	"used to encrypt data and to create digital signatures. It includes an "
	"advanced key management facility and is compliant with the proposed OpenPGP "
	"Internet standard as described in RFC2440."
	msgstr ""
	"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation sowie "
	"zum sicheren Speichern von Daten."

	#: src/gpg4win-src.nsi:86
	msgctxt "T_AboutGpg4winSrcVersion"
	msgid "This is Gpg4win version ${VERSION}"
	msgstr "Dies ist Gpg4win Version ${VERSION}"

	#: src/gpg4win-src.nsi:89
	msgctxt "T_AboutGpg4winSrcFileVersion"
	msgid "file version ${PROD_VERSION}"
	msgstr "Dateiversion ${PROD_VERSION}"

	#: src/gpg4win-src.nsi:92
	msgctxt "T_AboutGpg4winSrcReleaseDate"
	msgid "release date ${_BUILD_ISODATE}"
	msgstr "Releasedatum ${_BUILD_ISODATE}"

	#: src/installer.nsi:217
	msgctxt "T_LangCode"
	msgid "en"
	msgstr "de"

	#: src/installer.nsi:220
	msgctxt "T_GPLHeader"
	msgid ""
	"This software is licensed under the terms of the GNU General Public License "
	"(GPL) which guarantees your freedom to share and change Free Software."
	msgstr ""
	"Diese Software ist unter der GNU General Public License (GPL) lizensiert; "
	"dies gibt Ihnen die Freiheit, sie zu ändern und weiterzugeben."

	#: src/installer.nsi:225
	msgctxt "T_GPLShort"
	msgid ""
	"In short: You are allowed to run this software for any purpose. You may "
	"distribute it as long as you give the recipients the same rights you have "
	"received."
	msgstr ""
	"In aller Kürze: Sie haben das Recht, die Software zu jedem Zweck "
	"einzusetzen. Sie können die Software weitergeben, sofern Sie dem Empfänger "
	"dieselben Rechte einräumen, die auch Sie erhalten haben."

	#: src/installer.nsi:230
	msgctxt "T_RunKeyManager"
	msgid "Run the key manager"
	msgstr "Die Schlüsselverwaltung aufrufen"

	#: src/installer.nsi:233
	msgctxt "T_MoreInfo"
	msgid "Click here for the project's homepage"
	msgstr "Hier klicken um zur Homepage des Projekts zu gelangen"

	#: src/installer.nsi:235
	msgctxt "T_MoreInfoURL"
	msgid "http://www.gpg4win.org"
	msgstr "http://www.gpg4win.de"

	#: src/installer.nsi:237
	msgctxt "T_ShowReadme"
	msgid "Show the README file"
	msgstr "Die README Datei anzeigen"

	#: src/installer.nsi:240
	msgctxt "T_NoKeyManager"
	msgid "No key manager has been installed, thus we can't run one now."
	msgstr ""
	"Es wurde keine Schlüsselverwaltung installiert. Deswegen kann sie jetzt "
	"auch nicht ausgeführt werden."

	#: src/installer.nsi:245
	msgctxt "DESC_Menu_manuals"
	msgid "Documentation"
	msgstr "Dokumentation"

	#: src/installer.nsi:249
	msgctxt "DESC_Desktop_manuals"
	msgid "Gpg4win Documentation"
	msgstr "Gpg4win Dokumentation"

	#: src/installer.nsi:446
	msgctxt "T_InstallOptions"
	msgid "Install Options"
	msgstr "Installationsoptionen"

	#: src/installer.nsi:449
	msgctxt "T_InstallOptLinks"
	msgid "Start links"
	msgstr "Startlinks"

	#: src/installer.nsi:451
	msgctxt "T_InstOptLabelA"
	msgid "Please select where Gpg4win shall install links:"
	msgstr "Bitte wählen Sie, welche Verknüpfungen angelegt werden sollen:"

	#: src/installer.nsi:454
	msgctxt "T_InstOptLabelB"
	msgid "(Only programs will be linked into the quick launch bar.)"
	msgstr ""
	"(In die Schnellstartleiste werden nur Verknüpfungen für Programme angelegt.)"

	#: src/installer.nsi:457
	msgctxt "T_InstOptFieldA"
	msgid "Start Menu"
	msgstr "Startmenü"

	#: src/installer.nsi:460
	msgctxt "T_InstOptFieldB"
	msgid "Desktop"
	msgstr "Arbeitsfläche"

	#: src/installer.nsi:463
	msgctxt "T_InstOptFieldC"
	msgid "Quick Launch Bar"
	msgstr "Schnellstartleiste"

	#: src/installer.nsi:469
	msgctxt "T_FoundExistingVersion"
	msgid ""
	"Version $R1 has already been installed.\n"
	"Do you want to overwrite it with version ${VERSION}?"
	msgstr ""
	"Version $R1 ist hier bereits installiert.\n"
	"Möchten Sie diese mit Version ${VERSION} überschreiben?\n"
	"\n"
	"(Sie können in jedem Fall mit JA antworten, falls es sich um eine neuere "
	"oder dieselbe Version handelt.)"

	#: src/installer.nsi:472
	msgctxt "T_FoundExistingVersionB"
	msgid ""
	"A version of Gpg4Win has already been installed on the system. There will be "
	"no problem installing and thus overwriting this Version.\n"
	"\n"
	"Do you want to continue installing Gpg4win?"
	msgstr ""
	"Eine Version von Gpg4Win ist hier bereits installiert. Es ist problemlos "
	"möglich, die Installation fortzuführen.\n"
	"\n"
	"Möchten die die Installation von Gpg4Win fortführen?"

	#: src/installer.nsi:483
	msgctxt "T_FoundOldSeeManual"
	msgid ""
	"Please see the Gpg4win user manual to learn how to migrate existing keys "
	"from other GnuPG based installations to Gpg4win."
	msgstr ""
	"Bitte sehen Sie im Gpg4win für Einsteiger Handbuch nach, wie Sie Ihre "
	"Schlüssel aus anderen - GnuPG basierten - Installationen in Gpg4win "
	"überführen. Es wird dringend geraten Gpg4Win nicht zusammen mit diesen "
	"anderen Installation zu betreiben."

	#: src/installer.nsi:488
	msgctxt "T_FoundOldGnuPP"
	msgid ""
	"An old installation of GnuPP (GNU Privacy Project) has been been detected. "
	"That software is not maintained anymore and thus should be removed.\n"
	"\n"
	"Do you want to continue installing Gpg4win and take care of the old "
	"installation later?"
	msgstr ""
	"Eine alte Installation von GnuPP (GNU Privacy Project) wurde gefunden. "
	"Diese Software wird nicht mehr gepflegt und sollte deshalb vom System "
	"entfernt werden.\n"
	"\n"
	"Sie können die Installation von Gpg4win jetzt weiterdurchführen und danach "
	"entscheiden, ob Sie das alte GnuPP dann entfernen. Sie finden hierzu "
	"Hinweise im Gpg4Win Handbuch für Einsteiger. Falls Sie die alte "
	"Installation schon jetzt entfernen möchten, so exportieren Sie dort alle "
	"vorhandenen Schlüssel in eine Datei um sie so später in Gpg4Win wieder "
	"importieren zu können.\n"
	"\n"
	"Möchten Sie die Installation von Gpg4win weiter durchführen und sich dann "
	"später um die Entfernung von GnuPP kümmern?"

	#: src/installer.nsi:497
	msgctxt "T_FoundOldGnuPT"
	msgid ""
	"An installation of GnuPT has been been detected. This may cause problems "
	"when used along with Gpg4win.\n"
	"\n"
	"Do you want to continue installing Gpg4win?"
	msgstr ""
	"Eine Installation von GnuPT wurde gefunden. Dies kann zu Problemen führen, "
	"falls GnuPT zusammem mit Gpg4win benutzt wird. Falls Sie GnuPT "
	"zwischenzeitlich bereits entfernt haben, so ignorieren Sie diese Warnung "
	"bitte. Die Deinstallation von GnuPT erfolgt nicht immer spurlos und Gpg4win "
	"kann deshalb nicht sicher erkennen, ob es vollständig entfernt wurde.\n"
	"\n"
	"Sie können die Installation von Gpg4win jetzt weiterdurchführen und danach "
	"entscheiden, ob Sie das alte GnuPT dann entfernen. Sie finden hierzu "
	"Hinweise im Gpg4Win Handbuch für Einsteiger. Falls Sie die alte "
	"Installation schon jetzt entfernen möchten, so exportieren Sie dort alle "
	"vorhandenen Schlüssel in eine Datei um sie so später in Gpg4Win wieder "
	"importieren zu können.\n"
	"\n"
	"Möchten Sie die Installation von Gpg4win fortführen?"

	#: src/installer.nsi:504
	msgctxt "T_FoundOldWinPTSF"
	msgid ""
	"An old installation of the Sourceforge hosted WinPT has been been detected. "
	"That software is not maintained anymore and should be removed.\n"
	"\n"
	"Do you want to continue installing Gpg4win and take care of the old "
	"installation later?"
	msgstr ""
	"Eine alte Installation der Windows Privacy Tools von Sourceforge wurde "
	"gefunden. Diese Software wird nicht mehr gepflegt und verträgt sich "
	"vermutlich nicht mit Gpg4win. Sie sollte deshalb vom System entfernt "
	"werden.\n"
	"\n"
	"Sie können versuchen, die Installation von Gpg4win jetzt weiterdurchführen "
	"und danach entscheiden, ob Sie die alte Installation entfernen. Sie finden "
	"hierzu Hinweise im Gpg4Win Handbuch für Einsteiger.\n"
	"\n"
	"Wir empfehlen allerdings, diese alte Installation vorher zu entfernen. "
	"Brechen Sie hierzu die Installation von Gpg4win ab und exportieren Sie "
	"mittles dieser alten Version alle vorhandenen Schlüssel in eine Datei um sie "
	"so später in Gpg4Win wieder importieren zu können.\n"
	"\n"
	"Möchten Sie die Installation von Gpg4win trotzdem jetzt weiter durchführen?"

	#: src/installer.nsi:514
	msgctxt "T_FoundOldGnuPack"
	msgid ""
	"An installation of GnuPG-Pack has been been detected. You need to uninstall "
	"it before you can continue with Gpg4win installation.\n"
	"\n"
	"The installation will be aborted now!"
	msgstr ""
	"Eine Installation von GnuPG-Pack wurde gefunden. Sie müssen diese zuerst "
	"deinstallieren bevor Sie mit der Installation von Gpg4win fortfahren "
	"können.\n"
	"\n"
	"Die Installation von Gpg4win wird nun abgebrochen!"

	#: src/installer.nsi:523
	msgctxt "T_BetaWarning"
	msgid ""
	"Note: This is a BETA version of Gpg4win.\n"
	"\n"
	"Beta versions are only intended for testing and shall not be used in a "
	"production environment."
	msgstr ""
	"Achtung: Dies ist eine BETA-Version von Gpg4win.\n"
	"\n"
	"Das bedeutet, dass der Funktionsumfang an einigen\n"
	"Stellen nicht vollständig implementiert sein kann oder auch\n"
	"noch Fehler vorliegen können.\n"
	"\n"
	"Eine BETA-Version dient dem Test durch erfahrene\n"
	"Anwender oder Administratoren um die künftige\n"
	"neue Version kennenzulernen und Verbesserungsvorschläge\n"
	"einzubringen.\n"
	"\n"
	"Bitte lesen Sie unbedingt die Hinweise zur BETA-Version \n"
	"auf der Gpg4win Download-Seite:\n"
	"\n"
	" http://www.gpg4win.de/download-de.html "

	#: src/installer.nsi:530
	msgctxt "T_AdminNeeded"
	msgid ""
	"Warning: Administrator permissions required for a successful installation"
	msgstr ""
	"Achtung: Für eine erfolgreiche Installation werden Administratorrechte "
	"benötigt."

	#: src/installer.nsi:534
	msgctxt "T_CloseOtherApps"
	msgid ""
	"Please make sure that other applications are not running. In particular you "
	"should close Outlook and all Explorer windows. Gpg4win will try to install "
	"anyway but a reboot will be required then."
	msgstr ""
	"Bitte stellen Sie sicher, daß alle anderen Anwendugen geschlossen sind. "
	"Insbesondere sollten Sie Outlook und alle Explorer Fenster schliessen bevor "
	"Sie die Installation fortsetzen. Gpg4win wird auf jeden Fall versuchen, "
	"eine Installation durchzuführen; es ist dann aber u.U. notwendig, das System "
	"neu zu starten."

	#: src/installer.nsi:539
	msgctxt "T_ShuttingDownWinPT"
	msgid "Trying to shutdown a possible running instance of WinPT."
	msgstr "Ein möglicherweise laufendes WinPT wird jetzt automatisch beendet."

	#: src/installer.nsi:541
	msgctxt "T_ShuttingDownDirMngr"
	msgid "Trying to shutdown a possible running instance of DirMngr."
	msgstr "Ein möglicherweise laufender DirMngr wird jetzt automatisch beendet."

	#: src/inst-claws-mail.nsi:53
	msgctxt "DESC_SEC_claws_mail"
	msgid "Claws Mail-User-Agent"
	msgstr ""
	"Claws Mail ist ein vollständiges Mail- und News-Programm mit sehr guter "
	"Unterstützung für GnuPG."

	#: src/inst-claws-mail.nsi:56
	msgctxt "DESC_Menu_claws_mail"
	msgid "Run the Claws mailprogram."
	msgstr "Das Mailprogramm Claws Mail aufrufen."

	#: src/inst-claws-mail.nsi:59
	msgctxt "DESC_Menu_claws_mail_pdf"
	msgid "Show the online manual of Claws Mail"
	msgstr "Das englische Handbuch zu Claws Mail anzeigen"

	#: src/inst-eudoragpg.nsi:40
	msgctxt "DESC_SEC_eudoragpg"
	msgid "EudoraGPG is a plugin for the Eudora mail program"
	msgstr ""
	"EudoraGPG ist ein Plugin zur Verschlüsselung für das Eudora Mailprogramm"

	#: src/inst-gnupg2.nsi:118
	msgctxt "DESC_SEC_gnupg2"
	msgid "GNU Privacy Guard with S/MIME support"
	msgstr ""
	"Diese Version von GnuPG kann zusätzlich installiert werden um "
	"Verschlüsselung mittels S/MIME bereitzustellen. Bitte beachten Sie, daß "
	"diese Option noch nicht vollständig unterstützt ist."

	#: src/inst-gnupg.nsi:108
	msgctxt "DESC_SEC_gnupg"
	msgid "GNU Privacy Guard"
	msgstr ""
	"Der GNU Privacy Guard (GnuPG) ist der Kernbestandteil dieser Software. "
	"GnuPG stellt die eigentliche Verschlüsselung sowie die Verwaltung der "
	"Schlüssel bereit."

	#: src/inst-gpa.nsi:75
	msgctxt "DESC_SEC_gpa"
	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."

	#: src/inst-gpa.nsi:78
	msgctxt "DESC_Menu_gpa"
	msgid ""
	"Run the GNU Privacy Assistant key management tool. This is an alternative to "
	"the WinPT key management tool."
	msgstr ""
	"Das Schlüsselverwaltungsprogramm GNU Privacy Assistent aufrufen. Dies ist "
	"eine Alternative zu dem WinPT Programm."

	#: src/inst-gpg4win.nsi:43
	msgctxt "DESC_Menu_gpg4win_readme"
	msgid "General information on Gpg4Win"
	msgstr "Allgemeine Informationen zu Gpg4Win"

	#: src/inst-gpg4win.nsi:46
	msgctxt "DESC_Menu_gnupg_faq"
	msgid "Show the Frequently Asked Questions Document for GnuPG"
	msgstr "Das Dokument mit den häufig gestellten Fragen (FAQ) zu GnuPG anzeigen"

	#: src/inst-gpgee.nsi:65
	msgctxt "T_GPGee_RegFailed"
	msgid "Warning: Registration of the GPGee explorer extension failed."
	msgstr "Warnung: Registration der GPGee Explorer Extension ist fehlgeschlagen."

	#: src/inst-gpgee.nsi:68
	msgctxt "DESC_SEC_gpgee"
	msgid "GPG Explorer Extensions"
	msgstr ""
	"GPG Explorer Erweiterungen (GPGee) ist eine Erweiterung für den Explorer, "
	"die es ermöglicht, Dateien über das Kontextmenü zu verschlüsseln."

	#: src/inst-gpgee.nsi:71
	msgctxt "DESC_Menu_gpgee_hlp"
	msgid "Show the online manual of GPGee"
	msgstr "Das englische Handbuch zu GPGee anzeigen"

	#: src/inst-gpgex.nsi:80
	msgctxt "T_GpgEX_RegFailed"
	msgid "Warning: Registration of the GpgEX plugin failed."
	msgstr "Warnung: Registration des GpgEX Plugin ist fehlgeschlagen."

	#: src/inst-gpgex.nsi:83
	msgctxt "DESC_SEC_gpgex"
	msgid "GnuPG Shell Extension"
	msgstr ""
	"GPG Shell Extension (GpgEX) ist eine Erweiterung für den Explorer, die es "
	"ermöglicht, Dateien über das Kontextmenü zu verschlüsseln."

	#: src/inst-gpgol.nsi:57
	msgctxt "T_GpgOL_RegFailed"
	msgid "Warning: Registration of the GpgOL Outlook pluginfailed."
	msgstr "Warnung: Registration des GpgOL Outlook Plugin ist fehlgeschlagen."

	#: src/inst-gpgol.nsi:60
	msgctxt "DESC_SEC_gpgol"
	msgid "GnuPG for Outlook"
	msgstr ""
	"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:195
	msgctxt "DESC_SEC_kleopatra"
	-msgid "Kleopatra"
	-msgstr "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:198
	+#: src/inst-kleopatra.nsi:199
	msgctxt "DESC_Menu_kleopatra"
	msgid "Run the Kleopatra key management tool."
	msgstr "Das Schlüsselverwaltungsprogramm Kleopatra aufrufen."

	#: src/inst-man_advanced_de.nsi:39
	msgctxt "DESC_Name_man_advanced_de"
	msgid "Advanced Manual (German)"
	msgstr "Durchblickerhandbuch"

	#: src/inst-man_advanced_de.nsi:42
	msgctxt "DESC_SEC_man_advanced_de"
	msgid "Gpg4Win Manual for the Advanced User (German)"
	msgstr "Gpg4Win Handbuch für den Durchblicker"

	#: src/inst-man_advanced_de.nsi:45
	msgctxt "DESC_Menu_man_advanced_de"
	msgid "Show the German online manual of Gpg4Win for advanced users"
	msgstr "Das Online-Handbuch von Gpg4Win für den Durchblicker anzeigen"

	#: src/inst-man_advanced_en.nsi:39
	msgctxt "DESC_Name_man_advanced_en"
	msgid "Advanced Manual"
	msgstr "Durchblickerhandbuch (Englisch)"

	#: src/inst-man_advanced_en.nsi:42
	msgctxt "DESC_SEC_man_advanced_en"
	msgid "Gpg4Win Manual for the Advanced User"
	msgstr "Gpg4Win Handbuch für den Durchblicker (Englisch)"

	#: src/inst-man_advanced_en.nsi:45
	msgctxt "DESC_Menu_man_advanced_en"
	msgid "Show the online manual of Gpg4Win for advanced users"
	msgstr ""
	"Das englische Online-Handbuch von Gpg4Win für den Durchblicker anzeigen"

	#: src/inst-man_novice_de.nsi:39
	msgctxt "DESC_Name_man_novice_de"
	msgid "Novice Manual (German)"
	msgstr "Einsteigerhandbuch"

	#: src/inst-man_novice_de.nsi:42
	msgctxt "DESC_SEC_man_novice_de"
	msgid "Gpg4Win Manual for the Novice User (German)"
	msgstr "Gpg4Win Handbuch für den Einsteiger"

	#: src/inst-man_novice_de.nsi:45
	msgctxt "DESC_Menu_man_novice_de"
	msgid "Show the German online manual of Gpg4Win for novice users"
	msgstr "Das Online-Handbuch von Gpg4Win für den Einsteiger anzeigen"

	#: src/inst-man_novice_en.nsi:39
	msgctxt "DESC_Name_man_novice_en"
	msgid "Novice Manual"
	msgstr "Einsteigerhandbuch (Englisch)"

	#: src/inst-man_novice_en.nsi:42
	msgctxt "DESC_SEC_man_novice_en"
	msgid "Gpg4Win Manual for the Novice User"
	msgstr "Gpg4Win Handbuch für den Einsteiger (Englisch)"

	#: src/inst-man_novice_en.nsi:45
	msgctxt "DESC_Menu_man_novice_en"
	msgid "Show the online manual of Gpg4Win for novice users"
	msgstr "Das englische Online-Handbuch von Gpg4Win für den Einsteiger anzeigen"

	#: src/inst-winpt.nsi:46
	msgctxt "DESC_SEC_winpt"
	msgid "Windows Privacy Tray"
	msgstr ""
	"Windows Privacy Tray (WinPT) ist ein vielseitiges Programm zur "
	"Schlüsselverwaltung sowie aller anderen Funktionen von GnuPG. Es "
	"installiert sich in die Startleiste."

	#: src/inst-winpt.nsi:49
	msgctxt "DESC_Menu_winpt"
	msgid ""
	"Run the Windows Privacy Tray key management tool. This is a versatile key "
	"management and encryption tool."
	msgstr ""
	"Das Schlüsselverwaltungsprogramm Windows Privacy Tray aufrufen. Dies ist "
	"ein vielseitiges Programm zur Schlüsselverwaltung und Verschlüsselung. Es "
	"installiert sich in die Startleiste."

	+#~ msgctxt "DESC_SEC_kleopatra"
	+#~ msgid "Kleopatra"
	+#~ msgstr "Kleopatra"
	+
	#~ msgctxt "DESC_SEC_sylpheed"
	#~ msgid "Sylpheed-Claws Mail-User-Agent"
	#~ msgstr ""
	#~ "Sylpheed-Claws ist ein vollständiges Mail- und News-Programm mit sehr "
	#~ "guter Unterstützung für GnuPG."

	#~ msgctxt "DESC_Menu_sylpheed"
	#~ msgid "Run the Sylpheed-Claws mailprogram."
	#~ msgstr "Das Mailprogramm Sylpheed-Claws aufrufen."

	#~ msgctxt "DESC_Menu_sylpheed_pdf"
	#~ msgid "Show the online manual of Sylpheed Claws"
	#~ msgstr "Das englische Handbuch zu Sylpheed Claws anzeigen"
	diff --git a/po/es.po b/po/es.po
	index 4a05466e..861d5c17 100644
	--- a/po/es.po
	+++ b/po/es.po
	@@ -1,499 +1,503 @@
	# Spanish translations for gpg4win package.
	# Copyright (C) 2007 g10 Code GmbH
	# This file is distributed under the same license as the gpg4win package.
	#
	msgid ""
	msgstr ""
	"Project-Id-Version: gpg4win 1.1.1-svn417\n"
	"Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
	-"POT-Creation-Date: 2008-05-09 19:09+0200\n"
	+"POT-Creation-Date: 2008-05-28 11:25+0200\n"
	"PO-Revision-Date: 2008-01-30 17:07+0100\n"
	"Last-Translator: Diego Escalante Urrelo <diegoe@gnome.org>\n"
	"Language-Team: Spanish <diegoe@gnome.org>\n"
	"MIME-Version: 1.0\n"
	"Content-Type: text/plain; charset=ISO-8859-1\n"
	"Content-Transfer-Encoding: 8bit\n"
	"Plural-Forms: nplurals=2; plural=(n != 1);\n"

	#: src/g4wihelp.nsi:21
	msgctxt "T_AlreadyRunning"
	msgid "An instance of this installer is already running."
	msgstr "Una instancia del instalador ya está ejecutándose."

	#: src/gpg4win.nsi:117
	msgctxt "T_WelcomeTitleGpg4win"
	msgid "Welcome to the installation of Gpg4win"
	msgstr "Bienvenido a la instalación de Gpg4win"

	#: src/gpg4win.nsi:121
	msgctxt "T_AboutGpg4win"
	msgid ""
	"GnuPG is GNU's tool for secure communication and data storage. It can be "
	"used to encrypt data and to create digital signatures. It includes an "
	"advanced key management facility and is compliant with the proposed OpenPGP "
	"Internet standard as described in RFC2440."
	msgstr ""
	"GnuPG es una herramienta GNU para la comunicación y el almacenamiento de "
	"datos de forma segura. Puede ser usada para cifrar y crear firmas digitales."
	"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
	msgctxt "T_AboutGpg4winVersion"
	msgid "This is Gpg4win version ${VERSION}"
	msgstr "Este es Gpg4win versión ${VERSION}"

	#: src/gpg4win.nsi:130
	msgctxt "T_AboutGpg4winFileVersion"
	msgid "file version ${PROD_VERSION}"
	msgstr "versión del archivo ${PROD_VERSION}"

	#: src/gpg4win.nsi:133
	msgctxt "T_AboutGpg4winReleaseDate"
	msgid "release date ${_BUILD_ISODATE}"
	msgstr "fecha de publicación ${_BUILD_ISODATE}"

	#: src/gpg4win-src.nsi:76
	msgctxt "T_WelcomeTitleGpg4winSrc"
	msgid "Welcome to the installation of the Gpg4win sources"
	msgstr "Bienvenido a la instalación del código fuente de Gpg4win"

	#: src/gpg4win-src.nsi:80
	msgctxt "T_AboutGpg4winSrc"
	msgid ""
	"GnuPG is GNU's tool for secure communication and data storage. It can be "
	"used to encrypt data and to create digital signatures. It includes an "
	"advanced key management facility and is compliant with the proposed OpenPGP "
	"Internet standard as described in RFC2440."
	msgstr ""
	"GnuPG es una herramienta GNU para la comunicación y el almacenamiento de "
	"datos de forma segura. Puede ser usada para cifrar datos y crear firmas "
	"digitales.Incluye un gestor de llaves avanzado y cumple con la propuesta de "
	"estándar de Internet: OpenGPG, descrito en el RFC2440."

	#: src/gpg4win-src.nsi:86
	msgctxt "T_AboutGpg4winSrcVersion"
	msgid "This is Gpg4win version ${VERSION}"
	msgstr "Este es Gpg4win versión ${VERSION}"

	#: src/gpg4win-src.nsi:89
	msgctxt "T_AboutGpg4winSrcFileVersion"
	msgid "file version ${PROD_VERSION}"
	msgstr "versión del archivo ${PROD_VERSION}"

	#: src/gpg4win-src.nsi:92
	msgctxt "T_AboutGpg4winSrcReleaseDate"
	msgid "release date ${_BUILD_ISODATE}"
	msgstr "fecha de publicación ${_BUILD_ISODATE}"

	#: src/installer.nsi:217
	msgctxt "T_LangCode"
	msgid "en"
	msgstr "es"

	#: src/installer.nsi:220
	msgctxt "T_GPLHeader"
	msgid ""
	"This software is licensed under the terms of the GNU General Public License "
	"(GPL) which guarantees your freedom to share and change Free Software."
	msgstr ""
	"Este software está licenciado bajo los términos de la GNU General Public "
	"License (GPL) que garantiza su libertad para compartir y cambiar Software "
	"Libre"

	#: src/installer.nsi:225
	msgctxt "T_GPLShort"
	msgid ""
	"In short: You are allowed to run this software for any purpose. You may "
	"distribute it as long as you give the recipients the same rights you have "
	"received."
	msgstr ""
	"En resúmen: Se le permite ejecutar este software para cualquier propósito. "
	"Puede distribuirlo en tanto dé al receptor los mismos derechos que usted ha "
	"recibido."

	#: src/installer.nsi:230
	msgctxt "T_RunKeyManager"
	msgid "Run the key manager"
	msgstr "Ejecutar el gestor de llaves"

	#: src/installer.nsi:233
	msgctxt "T_MoreInfo"
	msgid "Click here for the project's homepage"
	msgstr "Siga este enlace para ver el sitio web del proyecto"

	#: src/installer.nsi:235
	msgctxt "T_MoreInfoURL"
	msgid "http://www.gpg4win.org"
	msgstr "http://www.gpg4win.org"

	#: src/installer.nsi:237
	msgctxt "T_ShowReadme"
	msgid "Show the README file"
	msgstr "Ver el archivo README"

	#: src/installer.nsi:240
	msgctxt "T_NoKeyManager"
	msgid "No key manager has been installed, thus we can't run one now."
	msgstr ""
	"No se puede ejecutar el gestor de llaves.No se encuentra ninguno instalado."

	#: src/installer.nsi:245
	msgctxt "DESC_Menu_manuals"
	msgid "Documentation"
	msgstr "Documentación"

	#: src/installer.nsi:249
	msgctxt "DESC_Desktop_manuals"
	msgid "Gpg4win Documentation"
	msgstr "Documentación de Gpg4win"

	#: src/installer.nsi:446
	msgctxt "T_InstallOptions"
	msgid "Install Options"
	msgstr "Opciones de instalación"

	#: src/installer.nsi:449
	msgctxt "T_InstallOptLinks"
	msgid "Start links"
	msgstr "Vínculos de inicio"

	#: src/installer.nsi:451
	msgctxt "T_InstOptLabelA"
	msgid "Please select where Gpg4win shall install links:"
	msgstr "Por favor seleccione dónde debe Gpg4win instalar los vínculos:"

	#: src/installer.nsi:454
	msgctxt "T_InstOptLabelB"
	msgid "(Only programs will be linked into the quick launch bar.)"
	msgstr "(Sólo las aplicaciones serán vinculadas en la barra de inicio rápido.)"

	#: src/installer.nsi:457
	msgctxt "T_InstOptFieldA"
	msgid "Start Menu"
	msgstr "Menú inicio"

	#: src/installer.nsi:460
	msgctxt "T_InstOptFieldB"
	msgid "Desktop"
	msgstr "Escritorio"

	#: src/installer.nsi:463
	msgctxt "T_InstOptFieldC"
	msgid "Quick Launch Bar"
	msgstr "Barra de inicio rápido"

	#: src/installer.nsi:469
	msgctxt "T_FoundExistingVersion"
	msgid ""
	"Version $R1 has already been installed.\n"
	"Do you want to overwrite it with version ${VERSION}?"
	msgstr ""
	"La versión $R1 ya está instalada.\n"
	"¿Desea sobreescribirla con la versión ${VERSION}?"

	#: src/installer.nsi:472
	msgctxt "T_FoundExistingVersionB"
	msgid ""
	"A version of Gpg4Win has already been installed on the system. There will be "
	"no problem installing and thus overwriting this Version.\n"
	"\n"
	"Do you want to continue installing Gpg4win?"
	msgstr ""
	"Una versión de Gpg4Win ya se encuentra instalada en este sistema.No habrá "
	"problema si instala y por ende, sobreescribe esta versión.\n"
	"\n"
	"¿Desea continuar con la instalación?"

	#: src/installer.nsi:483
	msgctxt "T_FoundOldSeeManual"
	msgid ""
	"Please see the Gpg4win user manual to learn how to migrate existing keys "
	"from other GnuPG based installations to Gpg4win."
	msgstr ""
	"Por favor revise el manual del usuario de Gpg4Win para que aprenda cómo "
	"migrar las llaves existentes de una instalación basada en GnuPG a Gpg4Win."

	#: src/installer.nsi:488
	msgctxt "T_FoundOldGnuPP"
	msgid ""
	"An old installation of GnuPP (GNU Privacy Project) has been been detected. "
	"That software is not maintained anymore and thus should be removed.\n"
	"\n"
	"Do you want to continue installing Gpg4win and take care of the old "
	"installation later?"
	msgstr ""
	"Una instalación anterior de GnuPP (GNU Privacy Project) ha sido detectada. "
	"Este software ya no se mantiene y por ende, debe ser borrado.\n"
	"\n"
	"¿Desea continuar con la instalación de Gpg4Win y dejar para mas tarde la "
	"instalación antigua de GnuPP?"

	#: src/installer.nsi:497
	msgctxt "T_FoundOldGnuPT"
	msgid ""
	"An installation of GnuPT has been been detected. This may cause problems "
	"when used along with Gpg4win.\n"
	"\n"
	"Do you want to continue installing Gpg4win?"
	msgstr ""
	"Una instalación de GnuPT ha sido detectada. Esto puede causar problemas si "
	"ambas aplicaciones se usan simultáneamente.\n"
	"\n"
	"¿Desea continuar instalando Gpg4Win?"

	#: src/installer.nsi:504
	msgctxt "T_FoundOldWinPTSF"
	msgid ""
	"An old installation of the Sourceforge hosted WinPT has been been detected. "
	"That software is not maintained anymore and should be removed.\n"
	"\n"
	"Do you want to continue installing Gpg4win and take care of the old "
	"installation later?"
	msgstr ""
	"Una instalación del antiguo WinPT (hospedado por Sourceforge) ha sido "
	"detectada. Este software no tiene soporte y por ende, debe ser borrado.\n"
	"\n"
	"¿Desea continuar con la instalación de Gpg4Win y dejar para más tarde la "
	"instalación antigua de WinPT?"

	#: src/installer.nsi:514
	msgctxt "T_FoundOldGnuPack"
	msgid ""
	"An installation of GnuPG-Pack has been been detected. You need to uninstall "
	"it before you can continue with Gpg4win installation.\n"
	"\n"
	"The installation will be aborted now!"
	msgstr ""
	"Una instalación de GnuPG-Pack ha sido detectada. Debe desinstalarla antes de "
	"continuar con la instalación de Gpg4Win.\n"
	"\n"
	"La instalación se detendrá ahora."

	#: src/installer.nsi:523
	msgctxt "T_BetaWarning"
	msgid ""
	"Note: This is a BETA version of Gpg4win.\n"
	"\n"
	"Beta versions are only intended for testing and shall not be used in a "
	"production environment."
	msgstr ""

	#: src/installer.nsi:530
	msgctxt "T_AdminNeeded"
	msgid ""
	"Warning: Administrator permissions required for a successful installation"
	msgstr ""
	"Advertencia: Necesita permisos de administrador para una instalación exitosa."

	#: src/installer.nsi:534
	#, fuzzy
	msgctxt "T_CloseOtherApps"
	msgid ""
	"Please make sure that other applications are not running. In particular you "
	"should close Outlook and all Explorer windows. Gpg4win will try to install "
	"anyway but a reboot will be required then."
	msgstr ""
	"Por favor asegúrese que otras aplicaciones no están ejecutándose. En "
	"especial, cierre Outlook y las ventanas del Explorador de Windows. Gpg4Win "
	"intentará instalarse de todas formas, pero será necesario que reinicie su "
	"sistema una vez terminado el proceso. "

	#: src/installer.nsi:539
	msgctxt "T_ShuttingDownWinPT"
	msgid "Trying to shutdown a possible running instance of WinPT."
	msgstr "Intentado cerrar instancias de WinPT que podrían estar ejecutándose."

	#: src/installer.nsi:541
	msgctxt "T_ShuttingDownDirMngr"
	msgid "Trying to shutdown a possible running instance of DirMngr."
	msgstr ""
	"Intentando cerrar instancias de DirMngr que podrían estar ejecutándose."

	#: src/inst-claws-mail.nsi:53
	msgctxt "DESC_SEC_claws_mail"
	msgid "Claws Mail-User-Agent"
	msgstr "Cliente de correo Claws."

	#: src/inst-claws-mail.nsi:56
	msgctxt "DESC_Menu_claws_mail"
	msgid "Run the Claws mailprogram."
	msgstr "Ejecutar el cliente de correo Claws."

	#: src/inst-claws-mail.nsi:59
	msgctxt "DESC_Menu_claws_mail_pdf"
	msgid "Show the online manual of Claws Mail"
	msgstr "Mostrar el manual en línea de Claws"

	#: src/inst-eudoragpg.nsi:40
	msgctxt "DESC_SEC_eudoragpg"
	msgid "EudoraGPG is a plugin for the Eudora mail program"
	msgstr "EudoraGPG es un plugin para el cliente de correo Eudora"

	#: src/inst-gnupg2.nsi:118
	msgctxt "DESC_SEC_gnupg2"
	msgid "GNU Privacy Guard with S/MIME support"
	msgstr "GNU Privacy Guard (GnuPG) con soporte para S/MIME"

	#: src/inst-gnupg.nsi:108
	msgctxt "DESC_SEC_gnupg"
	msgid "GNU Privacy Guard"
	msgstr "GNU Privacy Guard (GnuPG)"

	#: src/inst-gpa.nsi:75
	msgctxt "DESC_SEC_gpa"
	msgid "GNU Privacy Assistant"
	msgstr "GNU Privacy Assistant"

	#: src/inst-gpa.nsi:78
	msgctxt "DESC_Menu_gpa"
	msgid ""
	"Run the GNU Privacy Assistant key management tool. This is an alternative to "
	"the WinPT key management tool."
	msgstr ""
	"Ejecutar la herramienta de gestión de llaves GNU Privacy Assistant. Ésta es "
	"una alternativa a la herramienta de manejo de llaves WinPT."

	#: src/inst-gpg4win.nsi:43
	msgctxt "DESC_Menu_gpg4win_readme"
	msgid "General information on Gpg4Win"
	msgstr "Información general de Gpg4Win"

	#: src/inst-gpg4win.nsi:46
	msgctxt "DESC_Menu_gnupg_faq"
	msgid "Show the Frequently Asked Questions Document for GnuPG"
	msgstr "Mostrar las preguntas frecuentes (FAQ) sobre GnuPG"

	#: src/inst-gpgee.nsi:65
	msgctxt "T_GPGee_RegFailed"
	msgid "Warning: Registration of the GPGee explorer extension failed."
	msgstr ""
	"Advertencia: Falló el registro de la extensión GPGee del Explorador de "
	"Windows."

	#: src/inst-gpgee.nsi:68
	msgctxt "DESC_SEC_gpgee"
	msgid "GPG Explorer Extensions"
	msgstr "GPG Explorer Extensions (GPGee)"

	#: src/inst-gpgee.nsi:71
	msgctxt "DESC_Menu_gpgee_hlp"
	msgid "Show the online manual of GPGee"
	msgstr "Mostrar el manual en línea de GPGee"

	#: src/inst-gpgex.nsi:80
	msgctxt "T_GpgEX_RegFailed"
	msgid "Warning: Registration of the GpgEX plugin failed."
	msgstr "Advertencia: El intento de registrar el plugin GpgEx fracasó."

	#: src/inst-gpgex.nsi:83
	msgctxt "DESC_SEC_gpgex"
	msgid "GnuPG Shell Extension"
	msgstr "GPG Shell Extension (GpgEX)."

	#: src/inst-gpgol.nsi:57
	msgctxt "T_GpgOL_RegFailed"
	msgid "Warning: Registration of the GpgOL Outlook pluginfailed."
	msgstr "Advertencia: El registro del plugin de Outlook GpgOL falló."

	#: src/inst-gpgol.nsi:60
	msgctxt "DESC_SEC_gpgol"
	msgid "GnuPG for Outlook"
	msgstr "GnuPG para Outlook (GpgOL)"

	#: src/inst-kleopatra.nsi:195
	msgctxt "DESC_SEC_kleopatra"
	-msgid "Kleopatra"
	-msgstr "Kleopatra"
	+msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
	+msgstr ""

	-#: src/inst-kleopatra.nsi:198
	+#: src/inst-kleopatra.nsi:199
	msgctxt "DESC_Menu_kleopatra"
	msgid "Run the Kleopatra key management tool."
	msgstr "Ejecutar la herramienta de gestión de llaves Kleopatra."

	#: src/inst-man_advanced_de.nsi:39
	msgctxt "DESC_Name_man_advanced_de"
	msgid "Advanced Manual (German)"
	msgstr "Manual avanzado (Alemán)"

	#: src/inst-man_advanced_de.nsi:42
	msgctxt "DESC_SEC_man_advanced_de"
	msgid "Gpg4Win Manual for the Advanced User (German)"
	msgstr "Manual para el usuario avanzado de Gpg4Win (Alemán)"

	#: src/inst-man_advanced_de.nsi:45
	msgctxt "DESC_Menu_man_advanced_de"
	msgid "Show the German online manual of Gpg4Win for advanced users"
	msgstr ""
	"Mostrar el manual para usuarios avanzados de Gpg4Win, en línea (en Alemán)."

	#: src/inst-man_advanced_en.nsi:39
	msgctxt "DESC_Name_man_advanced_en"
	msgid "Advanced Manual"
	msgstr "Manual avanzado (Inglés)"

	#: src/inst-man_advanced_en.nsi:42
	msgctxt "DESC_SEC_man_advanced_en"
	msgid "Gpg4Win Manual for the Advanced User"
	msgstr "Manual para el usuario avanzado de Gpg4Win (Inglés)"

	#: src/inst-man_advanced_en.nsi:45
	msgctxt "DESC_Menu_man_advanced_en"
	msgid "Show the online manual of Gpg4Win for advanced users"
	msgstr "Mostrar el manual en línea de Gpg4Win para usuarios avanzados"

	#: src/inst-man_novice_de.nsi:39
	msgctxt "DESC_Name_man_novice_de"
	msgid "Novice Manual (German)"
	msgstr "Manual del principiante (Alemán)"

	#: src/inst-man_novice_de.nsi:42
	msgctxt "DESC_SEC_man_novice_de"
	msgid "Gpg4Win Manual for the Novice User (German)"
	msgstr "Manual del principiante de Gpg4Win (Alemán)"

	#: src/inst-man_novice_de.nsi:45
	msgctxt "DESC_Menu_man_novice_de"
	msgid "Show the German online manual of Gpg4Win for novice users"
	msgstr "Mostrar el manual del principiante de Gpg4Win, en línea (en Alemán)"

	#: src/inst-man_novice_en.nsi:39
	msgctxt "DESC_Name_man_novice_en"
	msgid "Novice Manual"
	msgstr "Manuel del principiante (Inglés)"

	#: src/inst-man_novice_en.nsi:42
	msgctxt "DESC_SEC_man_novice_en"
	msgid "Gpg4Win Manual for the Novice User"
	msgstr "Manual de Gpg4Win para el principiante (Inglés)"

	#: src/inst-man_novice_en.nsi:45
	msgctxt "DESC_Menu_man_novice_en"
	msgid "Show the online manual of Gpg4Win for novice users"
	msgstr "Mostrar el manual en línea de Gpg4Win para principiantes"

	#: src/inst-winpt.nsi:46
	msgctxt "DESC_SEC_winpt"
	msgid "Windows Privacy Tray"
	msgstr "Windows Privacy Tray (WinPT)."

	#: src/inst-winpt.nsi:49
	msgctxt "DESC_Menu_winpt"
	msgid ""
	"Run the Windows Privacy Tray key management tool. This is a versatile key "
	"management and encryption tool."
	msgstr ""
	"Ejecutar la herramienta de gestión de llaves Windows Privacy Tray. Ésta es "
	"una herramienta versátil para la gestión de llaves y cifrado."

	+#~ msgctxt "DESC_SEC_kleopatra"
	+#~ msgid "Kleopatra"
	+#~ msgstr "Kleopatra"
	+
	#~ msgctxt "DESC_SEC_sylpheed"
	#~ msgid "Sylpheed-Claws Mail-User-Agent"
	#~ msgstr "Cliente de correo Sylpheed-Claws"

	#~ msgctxt "DESC_Menu_sylpheed"
	#~ msgid "Run the Sylpheed-Claws mailprogram."
	#~ msgstr "Ejecutar el cliente de correo Sylpheed-Claws."

	#~ msgctxt "DESC_Menu_sylpheed_pdf"
	#~ msgid "Show the online manual of Sylpheed Claws"
	#~ msgstr "Mostrar el manual en línea de Sylpheed Claws"
	diff --git a/po/fr.po b/po/fr.po
	index 42f97256..15969a5d 100644
	--- a/po/fr.po
	+++ b/po/fr.po
	@@ -1,505 +1,509 @@
	# SOME DESCRIPTIVE TITLE.
	# Copyright (C) YEAR g10 Code GmbH
	# This file is distributed under the same license as the PACKAGE package.
	# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
	#
	msgid ""
	msgstr ""
	"Project-Id-Version: ngoinabox\n"
	"Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
	-"POT-Creation-Date: 2008-05-09 19:09+0200\n"
	+"POT-Creation-Date: 2008-05-28 11:25+0200\n"
	"PO-Revision-Date: 2008-03-10 16:46+0100\n"
	"Last-Translator: Fabian Rodriguez <magicfab@member.fsf.org>\n"
	"Language-Team: FRENCH <aep.lists@it46.se>\n"
	"MIME-Version: 1.0\n"
	"Content-Type: text/plain; charset=iso-8859-1\n"
	"Content-Transfer-Encoding: 8bit\n"

	#: src/g4wihelp.nsi:21
	msgctxt "T_AlreadyRunning"
	msgid "An instance of this installer is already running."
	msgstr "Une instance de cet installateur fonctionne déjà."

	#: src/gpg4win.nsi:117
	msgctxt "T_WelcomeTitleGpg4win"
	msgid "Welcome to the installation of Gpg4win"
	msgstr "Bienvenue à l'installation de Gpg4win"

	#: src/gpg4win.nsi:121
	msgctxt "T_AboutGpg4win"
	msgid ""
	"GnuPG is GNU's tool for secure communication and data storage. It can be "
	"used to encrypt data and to create digital signatures. It includes an "
	"advanced key management facility and is compliant with the proposed OpenPGP "
	"Internet standard as described in RFC2440."
	msgstr ""
	"GnuPG est l'outil du GNU pour la communication et le stockage de données "
	"sécurisées. Il peut être utilisé pour faire l'encodage de données et créer "
	"des signatures numériques. Il inclut un service avançé de gestion de clés et "
	"est conforme avec l'OpenPGP proposé Internet standard as described in "
	"RFC2440."

	#: src/gpg4win.nsi:127
	msgctxt "T_AboutGpg4winVersion"
	msgid "This is Gpg4win version ${VERSION}"
	msgstr "This is Gpg4win version ${VERSION}"

	#: src/gpg4win.nsi:130
	msgctxt "T_AboutGpg4winFileVersion"
	msgid "file version ${PROD_VERSION}"
	msgstr "file version ${PROD_VERSION}"

	#: src/gpg4win.nsi:133
	msgctxt "T_AboutGpg4winReleaseDate"
	msgid "release date ${_BUILD_ISODATE}"
	msgstr "release date ${_BUILD_ISODATE}"

	#: src/gpg4win-src.nsi:76
	msgctxt "T_WelcomeTitleGpg4winSrc"
	msgid "Welcome to the installation of the Gpg4win sources"
	msgstr "Bienvenue à l'installation des sources de Gpg4win"

	#: src/gpg4win-src.nsi:80
	msgctxt "T_AboutGpg4winSrc"
	msgid ""
	"GnuPG is GNU's tool for secure communication and data storage. It can be "
	"used to encrypt data and to create digital signatures. It includes an "
	"advanced key management facility and is compliant with the proposed OpenPGP "
	"Internet standard as described in RFC2440."
	msgstr ""
	"GnuPG est l'outil du GNU pour la communication et le stockage de données "
	"sécurisées. Il peut être utilisé pour faire l'encodage de données et créer "
	"des signatures numériques. Il inclut un service avançé de gestion de clés et "
	"est conforme avec l'OpenPGP proposé Internet standard as described in "
	"RFC2440."

	#: src/gpg4win-src.nsi:86
	msgctxt "T_AboutGpg4winSrcVersion"
	msgid "This is Gpg4win version ${VERSION}"
	msgstr "This is Gpg4win version ${VERSION}"

	#: src/gpg4win-src.nsi:89
	msgctxt "T_AboutGpg4winSrcFileVersion"
	msgid "file version ${PROD_VERSION}"
	msgstr "file version ${PROD_VERSION}"

	#: src/gpg4win-src.nsi:92
	msgctxt "T_AboutGpg4winSrcReleaseDate"
	msgid "release date ${_BUILD_ISODATE}"
	msgstr "release date ${_BUILD_ISODATE}"

	#: src/installer.nsi:217
	msgctxt "T_LangCode"
	msgid "en"
	msgstr "fr"

	#: src/installer.nsi:220
	msgctxt "T_GPLHeader"
	msgid ""
	"This software is licensed under the terms of the GNU General Public License "
	"(GPL) which guarantees your freedom to share and change Free Software."
	msgstr ""
	"Ce logiciel est autorisé en vertu du permis Licence publique général de GNU "
	"(GPL) qui garantit le droit de partager et de modifier les logiciels libres."

	#: src/installer.nsi:225
	msgctxt "T_GPLShort"
	msgid ""
	"In short: You are allowed to run this software for any purpose. You may "
	"distribute it as long as you give the recipients the same rights you have "
	"received."
	msgstr ""
	"En bref : On vous permet d'utiliser ce logiciel à n'importe quelle fin. Vous "
	"pouvez le distribuer pour autant que vous donniez aux destinataires les "
	"mêmes droits que vous avez"

	#: src/installer.nsi:230
	msgctxt "T_RunKeyManager"
	msgid "Run the key manager"
	msgstr "Lancer le gestionnaire de clés"

	#: src/installer.nsi:233
	msgctxt "T_MoreInfo"
	msgid "Click here for the project's homepage"
	msgstr "Cliquer ici pour la page d'accueil du projet"

	#: src/installer.nsi:235
	msgctxt "T_MoreInfoURL"
	msgid "http://www.gpg4win.org"
	msgstr "http://www.gpg4win.org"

	#: src/installer.nsi:237
	msgctxt "T_ShowReadme"
	msgid "Show the README file"
	msgstr "Montrez le dossier de README"

	#: src/installer.nsi:240
	msgctxt "T_NoKeyManager"
	msgid "No key manager has been installed, thus we can't run one now."
	msgstr ""
	"Directeur de clés n'a été installé. Impossible de le exécuter maintenant."

	#: src/installer.nsi:245
	msgctxt "DESC_Menu_manuals"
	msgid "Documentation"
	msgstr "Guides"

	#: src/installer.nsi:249
	msgctxt "DESC_Desktop_manuals"
	msgid "Gpg4win Documentation"
	msgstr "Guides pour l'installation du logiciel Gpg4win"

	#: src/installer.nsi:446
	msgctxt "T_InstallOptions"
	msgid "Install Options"
	msgstr "Installer les options"

	#: src/installer.nsi:449
	msgctxt "T_InstallOptLinks"
	msgid "Start links"
	msgstr "Démarrage Liens"

	#: src/installer.nsi:451
	msgctxt "T_InstOptLabelA"
	msgid "Please select where Gpg4win shall install links:"
	msgstr "Veuillez choisir où Gpg4win installera des liens:"

	#: src/installer.nsi:454
	msgctxt "T_InstOptLabelB"
	msgid "(Only programs will be linked into the quick launch bar.)"
	msgstr ""
	"(Seulement des programmes seront incorporés dans la barre rapide de "
	"lancement.)"

	#: src/installer.nsi:457
	msgctxt "T_InstOptFieldA"
	msgid "Start Menu"
	msgstr "Menu Démarrage"

	#: src/installer.nsi:460
	msgctxt "T_InstOptFieldB"
	msgid "Desktop"
	msgstr "Desktop"

	#: src/installer.nsi:463
	msgctxt "T_InstOptFieldC"
	msgid "Quick Launch Bar"
	msgstr "Barre rapide de Lancement"

	#: src/installer.nsi:469
	msgctxt "T_FoundExistingVersion"
	msgid ""
	"Version $R1 has already been installed.\n"
	"Do you want to overwrite it with version ${VERSION}?"
	msgstr ""
	"La version $R1 a déjà été installée.\n"
	"Voulez-vous la remplacer avec la version ${VERSION}?"

	#: src/installer.nsi:472
	msgctxt "T_FoundExistingVersionB"
	msgid ""
	"A version of Gpg4Win has already been installed on the system. There will be "
	"no problem installing and thus overwriting this Version.\n"
	"\n"
	"Do you want to continue installing Gpg4win?"
	msgstr ""
	"Une version de Gpg4Win a été déjà installée sur le système. Le remplacement "
	"de cette version s'effectuera sans problème.\n"
	"\n"
	"Voulez-vous poursuivre l'installation Gpg4win?"

	#: src/installer.nsi:483
	msgctxt "T_FoundOldSeeManual"
	msgid ""
	"Please see the Gpg4win user manual to learn how to migrate existing keys "
	"from other GnuPG based installations to Gpg4win."
	msgstr ""
	"Veuillez consulter le guide d'utilisateur de Gpg4win pour apprendre comment "
	"déplacer des clés existantes dans une installation GnuPG vers Gpg4win."

	#: src/installer.nsi:488
	msgctxt "T_FoundOldGnuPP"
	msgid ""
	"An old installation of GnuPP (GNU Privacy Project) has been been detected. "
	"That software is not maintained anymore and thus should be removed.\n"
	"\n"
	"Do you want to continue installing Gpg4win and take care of the old "
	"installation later?"
	msgstr ""
	"Une vieille installation de GnuPP (projet d'privé de GNU) a été détectée. "
	"Ce logiciel n'est plus sous maintenance et devrait pas être enlevé.\n"
	"\n"
	"Voulez-vous continuer d'installer Gpg4win et prendre soin de la vieille "
	"installation plus tard?"

	#: src/installer.nsi:497
	msgctxt "T_FoundOldGnuPT"
	msgid ""
	"An installation of GnuPT has been been detected. This may cause problems "
	"when used along with Gpg4win.\n"
	"\n"
	"Do you want to continue installing Gpg4win?"
	msgstr ""
	"Une installation de GnuPT a été détectée. Ceci peut poser des problèmes une "
	"fois utilisé avec Gpg4win.\n"
	"\n"
	"Voulez-vous continuer d'installer Gpg4win?"

	#: src/installer.nsi:504
	msgctxt "T_FoundOldWinPTSF"
	msgid ""
	"An old installation of the Sourceforge hosted WinPT has been been detected. "
	"That software is not maintained anymore and should be removed.\n"
	"\n"
	"Do you want to continue installing Gpg4win and take care of the old "
	"installation later?"
	msgstr ""
	"Une vieille installation du WinPT accueillie par Sourceforge a été détectée. "
	"Ce logiciel n'est plus sous maintenance et devrait être enlevé.\n"
	" \n"
	"Vous voulez continuer d'installer Gpg4win et prendre soin de la vieille "
	"installation plus tard?"

	#: src/installer.nsi:514
	msgctxt "T_FoundOldGnuPack"
	msgid ""
	"An installation of GnuPG-Pack has been been detected. You need to uninstall "
	"it before you can continue with Gpg4win installation.\n"
	"\n"
	"The installation will be aborted now!"
	msgstr ""
	"ne installation de GnuPG-Pack a été détectée. Vous devez l'enlever avant de "
	"pouvoir continuer avec l'installation Gpg4win.\n"
	"\n"
	"L'installation sera annulée maintenant!"

	#: src/installer.nsi:523
	msgctxt "T_BetaWarning"
	msgid ""
	"Note: This is a BETA version of Gpg4win.\n"
	"\n"
	"Beta versions are only intended for testing and shall not be used in a "
	"production environment."
	msgstr ""

	#: src/installer.nsi:530
	msgctxt "T_AdminNeeded"
	msgid ""
	"Warning: Administrator permissions required for a successful installation"
	msgstr ""
	"Avertissement : Permissions d'administrateur requises pour une installation "
	"réussie"

	#: src/installer.nsi:534
	msgctxt "T_CloseOtherApps"
	msgid ""
	"Please make sure that other applications are not running. In particular you "
	"should close Outlook and all Explorer windows. Gpg4win will try to install "
	"anyway but a reboot will be required then."
	msgstr ""
	"Veuillez s'assurer que d'autres applications ne fonctionnent pas. En "
	"particulier vérifiez que vous avez fermé Outlook et les fenêtres Explorer. "
	"Gpg4win essayera d'installer quoi qu'il en soit mais une réinitialisation "
	"sera exigé alors."

	#: src/installer.nsi:539
	msgctxt "T_ShuttingDownWinPT"
	msgid "Trying to shutdown a possible running instance of WinPT."
	msgstr "Essayant à l'arrêt un instance courant possible de WinPT."

	#: src/installer.nsi:541
	msgctxt "T_ShuttingDownDirMngr"
	msgid "Trying to shutdown a possible running instance of DirMngr."
	msgstr "Essayant à l'arrêt un instance courant possible de DirMngr."

	#: src/inst-claws-mail.nsi:53
	msgctxt "DESC_SEC_claws_mail"
	msgid "Claws Mail-User-Agent"
	msgstr "Claws Mail-User-Agent"

	#: src/inst-claws-mail.nsi:56
	msgctxt "DESC_Menu_claws_mail"
	msgid "Run the Claws mailprogram."
	msgstr "Courez le Claws mailprogram."

	#: src/inst-claws-mail.nsi:59
	msgctxt "DESC_Menu_claws_mail_pdf"
	msgid "Show the online manual of Claws Mail"
	msgstr "Montrez le guide en ligne du Claws Mail"

	#: src/inst-eudoragpg.nsi:40
	msgctxt "DESC_SEC_eudoragpg"
	msgid "EudoraGPG is a plugin for the Eudora mail program"
	msgstr ""
	"EudoraGPG est un plugin pour le logiciel de courrier électronique d'Eudora"

	#: src/inst-gnupg2.nsi:118
	msgctxt "DESC_SEC_gnupg2"
	msgid "GNU Privacy Guard with S/MIME support"
	msgstr "GNU Privacy Guard avec l'appui de S/MIME"

	#: src/inst-gnupg.nsi:108
	msgctxt "DESC_SEC_gnupg"
	msgid "GNU Privacy Guard"
	msgstr "GNU Privacy Guard"

	#: src/inst-gpa.nsi:75
	msgctxt "DESC_SEC_gpa"
	msgid "GNU Privacy Assistant"
	msgstr "GNU Privacy Assistant"

	#: src/inst-gpa.nsi:78
	msgctxt "DESC_Menu_gpa"
	msgid ""
	"Run the GNU Privacy Assistant key management tool. This is an alternative to "
	"the WinPT key management tool."
	msgstr ""
	"Courez le GNU Privacy Assistant outil pour gestionner le clé. C'est une "
	"alternative à l'outil de gestion de clé de WinPT."

	#: src/inst-gpg4win.nsi:43
	msgctxt "DESC_Menu_gpg4win_readme"
	msgid "General information on Gpg4Win"
	msgstr "Informations générales sur Gpg4Win"

	#: src/inst-gpg4win.nsi:46
	msgctxt "DESC_Menu_gnupg_faq"
	msgid "Show the Frequently Asked Questions Document for GnuPG"
	msgstr "Montrez le document fréquemment demandé de questions pour GnuPG"

	#: src/inst-gpgee.nsi:65
	msgctxt "T_GPGee_RegFailed"
	msgid "Warning: Registration of the GPGee explorer extension failed."
	msgstr ""
	"Avertissement : L'enregistrement de la prolongation d'explorateur de GPGee a "
	"échoué."

	#: src/inst-gpgee.nsi:68
	msgctxt "DESC_SEC_gpgee"
	msgid "GPG Explorer Extensions"
	msgstr "GPG Explorer Extensions"

	#: src/inst-gpgee.nsi:71
	msgctxt "DESC_Menu_gpgee_hlp"
	msgid "Show the online manual of GPGee"
	msgstr "Montrez le guide en ligne de GPGee"

	#: src/inst-gpgex.nsi:80
	msgctxt "T_GpgEX_RegFailed"
	msgid "Warning: Registration of the GpgEX plugin failed."
	msgstr "Avertissement : Enregistrement du plugin de GpgEX échoué."

	#: src/inst-gpgex.nsi:83
	msgctxt "DESC_SEC_gpgex"
	msgid "GnuPG Shell Extension"
	msgstr "GnuPG Shell Extension"

	#: src/inst-gpgol.nsi:57
	msgctxt "T_GpgOL_RegFailed"
	msgid "Warning: Registration of the GpgOL Outlook pluginfailed."
	msgstr ""
	"Avertissement : Enregistrement du plugin de perspectives de GpgOL échoué."

	#: src/inst-gpgol.nsi:60
	msgctxt "DESC_SEC_gpgol"
	msgid "GnuPG for Outlook"
	msgstr "GnuPG pour Outlook"

	#: src/inst-kleopatra.nsi:195
	msgctxt "DESC_SEC_kleopatra"
	-msgid "Kleopatra"
	-msgstr "Kleopatra"
	+msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
	+msgstr ""

	-#: src/inst-kleopatra.nsi:198
	+#: src/inst-kleopatra.nsi:199
	msgctxt "DESC_Menu_kleopatra"
	msgid "Run the Kleopatra key management tool."
	msgstr "Courez l'outil de gestion de clé de Kleopatra."

	#: src/inst-man_advanced_de.nsi:39
	msgctxt "DESC_Name_man_advanced_de"
	msgid "Advanced Manual (German)"
	msgstr "Guide Avançé (Allemand)"

	#: src/inst-man_advanced_de.nsi:42
	msgctxt "DESC_SEC_man_advanced_de"
	msgid "Gpg4Win Manual for the Advanced User (German)"
	msgstr "Gpg4Win Guide pour l'utilisateur avançé (Allemand)"

	#: src/inst-man_advanced_de.nsi:45
	msgctxt "DESC_Menu_man_advanced_de"
	msgid "Show the German online manual of Gpg4Win for advanced users"
	msgstr ""
	"Montrez le guide en ligne allemand de Gpg4Win pour les utilisateurs avançés"

	#: src/inst-man_advanced_en.nsi:39
	msgctxt "DESC_Name_man_advanced_en"
	msgid "Advanced Manual"
	msgstr "Guide Avançé"

	#: src/inst-man_advanced_en.nsi:42
	msgctxt "DESC_SEC_man_advanced_en"
	msgid "Gpg4Win Manual for the Advanced User"
	msgstr "Guide de Gpg4Win pour l'utilisateur avançé"

	#: src/inst-man_advanced_en.nsi:45
	msgctxt "DESC_Menu_man_advanced_en"
	msgid "Show the online manual of Gpg4Win for advanced users"
	msgstr "Montrez le guide en ligne de Gpg4Win pour les utilisateurs avançés"

	#: src/inst-man_novice_de.nsi:39
	msgctxt "DESC_Name_man_novice_de"
	msgid "Novice Manual (German)"
	msgstr "Gpg4Win Guide du débutant (Allemand)"

	#: src/inst-man_novice_de.nsi:42
	msgctxt "DESC_SEC_man_novice_de"
	msgid "Gpg4Win Manual for the Novice User (German)"
	msgstr "Guide de Gpg4Win pour l'utilisateur de débutant (Allemand)"

	#: src/inst-man_novice_de.nsi:45
	msgctxt "DESC_Menu_man_novice_de"
	msgid "Show the German online manual of Gpg4Win for novice users"
	msgstr ""
	"Montrez le guide en ligne allemand de Gpg4Win pour des utilisateurs de "
	"débutant"

	#: src/inst-man_novice_en.nsi:39
	msgctxt "DESC_Name_man_novice_en"
	msgid "Novice Manual"
	msgstr "Guide de débutant"

	#: src/inst-man_novice_en.nsi:42
	msgctxt "DESC_SEC_man_novice_en"
	msgid "Gpg4Win Manual for the Novice User"
	msgstr "Guide de Gpg4Win pour l'utilisateur de débutant"

	#: src/inst-man_novice_en.nsi:45
	msgctxt "DESC_Menu_man_novice_en"
	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-winpt.nsi:46
	msgctxt "DESC_SEC_winpt"
	msgid "Windows Privacy Tray"
	msgstr "Windows Privacy Tray"

	#: src/inst-winpt.nsi:49
	msgctxt "DESC_Menu_winpt"
	msgid ""
	"Run the Windows Privacy Tray key management tool. This is a versatile key "
	"management and encryption tool."
	msgstr ""
	"Courez l'outil de gestion de clé de plateau d'privé de Windows. C'est une "
	"clé souple outil de gestion de clé et de cryptage."

	+#~ msgctxt "DESC_SEC_kleopatra"
	+#~ msgid "Kleopatra"
	+#~ msgstr "Kleopatra"
	+
	#~ msgctxt "DESC_SEC_sylpheed"
	#~ msgid "Sylpheed-Claws Mail-User-Agent"
	#~ msgstr "Sylpheed-Claws Mail-User-Agent"

	#~ msgctxt "DESC_Menu_sylpheed"
	#~ msgid "Run the Sylpheed-Claws mailprogram."
	#~ msgstr "Courez le Sylpheed-Claws mailprogram."

	#~ msgctxt "DESC_Menu_sylpheed_pdf"
	#~ msgid "Show the online manual of Sylpheed Claws"
	#~ msgstr "Montrez le manuel en ligne de Sylpheed Claws"
	diff --git a/po/ru.po b/po/ru.po
	index c808cb11..b8fb27ba 100644
	--- a/po/ru.po
	+++ b/po/ru.po
	@@ -1,494 +1,498 @@
	# SOME DESCRIPTIVE TITLE.
	# Copyright (C) YEAR g10 Code GmbH
	# This file is distributed under the same license as the PACKAGE package.
	# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
	#
	msgid ""
	msgstr ""
	"Project-Id-Version: Gpg4Win Installer\n"
	"Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
	-"POT-Creation-Date: 2008-05-09 19:09+0200\n"
	+"POT-Creation-Date: 2008-05-28 11:25+0200\n"
	"PO-Revision-Date: 2008-04-22 11:57+0200\n"
	"Last-Translator: Sergei Smirnov <moscow@hro.org>\n"
	"Language-Team: Human Rights Network <moscow@hro.org>\n"
	"MIME-Version: 1.0\n"
	"Content-Type: text/plain; charset=CP1251\n"
	"Content-Transfer-Encoding: 8bit\n"
	"X-Poedit-Language: Russian\n"

	#: src/g4wihelp.nsi:21
	msgctxt "T_AlreadyRunning"
	msgid "An instance of this installer is already running."
	msgstr "Óñòàíîâêà ïðîãðàììû óæå çàïóùåíà."

	#: src/gpg4win.nsi:117
	msgctxt "T_WelcomeTitleGpg4win"
	msgid "Welcome to the installation of Gpg4win"
	msgstr "Äîáðî ïîæàëîâàòü â ïðîãðàììó óñòàíîâêè Gpg4win!"

	#: src/gpg4win.nsi:121
	msgctxt "T_AboutGpg4win"
	msgid ""
	"GnuPG is GNU's tool for secure communication and data storage. It can be "
	"used to encrypt data and to create digital signatures. It includes an "
	"advanced key management facility and is compliant with the proposed OpenPGP "
	"Internet standard as described in RFC2440."
	msgstr ""
	"GnuPG - áåñïëàòíàÿ ïðîãðàììà ñ îòêðûòûì êîäîì, êîòîðàÿ ïðåäíàçíà÷åíà äëÿ "
	"çàùèòû èíôîðìàöèè. Ñ ïîìîùüþ GnuPG ìîæíî øèôðîâàòü äàííûå è äîáàâëÿòü ê íèì "
	"öèôðîâóþ ïîäïèñü. GnuPG ñîäåðæèò ìîùíûé èíñòðóìåíòàðèé óïðàâëåíèÿ "
	"øèôðîâàëüíûìè êëþ÷àìè è ñîâìåñòèìà ñî ñòàíäàðòîì OpenPGP, îïèñàííûì â "
	"äîêóìåíòå RFC2440."

	#: src/gpg4win.nsi:127
	msgctxt "T_AboutGpg4winVersion"
	msgid "This is Gpg4win version ${VERSION}"
	msgstr "Âåðñèÿ Gpg4win ${VERSION}"

	#: src/gpg4win.nsi:130
	msgctxt "T_AboutGpg4winFileVersion"
	msgid "file version ${PROD_VERSION}"
	msgstr "Âåðñèÿ ôàéëà ${PROD_VERSION}"

	#: src/gpg4win.nsi:133
	msgctxt "T_AboutGpg4winReleaseDate"
	msgid "release date ${_BUILD_ISODATE}"
	msgstr "Äàòà ðåëèçà ${_BUILD_ISODATE}"

	#: src/gpg4win-src.nsi:76
	msgctxt "T_WelcomeTitleGpg4winSrc"
	msgid "Welcome to the installation of the Gpg4win sources"
	msgstr "Óñòàíîâêà êîìïîíåíòîâ Gpg4Win"

	#: src/gpg4win-src.nsi:80
	msgctxt "T_AboutGpg4winSrc"
	msgid ""
	"GnuPG is GNU's tool for secure communication and data storage. It can be "
	"used to encrypt data and to create digital signatures. It includes an "
	"advanced key management facility and is compliant with the proposed OpenPGP "
	"Internet standard as described in RFC2440."
	msgstr ""
	"GnuPG - áåñïëàòíàÿ ïðîãðàììà ñ îòêðûòûì êîäîì, êîòîðàÿ ïðåäíàçíà÷åíà äëÿ "
	"çàùèòû èíôîðìàöèè. Ñ ïîìîùüþ GnuPG ìîæíî øèôðîâàòü äàííûå è äîáàâëÿòü ê íèì "
	"öèôðîâóþ ïîäïèñü. GnuPG ñîäåðæèò ìîùíûé èíñòðóìåíòàðèé óïðàâëåíèÿ "
	"øèôðîâàëüíûìè êëþ÷àìè è ñîâìåñòèìà ñî ñòàíäàðòîì OpenPGP, îïèñàííûì â "
	"äîêóìåíòå RFC2440."

	#: src/gpg4win-src.nsi:86
	msgctxt "T_AboutGpg4winSrcVersion"
	msgid "This is Gpg4win version ${VERSION}"
	msgstr "Âåðñèÿ Gpg4win ${VERSION}"

	#: src/gpg4win-src.nsi:89
	msgctxt "T_AboutGpg4winSrcFileVersion"
	msgid "file version ${PROD_VERSION}"
	msgstr "Âåðñèÿ ôàéëà ${PROD_VERSION}"

	#: src/gpg4win-src.nsi:92
	msgctxt "T_AboutGpg4winSrcReleaseDate"
	msgid "release date ${_BUILD_ISODATE}"
	msgstr "Äàòà ðåëèçà ${_BUILD_ISODATE}"

	#: src/installer.nsi:217
	msgctxt "T_LangCode"
	msgid "en"
	msgstr "ru"

	#: src/installer.nsi:220
	msgctxt "T_GPLHeader"
	msgid ""
	"This software is licensed under the terms of the GNU General Public License "
	"(GPL) which guarantees your freedom to share and change Free Software."
	msgstr ""
	"Èñïîëüçîâàíèå ýòîé ïðîãðàììû ðåãóëèðóåòñÿ ëèöåíçèåé GNU General Public "
	"License (GPL). Âû ìîæåòå ñâîáîäíî ðàñïðîñòðàíÿòü ýòó ïðîãðàììó è âíîñèòü â "
	"íåå èçìåíåíèÿ."

	#: src/installer.nsi:225
	msgctxt "T_GPLShort"
	msgid ""
	"In short: You are allowed to run this software for any purpose. You may "
	"distribute it as long as you give the recipients the same rights you have "
	"received."
	msgstr ""
	"Âêðàòöå: âû ìîæåòå èñïîëüçîâàòü ýòó ïðîãðàììó â ëþáûõ öåëÿõ. Âû ìîæåòå "
	"ðàñïðîñòðàíÿòü åå ïðè óñëîâèè, ÷òî íå áóäåòå îãðàíè÷èâàòü ïðàâà äðóãèõ "
	"ïîëüçîâàòåëåé ïðîãðàììû."

	#: src/installer.nsi:230
	msgctxt "T_RunKeyManager"
	msgid "Run the key manager"
	msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé"

	#: src/installer.nsi:233
	msgctxt "T_MoreInfo"
	msgid "Click here for the project's homepage"
	msgstr "Âåá-ñàéò ïðîåêòà"

	#: src/installer.nsi:235
	msgctxt "T_MoreInfoURL"
	msgid "http://www.gpg4win.org"
	msgstr "http://www.gpg4win.org"

	#: src/installer.nsi:237
	msgctxt "T_ShowReadme"
	msgid "Show the README file"
	msgstr "Ïîêàçàòü ôàéë README"

	#: src/installer.nsi:240
	msgctxt "T_NoKeyManager"
	msgid "No key manager has been installed, thus we can't run one now."
	msgstr "Îøèáêà çàïóñêà ìåíåäæåðà êëþ÷åé: íè îäèí èç ìåíåäæåðîâ íå óñòàíîâëåí."

	#: src/installer.nsi:245
	msgctxt "DESC_Menu_manuals"
	msgid "Documentation"
	msgstr "Äîêóìåíòàöèÿ"

	#: src/installer.nsi:249
	msgctxt "DESC_Desktop_manuals"
	msgid "Gpg4win Documentation"
	msgstr "Äîêóìåíòàöèÿ Gpg4win"

	#: src/installer.nsi:446
	msgctxt "T_InstallOptions"
	msgid "Install Options"
	msgstr "Ïàðàìåòðû óñòàíîâêè"

	#: src/installer.nsi:449
	msgctxt "T_InstallOptLinks"
	msgid "Start links"
	msgstr "ßðëûêè Gpg4win"

	#: src/installer.nsi:451
	msgctxt "T_InstOptLabelA"
	msgid "Please select where Gpg4win shall install links:"
	msgstr "Ãäå ñîçäàâàòü ÿðëûêè Gpg4win:"

	#: src/installer.nsi:454
	msgctxt "T_InstOptLabelB"
	msgid "(Only programs will be linked into the quick launch bar.)"
	msgstr "(Â ïàíåëè áûñòðîãî çàïóñêà áóäóò ññûëêè òîëüêî íà ïðîãðàììû)."

	#: src/installer.nsi:457
	msgctxt "T_InstOptFieldA"
	msgid "Start Menu"
	msgstr "Ìåíþ Ïóñê"

	#: src/installer.nsi:460
	msgctxt "T_InstOptFieldB"
	msgid "Desktop"
	msgstr "Ðàáî÷èé ñòîë"

	#: src/installer.nsi:463
	msgctxt "T_InstOptFieldC"
	msgid "Quick Launch Bar"
	msgstr "Ïàíåëü áûñòðîãî çàïóñêà"

	#: src/installer.nsi:469
	msgctxt "T_FoundExistingVersion"
	msgid ""
	"Version $R1 has already been installed.\n"
	"Do you want to overwrite it with version ${VERSION}?"
	msgstr ""
	"Âåðñèÿ $R1 óæå óñòàíîâëåíà.\n"
	"Ïåðåçàïèñàòü åå âåðñèåé ${VERSION}?"

	#: src/installer.nsi:472
	msgctxt "T_FoundExistingVersionB"
	msgid ""
	"A version of Gpg4Win has already been installed on the system. There will be "
	"no problem installing and thus overwriting this Version.\n"
	"\n"
	"Do you want to continue installing Gpg4win?"
	msgstr ""
	"Gpg4Win óæå óñòàíîâëåíà íà ýòîì êîìïüþòåðå. Äàëüíåéøàÿ óñòàíîâêà ïåðåçàïèøåò "
	"ýòó âåðñèþ íîâîé.\n"
	"\n"
	"Ïðîäîëæèòü óñòàíîâêó Gpg4Win?"

	#: src/installer.nsi:483
	msgctxt "T_FoundOldSeeManual"
	msgid ""
	"Please see the Gpg4win user manual to learn how to migrate existing keys "
	"from other GnuPG based installations to Gpg4win."
	msgstr ""
	"Âîïðîñû ïåðåíîñà êëþ÷åé èç äðóãèõ ïðîãðàìì â Gpg4Win ðàññìàòðèâàþòñÿ â "
	"ðóêîâîäñòâå ïîëüçîâàòåëÿ Gpg4Win."

	#: src/installer.nsi:488
	msgctxt "T_FoundOldGnuPP"
	msgid ""
	"An old installation of GnuPP (GNU Privacy Project) has been been detected. "
	"That software is not maintained anymore and thus should be removed.\n"
	"\n"
	"Do you want to continue installing Gpg4win and take care of the old "
	"installation later?"
	msgstr ""
	"Îáíàðóæåíà ñòàðàÿ óñòàíîâêà GnuPP (GNU Privacy Project). Ýòîò ïðîåêò äàâíî "
	"ïðåêðàùåí, ðåêîìåíäóåì óäàëèòü ïðîãðàììó.\n"
	"\n"
	"Ïðîäîëæèòü óñòàíîâêó Gpg4Win (à ñ GnuPP ðàçáåðåìñÿ ïîòîì)?"

	#: src/installer.nsi:497
	msgctxt "T_FoundOldGnuPT"
	msgid ""
	"An installation of GnuPT has been been detected. This may cause problems "
	"when used along with Gpg4win.\n"
	"\n"
	"Do you want to continue installing Gpg4win?"
	msgstr ""
	"Îáíàðóæåíà óñòàíîâëåííàÿ ïðîãðàììà GnuPT. Îíà ìîæåò êîíôëèêòîâàòü ñ "
	"Gpg4Win.\n"
	"\n"
	"Ïðîäîëæèòü óñòàíîâêó Gpg4win?"

	#: src/installer.nsi:504
	msgctxt "T_FoundOldWinPTSF"
	msgid ""
	"An old installation of the Sourceforge hosted WinPT has been been detected. "
	"That software is not maintained anymore and should be removed.\n"
	"\n"
	"Do you want to continue installing Gpg4win and take care of the old "
	"installation later?"
	msgstr ""
	"Îáíàðóæåíà óñòàíîâëåííàÿ ñòàðàÿ âåðñèÿ WinPT (ïðîåêò íà Sourceforge). Ýòà "
	"âåðñèÿ áîëåå íå ðàçâèâàåòñÿ.\n"
	"Ðåêîìåíäóåòñÿ óäàëèòü åå.\n"
	"\n"
	"Ïðîäîëæèòü óñòàíîâêó Gpg4win (à ñî ñòàðîé ïðîãðàììîé ðàçáåðåìñÿ ïîòîì)?"

	#: src/installer.nsi:514
	msgctxt "T_FoundOldGnuPack"
	msgid ""
	"An installation of GnuPG-Pack has been been detected. You need to uninstall "
	"it before you can continue with Gpg4win installation.\n"
	"\n"
	"The installation will be aborted now!"
	msgstr ""
	"Îáíàðóæåíà óñòàíîâëåííàÿ ïðîãðàììà GnuPG-Pack. Íóæíî óäàëèòü åå ñ êîìïüþòåðà "
	"ïðåæäå, ÷åì ïðîäîëæèòü\n"
	"óñòàíîâêó Gpg4win.\n"
	"\n"
	"Óñòàíîâêà ïðåðâàíà!"

	#: src/installer.nsi:523
	msgctxt "T_BetaWarning"
	msgid ""
	"Note: This is a BETA version of Gpg4win.\n"
	"\n"
	"Beta versions are only intended for testing and shall not be used in a "
	"production environment."
	msgstr ""

	#: src/installer.nsi:530
	msgctxt "T_AdminNeeded"
	msgid ""
	"Warning: Administrator permissions required for a successful installation"
	msgstr "Äëÿ óñïåøíîé óñòàíîâêè òðåáóþòñÿ ïðàâà àäìèíèñòðàòîðà"

	#: src/installer.nsi:534
	msgctxt "T_CloseOtherApps"
	msgid ""
	"Please make sure that other applications are not running. In particular you "
	"should close Outlook and all Explorer windows. Gpg4win will try to install "
	"anyway but a reboot will be required then."
	msgstr ""
	"Óáåäèòåñü, ÷òî íå çàïóùåíû äðóãèå ïðèëîæåíèÿ. Â ÷àñòíîñòè, ñëåäóåò çàêðûòü "
	"Outlook è Explorer. Åñëè ýòî íå ñäåëàòü, Gpg4Win âñå ðàâíî áóäåò "
	"óñòàíîâëåíà, íî ïîòðåáóåòñÿ ïåðåçàãðóçêà."

	#: src/installer.nsi:539
	msgctxt "T_ShuttingDownWinPT"
	msgid "Trying to shutdown a possible running instance of WinPT."
	msgstr "Âîçìîæíî, çàïóùåíà ïðîãðàììà WinPT. Ïîïðîáóåì çàêðûòü åå."

	#: src/installer.nsi:541
	msgctxt "T_ShuttingDownDirMngr"
	msgid "Trying to shutdown a possible running instance of DirMngr."
	msgstr "Âîçìîæíî, çàïóùåíà ïðîãðàììà DirMngr. Ïîïðîáóåì çàêðûòü åå."

	#: src/inst-claws-mail.nsi:53
	msgctxt "DESC_SEC_claws_mail"
	msgid "Claws Mail-User-Agent"
	msgstr "Ïî÷òîâûé êëèåíò Claws"

	#: src/inst-claws-mail.nsi:56
	msgctxt "DESC_Menu_claws_mail"
	msgid "Run the Claws mailprogram."
	msgstr "Çàïóñê ïî÷òîâîé ïðîãðàììû Claws."

	#: src/inst-claws-mail.nsi:59
	msgctxt "DESC_Menu_claws_mail_pdf"
	msgid "Show the online manual of Claws Mail"
	msgstr "Ïîêàçàòü îíëàéíîâîå ðóêîâîäñòâî ê ïî÷òîâîìó êëèåíòó Claws Mail"

	#: src/inst-eudoragpg.nsi:40
	msgctxt "DESC_SEC_eudoragpg"
	msgid "EudoraGPG is a plugin for the Eudora mail program"
	msgstr "EudoraGPG - ðàñøèðåíèå ïî÷òîâîãî êëèåíòà Eudora"

	#: src/inst-gnupg2.nsi:118
	msgctxt "DESC_SEC_gnupg2"
	msgid "GNU Privacy Guard with S/MIME support"
	msgstr "GNU Privacy Guard ñ ïîääåðæêîé S/MIME"

	#: src/inst-gnupg.nsi:108
	msgctxt "DESC_SEC_gnupg"
	msgid "GNU Privacy Guard"
	msgstr "GNU Privacy Guard"

	#: src/inst-gpa.nsi:75
	msgctxt "DESC_SEC_gpa"
	msgid "GNU Privacy Assistant"
	msgstr "GNU Privacy Assistant"

	#: src/inst-gpa.nsi:78
	msgctxt "DESC_Menu_gpa"
	msgid ""
	"Run the GNU Privacy Assistant key management tool. This is an alternative to "
	"the WinPT key management tool."
	msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé GNU Privacy Assistant (àëüòåðíàòèâà WinPT)."

	#: src/inst-gpg4win.nsi:43
	msgctxt "DESC_Menu_gpg4win_readme"
	msgid "General information on Gpg4Win"
	msgstr "Îáùàÿ èíôîðìàöèÿ î Gpg4Win"

	#: src/inst-gpg4win.nsi:46
	msgctxt "DESC_Menu_gnupg_faq"
	msgid "Show the Frequently Asked Questions Document for GnuPG"
	msgstr "FAQ ïî ïðîãðàììå GnuPG"

	#: src/inst-gpgee.nsi:65
	msgctxt "T_GPGee_RegFailed"
	msgid "Warning: Registration of the GPGee explorer extension failed."
	msgstr "Îøèáêà ðåãèñòðàöèè GPGee."

	#: src/inst-gpgee.nsi:68
	msgctxt "DESC_SEC_gpgee"
	msgid "GPG Explorer Extensions"
	msgstr "Ðàñøèðåíèå GPG äëÿ Ïðîâîäíèêà Windows"

	#: src/inst-gpgee.nsi:71
	msgctxt "DESC_Menu_gpgee_hlp"
	msgid "Show the online manual of GPGee"
	msgstr "Ïîêàçàòü îíëàéíîâîå ðóêîâîäñòâî ïî GPGee"

	#: src/inst-gpgex.nsi:80
	msgctxt "T_GpgEX_RegFailed"
	msgid "Warning: Registration of the GpgEX plugin failed."
	msgstr "Îøèáêà ðåãèñòðàöèè GpgEX."

	#: src/inst-gpgex.nsi:83
	msgctxt "DESC_SEC_gpgex"
	msgid "GnuPG Shell Extension"
	msgstr "Îáîëî÷êà GnuPG"

	#: src/inst-gpgol.nsi:57
	msgctxt "T_GpgOL_RegFailed"
	msgid "Warning: Registration of the GpgOL Outlook pluginfailed."
	msgstr "Îøèáêà ðåãèñòðàöèè ïëàãèíà GpgOL (äëÿ Outlook)."

	#: src/inst-gpgol.nsi:60
	msgctxt "DESC_SEC_gpgol"
	msgid "GnuPG for Outlook"
	msgstr "GnuPG äëÿ MS Outlook"

	#: src/inst-kleopatra.nsi:195
	msgctxt "DESC_SEC_kleopatra"
	-msgid "Kleopatra"
	-msgstr "Kleopatra"
	+msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
	+msgstr ""

	-#: src/inst-kleopatra.nsi:198
	+#: src/inst-kleopatra.nsi:199
	msgctxt "DESC_Menu_kleopatra"
	msgid "Run the Kleopatra key management tool."
	msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé Kleopatra."

	#: src/inst-man_advanced_de.nsi:39
	msgctxt "DESC_Name_man_advanced_de"
	msgid "Advanced Manual (German)"
	msgstr "Ïîäðîáíîå ðóêîâîäñòâî (íåì.)"

	#: src/inst-man_advanced_de.nsi:42
	msgctxt "DESC_SEC_man_advanced_de"
	msgid "Gpg4Win Manual for the Advanced User (German)"
	msgstr "Ðóêîâîäñòâî Gpg4Win äëÿ ïðîäâèíóòûõ ïîëüçîâàòåëåé (íåì.)"

	#: src/inst-man_advanced_de.nsi:45
	msgctxt "DESC_Menu_man_advanced_de"
	msgid "Show the German online manual of Gpg4Win for advanced users"
	msgstr ""
	"Ïîêàçàòü îíëàéíîâîå ðóêîâîäñòâî Gpg4Win äëÿ ïðîäâèíóòûõ ïîëüçîâàòåëåé (íåì.)"

	#: src/inst-man_advanced_en.nsi:39
	msgctxt "DESC_Name_man_advanced_en"
	msgid "Advanced Manual"
	msgstr "Ïîäðîáíîå ðóêîâîäñòâî"

	#: src/inst-man_advanced_en.nsi:42
	msgctxt "DESC_SEC_man_advanced_en"
	msgid "Gpg4Win Manual for the Advanced User"
	msgstr "Ðóêîâîäñòâî Gpg4Win äëÿ ïðîäâèíóòûõ ïîëüçîâàòåëåé"

	#: src/inst-man_advanced_en.nsi:45
	msgctxt "DESC_Menu_man_advanced_en"
	msgid "Show the online manual of Gpg4Win for advanced users"
	msgstr "Ïîêàçàòü îíëàéíîâîå ðóêîâîäñòâî Gpg4Win äëÿ ïðîäâèíóòûõ ïîëüçîâàòåëåé"

	#: src/inst-man_novice_de.nsi:39
	msgctxt "DESC_Name_man_novice_de"
	msgid "Novice Manual (German)"
	msgstr "Áûñòðûå èíñòðóêöèè (íåì.)"

	#: src/inst-man_novice_de.nsi:42
	msgctxt "DESC_SEC_man_novice_de"
	msgid "Gpg4Win Manual for the Novice User (German)"
	msgstr "Èíñòðóêöèè ïî Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ (íåì.)"

	#: src/inst-man_novice_de.nsi:45
	msgctxt "DESC_Menu_man_novice_de"
	msgid "Show the German online manual of Gpg4Win for novice users"
	msgstr ""
	"Ïîêàçàòü îíëàéíîâûå èíñòðóêöèè Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ (íåì.)"

	#: src/inst-man_novice_en.nsi:39
	msgctxt "DESC_Name_man_novice_en"
	msgid "Novice Manual"
	msgstr "Áûñòðûå èíñòðóêöèè"

	#: src/inst-man_novice_en.nsi:42
	msgctxt "DESC_SEC_man_novice_en"
	msgid "Gpg4Win Manual for the Novice User"
	msgstr "Èíñòðóêöèè Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ"

	#: src/inst-man_novice_en.nsi:45
	msgctxt "DESC_Menu_man_novice_en"
	msgid "Show the online manual of Gpg4Win for novice users"
	msgstr "Ïîêàçàòü îíëàéíîâûå èíñòðóêöèè Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ"

	#: src/inst-winpt.nsi:46
	msgctxt "DESC_SEC_winpt"
	msgid "Windows Privacy Tray"
	msgstr "Windows Privacy Tray"

	#: src/inst-winpt.nsi:49
	msgctxt "DESC_Menu_winpt"
	msgid ""
	"Run the Windows Privacy Tray key management tool. This is a versatile key "
	"management and encryption tool."
	msgstr ""
	"Çàïóñê Windows Privacy Tray. Ýòî óíèâåðñàëüíûé èíñòðóìåíò óïðàâëåíèÿ êëþ÷àìè "
	"è øèôðîâàíèÿ äàííûõ."

	+#~ msgctxt "DESC_SEC_kleopatra"
	+#~ msgid "Kleopatra"
	+#~ msgstr "Kleopatra"
	+
	#~ msgctxt "DESC_SEC_sylpheed"
	#~ msgid "Sylpheed-Claws Mail-User-Agent"
	#~ msgstr "Ïî÷òîâûé êëèåíò Sylpheed-Claws"

	#~ msgctxt "DESC_Menu_sylpheed"
	#~ msgid "Run the Sylpheed-Claws mailprogram."
	#~ msgstr "Çàïóñê ïî÷òîâîé ïðîãðàììû Sylpheed-Claws."

	#~ msgctxt "DESC_Menu_sylpheed_pdf"
	#~ msgid "Show the online manual of Sylpheed Claws"
	#~ msgstr "Ïîêàçàòü îíëàéíîâîå ðóêîâîäñòâî Sylpheed Claws"
	diff --git a/src/inst-kleopatra.nsi b/src/inst-kleopatra.nsi
	index 046fe9b2..8ee7dd06 100644
	--- a/src/inst-kleopatra.nsi
	+++ b/src/inst-kleopatra.nsi
	@@ -1,199 +1,200 @@
	# inst-kleopatra.nsi - Installer snippet for kleopatra. -- coding: latin-1; --
	# Copyright (C) 2005, 2007, 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, write to the Free Software
	# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA


	!ifdef prefix
	!undef prefix
	!endif
	!define prefix ${ipdir}/kleopatra-${gpg4win_pkg_kleopatra_version}

	${MementoSection} "Kleopatra" SEC_kleopatra
	SetOutPath "$INSTDIR"
	!ifdef SOURCES
	File "${gpg4win_pkg_kleopatra_src}"
	!else

	# Relocate this when dbus-daemon is relocated.
	SetOutPath "$INSTDIR\bin"
	File ${prefix}/bin/kleopatra.exe
	SetOutPath "$INSTDIR"
	File /oname=kleopatra.exe "${BUILD_DIR}/kleowrap.exe"

	File ${prefix}/bin/kgpgconf.exe
	File ${prefix}/bin/kwatchgnupg.exe
	File ${prefix}/bin/libkleo.dll
	File ${prefix}/bin/libkleopatraclientcore.dll
	File ${prefix}/bin/libkleopatraclientgui.dll
	File ${prefix}/lib/kde4/kcm_kleopatra.dll

	SetOutPath "$INSTDIR\share\applications\kde4"

	File ${prefix}/share/applications/kde4/kleopatra_import.desktop

	SetOutPath "$INSTDIR\share\apps\kleopatra"

	File ${prefix}/share/apps/kleopatra/kleopatra.rc

	SetOutPath "$INSTDIR\share\apps\kleopatra\pics"

	File ${prefix}/share/apps/kleopatra/pics/kleopatra_splashscreen.png
	File ${prefix}/share/apps/kleopatra/pics/kleopatra_splashscreen.svgz
	File ${prefix}/share/apps/kleopatra/pics/kleopatra_wizard.png
	File ${prefix}/share/apps/kleopatra/pics/kleopatra_wizard.svgz

	SetOutPath "$INSTDIR\share\apps\kwatchgnupg"

	File ${prefix}/share/apps/kwatchgnupg/kwatchgnupgui.rc

	SetOutPath "$INSTDIR\share\apps\kwatchgnupg\pics"

	File ${prefix}/share/apps/kwatchgnupg/pics/kwatchgnupg.png
	File ${prefix}/share/apps/kwatchgnupg/pics/kwatchgnupg2.png

	SetOutPath "$INSTDIR\share\apps\libkleopatra\pics"

	File ${prefix}/share/apps/libkleopatra/pics/chiasmus_chi.png
	File ${prefix}/share/apps/libkleopatra/pics/key.png
	File ${prefix}/share/apps/libkleopatra/pics/key_bad.png
	File ${prefix}/share/apps/libkleopatra/pics/key_ok.png
	File ${prefix}/share/apps/libkleopatra/pics/key_unknown.png

	SetOutPath "$INSTDIR\share\config"

	File ${prefix}/share/config/libkleopatrarc

	SetOutPath "$INSTDIR\share\icons\oxygen\128x128\apps"

	File ${prefix}/share/icons/oxygen/128x128/apps/kleopatra.png

	SetOutPath "$INSTDIR\share\icons\oxygen\16x16\apps"

	File ${prefix}/share/icons/oxygen/16x16/apps/kleopatra.png

	SetOutPath "$INSTDIR\share\icons\oxygen\22x22\apps"

	File ${prefix}/share/icons/oxygen/22x22/apps/kleopatra.png

	SetOutPath "$INSTDIR\share\icons\oxygen\32x32\apps"

	File ${prefix}/share/icons/oxygen/32x32/apps/kleopatra.png

	SetOutPath "$INSTDIR\share\icons\oxygen\48x48\apps"

	File ${prefix}/share/icons/oxygen/48x48/apps/kleopatra.png

	SetOutPath "$INSTDIR\share\icons\oxygen\64x64\apps"

	File ${prefix}/share/icons/oxygen/64x64/apps/kleopatra.png

	SetOutPath "$INSTDIR\share\icons\oxygen\scalable\apps"

	File ${prefix}/share/icons/oxygen/scalable/apps/kleopatra.svgz

	SetOutPath "$INSTDIR\share\kde4\services"

	File ${prefix}/share/kde4/services/kleopatra_config_appear.desktop
	File ${prefix}/share/kde4/services/kleopatra_config_dirserv.desktop
	File ${prefix}/share/kde4/services/kleopatra_config_dnorder.desktop
	File ${prefix}/share/kde4/services/kleopatra_config_smimevalidation.desktop

	SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"

	File ${prefix}/share/locale/de/LC_MESSAGES/akregator.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdelibs.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdepim.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/desktop_l10n.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kabc2mutt.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kabc_slox.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kabcakonadi.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kabcclient.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kaddressbook.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kalarm.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/katepart4.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kcertpart.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kcm_phonon.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kcmcrypto.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kcmkabconfig.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kcmkontactnt.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs4.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs_colors4.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kdepimresources.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kdepimwizards.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kdgantt1.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kfile_vcf.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kfileaudiopreview4.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kio4.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kio_groupwise.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kio_help4.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kitchensync.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kleopatra.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kmail.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kmail_text_calendar_plugin.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kmail_text_vcard_plugin.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kmail_text_xdiff_plugin.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kmailcvt.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kmobiletools.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kmobiletools_at_engine.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/knode.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/knotes.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kode.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/konsolekalendar.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kontact.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/korganizer.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/korn.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kpilot.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kres_birthday.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kres_blog.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kres_featureplan.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kres_groupware.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kres_groupwise.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kres_kolab.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kres_remote.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kres_scalix.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kres_tvanytime.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kres_xmlrpc.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditor_plugins.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/ktimetracker.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/ktnef.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kwatchgnupg.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/kxforms.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/libakonadi.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/libkdepim.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/libkholidays.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/libkleopatra.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/libkpgp.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/libksieve.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/libphonon.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/phonon_kde.mo
	File ${prefix}/share/locale/de/LC_MESSAGES/timezones4.mo

	SetOutPath "$INSTDIR\share\locale\de"

	File ${prefix}/share/locale/de/entry.desktop

	!endif
	${MementoSectionEnd}


	LangString DESC_SEC_kleopatra ${LANG_ENGLISH} \
	- "Kleopatra"
	+ "Keymanager for OpenPGP and X.509 and common crypto dialogs."
	+

	LangString DESC_Menu_kleopatra ${LANG_ENGLISH} \
	"Run the Kleopatra key management tool."

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 18, 11:35 PM (20 h, 56 m)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: a9/28/e5a281ab88eea51680760da9b8d0

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions