[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-154-g65e2b1a

by Andre Heinecke cvs at cvs.gnupg.org
Mon Apr 29 19:29:11 CEST 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  65e2b1a573f27d34d6fa48212a42f434a169f54b (commit)
       via  dad73390e8d2050f059d2024a6904b0d8d145221 (commit)
      from  fd8f58e3320631ecb637538b58100662648e39ba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 65e2b1a573f27d34d6fa48212a42f434a169f54b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Apr 29 17:03:23 2013 +0000

    Remove help:/ prefix in kleopatra documentation
    
        As we do not package khelpcenter we use the file links
        in the doc
    
        * src/Makefile.am: Add postinst for kleopatra to fix help links

diff --git a/src/Makefile.am b/src/Makefile.am
index fb6ba81..e7d133b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -488,6 +488,14 @@ define gpg4win_pkg_gnutls_post_install
  perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
 endef
 
+# We don't use khelpcenter in kleopatra so remove the help links
+define gpg4win_pkg_kleopatra_post_install
+ (for i in de en ; do \
+    (cd $$$${pkgidir}/share/doc/HTML/$$$${i}; \
+     perl -pi -e 's/help:\///g' `find . -name \*.html`); \
+ done)
+endef
+
 
 define gpg4win_pkg_libiconv_post_install
 (cp $(srcdir)/libiconv.def $$$${pkgidir}/lib;		\

commit dad73390e8d2050f059d2024a6904b0d8d145221
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Apr 29 17:01:01 2013 +0000

    Update kleopatra packaging for KDE 4.10
    
        * packages/packages.current: Use repackaged kleopatra version
        with some additional files and exploded documentation.
        * src/inst-kleopatra.nsi, src/uninst-kleopatra: Handle updated
        paths and filenames.

diff --git a/packages/packages.current b/packages/packages.current
index 340dd0d..37a3599 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -473,8 +473,8 @@ chk  a9384cd6fe240a362f5bbb3bbc0e918af63531dc
 #
 server http://files.kolab.org/local/gpg4win
 
-file kleopatra-20130426-1-bin.tar.bz2
-chk  4afe6f491269781490610e9cb30978a5907c593f
+file kleopatra-20130426-2-bin.tar.bz2
+chk  f978a93765fc2dc4da2e8af0f5e2fae66d9ee189
 
 file kleopatra-20130426-src.tar.bz2
 chk  647450abb26bdd0449bc4be5d10184571cb94b8e
diff --git a/src/inst-kleopatra.nsi b/src/inst-kleopatra.nsi
index 08c0e97..51a4ff9 100644
--- a/src/inst-kleopatra.nsi
+++ b/src/inst-kleopatra.nsi
@@ -39,14 +39,12 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
 
   File ${prefix}/bin/kgpgconf.exe
   File ${prefix}/bin/kwatchgnupg.exe
-  File ${prefix}/bin/kcmdwrapper.exe
+  File ${prefix}/bin/kdebugdialog.exe
+#  File ${prefix}/bin/kcmdwrapper.exe
   File ${prefix}/bin/kbuildsycoca4.exe
   File ${prefix}/bin/libattica.dll
-  File ${prefix}/bin/libdbus-1.dll
   File ${prefix}/bin/libdbusmenu-qt.dll
   File ${prefix}/bin/libgcc_s_sjlj-1.dll
-  File ${prefix}/bin/libgpg-error-0.dll
-  File ${prefix}/bin/libgpgme-11.dll
   File ${prefix}/bin/libgpgme++.dll
   File ${prefix}/bin/wconv.dll
   File ${prefix}/bin/libintl.dll
@@ -110,73 +108,76 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
 
   SetOutPath "$INSTDIR\share\config"
 
-  File ${prefix}/share/config/libkleopatrarc
+  #File ${prefix}/share/config/libkleopatrarc
 
   # TODO
   SetOutPath "$INSTDIR\share\doc\HTML\common"
 
-  File ${prefix}/share/doc/HTML/common/common/1.png
-  File ${prefix}/share/doc/HTML/common/common/10.png
-  File ${prefix}/share/doc/HTML/common/common/2.png
-  File ${prefix}/share/doc/HTML/common/common/3.png
-  File ${prefix}/share/doc/HTML/common/common/4.png
-  File ${prefix}/share/doc/HTML/common/common/5.png
-  File ${prefix}/share/doc/HTML/common/common/6.png
-  File ${prefix}/share/doc/HTML/common/common/7.png
-  File ${prefix}/share/doc/HTML/common/common/8.png
-  File ${prefix}/share/doc/HTML/common/common/9.png
-  File ${prefix}/share/doc/HTML/common/common/CMakeLists.txt
-  File ${prefix}/share/doc/HTML/common/common/Doxyfile.global
-  File ${prefix}/share/doc/HTML/common/common/README.Doxygen
-  File ${prefix}/share/doc/HTML/common/common/artistic-license.html
-  File ${prefix}/share/doc/HTML/common/common/block_title_bottom.png
-  File ${prefix}/share/doc/HTML/common/common/block_title_mid.png
-  File ${prefix}/share/doc/HTML/common/common/block_title_top.png
-  File ${prefix}/share/doc/HTML/common/common/bottom-left.png
-  File ${prefix}/share/doc/HTML/common/common/bottom-middle.png
-  File ${prefix}/share/doc/HTML/common/common/bottom-right.png
-  File ${prefix}/share/doc/HTML/common/common/bsd-license.html
-  File ${prefix}/share/doc/HTML/common/common/doxygen.css
-  File ${prefix}/share/doc/HTML/common/common/favicon.ico
-  File ${prefix}/share/doc/HTML/common/common/fdl-license
-  File ${prefix}/share/doc/HTML/common/common/fdl-license.html
-  File ${prefix}/share/doc/HTML/common/common/fdl-notice.html
-  File ${prefix}/share/doc/HTML/common/common/flat.css
-  File ${prefix}/share/doc/HTML/common/common/footer.html
-  File ${prefix}/share/doc/HTML/common/common/gpl-license
-  File ${prefix}/share/doc/HTML/common/common/gpl-license.html
-  File ${prefix}/share/doc/HTML/common/common/header.html
-  File ${prefix}/share/doc/HTML/common/common/kde-default.css
-  File ${prefix}/share/doc/HTML/common/common/kde.css
-  File ${prefix}/share/doc/HTML/common/common/kde_logo.png
-  File ${prefix}/share/doc/HTML/common/common/kde_logo_bg.png
-  File ${prefix}/share/doc/HTML/common/common/lgpl-license
-  File ${prefix}/share/doc/HTML/common/common/lgpl-license.html
-  File ${prefix}/share/doc/HTML/common/common/mainfooter.html
-  File ${prefix}/share/doc/HTML/common/common/mainheader.html
-  File ${prefix}/share/doc/HTML/common/common/print.css
-  File ${prefix}/share/doc/HTML/common/common/qpl-license.html
-  File ${prefix}/share/doc/HTML/common/common/tabs.css
-  File ${prefix}/share/doc/HTML/common/common/top-kde.jpg
-  File ${prefix}/share/doc/HTML/common/common/top-left.jpg
-  File ${prefix}/share/doc/HTML/common/common/top-left.png
-  File ${prefix}/share/doc/HTML/common/common/top-middle.png
-  File ${prefix}/share/doc/HTML/common/common/top-right.jpg
-  File ${prefix}/share/doc/HTML/common/common/top-right.png
-  File ${prefix}/share/doc/HTML/common/common/top.jpg
-  File ${prefix}/share/doc/HTML/common/common/x11-license.html
-  File ${prefix}/share/doc/HTML/common/common/xml.dcl
+  File ${prefix}/share/doc/HTML/en/common/1.png
+  File ${prefix}/share/doc/HTML/en/common/10.png
+  File ${prefix}/share/doc/HTML/en/common/2.png
+  File ${prefix}/share/doc/HTML/en/common/3.png
+  File ${prefix}/share/doc/HTML/en/common/4.png
+  File ${prefix}/share/doc/HTML/en/common/5.png
+  File ${prefix}/share/doc/HTML/en/common/6.png
+  File ${prefix}/share/doc/HTML/en/common/7.png
+  File ${prefix}/share/doc/HTML/en/common/8.png
+  File ${prefix}/share/doc/HTML/en/common/9.png
+  File ${prefix}/share/doc/HTML/en/common/artistic-license.html
+  File ${prefix}/share/doc/HTML/en/common/block_title_bottom.png
+  File ${prefix}/share/doc/HTML/en/common/block_title_mid.png
+  File ${prefix}/share/doc/HTML/en/common/block_title_top.png
+  File ${prefix}/share/doc/HTML/en/common/bottom-left.png
+  File ${prefix}/share/doc/HTML/en/common/bottom-middle.png
+  File ${prefix}/share/doc/HTML/en/common/bottom-right.png
+  File ${prefix}/share/doc/HTML/en/common/bsd-license.html
+  File ${prefix}/share/doc/HTML/en/common/doxygen.css
+  File ${prefix}/share/doc/HTML/en/common/favicon.ico
+  File ${prefix}/share/doc/HTML/en/common/fdl-license.html
+  File ${prefix}/share/doc/HTML/en/common/fdl-license
+  File ${prefix}/share/doc/HTML/en/common/fdl-notice.html
+  File ${prefix}/share/doc/HTML/en/common/kde-docs.css
+  File ${prefix}/share/doc/HTML/en/common/footer.html
+  File ${prefix}/share/doc/HTML/en/common/gpl-license.html
+  File ${prefix}/share/doc/HTML/en/common/gpl-license
+  File ${prefix}/share/doc/HTML/en/common/header.html
+  File ${prefix}/share/doc/HTML/en/common/kde-default.css
+  File ${prefix}/share/doc/HTML/en/common/kde-docs.css
+  File ${prefix}/share/doc/HTML/en/common/kde_logo_bg.png
+  File ${prefix}/share/doc/HTML/en/common/lgpl-license.html
+  File ${prefix}/share/doc/HTML/en/common/lgpl-license
+  File ${prefix}/share/doc/HTML/en/common/mainfooter.html
+  File ${prefix}/share/doc/HTML/en/common/mainheader.html
+  File ${prefix}/share/doc/HTML/en/common/qpl-license.html
+  File ${prefix}/share/doc/HTML/en/common/tabs.css
+  File ${prefix}/share/doc/HTML/en/common/top-kde.jpg
+  File ${prefix}/share/doc/HTML/en/common/top-left.jpg
+  File ${prefix}/share/doc/HTML/en/common/top-left.png
+  File ${prefix}/share/doc/HTML/en/common/top-middle.png
+  File ${prefix}/share/doc/HTML/en/common/top-right.jpg
+  File ${prefix}/share/doc/HTML/en/common/top-right.png
+  File ${prefix}/share/doc/HTML/en/common/top.jpg
+  File ${prefix}/share/doc/HTML/en/common/x11-license.html
+  File ${prefix}/share/doc/HTML/en/common/xml.dcl
 
   SetOutPath "$INSTDIR\share\doc\HTML\de\kleopatra"
 
+  File ${prefix}/share/doc/HTML/de/common/fdl-translated.html
+  File ${prefix}/share/doc/HTML/de/common/gpl-translated.html
+  File ${prefix}/share/doc/HTML/de/common/kde-localised.css
+  File ${prefix}/share/doc/HTML/de/common/lgpl-translated.html
+
+  File ${prefix}/share/doc/HTML/de/kleopatra/admin-archive-definitions.html
+  File ${prefix}/share/doc/HTML/de/kleopatra/admin-checksum-definitions.html
   File ${prefix}/share/doc/HTML/de/kleopatra/admin-key-filters.html
   File ${prefix}/share/doc/HTML/de/kleopatra/admin.html
   File ${prefix}/share/doc/HTML/de/kleopatra/commandline-options.html
   File ${prefix}/share/doc/HTML/de/kleopatra/configuration-appearance.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/configuration-dn-order.html
+  File ${prefix}/share/doc/HTML/de/kleopatra/configuration-crypto-operations.html
+  File ${prefix}/share/doc/HTML/de/kleopatra/configuration-gnupg-system.html
+  File ${prefix}/share/doc/HTML/de/kleopatra/configuration-smime-validation.html
   File ${prefix}/share/doc/HTML/de/kleopatra/configuration.html
   File ${prefix}/share/doc/HTML/de/kleopatra/credits-and-license.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/functions-keybox-management.html
   File ${prefix}/share/doc/HTML/de/kleopatra/functions-newkey.html
   File ${prefix}/share/doc/HTML/de/kleopatra/functions-search.html
   File ${prefix}/share/doc/HTML/de/kleopatra/functions.html
@@ -184,11 +185,11 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
   File ${prefix}/share/doc/HTML/de/kleopatra/introduction.html
   File ${prefix}/share/doc/HTML/de/kleopatra/menu.html
   File ${prefix}/share/doc/HTML/de/kleopatra/menucertificates.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/menucrls.html
   File ${prefix}/share/doc/HTML/de/kleopatra/menuhelp.html
   File ${prefix}/share/doc/HTML/de/kleopatra/menusettings.html
   File ${prefix}/share/doc/HTML/de/kleopatra/menutools.html
   File ${prefix}/share/doc/HTML/de/kleopatra/menuview.html
+  File ${prefix}/share/doc/HTML/de/kleopatra/menuwindow.html
 
   SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra"
 
@@ -216,37 +217,40 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
   File ${prefix}/share/doc/HTML/en/kleopatra/menuview.html
   File ${prefix}/share/doc/HTML/en/kleopatra/menuwindow.html
 
-  SetOutPath "$INSTDIR\share\icons\oxygen\128x128\apps"
+  SetOutPath "$INSTDIR\share\icons\hicolor\128x128\apps"
+
+  File ${prefix}/share/icons/hicolor/128x128/apps/kleopatra.png
 
-  File ${prefix}/share/icons/oxygen/128x128/apps/kleopatra.png
+  SetOutPath "$INSTDIR\share\icons\hicolor\16x16\apps"
 
-  SetOutPath "$INSTDIR\share\icons\oxygen\16x16\apps"
+  File ${prefix}/share/icons/hicolor/16x16/apps/kleopatra.png
 
-  File ${prefix}/share/icons/oxygen/16x16/apps/kleopatra.png
+  SetOutPath "$INSTDIR\share\icons\hicolor\22x22\apps"
 
-  SetOutPath "$INSTDIR\share\icons\oxygen\22x22\apps"
+  File ${prefix}/share/icons/hicolor/22x22/apps/kleopatra.png
 
-  File ${prefix}/share/icons/oxygen/22x22/apps/kleopatra.png
+  SetOutPath "$INSTDIR\share\icons\hicolor\256x256\apps"
 
-  SetOutPath "$INSTDIR\share\icons\oxygen\256x256\apps"
+  File ${prefix}/share/icons/hicolor/256x256/apps/kleopatra.png
 
-  File ${prefix}/share/icons/oxygen/256x256/apps/kleopatra.png
+  SetOutPath "$INSTDIR\share\icons\hicolor\32x32\apps"
 
-  SetOutPath "$INSTDIR\share\icons\oxygen\32x32\apps"
+  File ${prefix}/share/icons/hicolor/32x32/apps/kleopatra.png
 
-  File ${prefix}/share/icons/oxygen/32x32/apps/kleopatra.png
+  SetOutPath "$INSTDIR\share\icons\hicolor\48x48\apps"
 
-  SetOutPath "$INSTDIR\share\icons\oxygen\48x48\apps"
+  File ${prefix}/share/icons/hicolor/48x48/apps/kleopatra.png
 
-  File ${prefix}/share/icons/oxygen/48x48/apps/kleopatra.png
+  SetOutPath "$INSTDIR\share\icons\hicolor\64x64\apps"
 
-  SetOutPath "$INSTDIR\share\icons\oxygen\64x64\apps"
+  File ${prefix}/share/icons/hicolor/64x64/apps/kleopatra.png
 
-  File ${prefix}/share/icons/oxygen/64x64/apps/kleopatra.png
+  SetOutPath "$INSTDIR\share\icons\hicolor\scalable\apps"
 
-  SetOutPath "$INSTDIR\share\icons\oxygen\scalable\apps"
+  File ${prefix}/share/icons/hicolor/scalable/apps/kleopatra.svgz
 
-  File ${prefix}/share/icons/oxygen/scalable/apps/kleopatra.svgz
+  SetOutPath "$INSTDIR\share\icons\hicolor"
+  File ${prefix}/share/icons/hicolor/index.theme
 
   SetOutPath "$INSTDIR\share\kde4\services"
 
@@ -261,6 +265,7 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
   File ${prefix}/share/kde4/services/kleopatra_signencryptfolders.desktop
 
   # Parts formerly in the kdelibs section:
+
   SetOutPath "$INSTDIR\share\apps\kcharselect"
 
   File ${prefix}/share/apps/kcharselect/kcharselect-data
@@ -275,9 +280,6 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
   File ${prefix}/share/apps/kdeui/about/bar-top-left.png
   File ${prefix}/share/apps/kdeui/about/bar-top-middle.png
   File ${prefix}/share/apps/kdeui/about/bar-top-right.png
-  File ${prefix}/share/apps/kdeui/about/bottom-left.png
-  File ${prefix}/share/apps/kdeui/about/bottom-middle.png
-  File ${prefix}/share/apps/kdeui/about/bottom-right.png
   File ${prefix}/share/apps/kdeui/about/box-bottom-left.png
   File ${prefix}/share/apps/kdeui/about/box-bottom-middle.png
   File ${prefix}/share/apps/kdeui/about/box-bottom-right.png
@@ -289,7 +291,6 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
   File ${prefix}/share/apps/kdeui/about/kde_infopage.css
   File ${prefix}/share/apps/kdeui/about/kde_infopage_rtl.css
   File ${prefix}/share/apps/kdeui/about/top-middle.png
-  File ${prefix}/share/apps/kdeui/about/top-right.png
 
   SetOutPath "$INSTDIR\share\apps\kdeui\pics"
 
@@ -317,45 +318,43 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
 
   File ${prefix}/share/config/ui/ui_standards.rc
 
-  SetOutPath "$INSTDIR\share\kde4\services\kded"
+#  SetOutPath "$INSTDIR\share\kde4\services\kded"
 
-  File ${prefix}/share/kde4/services/kded/kdedglobalaccel.desktop
+#  File ${prefix}/share/kde4/services/kded/kdedglobalaccel.desktop
 
-  SetOutPath "$INSTDIR\share\kde4\servicetypes"
+#  SetOutPath "$INSTDIR\share\kde4\servicetypes"
 
-  File ${prefix}/share/kde4/servicetypes/kconfigbackend.desktop
-  File ${prefix}/share/kde4/servicetypes/kplugininfo.desktop
-  File ${prefix}/share/kde4/servicetypes/sonnetspeller.desktop
+#  File ${prefix}/share/kde4/servicetypes/kconfigbackend.desktop
+#  File ${prefix}/share/kde4/servicetypes/kplugininfo.desktop
+#  File ${prefix}/share/kde4/servicetypes/sonnetspeller.desktop
 
   SetOutPath "$INSTDIR\share\locale"
 
   File ${prefix}/share/locale/all_languages
 
   SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
-
+  # TODO This is way too much
   File ${prefix}/share/locale/de/LC_MESSAGES/akonaditray.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/akregator.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdepim.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdepimlibs.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kabc.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kabc2mutt.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kabc_dir.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kabc_file.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kabc_ldapkio.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kabc_net.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/kabcformat_binary.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kaddressbook-mobile.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/kcmkabconfig.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kcmkontactnt.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/kio_groupwise.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/kcmcrypto.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/kdeqt.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_help4.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kio_imap4.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kio_ldap.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kio_mbox.mo
@@ -363,40 +362,25 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
   File ${prefix}/share/locale/de/LC_MESSAGES/kio_pop3.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kio_sieve.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kio_smtp.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kitchensync.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kjots.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kleopatra.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kmail-mobile.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/kontactinterfaces.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/korganizer-mobile.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/libkblog.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/libkcal.mo
@@ -413,26 +397,9 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
   File ${prefix}/share/locale/de/LC_MESSAGES/libktnef.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/libkxmlrpcclient.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/libmailtransport.mo
-
-  File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdelibs.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/desktop_l10n.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/kdelibs4.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs_colors4.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kdeqt.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_help4.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditor_plugins.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
 
 
-
 !endif
 ${MementoSectionEnd}
 
diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index e594051..9e260c8 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -49,14 +49,15 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\share\kde4\services\kleopatra_config_cryptooperations.desktop"
   Delete "$INSTDIR\share\kde4\services\kleopatra_config_appear.desktop"
   Delete "$INSTDIR\share\kde4\services\kleopatra_config_dnorder.desktop"
-  Delete "$INSTDIR\share\icons\oxygen\scalable\apps\kleopatra.svgz"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\256x256\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\apps\kleopatra.png"
+  Delete "$INSTDIR\share\icons\hicolor\scalable\apps\kleopatra.svgz"
+  Delete "$INSTDIR\share\icons\hicolor\64x64\apps\kleopatra.png"
+  Delete "$INSTDIR\share\icons\hicolor\48x48\apps\kleopatra.png"
+  Delete "$INSTDIR\share\icons\hicolor\32x32\apps\kleopatra.png"
+  Delete "$INSTDIR\share\icons\hicolor\256x256\apps\kleopatra.png"
+  Delete "$INSTDIR\share\icons\hicolor\22x22\apps\kleopatra.png"
+  Delete "$INSTDIR\share\icons\hicolor\16x16\apps\kleopatra.png"
+  Delete "$INSTDIR\share\icons\hicolor\128x128\apps\kleopatra.png"
+  Delete "$INSTDIR\share\icons\hicolor\index.theme
   Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuwindow.html"
   Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuview.html"
   Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menutools.html"
@@ -82,11 +83,12 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin-key-filters.html"
   Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin-checksum-definitions.html"
   Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin-archive-definitions.html"
+
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menuwindow.html"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menuview.html"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menutools.html"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menusettings.html"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menuhelp.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menucrls.html"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menucertificates.html"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menu.html"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\introduction.html"
@@ -98,64 +100,72 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\credits-and-license.html"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration.html"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-dn-order.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-smime-validation.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-gnupg-system.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-crypto-operations.html"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-appearance.html"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\commandline-options.html"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin.html"
   Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin-key-filters.html"
-  Delete "$INSTDIR\share\doc\HTML\common\xml.dcl"
-  Delete "$INSTDIR\share\doc\HTML\common\x11-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\top.jpg"
-  Delete "$INSTDIR\share\doc\HTML\common\top-right.png"
-  Delete "$INSTDIR\share\doc\HTML\common\top-right.jpg"
-  Delete "$INSTDIR\share\doc\HTML\common\top-middle.png"
-  Delete "$INSTDIR\share\doc\HTML\common\top-left.png"
-  Delete "$INSTDIR\share\doc\HTML\common\top-left.jpg"
-  Delete "$INSTDIR\share\doc\HTML\common\top-kde.jpg"
-  Delete "$INSTDIR\share\doc\HTML\common\tabs.css"
-  Delete "$INSTDIR\share\doc\HTML\common\qpl-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\print.css"
-  Delete "$INSTDIR\share\doc\HTML\common\mainheader.html"
-  Delete "$INSTDIR\share\doc\HTML\common\mainfooter.html"
-  Delete "$INSTDIR\share\doc\HTML\common\lgpl-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\lgpl-license"
-  Delete "$INSTDIR\share\doc\HTML\common\kde_logo_bg.png"
-  Delete "$INSTDIR\share\doc\HTML\common\kde_logo.png"
-  Delete "$INSTDIR\share\doc\HTML\common\kde.css"
-  Delete "$INSTDIR\share\doc\HTML\common\kde-localised.css.template"
-  Delete "$INSTDIR\share\doc\HTML\common\kde-docs.css"
-  Delete "$INSTDIR\share\doc\HTML\common\kde-default.css"
-  Delete "$INSTDIR\share\doc\HTML\common\header.html"
-  Delete "$INSTDIR\share\doc\HTML\common\gpl-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\gpl-license"
-  Delete "$INSTDIR\share\doc\HTML\common\footer.html"
-  Delete "$INSTDIR\share\doc\HTML\common\flat.css"
-  Delete "$INSTDIR\share\doc\HTML\common\fdl-notice.html"
-  Delete "$INSTDIR\share\doc\HTML\common\fdl-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\fdl-license"
-  Delete "$INSTDIR\share\doc\HTML\common\favicon.ico"
-  Delete "$INSTDIR\share\doc\HTML\common\doxygen.css"
-  Delete "$INSTDIR\share\doc\HTML\common\bsd-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\bottom-right.png"
-  Delete "$INSTDIR\share\doc\HTML\common\bottom-middle.png"
-  Delete "$INSTDIR\share\doc\HTML\common\bottom-left.png"
-  Delete "$INSTDIR\share\doc\HTML\common\block_title_top.png"
-  Delete "$INSTDIR\share\doc\HTML\common\block_title_mid.png"
-  Delete "$INSTDIR\share\doc\HTML\common\block_title_bottom.png"
-  Delete "$INSTDIR\share\doc\HTML\common\artistic-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\README.Doxygen"
-  Delete "$INSTDIR\share\doc\HTML\common\Doxyfile.global"
-  Delete "$INSTDIR\share\doc\HTML\common\CMakeLists.txt"
-  Delete "$INSTDIR\share\doc\HTML\common\9.png"
-  Delete "$INSTDIR\share\doc\HTML\common\8.png"
-  Delete "$INSTDIR\share\doc\HTML\common\7.png"
-  Delete "$INSTDIR\share\doc\HTML\common\6.png"
-  Delete "$INSTDIR\share\doc\HTML\common\5.png"
-  Delete "$INSTDIR\share\doc\HTML\common\4.png"
-  Delete "$INSTDIR\share\doc\HTML\common\3.png"
-  Delete "$INSTDIR\share\doc\HTML\common\2.png"
-  Delete "$INSTDIR\share\doc\HTML\common\10.png"
-  Delete "$INSTDIR\share\doc\HTML\common\1.png"
-  Delete "$INSTDIR\share\config\libkleopatrarc"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin-checksum-definitions.html"
+  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin-archive-definitions.html"
+
+  Delete "$INSTDIR\share\doc\HTML\en\common\xml.dcl"
+  Delete "$INSTDIR\share\doc\HTML\en\common\x11-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\common\top.jpg"
+  Delete "$INSTDIR\share\doc\HTML\en\common\top-right.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\top-right.jpg"
+  Delete "$INSTDIR\share\doc\HTML\en\common\top-middle.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\top-left.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\top-left.jpg"
+  Delete "$INSTDIR\share\doc\HTML\en\common\top-kde.jpg"
+  Delete "$INSTDIR\share\doc\HTML\en\common\tabs.css"
+  Delete "$INSTDIR\share\doc\HTML\en\common\qpl-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\common\print.css"
+  Delete "$INSTDIR\share\doc\HTML\en\common\mainheader.html"
+  Delete "$INSTDIR\share\doc\HTML\en\common\mainfooter.html"
+  Delete "$INSTDIR\share\doc\HTML\en\common\lgpl-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\common\lgpl-license"
+  Delete "$INSTDIR\share\doc\HTML\en\common\kde_logo_bg.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\kde_logo.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\kde.css"
+  Delete "$INSTDIR\share\doc\HTML\en\common\kde-localised.css.template"
+  Delete "$INSTDIR\share\doc\HTML\en\common\kde-docs.css"
+  Delete "$INSTDIR\share\doc\HTML\en\common\kde-default.css"
+  Delete "$INSTDIR\share\doc\HTML\en\common\header.html"
+  Delete "$INSTDIR\share\doc\HTML\en\common\gpl-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\common\gpl-license"
+  Delete "$INSTDIR\share\doc\HTML\en\common\footer.html"
+  Delete "$INSTDIR\share\doc\HTML\en\common\flat.css"
+  Delete "$INSTDIR\share\doc\HTML\en\common\fdl-notice.html"
+  Delete "$INSTDIR\share\doc\HTML\en\common\fdl-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\common\fdl-license"
+  Delete "$INSTDIR\share\doc\HTML\en\common\favicon.ico"
+  Delete "$INSTDIR\share\doc\HTML\en\common\doxygen.css"
+  Delete "$INSTDIR\share\doc\HTML\en\common\bsd-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\common\bottom-right.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\bottom-middle.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\bottom-left.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\block_title_top.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\block_title_mid.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\block_title_bottom.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\artistic-license.html"
+  Delete "$INSTDIR\share\doc\HTML\en\common\9.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\8.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\7.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\6.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\5.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\4.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\3.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\2.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\10.png"
+  Delete "$INSTDIR\share\doc\HTML\en\common\1.png"
+  Delete "$INSTDIR\share\doc\HTML\de\\common\\fdl-translated.html"
+  Delete "$INSTDIR\share\doc\HTML\de\\common\\gpl-translated.html"
+  Delete "$INSTDIR\share\doc\HTML\de\\common\\lgpl-translated.html"
+  Delete "$INSTDIR\share\doc\HTML\de\\common\\kde-localised.css"
+
+#  Delete "$INSTDIR\share\config\libkleopatrarc"
   Delete "$INSTDIR\share\apps\libkleopatra\pics\smartcard.xpm"
   Delete "$INSTDIR\share\apps\libkleopatra\pics\key_unknown.png"
   Delete "$INSTDIR\share\apps\libkleopatra\pics\key_ok.png"
@@ -187,16 +197,11 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\libkleo.dll"
   Delete "$INSTDIR\kwatchgnupg.exe"
   Delete "$INSTDIR\kgpgconf.exe"
-  Delete "$INSTDIR\kgpgconf.exe"
-  Delete "$INSTDIR\kwatchgnupg.exe"
-  Delete "$INSTDIR\kcmdwrapper.exe"
+#  Delete "$INSTDIR\kcmdwrapper.exe"
   Delete "$INSTDIR\kbuildsycoca4.exe"
   Delete "$INSTDIR\libattica.dll"
-  Delete "$INSTDIR\libdbus-1.dll"
   Delete "$INSTDIR\libdbusmenu-qt.dll"
   Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
-  Delete "$INSTDIR\libgpg-error-0.dll"
-  Delete "$INSTDIR\libgpgme-11.dll"
   Delete "$INSTDIR\libgpgme++.dll"
   Delete "$INSTDIR\wconv.dll"
   Delete "$INSTDIR\libintl.dll"
@@ -212,9 +217,6 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\libqgpgme.dll"
 
   # Parts formerly in the kdelibs section
-  Delete "$INSTDIR\bin\kcmdwrapper.exe"
-  Delete "$INSTDIR\bin\kbuildsycoca4.exe"
-  RMDir "$INSTDIR\bin"
 
   Delete "$INSTDIR\kdebugdialog.exe"
   Delete "$INSTDIR\kded_globalaccel.dll"
@@ -230,107 +232,77 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\kbuildsycoca4.exe"
 
   Delete "$INSTDIR\share\locale\all_languages"
+
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akonaditray.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akregator.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_dir.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_file.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_ldapkio.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_net.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcclient.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcformat_binary.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kaddressbook-mobile.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kaddressbook.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kalarm.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\katepart4.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcertpart.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmcrypto.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdelibs4.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdelibs_colors4.mo"
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdeqt.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\timezones4.mo"
-  #Delete "$INSTDIR\share\locale\de\LC_MESSAGES\phonon_kde.mo"
-  #Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libphonon.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libmailtransport.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkxmlrpcclient.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libktnef.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libksieve.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkresources.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpimutils.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpimidentities.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpgp.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkmime.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkleopatra.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkldap.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkholidays.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkdepim.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkcal.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkblog.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libakonadi.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kxforms.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kwatchgnupg.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktnef.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktimetracker.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktexteditorkabcbridge_plugin.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktexteditor_plugins.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_xmlrpc.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_tvanytime.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_scalix.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_remote.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_kolab.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_groupwise.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_groupware.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_featureplan.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_blog.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_birthday.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kpilot.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korn.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korganizer.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kontactinterfaces.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kontact.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\konsolekalendar.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kode.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\knotes.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\knode.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmobiletools_at_engine.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmobiletools.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmailcvt.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_xdiff_plugin.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_vcard_plugin.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_calendar_plugin.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kleopatra.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kjots.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kitchensync.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_smtp.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_sieve.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_pop3.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_nntp.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_mbox.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_ldap.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_imap4.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_help4.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_groupwise.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio4.mo"
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kfileaudiopreview4.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kfile_vcf.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdgantt1.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdepimwizards.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdepimresources.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdelibs_colors4.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdelibs4.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmkontactnt.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmkabconfig.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmcrypto.mo"
-  #Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcm_phonon.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcertpart.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\katepart4.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kalarm.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kaddressbook.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcformat_binary.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcclient.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcakonadi.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_slox.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_net.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_ldapkio.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_file.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_dir.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc2mutt.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_l10n.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepimlibs.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepim.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdelibs.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akregator.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akonaditray.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio4.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_help4.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_imap4.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_ldap.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_mbox.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_nntp.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_pop3.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_sieve.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_smtp.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kjots.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kleopatra.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail-mobile.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmailcvt.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\knode.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\knotes.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\konsolekalendar.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kontact.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kontactinterfaces.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korganizer-mobile.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korganizer.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_blog.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_remote.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktexteditor_plugins.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktexteditorkabcbridge_plugin.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktimetracker.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktnef.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kwatchgnupg.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libakonadi.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkblog.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkcal.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkdepim.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkholidays.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkldap.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkleopatra.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkmime.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpgp.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpimidentities.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpimutils.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkresources.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libksieve.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libktnef.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkxmlrpcclient.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libmailtransport.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\timezones4.mo"
+
 
-  Delete "$INSTDIR\share\kde4\servicetypes\sonnetspeller.desktop"
-  Delete "$INSTDIR\share\kde4\servicetypes\kplugininfo.desktop"
-  Delete "$INSTDIR\share\kde4\servicetypes\kconfigbackend.desktop"
-  Delete "$INSTDIR\share\kde4\services\kded\kdedglobalaccel.desktop"
+#  Delete "$INSTDIR\share\kde4\servicetypes\sonnetspeller.desktop"
+#  Delete "$INSTDIR\share\kde4\servicetypes\kplugininfo.desktop"
+#  Delete "$INSTDIR\share\kde4\servicetypes\kconfigbackend.desktop"
+#  Delete "$INSTDIR\share\kde4\services\kded\kdedglobalaccel.desktop"
   Delete "$INSTDIR\share\config\ui\ui_standards.rc"
   Delete "$INSTDIR\share\config\kdebugrc"
   Delete "$INSTDIR\share\config\kdebug.areas"
@@ -346,7 +318,6 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nup1.png"
   Delete "$INSTDIR\share\apps\kdeui\pics\aboutkde.png"
   Delete "$INSTDIR\share\apps\kdeui\about\top-middle.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\top-right.png"
   Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage_rtl.css"
   Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage.css"
   Delete "$INSTDIR\share\apps\kdeui\about\box-top-right.png"
@@ -357,9 +328,6 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-right.png"
   Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-middle.png"
   Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-left.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bottom-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bottom-middle.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bottom-left.png"
   Delete "$INSTDIR\share\apps\kdeui\about\bar-top-right.png"
   Delete "$INSTDIR\share\apps\kdeui\about\bar-top-middle.png"
   Delete "$INSTDIR\share\apps\kdeui\about\bar-top-left.png"
@@ -413,10 +381,11 @@ Section "-un.kleopatra"
   RMDir "$INSTDIR\share\icons\oxygen"
   RMDir "$INSTDIR\share\icons"
   RMDir "$INSTDIR\share\doc\HTML\en\kleopatra"
+  RMDir "$INSTDIR\share\doc\HTML\en\common"
   RMDir "$INSTDIR\share\doc\HTML\en"
   RMDir "$INSTDIR\share\doc\HTML\de\kleopatra"
+  RMDir "$INSTDIR\share\doc\HTML\de\common"
   RMDir "$INSTDIR\share\doc\HTML\de"
-  RMDir "$INSTDIR\share\doc\HTML\common"
   RMDir "$INSTDIR\share\doc\HTML"
   RMDir "$INSTDIR\share\doc"
   RMDir "$INSTDIR\share\config"

-----------------------------------------------------------------------

Summary of changes:
 packages/packages.current |    4 +-
 src/Makefile.am           |    8 +
 src/inst-kleopatra.nsi    |  233 ++++++++++++++-------------------
 src/uninst-kleopatra.nsi  |  319 ++++++++++++++++++++-------------------------
 4 files changed, 254 insertions(+), 310 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org



More information about the Gpg4win-commits mailing list