[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.0.0-23-g3c4d4ce

by Andre Heinecke cvs at cvs.gnupg.org
Thu Nov 16 13:31:14 CET 2017


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  3c4d4cedfe7f2bc31e7623bed8b3e7ad5bc7bbe5 (commit)
       via  3a51635d1e4041b7e46cd9660d27c8abe11fcaf4 (commit)
       via  cab20f75e2d14df53098b0535cb6244ebcb6c680 (commit)
       via  d753b39a060ad31dbd32b1a22e361c057e9d1815 (commit)
       via  1d1db85250663aecbd0c939f799f9d4d6ce2ebb5 (commit)
      from  1056c96e2a7f6547f5f47bbf1146d76f61d63c9a (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 3c4d4cedfe7f2bc31e7623bed8b3e7ad5bc7bbe5
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Nov 16 13:30:00 2017 +0100

    Update NEWS and README for 3.0.1
    
    --

diff --git a/NEWS b/NEWS
index a75d1dc..4422cac 100644
--- a/NEWS
+++ b/NEWS
@@ -3,13 +3,13 @@
 # The version number given below are for the standard installers as
 # distributed by www.gpg4win.org.
 
-Noteworthy changes in Version 3.0.1 (UNRELEASED)
+Noteworthy changes in Version 3.0.1 (2017-11-17)
 ------------------------------------------------
 
 (en) GpgOL: A cause for seemingly random crashes in GpgOL has been
      fixed.
 
-(de) GpgOL: Eine ursache für augenscheinlich zufällige Abstürze
+(de) GpgOL: Eine Ursache für augenscheinlich zufällige Abstürze
      von Outlook wurde beseitigt.
 
 (en) GpgOL: A crash when pasting recipients has been fixed.
@@ -37,16 +37,20 @@ Noteworthy changes in Version 3.0.1 (UNRELEASED)
 (en) Kleopatra: Verschiedene Probleme im Umgang mit Dateiordnern
      und Archiven wurden behoben.
 
+(en) GnuPG: Has been updated to version 2.2.2.
+
+(de) GnuPG: Wurde auf Version 2.2.2 aktualisiert.
+
+(en) Some small bugfixes and improvements.
+
+(de) Weitere kleine Fehlerkorrketuren und Verbesserungen.
+
 (en) The mkportable process can be used again to create a portable
      Gpg4win variant.
 
 (de) Der mkportable Prozess kann wieder verwendet werden um einen
      portable Gpg4win variante zu erstellen.
 
-(en) GnuPG: Has been updated to version 2.2.2.
-
-(de) GnuPG: Wurde auf Version 2.2.2 aktualisiert.
-
 ~~~~~~~~~~~~~~~
 GnuPG:          2.2.2
 Kleopatra:      3.0.0
diff --git a/doc/README.de.txt b/doc/README.de.txt
index ce7442b..fcbaf4e 100644
--- a/doc/README.de.txt
+++ b/doc/README.de.txt
@@ -50,77 +50,29 @@ Die integrierten Gpg4win-Komponenten in Version !VERSION! sind:
 Neu in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
 -----------------------------------------
 
-- Es wird nun die moderne 2.2 Variante von GnuPG verwendet. Unter:
-  https://www.gnupg.org/faq/whats-new-in-2.1.html (englisch)
-  finden sich mehr details dazu.
+- GpgOL: Eine Ursache für augenscheinlich zufällige Abstürze
+  von Outlook wurde beseitigt.
 
-- GpgOL für Outlook 2010 und spätere Versionen verwendet nun
-  Schaltknöpfe zur Auswahl, ob eine Mail verschlüsselt und/oder
-  signiert sein soll. Die Operation erfolgt während des Versendens,
-  dabei werden auch alle Anhänge mitverschlüsselt und ein
-  standardisiertes Format (MIME) verwendet.
+- GpgOL: Ein Absturz wenn Empfänger über einfügen hinzugefügt
+  wurden ist behoben.
 
-- GpgOL für Outlook 2010 und spätere Versionen entschlüsselt nun
-  wieder automatisch Mails.
+- GpgOL: Verschiedene Probleme mit S/MIME mails wurden behoben.
 
-- Alle 68 KDE-Übersetzungen von Kleopatra werden nun mit Gpg4win
-  installiert.
+- GpgOL: Ein Benutzerschnittstellen-Fehler in Outlook 2010 wurde
+  behoben.
 
-- Kleopatra verwendet ein aktualisertes Icon-Set.
+- Kleopatra: Various problems regarding S/MIME File operations
+  have been fixed.
 
-- Kleopatra zeigt nun die verwendete Kurve für ECC-Schlüssel in den
-  technischen Details an.
+- Kleopatra: Various problems regading folder operations and
+  archives have been fixed.
 
-- Die von Kleopatra verwendeten Programmbibliotheken wurden aktualisiert.
+- GnuPG: Wurde auf Version 2.2.2 aktualisiert.
 
-- Ausführbare Anwendungen werden nun in einem Unterordner abgelegt. Die
-  Hilfsanwendungen DBus und kbuildsycoca werden nicht mehr benötigt.
-  Dies löst eine Reihe von Startproblemen von Kleopatra, die bei manchen
-  Anwendern aufgetreten sind.
-
-- Nach dem Import eines geheimen Schlüssels bietet Kleopatra nun direkt
-  an, diesen Schlüssel zu markieren (sogenanntes "Inhabervertrauen").
-
-- Kleopatra bietet nun in den erweiterten Optionen bei der
-  Schlüsselerstellung an ECC-Schlüssel zu erstellen.
-
-- Kleopatra bietet nun die Option einen privaten Schlüssel mit Paperkey zu drucken.
-
-- Es ist nun auch möglich über Kleopatras Dateimenü Ordner zu verschlüsseln.
-
-- GPA und Kleopatra werden nun als Anwendungen für OpenPGP- und S/MIME-Dateiendungen in
-  Windows registriert.
-
-- Der Dateiverschlüsselungsdialog von Kleopatra wurde neu entworfen, um weniger
-  Schritte zu enthalten und die Nutzererfahrung zu verbessern.
-
-- Kleopatra erkennt nun automatisch, um welchen Dateityp es sich handelt und startet
-  die entsprechende Aktion (z.B. entschlüsseln) automatisch.
-
-- Symmetrische (nur mit Passwort) Verschlüsselung kann nun auch über Kleopatra
-  durchgeführt und mit Public-Key-Verschlüsselung kombiniert werden.
-
-- Pinentry erlaubt es nun die eingegebene Passphrase anzuzeigen.
-
-- Kleopatra unterstützt nun die Verwaltung von OpenPGP-Smartcards.
-
-- GpgOL für Outlook 2010 und spätere Versionen hat ein neues
-  Benutzerinterface, um den kryptografischen Status direkt im E-Mail-Fenster
-  anzuzeigen.
-
-- GnuPG unterstützt nun https und verwendet standardmäßig den
-  https sks-keyserver pool.
-
-- GpgOL unterstützt nun das Senden und Empfangen von HTML-E-Mails.
-
-- Kleopatra hat nun verbesserte Nachrichten beim Überprüfen von
-  Dateien.
-
-- Kleopatra erlaubt es einem nun direkt fehlendene Zertifikate
-  beim Dateiüberprüfen zu importieren.
-
-- Viele Fehlerbehebungen und kleinere Verbesserungen.
+- Weitere kleine Fehlerkorrketuren und Verbesserungen.
 
+- Der mkportable Prozess kann wieder verwendet werden um einen
+  portable Gpg4win variante zu erstellen.
 
 3. Anmerkungen
 ==============
diff --git a/doc/README.en.txt b/doc/README.en.txt
index 5dfc8ac..d7d401e 100644
--- a/doc/README.en.txt
+++ b/doc/README.en.txt
@@ -48,73 +48,26 @@ Included Gpg4win components in Version !VERSION! are:
 New in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
 -----------------------------------------
 
-- GnuPG is now of the modern 2.2 variant. See:
-  https://www.gnupg.org/faq/whats-new-in-2.1.html
-  for more information about this.
+- GpgOL: A cause for seemingly random crashes in GpgOL has been
+  fixed.
 
-- GpgOL is now also supported for 64bit Outlook.
+- GpgOL: A crash when pasting recipients has been fixed.
 
-- GpgOL for Outlook 2010 and later now uses toggle buttons
-  to let you select Encypt and Sign. The operations are done
-  when the mail is sent, including all attachments,
-  using a standard format (MIME).
+- GpgOL: Various problems regarding S/MIME mails have been fixed.
 
-- GpgOL for Outlook 2010 and later now automatically decrypts mails
-  again.
+- GpgOL: A user interface error for Outlook 2010 has been fixed.
 
-- All 68 KDE translations for Kleopatra are now included in Gpg4win.
+- Kleopatra: Fehler bei S/MIME Dateioperationen wurden behoben.
 
-- Kleopatra uses an updated icon theme.
+- Kleopatra: Verschiedene Probleme im Umgang mit Dateiordnern
+  und Archiven wurden behoben.
 
-- Kleopatra now shows the used curve in for ECC keys under technical
-  details.
+- GnuPG: Has been updated to version 2.2.2.
 
-- Kleopatra has been updated to a new set of base libraries.
-
-- Binaries are now all installed in a bin subdirectory. DBus
-  and kbuildsycoa are no longer required. This fixes the startup issues
-  of Kleopatra some users were facing.
-
-- After importing a secret key in Kleopatra you will be asked to directly
-  mark it as your own key. (Ownertrust)
-
-- Kleopatra now allows you to create ECC keys in the Advanced Settings
-  during Key generation.
-
-- Kleopatras file menu now also offers to encrypt Folders.
-
-- Kleopatra has a new option to print a secret key through the paperkey tool.
-
-- GPA and Kleopatra are now registred for OpenPGP and S/MIME related file extensions.
-
-- The file encryption dialog in Kleopatra has been redesigned to reduce steps and
-  improve user experience.
-
-- Kleopatra automatically detects the type of an input file and automatically starts
-  the corresponding action (e.g. decrypt).
-
-- Symmetric (password only) encryption is now accessible through Kleopatra and can
-  be combined with public-key encryption.
-
-- Pinentry now enables you to inspect the typed passphrase.
-
-- Kleopatra now supports OpenPGP Smartcards management.
-
-- GpgOL for Outlook 2010 and later has a new interface to show
-  the signature / encryption state inside of Outlook.
-
-- GnuPG now supports https and uses the https sks-keyserver pool
-  by default.
-
-- GpgOL now supports sending and receiving HTML Mails
-
-- Kleopatra now supports to directly import missing certificates
-  when verifying a file.
-
-- Kleopatra has improved file verification messages.
-
-- Many bugfixes and minor improvements.
+- Some small bugfixes and improvements.
 
+- The mkportable process can be used again to create a portable
+  Gpg4win variant.
 
 3. Additional Notes
 ===================

commit 3a51635d1e4041b7e46cd9660d27c8abe11fcaf4
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Nov 16 13:25:10 2017 +0100

    Auto update po files
    
    --

diff --git a/po/ar.po b/po/ar.po
index d0081e8..cc8b3dd 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -89,10 +89,11 @@ msgctxt "T_LangCode"
 msgid "en"
 msgstr "ar"
 
+#, fuzzy
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
-"(GPL)."
+"(GNU GPL)."
 msgstr ""
 "åÐå ÇáÈÑãÌíÉ ãÑÎÕÉ ÈÑÎÕÉ Ìäæ ÇáÚãæãíÉ ÇáÚÇãÉ (GPL) æÇáÊí ÊãäÍß ÍÑíÉ ãÔÇÑßÉ "
 "æÊÚÏíá ÇáÈÑãÌíÇÊ ÇáÍÑÉ."
@@ -107,8 +108,8 @@ msgstr ""
 "ÇáãÊáÞíä äÝÓ ÇáÍÞæÞ ÇáÊí ÍÕáÊ ÚáíåÇ."
 
 msgctxt "T_MoreInfo"
-msgid "Click here for the project's homepage"
-msgstr "ÇäÞÑ åäÇ áÊÒæÑ ÕÝÍÉ ÇáãÔÑæÚ"
+msgid "Go to Gpg4win's webpage"
+msgstr ""
 
 msgctxt "T_MoreInfoURL"
 msgid "https://www.gpg4win.org"
@@ -284,10 +285,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
-msgctxt "T_XPisDeprecated"
+msgctxt "T_WinisDeprecated"
 msgid ""
-"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
-"Support for them may be removed in a future version."
+"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version.\n"
+"\n"
+"Kleopatra is disabled."
 msgstr ""
 
 msgctxt "T_Installing_GnuPG"
@@ -346,45 +349,49 @@ msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ ßáíæÈÇÊÑÇ."
 
+#~ msgctxt "T_MoreInfo"
+#~ msgid "Click here for the project's homepage"
+#~ msgstr "ÇäÞÑ åäÇ áÊÒæÑ ÕÝÍÉ ÇáãÔÑæÚ"
+
 #, fuzzy
-msgctxt "DESC_Name_compendium"
-msgid "Gpg4win Compendium"
-msgstr "æËÇÆÞ Gpg4win"
+#~ msgctxt "DESC_Name_compendium"
+#~ msgid "Gpg4win Compendium"
+#~ msgstr "æËÇÆÞ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_SEC_compendium"
-msgid "The Gpg4win documentation (English and German)"
-msgstr "æËÇÆÞ Gpg4win"
+#~ msgctxt "DESC_SEC_compendium"
+#~ msgid "The Gpg4win documentation (English and German)"
+#~ msgstr "æËÇÆÞ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_Name_compendium_de_pdf"
-msgid "Gpg4win Compendium (pdf, German)"
-msgstr "æËÇÆÞ Gpg4win"
+#~ msgctxt "DESC_Name_compendium_de_pdf"
+#~ msgid "Gpg4win Compendium (pdf, German)"
+#~ msgstr "æËÇÆÞ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_Name_compendium_en_pdf"
-msgid "Gpg4win Compendium (pdf, English)"
-msgstr "æËÇÆÞ Gpg4win"
+#~ msgctxt "DESC_Name_compendium_en_pdf"
+#~ msgid "Gpg4win Compendium (pdf, English)"
+#~ msgstr "æËÇÆÞ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_Name_compendium_de_html"
-msgid "Gpg4win Compendium (html, German)"
-msgstr "æËÇÆÞ Gpg4win"
+#~ msgctxt "DESC_Name_compendium_de_html"
+#~ msgid "Gpg4win Compendium (html, German)"
+#~ msgstr "æËÇÆÞ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_Name_compendium_en_html"
-msgid "Gpg4win Compendium (html, English)"
-msgstr "æËÇÆÞ Gpg4win"
+#~ msgctxt "DESC_Name_compendium_en_html"
+#~ msgid "Gpg4win Compendium (html, English)"
+#~ msgstr "æËÇÆÞ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_Menu_compendium_de_pdf"
-msgid "Show the Gpg4win Compendium (pdf, German)"
-msgstr "æËÇÆÞ Gpg4win"
+#~ msgctxt "DESC_Menu_compendium_de_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, German)"
+#~ msgstr "æËÇÆÞ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_Menu_compendium_en_pdf"
-msgid "Show the Gpg4win Compendium (pdf, English)"
-msgstr "ÇÚÑÖ Ïáíá Gpg4Win Úáì ÇáæÈ ááãÓÊÎÏãíä ÇáãÈÊÏÆíä"
+#~ msgctxt "DESC_Menu_compendium_en_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, English)"
+#~ msgstr "ÇÚÑÖ Ïáíá Gpg4Win Úáì ÇáæÈ ááãÓÊÎÏãíä ÇáãÈÊÏÆíä"
 
 #~ msgctxt "T_AdminNeeded"
 #~ msgid ""
diff --git a/po/cz.po b/po/cz.po
index 2cd0934..acb4b46 100644
--- a/po/cz.po
+++ b/po/cz.po
@@ -90,10 +90,11 @@ msgctxt "T_LangCode"
 msgid "en"
 msgstr "cz"
 
+#, fuzzy
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
-"(GPL)."
+"(GNU GPL)."
 msgstr ""
 "ento program je licencovaný pod licencí GNU General Public License (GPL)."
 
@@ -110,8 +111,8 @@ msgstr ""
 "se  stejnými právy, které jste obdrželi."
 
 msgctxt "T_MoreInfo"
-msgid "Click here for the project's homepage"
-msgstr "Kliknìte pro homepage projektu"
+msgid "Go to Gpg4win's webpage"
+msgstr ""
 
 msgctxt "T_MoreInfoURL"
 msgid "https://www.gpg4win.org"
@@ -290,10 +291,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
-msgctxt "T_XPisDeprecated"
+msgctxt "T_WinisDeprecated"
 msgid ""
-"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
-"Support for them may be removed in a future version."
+"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version.\n"
+"\n"
+"Kleopatra is disabled."
 msgstr ""
 
 msgctxt "T_Installing_GnuPG"
@@ -356,37 +359,41 @@ msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "Spustit Správce certifikátù Kleopatra."
 
-msgctxt "DESC_Name_compendium"
-msgid "Gpg4win Compendium"
-msgstr "Gpg4win Compendium"
+#~ msgctxt "T_MoreInfo"
+#~ msgid "Click here for the project's homepage"
+#~ msgstr "Kliknìte pro homepage projektu"
+
+#~ msgctxt "DESC_Name_compendium"
+#~ msgid "Gpg4win Compendium"
+#~ msgstr "Gpg4win Compendium"
 
-msgctxt "DESC_SEC_compendium"
-msgid "The Gpg4win documentation (English and German)"
-msgstr "Gpg4win dokumentace (anglicky a nìmecky)"
+#~ msgctxt "DESC_SEC_compendium"
+#~ msgid "The Gpg4win documentation (English and German)"
+#~ msgstr "Gpg4win dokumentace (anglicky a nìmecky)"
 
-msgctxt "DESC_Name_compendium_de_pdf"
-msgid "Gpg4win Compendium (pdf, German)"
-msgstr "Gpg4win Compendium (pdf, nìmecky)"
+#~ msgctxt "DESC_Name_compendium_de_pdf"
+#~ msgid "Gpg4win Compendium (pdf, German)"
+#~ msgstr "Gpg4win Compendium (pdf, nìmecky)"
 
-msgctxt "DESC_Name_compendium_en_pdf"
-msgid "Gpg4win Compendium (pdf, English)"
-msgstr "Gpg4win Compendium (pdf, anglicky)"
+#~ msgctxt "DESC_Name_compendium_en_pdf"
+#~ msgid "Gpg4win Compendium (pdf, English)"
+#~ msgstr "Gpg4win Compendium (pdf, anglicky)"
 
-msgctxt "DESC_Name_compendium_de_html"
-msgid "Gpg4win Compendium (html, German)"
-msgstr "Gpg4win Compendium (html, nìmecky)"
+#~ msgctxt "DESC_Name_compendium_de_html"
+#~ msgid "Gpg4win Compendium (html, German)"
+#~ msgstr "Gpg4win Compendium (html, nìmecky)"
 
-msgctxt "DESC_Name_compendium_en_html"
-msgid "Gpg4win Compendium (html, English)"
-msgstr "Gpg4win Compendium (html, anglicky)"
+#~ msgctxt "DESC_Name_compendium_en_html"
+#~ msgid "Gpg4win Compendium (html, English)"
+#~ msgstr "Gpg4win Compendium (html, anglicky)"
 
-msgctxt "DESC_Menu_compendium_de_pdf"
-msgid "Show the Gpg4win Compendium (pdf, German)"
-msgstr "Ukázat Gpg4win Compendium (pdf, nìmecky)"
+#~ msgctxt "DESC_Menu_compendium_de_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, German)"
+#~ msgstr "Ukázat Gpg4win Compendium (pdf, nìmecky)"
 
-msgctxt "DESC_Menu_compendium_en_pdf"
-msgid "Show the Gpg4win Compendium (pdf, English)"
-msgstr "Ukázat Gpg4win Compendium (pdf, anglicky)"
+#~ msgctxt "DESC_Menu_compendium_en_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, English)"
+#~ msgstr "Ukázat Gpg4win Compendium (pdf, anglicky)"
 
 #~ msgctxt "T_AdminNeeded"
 #~ msgid ""
diff --git a/po/de.po b/po/de.po
index c1f1f69..9a8bb50 100644
--- a/po/de.po
+++ b/po/de.po
@@ -89,10 +89,11 @@ msgctxt "T_LangCode"
 msgid "en"
 msgstr "de"
 
+#, fuzzy
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
-"(GPL)."
+"(GNU GPL)."
 msgstr ""
 "Diese Software ist unter der GNU General Public License (GPL) lizensiert."
 
@@ -346,10 +347,12 @@ msgstr ""
 "\n"
 "Claws Mail aus Gpg4win jetzt deinstallieren?"
 
-msgctxt "T_XPisDeprecated"
+msgctxt "T_WinisDeprecated"
 msgid ""
-"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
-"Support for them may be removed in a future version."
+"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version.\n"
+"\n"
+"Kleopatra is disabled."
 msgstr ""
 
 msgctxt "T_Installing_GnuPG"
@@ -418,37 +421,37 @@ msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "Den Zertifikatsmanager Kleopatra aufrufen."
 
-msgctxt "DESC_Name_compendium"
-msgid "Gpg4win Compendium"
-msgstr "Gpg4win-Kompendium"
+#~ msgctxt "DESC_Name_compendium"
+#~ msgid "Gpg4win Compendium"
+#~ msgstr "Gpg4win-Kompendium"
 
-msgctxt "DESC_SEC_compendium"
-msgid "The Gpg4win documentation (English and German)"
-msgstr "Die Gpg4win Dokumentation (in deutsch und english)"
+#~ msgctxt "DESC_SEC_compendium"
+#~ msgid "The Gpg4win documentation (English and German)"
+#~ msgstr "Die Gpg4win Dokumentation (in deutsch und english)"
 
-msgctxt "DESC_Name_compendium_de_pdf"
-msgid "Gpg4win Compendium (pdf, German)"
-msgstr "Gpg4win-Kompendium (pdf, deutsch)"
+#~ msgctxt "DESC_Name_compendium_de_pdf"
+#~ msgid "Gpg4win Compendium (pdf, German)"
+#~ msgstr "Gpg4win-Kompendium (pdf, deutsch)"
 
-msgctxt "DESC_Name_compendium_en_pdf"
-msgid "Gpg4win Compendium (pdf, English)"
-msgstr "Gpg4win-Kompendium (pdf, english)"
+#~ msgctxt "DESC_Name_compendium_en_pdf"
+#~ msgid "Gpg4win Compendium (pdf, English)"
+#~ msgstr "Gpg4win-Kompendium (pdf, english)"
 
-msgctxt "DESC_Name_compendium_de_html"
-msgid "Gpg4win Compendium (html, German)"
-msgstr "Gpg4win-Kompendium (html, deutsch)"
+#~ msgctxt "DESC_Name_compendium_de_html"
+#~ msgid "Gpg4win Compendium (html, German)"
+#~ msgstr "Gpg4win-Kompendium (html, deutsch)"
 
-msgctxt "DESC_Name_compendium_en_html"
-msgid "Gpg4win Compendium (html, English)"
-msgstr "Gpg4win-Kompendium (html, englisch)"
+#~ msgctxt "DESC_Name_compendium_en_html"
+#~ msgid "Gpg4win Compendium (html, English)"
+#~ msgstr "Gpg4win-Kompendium (html, englisch)"
 
-msgctxt "DESC_Menu_compendium_de_pdf"
-msgid "Show the Gpg4win Compendium (pdf, German)"
-msgstr "Gpg4win-Kompendium (pdf, deutsch)"
+#~ msgctxt "DESC_Menu_compendium_de_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, German)"
+#~ msgstr "Gpg4win-Kompendium (pdf, deutsch)"
 
-msgctxt "DESC_Menu_compendium_en_pdf"
-msgid "Show the Gpg4win Compendium (pdf, English)"
-msgstr "Gpg4win-Kompendium (pdf, englisch)"
+#~ msgctxt "DESC_Menu_compendium_en_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, English)"
+#~ msgstr "Gpg4win-Kompendium (pdf, englisch)"
 
 #~ msgctxt "T_AdminNeeded"
 #~ msgid ""
diff --git a/po/es.po b/po/es.po
index 08ff2f5..cfb0a59 100644
--- a/po/es.po
+++ b/po/es.po
@@ -88,10 +88,11 @@ msgctxt "T_LangCode"
 msgid "en"
 msgstr "es"
 
+#, fuzzy
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
-"(GPL)."
+"(GNU GPL)."
 msgstr ""
 "Este software está licenciado bajo los términos de la GNU General Public "
 "License (GPL)."
@@ -107,8 +108,8 @@ msgstr ""
 "recibido."
 
 msgctxt "T_MoreInfo"
-msgid "Click here for the project's homepage"
-msgstr "Siga este enlace para ver el sitio web del proyecto"
+msgid "Go to Gpg4win's webpage"
+msgstr ""
 
 msgctxt "T_MoreInfoURL"
 msgid "https://www.gpg4win.org"
@@ -290,10 +291,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
-msgctxt "T_XPisDeprecated"
+msgctxt "T_WinisDeprecated"
 msgid ""
-"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
-"Support for them may be removed in a future version."
+"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version.\n"
+"\n"
+"Kleopatra is disabled."
 msgstr ""
 
 msgctxt "T_Installing_GnuPG"
@@ -352,38 +355,14 @@ msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "Ejecutar la herramienta de gestión de llaves Kleopatra."
 
-msgctxt "DESC_Name_compendium"
-msgid "Gpg4win Compendium"
-msgstr ""
+#~ msgctxt "T_MoreInfo"
+#~ msgid "Click here for the project's homepage"
+#~ msgstr "Siga este enlace para ver el sitio web del proyecto"
 
 #, fuzzy
-msgctxt "DESC_SEC_compendium"
-msgid "The Gpg4win documentation (English and German)"
-msgstr "Documentación de Gpg4win"
-
-msgctxt "DESC_Name_compendium_de_pdf"
-msgid "Gpg4win Compendium (pdf, German)"
-msgstr ""
-
-msgctxt "DESC_Name_compendium_en_pdf"
-msgid "Gpg4win Compendium (pdf, English)"
-msgstr ""
-
-msgctxt "DESC_Name_compendium_de_html"
-msgid "Gpg4win Compendium (html, German)"
-msgstr ""
-
-msgctxt "DESC_Name_compendium_en_html"
-msgid "Gpg4win Compendium (html, English)"
-msgstr ""
-
-msgctxt "DESC_Menu_compendium_de_pdf"
-msgid "Show the Gpg4win Compendium (pdf, German)"
-msgstr ""
-
-msgctxt "DESC_Menu_compendium_en_pdf"
-msgid "Show the Gpg4win Compendium (pdf, English)"
-msgstr ""
+#~ msgctxt "DESC_SEC_compendium"
+#~ msgid "The Gpg4win documentation (English and German)"
+#~ msgstr "Documentación de Gpg4win"
 
 #~ msgctxt "T_AdminNeeded"
 #~ msgid ""
diff --git a/po/fr.po b/po/fr.po
index c614581..cdaeb34 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -88,10 +88,11 @@ msgctxt "T_LangCode"
 msgid "en"
 msgstr "fr"
 
+#, fuzzy
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
-"(GPL)."
+"(GNU GPL)."
 msgstr ""
 "Ce logiciel est publié selon les termes de la Licence publique générale GNU "
 "(GPL)."
@@ -107,8 +108,8 @@ msgstr ""
 "les mêmes droits que ceux que vous avez."
 
 msgctxt "T_MoreInfo"
-msgid "Click here for the project's homepage"
-msgstr "Cliquer ici pour ouvrir la page d'accueil du projet"
+msgid "Go to Gpg4win's webpage"
+msgstr ""
 
 msgctxt "T_MoreInfoURL"
 msgid "https://www.gpg4win.org"
@@ -295,10 +296,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
-msgctxt "T_XPisDeprecated"
+msgctxt "T_WinisDeprecated"
 msgid ""
-"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
-"Support for them may be removed in a future version."
+"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version.\n"
+"\n"
+"Kleopatra is disabled."
 msgstr ""
 
 msgctxt "T_Installing_GnuPG"
@@ -357,37 +360,41 @@ msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "Lancer l'outil de gestion de clés Kleopatra."
 
-msgctxt "DESC_Name_compendium"
-msgid "Gpg4win Compendium"
-msgstr "Compendium de Gpg4win"
+#~ msgctxt "T_MoreInfo"
+#~ msgid "Click here for the project's homepage"
+#~ msgstr "Cliquer ici pour ouvrir la page d'accueil du projet"
+
+#~ msgctxt "DESC_Name_compendium"
+#~ msgid "Gpg4win Compendium"
+#~ msgstr "Compendium de Gpg4win"
 
-msgctxt "DESC_SEC_compendium"
-msgid "The Gpg4win documentation (English and German)"
-msgstr "La documentation de Gpg4win (anglais et allemand)"
+#~ msgctxt "DESC_SEC_compendium"
+#~ msgid "The Gpg4win documentation (English and German)"
+#~ msgstr "La documentation de Gpg4win (anglais et allemand)"
 
-msgctxt "DESC_Name_compendium_de_pdf"
-msgid "Gpg4win Compendium (pdf, German)"
-msgstr "Compendium de Gpg4win (PDF, allemand)"
+#~ msgctxt "DESC_Name_compendium_de_pdf"
+#~ msgid "Gpg4win Compendium (pdf, German)"
+#~ msgstr "Compendium de Gpg4win (PDF, allemand)"
 
-msgctxt "DESC_Name_compendium_en_pdf"
-msgid "Gpg4win Compendium (pdf, English)"
-msgstr "Compendium de Gpg4win (PDF, anglais)"
+#~ msgctxt "DESC_Name_compendium_en_pdf"
+#~ msgid "Gpg4win Compendium (pdf, English)"
+#~ msgstr "Compendium de Gpg4win (PDF, anglais)"
 
-msgctxt "DESC_Name_compendium_de_html"
-msgid "Gpg4win Compendium (html, German)"
-msgstr "Compendium de Gpg4win (HTML, allemand)"
+#~ msgctxt "DESC_Name_compendium_de_html"
+#~ msgid "Gpg4win Compendium (html, German)"
+#~ msgstr "Compendium de Gpg4win (HTML, allemand)"
 
-msgctxt "DESC_Name_compendium_en_html"
-msgid "Gpg4win Compendium (html, English)"
-msgstr "Compendium de Gpg4win (HTML, anglais)"
+#~ msgctxt "DESC_Name_compendium_en_html"
+#~ msgid "Gpg4win Compendium (html, English)"
+#~ msgstr "Compendium de Gpg4win (HTML, anglais)"
 
-msgctxt "DESC_Menu_compendium_de_pdf"
-msgid "Show the Gpg4win Compendium (pdf, German)"
-msgstr "Afficher le Compendium de Gpg4win (PDF, allemand)"
+#~ msgctxt "DESC_Menu_compendium_de_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, German)"
+#~ msgstr "Afficher le Compendium de Gpg4win (PDF, allemand)"
 
-msgctxt "DESC_Menu_compendium_en_pdf"
-msgid "Show the Gpg4win Compendium (pdf, English)"
-msgstr "Afficher le Compendium de Gpg4win (PDF, anglais)"
+#~ msgctxt "DESC_Menu_compendium_en_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, English)"
+#~ msgstr "Afficher le Compendium de Gpg4win (PDF, anglais)"
 
 #~ msgctxt "T_AdminNeeded"
 #~ msgid ""
diff --git a/po/it.po b/po/it.po
index 4181864..b9bcf98 100644
--- a/po/it.po
+++ b/po/it.po
@@ -89,10 +89,11 @@ msgctxt "T_LangCode"
 msgid "en"
 msgstr "it"
 
+#, fuzzy
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
-"(GPL)."
+"(GNU GPL)."
 msgstr ""
 "Questo programma è fornito in accordo coi termini della GNU General Public "
 "Licence (GPL)."
@@ -108,8 +109,8 @@ msgstr ""
 "che hai ricevuto."
 
 msgctxt "T_MoreInfo"
-msgid "Click here for the project's homepage"
-msgstr "Clicca qui per accedere alla pagina principale del progetto."
+msgid "Go to Gpg4win's webpage"
+msgstr ""
 
 msgctxt "T_MoreInfoURL"
 msgid "https://www.gpg4win.org"
@@ -294,10 +295,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
-msgctxt "T_XPisDeprecated"
+msgctxt "T_WinisDeprecated"
 msgid ""
-"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
-"Support for them may be removed in a future version."
+"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version.\n"
+"\n"
+"Kleopatra is disabled."
 msgstr ""
 
 msgctxt "T_Installing_GnuPG"
@@ -356,37 +359,41 @@ msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "Esegui lo strumento di amministrazione delle chiavi Kleopatra."
 
-msgctxt "DESC_Name_compendium"
-msgid "Gpg4win Compendium"
-msgstr "Riassunto di Gpg4win"
+#~ msgctxt "T_MoreInfo"
+#~ msgid "Click here for the project's homepage"
+#~ msgstr "Clicca qui per accedere alla pagina principale del progetto."
+
+#~ msgctxt "DESC_Name_compendium"
+#~ msgid "Gpg4win Compendium"
+#~ msgstr "Riassunto di Gpg4win"
 
-msgctxt "DESC_SEC_compendium"
-msgid "The Gpg4win documentation (English and German)"
-msgstr "La documentazione di Gpg4win (Inglese e Tedesco)"
+#~ msgctxt "DESC_SEC_compendium"
+#~ msgid "The Gpg4win documentation (English and German)"
+#~ msgstr "La documentazione di Gpg4win (Inglese e Tedesco)"
 
-msgctxt "DESC_Name_compendium_de_pdf"
-msgid "Gpg4win Compendium (pdf, German)"
-msgstr "Riassunto di Gpg4win (pdf, Tedesco)"
+#~ msgctxt "DESC_Name_compendium_de_pdf"
+#~ msgid "Gpg4win Compendium (pdf, German)"
+#~ msgstr "Riassunto di Gpg4win (pdf, Tedesco)"
 
-msgctxt "DESC_Name_compendium_en_pdf"
-msgid "Gpg4win Compendium (pdf, English)"
-msgstr "Riassunto di Gpg4win (pdf, Inglese)"
+#~ msgctxt "DESC_Name_compendium_en_pdf"
+#~ msgid "Gpg4win Compendium (pdf, English)"
+#~ msgstr "Riassunto di Gpg4win (pdf, Inglese)"
 
-msgctxt "DESC_Name_compendium_de_html"
-msgid "Gpg4win Compendium (html, German)"
-msgstr "Riassunto di Gpg4win (html, Tedesco)"
+#~ msgctxt "DESC_Name_compendium_de_html"
+#~ msgid "Gpg4win Compendium (html, German)"
+#~ msgstr "Riassunto di Gpg4win (html, Tedesco)"
 
-msgctxt "DESC_Name_compendium_en_html"
-msgid "Gpg4win Compendium (html, English)"
-msgstr "Riassunto di Gpg4win (html, Inglese)"
+#~ msgctxt "DESC_Name_compendium_en_html"
+#~ msgid "Gpg4win Compendium (html, English)"
+#~ msgstr "Riassunto di Gpg4win (html, Inglese)"
 
-msgctxt "DESC_Menu_compendium_de_pdf"
-msgid "Show the Gpg4win Compendium (pdf, German)"
-msgstr "Mostra il riassunto di Gpg4win (pdf, Tedesco)"
+#~ msgctxt "DESC_Menu_compendium_de_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, German)"
+#~ msgstr "Mostra il riassunto di Gpg4win (pdf, Tedesco)"
 
-msgctxt "DESC_Menu_compendium_en_pdf"
-msgid "Show the Gpg4win Compendium (pdf, English)"
-msgstr "Mostra il riassunto di Gpg4win (pdf, Inglese)"
+#~ msgctxt "DESC_Menu_compendium_en_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, English)"
+#~ msgstr "Mostra il riassunto di Gpg4win (pdf, Inglese)"
 
 #~ msgctxt "T_AdminNeeded"
 #~ msgid ""
diff --git a/po/no.po b/po/no.po
index 1719086..0a14aac 100644
--- a/po/no.po
+++ b/po/no.po
@@ -88,10 +88,11 @@ msgctxt "T_LangCode"
 msgid "en"
 msgstr "no"
 
+#, fuzzy
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
-"(GPL)."
+"(GNU GPL)."
 msgstr ""
 "Denne programvaren er lisensiert under vilkårene i GNU General Public "
 "License (GPL)"
@@ -106,8 +107,8 @@ msgstr ""
 "den videre så lenge mottakerne får same rettighetene til den som du har fått."
 
 msgctxt "T_MoreInfo"
-msgid "Click here for the project's homepage"
-msgstr "Trykk her for prosjektets hjemmeside"
+msgid "Go to Gpg4win's webpage"
+msgstr ""
 
 msgctxt "T_MoreInfoURL"
 msgid "https://www.gpg4win.org"
@@ -296,10 +297,12 @@ msgstr ""
 "installere en oppdatert versjon fra: http://www.claws-mail.org/win32 Vil du "
 "avinstallere 'Claws Mail' fra Gpg4win nå?"
 
-msgctxt "T_XPisDeprecated"
+msgctxt "T_WinisDeprecated"
 msgid ""
-"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
-"Support for them may be removed in a future version."
+"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version.\n"
+"\n"
+"Kleopatra is disabled."
 msgstr ""
 
 msgctxt "T_Installing_GnuPG"
@@ -355,37 +358,41 @@ msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "Kjør Kleopatra nøkkelhåndteringsverktøy."
 
-msgctxt "DESC_Name_compendium"
-msgid "Gpg4win Compendium"
-msgstr "Gpg4win Compendium"
+#~ msgctxt "T_MoreInfo"
+#~ msgid "Click here for the project's homepage"
+#~ msgstr "Trykk her for prosjektets hjemmeside"
+
+#~ msgctxt "DESC_Name_compendium"
+#~ msgid "Gpg4win Compendium"
+#~ msgstr "Gpg4win Compendium"
 
-msgctxt "DESC_SEC_compendium"
-msgid "The Gpg4win documentation (English and German)"
-msgstr "Gpg4win dokumentasjon (Engelsk og Tysk)"
+#~ msgctxt "DESC_SEC_compendium"
+#~ msgid "The Gpg4win documentation (English and German)"
+#~ msgstr "Gpg4win dokumentasjon (Engelsk og Tysk)"
 
-msgctxt "DESC_Name_compendium_de_pdf"
-msgid "Gpg4win Compendium (pdf, German)"
-msgstr "Gpg4win Compendium (pdf, Tysk)"
+#~ msgctxt "DESC_Name_compendium_de_pdf"
+#~ msgid "Gpg4win Compendium (pdf, German)"
+#~ msgstr "Gpg4win Compendium (pdf, Tysk)"
 
-msgctxt "DESC_Name_compendium_en_pdf"
-msgid "Gpg4win Compendium (pdf, English)"
-msgstr "Gpg4win Compendium (pdf, Engelsk)"
+#~ msgctxt "DESC_Name_compendium_en_pdf"
+#~ msgid "Gpg4win Compendium (pdf, English)"
+#~ msgstr "Gpg4win Compendium (pdf, Engelsk)"
 
-msgctxt "DESC_Name_compendium_de_html"
-msgid "Gpg4win Compendium (html, German)"
-msgstr "Gpg4win Compendium (html, Tysk)"
+#~ msgctxt "DESC_Name_compendium_de_html"
+#~ msgid "Gpg4win Compendium (html, German)"
+#~ msgstr "Gpg4win Compendium (html, Tysk)"
 
-msgctxt "DESC_Name_compendium_en_html"
-msgid "Gpg4win Compendium (html, English)"
-msgstr "Gpg4win Compendium (html, Engelsk)"
+#~ msgctxt "DESC_Name_compendium_en_html"
+#~ msgid "Gpg4win Compendium (html, English)"
+#~ msgstr "Gpg4win Compendium (html, Engelsk)"
 
-msgctxt "DESC_Menu_compendium_de_pdf"
-msgid "Show the Gpg4win Compendium (pdf, German)"
-msgstr "Vis Gpg4win Compendium (pdf, Tysk)"
+#~ msgctxt "DESC_Menu_compendium_de_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, German)"
+#~ msgstr "Vis Gpg4win Compendium (pdf, Tysk)"
 
-msgctxt "DESC_Menu_compendium_en_pdf"
-msgid "Show the Gpg4win Compendium (pdf, English)"
-msgstr "Vis Gpg4win Compendium (pdf, Engelsk)"
+#~ msgctxt "DESC_Menu_compendium_en_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, English)"
+#~ msgstr "Vis Gpg4win Compendium (pdf, Engelsk)"
 
 #~ msgctxt "T_AdminNeeded"
 #~ msgid ""
diff --git a/po/pt.po b/po/pt.po
index fd299ec..2115d2e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -88,10 +88,11 @@ msgctxt "T_LangCode"
 msgid "en"
 msgstr "pt"
 
+#, fuzzy
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
-"(GPL)."
+"(GNU GPL)."
 msgstr ""
 "Este software está licenciado sob os termos da GNU General Public License "
 "(GPL)."
@@ -107,11 +108,12 @@ msgstr ""
 "recebeste."
 
 msgctxt "T_MoreInfo"
-msgid "Click here for the project's homepage"
-msgstr "Clica aqui para a homepage do projeto"
+msgid "Go to Gpg4win's webpage"
+msgstr ""
 
+#, fuzzy
 msgctxt "T_MoreInfoURL"
-msgid "http://www.gpg4win.org"
+msgid "https://www.gpg4win.org"
 msgstr "http://www.gpg4win.org"
 
 msgctxt "T_ShowReadme"
@@ -304,10 +306,13 @@ msgstr ""
 "\n"
 "Desinstalar o Claws Mail do Gpg4win agora?"
 
-msgctxt "T_XPisDeprecated"
+#, fuzzy
+msgctxt "T_WinisDeprecated"
 msgid ""
-"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
-"Support for them may be removed in a future version."
+"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version.\n"
+"\n"
+"Kleopatra is disabled."
 msgstr ""
 "Versões do Windows antes do Windows Vista já não são mantidas pelo Gpg4win.\n"
 "O suporte para eles pode ser removido numa versão futura."
@@ -365,37 +370,41 @@ msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "Executar a ferramenta de gestão de chaves Kleopatra."
 
-msgctxt "DESC_Name_compendium"
-msgid "Gpg4win Compendium"
-msgstr "Compêndio Gpg4win"
+#~ msgctxt "T_MoreInfo"
+#~ msgid "Click here for the project's homepage"
+#~ msgstr "Clica aqui para a homepage do projeto"
+
+#~ msgctxt "DESC_Name_compendium"
+#~ msgid "Gpg4win Compendium"
+#~ msgstr "Compêndio Gpg4win"
 
-msgctxt "DESC_SEC_compendium"
-msgid "The Gpg4win documentation (English and German)"
-msgstr "A documentação do Gpg4win (Inglês e Alemão)"
+#~ msgctxt "DESC_SEC_compendium"
+#~ msgid "The Gpg4win documentation (English and German)"
+#~ msgstr "A documentação do Gpg4win (Inglês e Alemão)"
 
-msgctxt "DESC_Name_compendium_de_pdf"
-msgid "Gpg4win Compendium (pdf, German)"
-msgstr "Compêndio Gpg4win (pdf, Alemão)"
+#~ msgctxt "DESC_Name_compendium_de_pdf"
+#~ msgid "Gpg4win Compendium (pdf, German)"
+#~ msgstr "Compêndio Gpg4win (pdf, Alemão)"
 
-msgctxt "DESC_Name_compendium_en_pdf"
-msgid "Gpg4win Compendium (pdf, English)"
-msgstr "Compêndio Gpg4win (pdf, Inglês)"
+#~ msgctxt "DESC_Name_compendium_en_pdf"
+#~ msgid "Gpg4win Compendium (pdf, English)"
+#~ msgstr "Compêndio Gpg4win (pdf, Inglês)"
 
-msgctxt "DESC_Name_compendium_de_html"
-msgid "Gpg4win Compendium (html, German)"
-msgstr "Compêndio Gpg4win (html, Alemão)"
+#~ msgctxt "DESC_Name_compendium_de_html"
+#~ msgid "Gpg4win Compendium (html, German)"
+#~ msgstr "Compêndio Gpg4win (html, Alemão)"
 
-msgctxt "DESC_Name_compendium_en_html"
-msgid "Gpg4win Compendium (html, English)"
-msgstr "Compêndio Gpg4win (html, Inglês)"
+#~ msgctxt "DESC_Name_compendium_en_html"
+#~ msgid "Gpg4win Compendium (html, English)"
+#~ msgstr "Compêndio Gpg4win (html, Inglês)"
 
-msgctxt "DESC_Menu_compendium_de_pdf"
-msgid "Show the Gpg4win Compendium (pdf, German)"
-msgstr "Mostrar o Compêndio Gpg4win (pdf, Alemão)"
+#~ msgctxt "DESC_Menu_compendium_de_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, German)"
+#~ msgstr "Mostrar o Compêndio Gpg4win (pdf, Alemão)"
 
-msgctxt "DESC_Menu_compendium_en_pdf"
-msgid "Show the Gpg4win Compendium (pdf, English)"
-msgstr "Mostrar o Compêndio Gpg4win (pdf, Inglês)"
+#~ msgctxt "DESC_Menu_compendium_en_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, English)"
+#~ msgstr "Mostrar o Compêndio Gpg4win (pdf, Inglês)"
 
 #~ msgctxt "T_AdminNeeded"
 #~ msgid ""
diff --git a/po/ru.po b/po/ru.po
index 8006c2c..b41b603 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -91,10 +91,11 @@ msgctxt "T_LangCode"
 msgid "en"
 msgstr "ru"
 
+#, fuzzy
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
-"(GPL)."
+"(GNU GPL)."
 msgstr ""
 "Èñïîëüçîâàíèå ýòîé ïðîãðàììû ðåãóëèðóåòñÿ ëèöåíçèåé GNU General Public "
 "License (GPL). Âû ìîæåòå ñâîáîäíî ðàñïðîñòðàíÿòü ýòó ïðîãðàììó è âíîñèòü â "
@@ -111,8 +112,8 @@ msgstr ""
 "ïîëüçîâàòåëåé ïðîãðàììû."
 
 msgctxt "T_MoreInfo"
-msgid "Click here for the project's homepage"
-msgstr "Âåá-ñàéò ïðîåêòà"
+msgid "Go to Gpg4win's webpage"
+msgstr ""
 
 msgctxt "T_MoreInfoURL"
 msgid "https://www.gpg4win.org"
@@ -292,10 +293,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
-msgctxt "T_XPisDeprecated"
+msgctxt "T_WinisDeprecated"
 msgid ""
-"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
-"Support for them may be removed in a future version."
+"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version.\n"
+"\n"
+"Kleopatra is disabled."
 msgstr ""
 
 msgctxt "T_Installing_GnuPG"
@@ -354,45 +357,49 @@ msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé Kleopatra."
 
+#~ msgctxt "T_MoreInfo"
+#~ msgid "Click here for the project's homepage"
+#~ msgstr "Âåá-ñàéò ïðîåêòà"
+
 #, fuzzy
-msgctxt "DESC_Name_compendium"
-msgid "Gpg4win Compendium"
-msgstr "Äîêóìåíòàöèÿ Gpg4win"
+#~ msgctxt "DESC_Name_compendium"
+#~ msgid "Gpg4win Compendium"
+#~ msgstr "Äîêóìåíòàöèÿ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_SEC_compendium"
-msgid "The Gpg4win documentation (English and German)"
-msgstr "Äîêóìåíòàöèÿ Gpg4win"
+#~ msgctxt "DESC_SEC_compendium"
+#~ msgid "The Gpg4win documentation (English and German)"
+#~ msgstr "Äîêóìåíòàöèÿ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_Name_compendium_de_pdf"
-msgid "Gpg4win Compendium (pdf, German)"
-msgstr "Äîêóìåíòàöèÿ Gpg4win"
+#~ msgctxt "DESC_Name_compendium_de_pdf"
+#~ msgid "Gpg4win Compendium (pdf, German)"
+#~ msgstr "Äîêóìåíòàöèÿ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_Name_compendium_en_pdf"
-msgid "Gpg4win Compendium (pdf, English)"
-msgstr "Äîêóìåíòàöèÿ Gpg4win"
+#~ msgctxt "DESC_Name_compendium_en_pdf"
+#~ msgid "Gpg4win Compendium (pdf, English)"
+#~ msgstr "Äîêóìåíòàöèÿ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_Name_compendium_de_html"
-msgid "Gpg4win Compendium (html, German)"
-msgstr "Äîêóìåíòàöèÿ Gpg4win"
+#~ msgctxt "DESC_Name_compendium_de_html"
+#~ msgid "Gpg4win Compendium (html, German)"
+#~ msgstr "Äîêóìåíòàöèÿ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_Name_compendium_en_html"
-msgid "Gpg4win Compendium (html, English)"
-msgstr "Äîêóìåíòàöèÿ Gpg4win"
+#~ msgctxt "DESC_Name_compendium_en_html"
+#~ msgid "Gpg4win Compendium (html, English)"
+#~ msgstr "Äîêóìåíòàöèÿ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_Menu_compendium_de_pdf"
-msgid "Show the Gpg4win Compendium (pdf, German)"
-msgstr "Äîêóìåíòàöèÿ Gpg4win"
+#~ msgctxt "DESC_Menu_compendium_de_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, German)"
+#~ msgstr "Äîêóìåíòàöèÿ Gpg4win"
 
 #, fuzzy
-msgctxt "DESC_Menu_compendium_en_pdf"
-msgid "Show the Gpg4win Compendium (pdf, English)"
-msgstr "Ïîêàçàòü îíëàéíîâûå èíñòðóêöèè Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ"
+#~ msgctxt "DESC_Menu_compendium_en_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, English)"
+#~ msgstr "Ïîêàçàòü îíëàéíîâûå èíñòðóêöèè Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ"
 
 #~ msgctxt "T_AdminNeeded"
 #~ msgid ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 04b064d..6b43659 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -87,10 +87,11 @@ msgctxt "T_LangCode"
 msgid "en"
 msgstr "zh_CN"
 
+#, fuzzy
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
-"(GPL)."
+"(GNU GPL)."
 msgstr "´ËÈí¼þÒÀÕÕ GNU ͨÓù«¹²Ðí¿ÉÖ¤£¨GPL£©µÄÌõ¿îÊÚȨ¡£"
 
 msgctxt "T_GPLShort"
@@ -103,8 +104,8 @@ msgstr ""
 "¸øÓèËûÃÇÓëÄãËù»ñµÃµÄÏàͬµÄȨÀû¡£"
 
 msgctxt "T_MoreInfo"
-msgid "Click here for the project's homepage"
-msgstr "µã»÷´Ë´¦·ÃÎÊÏîÄ¿Ê×Ò³"
+msgid "Go to Gpg4win's webpage"
+msgstr ""
 
 msgctxt "T_MoreInfoURL"
 msgid "https://www.gpg4win.org"
@@ -275,10 +276,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
-msgctxt "T_XPisDeprecated"
+msgctxt "T_WinisDeprecated"
 msgid ""
-"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
-"Support for them may be removed in a future version."
+"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version.\n"
+"\n"
+"Kleopatra is disabled."
 msgstr ""
 
 msgctxt "T_Installing_GnuPG"
@@ -335,37 +338,41 @@ msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "ÔËÐÐ Kleopatra ÃÜÔ¿¹ÜÀí¹¤¾ß¡£"
 
-msgctxt "DESC_Name_compendium"
-msgid "Gpg4win Compendium"
-msgstr "Gpg4win ʹÓøÙÒª"
+#~ msgctxt "T_MoreInfo"
+#~ msgid "Click here for the project's homepage"
+#~ msgstr "µã»÷´Ë´¦·ÃÎÊÏîÄ¿Ê×Ò³"
+
+#~ msgctxt "DESC_Name_compendium"
+#~ msgid "Gpg4win Compendium"
+#~ msgstr "Gpg4win ʹÓøÙÒª"
 
-msgctxt "DESC_SEC_compendium"
-msgid "The Gpg4win documentation (English and German)"
-msgstr "Gpg4win Îĵµ£¨Ó¢ÓïºÍµÂÓ"
+#~ msgctxt "DESC_SEC_compendium"
+#~ msgid "The Gpg4win documentation (English and German)"
+#~ msgstr "Gpg4win Îĵµ£¨Ó¢ÓïºÍµÂÓ"
 
-msgctxt "DESC_Name_compendium_de_pdf"
-msgid "Gpg4win Compendium (pdf, German)"
-msgstr "Gpg4win ʹÓøÙÒª£¨PDF£¬µÂÓ"
+#~ msgctxt "DESC_Name_compendium_de_pdf"
+#~ msgid "Gpg4win Compendium (pdf, German)"
+#~ msgstr "Gpg4win ʹÓøÙÒª£¨PDF£¬µÂÓ"
 
-msgctxt "DESC_Name_compendium_en_pdf"
-msgid "Gpg4win Compendium (pdf, English)"
-msgstr "Gpg4win ʹÓøÙÒª£¨PDF£¬Ó¢Ó"
+#~ msgctxt "DESC_Name_compendium_en_pdf"
+#~ msgid "Gpg4win Compendium (pdf, English)"
+#~ msgstr "Gpg4win ʹÓøÙÒª£¨PDF£¬Ó¢Ó"
 
-msgctxt "DESC_Name_compendium_de_html"
-msgid "Gpg4win Compendium (html, German)"
-msgstr "Gpg4win ʹÓøÙÒª£¨HTML£¬µÂÓ"
+#~ msgctxt "DESC_Name_compendium_de_html"
+#~ msgid "Gpg4win Compendium (html, German)"
+#~ msgstr "Gpg4win ʹÓøÙÒª£¨HTML£¬µÂÓ"
 
-msgctxt "DESC_Name_compendium_en_html"
-msgid "Gpg4win Compendium (html, English)"
-msgstr "Gpg4win ʹÓøÙÒª£¨HTML£¬Ó¢Ó"
+#~ msgctxt "DESC_Name_compendium_en_html"
+#~ msgid "Gpg4win Compendium (html, English)"
+#~ msgstr "Gpg4win ʹÓøÙÒª£¨HTML£¬Ó¢Ó"
 
-msgctxt "DESC_Menu_compendium_de_pdf"
-msgid "Show the Gpg4win Compendium (pdf, German)"
-msgstr "ÏÔʾ Gpg4win ʹÓøÙÒª£¨PDF£¬µÂÓ"
+#~ msgctxt "DESC_Menu_compendium_de_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, German)"
+#~ msgstr "ÏÔʾ Gpg4win ʹÓøÙÒª£¨PDF£¬µÂÓ"
 
-msgctxt "DESC_Menu_compendium_en_pdf"
-msgid "Show the Gpg4win Compendium (pdf, English)"
-msgstr "ÏÔʾ Gpg4win ʹÓøÙÒª£¨PDF£¬Ó¢Ó"
+#~ msgctxt "DESC_Menu_compendium_en_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, English)"
+#~ msgstr "ÏÔʾ Gpg4win ʹÓøÙÒª£¨PDF£¬Ó¢Ó"
 
 #~ msgctxt "T_AdminNeeded"
 #~ msgid ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 876f3de..93eb91e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -87,10 +87,11 @@ msgctxt "T_LangCode"
 msgid "en"
 msgstr "zh_CN"
 
+#, fuzzy
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
-"(GPL)."
+"(GNU GPL)."
 msgstr "¦¹³nÅé¨Ì·Ó GNU ³q¥Î¤½¦@³\¥iÃÒ¡]GPL¡^ªº±ø´Ú±ÂÅv¡C"
 
 msgctxt "T_GPLShort"
@@ -103,8 +104,8 @@ msgstr ""
 "µ¹¤©¥L­Ì»P§A©ÒÀò±oªº¬Û¦PªºÅv§Q¡C"
 
 msgctxt "T_MoreInfo"
-msgid "Click here for the project's homepage"
-msgstr "ÂI¿ï¦¹³B³X°Ý¶µ¥Ø­º­¶"
+msgid "Go to Gpg4win's webpage"
+msgstr ""
 
 msgctxt "T_MoreInfoURL"
 msgid "https://www.gpg4win.org"
@@ -275,10 +276,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
-msgctxt "T_XPisDeprecated"
+msgctxt "T_WinisDeprecated"
 msgid ""
-"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
-"Support for them may be removed in a future version."
+"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version.\n"
+"\n"
+"Kleopatra is disabled."
 msgstr ""
 
 msgctxt "T_Installing_GnuPG"
@@ -335,37 +338,41 @@ msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "°õ¦æ Kleopatra ª÷Æ_ºÞ²z¤u¨ã¡C"
 
-msgctxt "DESC_Name_compendium"
-msgid "Gpg4win Compendium"
-msgstr "Gpg4win ¨Ï¥Îºõ­n"
+#~ msgctxt "T_MoreInfo"
+#~ msgid "Click here for the project's homepage"
+#~ msgstr "ÂI¿ï¦¹³B³X°Ý¶µ¥Ø­º­¶"
+
+#~ msgctxt "DESC_Name_compendium"
+#~ msgid "Gpg4win Compendium"
+#~ msgstr "Gpg4win ¨Ï¥Îºõ­n"
 
-msgctxt "DESC_SEC_compendium"
-msgid "The Gpg4win documentation (English and German)"
-msgstr "Gpg4win ¤å¥ó¡]­^»y©M¼w»y¡^"
+#~ msgctxt "DESC_SEC_compendium"
+#~ msgid "The Gpg4win documentation (English and German)"
+#~ msgstr "Gpg4win ¤å¥ó¡]­^»y©M¼w»y¡^"
 
-msgctxt "DESC_Name_compendium_de_pdf"
-msgid "Gpg4win Compendium (pdf, German)"
-msgstr "Gpg4win ¨Ï¥Îºõ­n¡]PDF¡A¼w»y¡^"
+#~ msgctxt "DESC_Name_compendium_de_pdf"
+#~ msgid "Gpg4win Compendium (pdf, German)"
+#~ msgstr "Gpg4win ¨Ï¥Îºõ­n¡]PDF¡A¼w»y¡^"
 
-msgctxt "DESC_Name_compendium_en_pdf"
-msgid "Gpg4win Compendium (pdf, English)"
-msgstr "Gpg4win ¨Ï¥Îºõ­n¡]PDF¡A­^»y¡^"
+#~ msgctxt "DESC_Name_compendium_en_pdf"
+#~ msgid "Gpg4win Compendium (pdf, English)"
+#~ msgstr "Gpg4win ¨Ï¥Îºõ­n¡]PDF¡A­^»y¡^"
 
-msgctxt "DESC_Name_compendium_de_html"
-msgid "Gpg4win Compendium (html, German)"
-msgstr "Gpg4win ¨Ï¥Îºõ­n¡]HTML¡A¼w»y¡^"
+#~ msgctxt "DESC_Name_compendium_de_html"
+#~ msgid "Gpg4win Compendium (html, German)"
+#~ msgstr "Gpg4win ¨Ï¥Îºõ­n¡]HTML¡A¼w»y¡^"
 
-msgctxt "DESC_Name_compendium_en_html"
-msgid "Gpg4win Compendium (html, English)"
-msgstr "Gpg4win ¨Ï¥Îºõ­n¡]HTML¡A­^»y¡^"
+#~ msgctxt "DESC_Name_compendium_en_html"
+#~ msgid "Gpg4win Compendium (html, English)"
+#~ msgstr "Gpg4win ¨Ï¥Îºõ­n¡]HTML¡A­^»y¡^"
 
-msgctxt "DESC_Menu_compendium_de_pdf"
-msgid "Show the Gpg4win Compendium (pdf, German)"
-msgstr "Åã¥Ü Gpg4win ¨Ï¥Îºõ­n¡]PDF¡A¼w»y¡^"
+#~ msgctxt "DESC_Menu_compendium_de_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, German)"
+#~ msgstr "Åã¥Ü Gpg4win ¨Ï¥Îºõ­n¡]PDF¡A¼w»y¡^"
 
-msgctxt "DESC_Menu_compendium_en_pdf"
-msgid "Show the Gpg4win Compendium (pdf, English)"
-msgstr "Åã¥Ü Gpg4win ¨Ï¥Îºõ­n¡]PDF¡A­^»y¡^"
+#~ msgctxt "DESC_Menu_compendium_en_pdf"
+#~ msgid "Show the Gpg4win Compendium (pdf, English)"
+#~ msgstr "Åã¥Ü Gpg4win ¨Ï¥Îºõ­n¡]PDF¡A­^»y¡^"
 
 #~ msgctxt "T_AdminNeeded"
 #~ msgid ""

commit cab20f75e2d14df53098b0535cb6244ebcb6c680
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Nov 16 13:24:49 2017 +0100

    Update NEWS
    
    --

diff --git a/NEWS b/NEWS
index 0c785b4..a75d1dc 100644
--- a/NEWS
+++ b/NEWS
@@ -3,14 +3,55 @@
 # The version number given below are for the standard installers as
 # distributed by www.gpg4win.org.
 
-Noteworthy changes in Version 3.x.x (UNRELEASED)
+Noteworthy changes in Version 3.0.1 (UNRELEASED)
 ------------------------------------------------
 
+(en) GpgOL: A cause for seemingly random crashes in GpgOL has been
+     fixed.
+
+(de) GpgOL: Eine ursache für augenscheinlich zufällige Abstürze
+     von Outlook wurde beseitigt.
+
+(en) GpgOL: A crash when pasting recipients has been fixed.
+
+(de) GpgOL: Ein Absturz wenn Empfänger über einfügen hinzugefügt
+     wurden ist behoben.
+
+(en) GpgOL: Various problems regarding S/MIME mails have been fixed.
+
+(de) GpgOL: Verschiedene Probleme mit S/MIME mails wurden behoben.
+
+(en) GpgOL: A user interface error for Outlook 2010 has been fixed.
+
+(de) GpgOL: Ein Benutzerschnittstellen-Fehler in Outlook 2010 wurde
+     behoben.
+
+(de) Kleopatra: Various problems regarding S/MIME File operations
+     have been fixed.
+
+(en) Kleopatra: Fehler bei S/MIME Dateioperationen wurden behoben.
+
+(de) Kleopatra: Various problems regading folder operations and
+     archives have been fixed.
+
+(en) Kleopatra: Verschiedene Probleme im Umgang mit Dateiordnern
+     und Archiven wurden behoben.
+
+(en) The mkportable process can be used again to create a portable
+     Gpg4win variant.
+
+(de) Der mkportable Prozess kann wieder verwendet werden um einen
+     portable Gpg4win variante zu erstellen.
+
+(en) GnuPG: Has been updated to version 2.2.2.
+
+(de) GnuPG: Wurde auf Version 2.2.2 aktualisiert.
+
 ~~~~~~~~~~~~~~~
 GnuPG:          2.2.2
 Kleopatra:      3.0.0
 GPA:            0.9.9
-GpgOL:          2.0.1
+GpgOL:          2.0.2
 GpgEX:          1.0.5
 Kompendium DE:  4.0.0
 Kompendium EN:  3.0.0

commit d753b39a060ad31dbd32b1a22e361c057e9d1815
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Nov 16 13:23:58 2017 +0100

    Add Patch for GpgOL 2.0.2 regression
    
    * Makefile.am (EXTRA_DIST): Update accordingly.
    * patches/gpgol/0001-Use-table-view-reading-pane-for-OL-2013.patch:
    New.

diff --git a/Makefile.am b/Makefile.am
index 2e18138..53afa5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,8 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch \
         patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch \
         patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
-        patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch
+        patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch \
+        patches/gpgol/0001-Use-table-view-reading-pane-for-OL-2013.patch
 
 copy-news:
 	cp NEWS doc/website/NEWS.last
diff --git a/patches/gpgol/0001-Use-table-view-reading-pane-for-OL-2013.patch b/patches/gpgol/0001-Use-table-view-reading-pane-for-OL-2013.patch
new file mode 100755
index 0000000..cfef04d
--- /dev/null
+++ b/patches/gpgol/0001-Use-table-view-reading-pane-for-OL-2013.patch
@@ -0,0 +1,130 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From 4f9c720433aabc37484bc4f365efc5949f8fa3f0 Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke at intevation.de>
+Date: Thu, 16 Nov 2017 12:43:38 +0100
+Subject: [PATCH] Use table view reading pane for OL <= 2013
+
+* src/explorer-events.cpp (EVENT_SINK_INVOKE),
+src/ribbon-callbacks.cpp (get_mail_from_control): Check
+version to determine codepath.
+
+--
+The crash only appeared on Outlook 2016. Older Versions
+don't have the previewPane object. So we need to have
+a fallback.
+---
+ src/explorer-events.cpp  | 42 +++++++++++++++++++++++-------------------
+ src/ribbon-callbacks.cpp | 26 +++++++++++++++++++++++++-
+ 2 files changed, 48 insertions(+), 20 deletions(-)
+
+diff --git a/src/explorer-events.cpp b/src/explorer-events.cpp
+index 1529a88..8ed0784 100644
+--- a/src/explorer-events.cpp
++++ b/src/explorer-events.cpp
+@@ -82,34 +82,38 @@ EVENT_SINK_INVOKE(ExplorerEvents)
+         {
+           log_oom_extra ("%s:%s: Selection change in explorer: %p",
+                          SRCNAME, __func__, this);
+-#if 0
+-          Somehow latest Outlook 2016 crashes when accessing the current view
++          /* Somehow latest Outlook 2016 crashes when accessing the current view
+           of the Explorer. This is even reproducible with
+           GpgOL disabled and only with Outlook Spy active. If you select
+           the explorer of an Outlook.com resource and then access
+           the CurrentView and close the CurrentView again in Outlook Spy
+-          outlook crashes.
++          outlook crashes. */
+
+-          LPDISPATCH tableView = get_oom_object (m_object, "CurrentView");
+-          if (!tableView)
+-            {
+-              TRACEPOINT;
+-              break;
+-            }
+-          int hasReadingPane = get_oom_bool (tableView, "ShowReadingPane");
+-          gpgol_release (tableView);
+-          if (!hasReadingPane)
++          if (g_ol_version_major <= 15)
+             {
+-              break;
++              LPDISPATCH tableView = get_oom_object (m_object, "CurrentView");
++              if (!tableView)
++                {
++                  TRACEPOINT;
++                  break;
++                }
++              int hasReadingPane = get_oom_bool (tableView, "ShowReadingPane");
++              gpgol_release (tableView);
++              if (!hasReadingPane)
++                {
++                  break;
++                }
+             }
+-#else
+-          LPDISPATCH prevEdit = get_oom_object (m_object, "PreviewPane.WordEditor");
+-          gpgol_release (prevEdit);
+-          if (!prevEdit)
++          else
+             {
+-              break;
++              LPDISPATCH prevEdit = get_oom_object (m_object, "PreviewPane.WordEditor");
++              gpgol_release (prevEdit);
++              if (!prevEdit)
++                {
++                  break;
++                }
+             }
+-#endif
++
+           HANDLE thread = CreateThread (NULL, 0, invalidate_ui, (LPVOID) this, 0,
+                                         NULL);
+
+diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
+index c2a78d1..f787622 100644
+--- a/src/ribbon-callbacks.cpp
++++ b/src/ribbon-callbacks.cpp
+@@ -1463,7 +1463,7 @@ get_mail_from_control (LPDISPATCH ctrl, bool *none_selected)
+         {
+           *none_selected = true;
+         }
+-      else
++      else if (g_ol_version_major >= 16)
+         {
+           // Avoid showing wrong crypto state if we don't have a reading
+           // pane. In that case the parser will finish for a mail which is gone
+@@ -1477,6 +1477,30 @@ get_mail_from_control (LPDISPATCH ctrl, bool *none_selected)
+               mailitem = nullptr;
+             }
+         }
++      else
++        {
++          // Preview Pane is not available in older outlooks
++          LPDISPATCH tableView = get_oom_object (context, "CurrentView");
++          if (!tableView)
++            {
++              // Woops, should not happen.
++              TRACEPOINT;
++              *none_selected = true;
++              gpgol_release (mailitem);
++              mailitem = nullptr;
++            }
++          else
++            {
++              int hasReadingPane = get_oom_bool (tableView, "ShowReadingPane");
++              gpgol_release (tableView);
++              if (!hasReadingPane)
++                {
++                  *none_selected = true;
++                  gpgol_release (mailitem);
++                  mailitem = nullptr;
++                }
++            }
++        }
+     }
+
+   gpgol_release (context);
+--
+2.11.0

commit 1d1db85250663aecbd0c939f799f9d4d6ce2ebb5
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Nov 16 13:21:58 2017 +0100

    Update packages
    
    * packages/packages.current (gpgol, libgpg-error)
    (libassuan, gpgme, kleopatra, kde-l10n): Update.
    (gnupg-w32): Add patched version of 2.2.2.
    
    --
    The GnuPG-w32 Patches are all applied upstream to the
    2.2 branch of GnuPG.

diff --git a/packages/packages.current b/packages/packages.current
index 683f8b7..a6d45d5 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -238,8 +238,8 @@ server http://files.gpg4win.org/src
 # last-changed: 2017-09-12
 # by: ah
 # verified: Sig 5B80 C575 4298 F0CB  55D8 ED6A BCEF 7E29 4B09 2E28
-file gpgol/gpgol-2.0.1.tar.bz2
-chk  0872f2f6d11b6b9d227f460a86fa8ae00d18eba812f36a4ed94a1663fe49f74b
+file gpgol/gpgol-2.0.2.tar.bz2
+chk  4f378e4e18523bb378ac0d627a59415085fd4394793b6fed11c684f20ef1fba6
 
 #
 # GpgEX
@@ -281,23 +281,23 @@ server ftp://ftp.gnupg.org/gcrypt
 
 # last-changed: 2016-11-14
 # by: ah
-file libgpg-error/libgpg-error-1.25.tar.bz2
-chk  f628f75843433b38b05af248121beb7db5bd54bb2106f384edac39934261320c
+file libgpg-error/libgpg-error-1.27.tar.bz2
+chk  4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
 
 # last-changed: 2016-07-22
 # by: ah
-file libassuan/libassuan-2.4.3.tar.bz2
-chk  22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71
+file libassuan/libassuan-2.4.4.tar.bz2
+chk  9e69a102272324de0bb56025779f84fd44901afcc6eac51505f6a63ea5737ca1
 
 # last changed: 2017-11-07
 # by: js
-name gnupg-w32-2.2.2-20171107-bin.exe
-file binary/gnupg-w32-2.2.2_20171107.exe
-chk  846477967a8cb934438ecbb6c8032c19e652c1d31d772fe02e9e40555e2f68ea
+#name gnupg-w32-2.2.2-20171107-bin.exe
+#file binary/gnupg-w32-2.2.2_20171107.exe
+#chk  846477967a8cb934438ecbb6c8032c19e652c1d31d772fe02e9e40555e2f68ea
 
-name gnupg-w32-2.2.2-20171107-src.tar.xz
-file binary/gnupg-w32-2.2.2_20171107.tar.xz
-chk  fe515ef3245154a03787c6b87d6439e30d2772a4e83baa725f192da7d0bcd2bd
+#name gnupg-w32-2.2.2-20171107-src.tar.xz
+#file binary/gnupg-w32-2.2.2_20171107.tar.xz
+#chk  fe515ef3245154a03787c6b87d6439e30d2772a4e83baa725f192da7d0bcd2bd
 
 # last changed: 2016-01-17
 # by: ah
@@ -514,18 +514,21 @@ chk 40c874c98c0eb0c76e9a5015aab5d5ed791c1e0bed138f412fb496031e80eb3f
 server http://files.intevation.de/projects/gpg4all
 
 # by: ah
-file gpgme/gpgme-1.10.0-beta75.tar.bz2
-chk  1aecd6b22507f6b0c27afe6dc6f6d3fa4c813bbaef46199a9e4ac7f7359aef89
+file gpgme/gpgme-1.10.0-beta80.tar.bz2
+chk  8ce467c5f72543a025197b8aeac9b6476db14b70401302491af9ccb1e0bf48d2
 
-# Switched back to stable
-# GnuPG 2.2.x branch
-#name gnupg-w32-2.2.1-beta9-20170912-bin.exe
-#file gnupg/gnupg-w32-2.2.1-beta9_20170912.exe
-#chk  25486bfdf0913f309eff167d55078f8169ee9e6a8ac3334999d9489c3849d4d4
+# Switch back to stable on next release
+# GnuPG 2.2.2 Patched with git revs:
+# 5ecef193bc2144e6d51a6bd5727bfd08a0d28b66 (kbx corruption)
+# 878b8bfdcc3a8becfc46b9287a2d14cd3c875f28 (gpgtar file names)
+# 4f5afaf1fdb5cb13859aca390ccb5a1ba1dba00c (registry access)
+name gnupg-w32-2.2.2-20171116-bin.exe
+file gnupg/gnupg-w32-2.2.2_20171116.exe
+chk  1e900099346919944e9c0c29a275f2fdaa9c544ea81ef12731e19bffef7a6d8e
 
-#name gnupg-w32-2.2.1-beta9-20170912-src.tar.xz
-#file gnupg/gnupg-w32-2.2.1-beta9_20170912.tar.xz
-#chk  8d55c4d5ecc570e4d56c3cad2b8a88f49cd9f6b797efb0cc6978b37f2f27bf2f
+name gnupg-w32-2.2.2-20171116-src.tar.xz
+file gnupg/gnupg-w32-2.2.2_20171116.tar.xz
+chk  b87c67f07b5dd2dc375adf9d6026add22c0703efcc0b4640d379fc02180b68fc
 
 # Libkleo
 # last changed: see package date.
@@ -538,16 +541,16 @@ chk 4923b327005eaec0f75ce3411c80d2ff23a92a162d2285b8bb7366a280d320e1
 # last changed: see package date.
 # by: ah
 # verified: Tarball created by ah with script kde-l10n.sh
-file kde-l10n/kde-l10n-201708221602-bin.tar.xz
-chk e43d329e80a5a0b19d3de46ddba629e6f221aa6be3a6480477e8fd118e7f1b94
+file kde-l10n/kde-l10n-201711161035-bin.tar.xz
+chk e8e175b6fced87f28dc1fc66cad88df6e0794df631350102e9d4b39512efe613
 
 
-file kde-l10n/kde-l10n-201708221602-src.tar.xz
-chk 2606958008a06b5bcb2de9e0c237f3ffa2e132ca025c4393e1cba8bcfe7a64be
+file kde-l10n/kde-l10n-201711161035-src.tar.xz
+chk 1d27bcbf9b01c1568ea11d8b9d870b3afed8b1f3f3251d402394790c8779c6b6
 
 # Kleopatra
 # last changed: see package date.
 # by: ah
 # verified: Tarball created by ah.
-file kleopatra/kleopatra-201709081511.tar.gz
-chk 33414563567050e19f8f1921623fd7186072802ad087ff0f168ab0adda9ed558
+file kleopatra/kleopatra-201711161242.tar.gz
+chk 25913fdf99aec23262258c13180b72d4e236e97676a5b5f630492a91fc387acc

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

Summary of changes:
 Makefile.am                                        |   3 +-
 NEWS                                               |  49 +++++++-
 doc/README.de.txt                                  |  78 +++----------
 doc/README.en.txt                                  |  71 ++---------
 packages/packages.current                          |  59 +++++-----
 ...1-Use-table-view-reading-pane-for-OL-2013.patch | 130 +++++++++++++++++++++
 po/ar.po                                           |  67 ++++++-----
 po/cz.po                                           |  67 ++++++-----
 po/de.po                                           |  59 +++++-----
 po/es.po                                           |  51 +++-----
 po/fr.po                                           |  67 ++++++-----
 po/it.po                                           |  67 ++++++-----
 po/no.po                                           |  67 ++++++-----
 po/pt.po                                           |  71 ++++++-----
 po/ru.po                                           |  67 ++++++-----
 po/zh_CN.po                                        |  67 ++++++-----
 po/zh_TW.po                                        |  67 ++++++-----
 17 files changed, 619 insertions(+), 488 deletions(-)
 create mode 100755 patches/gpgol/0001-Use-table-view-reading-pane-for-OL-2013.patch


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



More information about the Gpg4win-commits mailing list