[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-253-g1a7f2ba

Fri Jun 9 13:12:36 CEST 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  1a7f2ba61dda5edeb82a90c7b9fdb079902b6233 (commit)
       via  2c2fd7931c9db306c99098ac233945fbfb0203b3 (commit)
       via  527038efba3408289ce815a915001d6b148350b5 (commit)
       via  ab144aa35f77270ed2753c72bf00a9b245c1f7f8 (commit)
      from  cc2314bdc07fee57109374a4d32b8cd5b6ac36a7 (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 1a7f2ba61dda5edeb82a90c7b9fdb079902b6233
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jun 9 13:12:03 2017 +0200

    Fix source installer build after Multiuser change
    
    * src/installer.nsi: Fix build of source installer.

diff --git a/src/installer.nsi b/src/installer.nsi
index 040d3ff..6754029 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -30,6 +30,7 @@
 !macroend
 !endif
 
+!include "FileFunc.nsh"
 !include "WinMessages.nsh"
 !include "WinVer.nsh"
 
@@ -313,6 +314,7 @@ FunctionEnd
 
 # Check whether one of the other GnuPG systems has already been
 # installed.  We do this by looking at the registry.
+!ifndef SOURCES
 Function CheckOtherGnuPGApps
   StrCpy $OtherGnuPGDetected ""
   ClearErrors
@@ -339,6 +341,7 @@ Function CheckOtherGnuPGApps
 
 
 FunctionEnd
+!endif
 
 # Check whether gpg4win has already been installed.  This is called as
 # a leave function from the directory page.  A call to abort will get
@@ -670,7 +673,7 @@ Function .onInit
 
   Delete $TEMP\gpgspltmp.bmp
   # Note that we delete gpgspltmp.wav in .onInst{Failed,Success}
-!endif
+!else
   ${GetParameters} $R0
   ClearErrors
   ${GetOptions} $R0 /MINIMAL= $is_minimal
@@ -687,6 +690,7 @@ Function .onInit
   goto initDone
 unmodified:
   !insertmacro MULTIUSER_INIT
+!endif
 initDone:
   # Enable this to force a language selection dialog on every run (the
   # preferred language is the default).  Otherwise, the preferred
@@ -704,12 +708,16 @@ ${Endif}
   ${MementoSectionRestore}
   Call CalcDefaults
   Call CalcDepends
+!ifndef SOURCES
   Call CheckOtherGnuPGApps
+!endif
 FunctionEnd
 
 
 Function un.onInit
+!ifndef SOURCES
   !insertmacro MULTIUSER_UNINIT
+!endif
   # Remove the language preference.
   !insertmacro MUI_UNGETLANGUAGE
 FunctionEnd

commit 2c2fd7931c9db306c99098ac233945fbfb0203b3
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jun 9 13:11:22 2017 +0200

    Use builtin libpng for qt
    
    --

diff --git a/src/Makefile.am b/src/Makefile.am
index 9ff5b27..d4de923 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -300,7 +300,7 @@ gpg4win_pkg_qtbase_configure = ../$$$${pkg_version}/configure -opensource \
             -no-sql-psql \
             -no-sql-tds \
             -qt-zlib \
-            -system-libpng \
+            -qt-libpng \
             -qt-libjpeg \
             -qt-freetype \
             -qt-pcre \

commit 527038efba3408289ce815a915001d6b148350b5
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jun 9 13:10:37 2017 +0200

    Auto: Update PO files
    
    * po/*: Update.

diff --git a/po/ar.po b/po/ar.po
index 229ed4d..bd3fdeb 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -250,10 +250,13 @@ msgid ""
 "production environment."
 msgstr ""
 
-msgctxt "T_AdminNeeded"
+msgctxt "T_AdminWanted"
 msgid ""
-"Warning: Administrator permissions required for a successful installation"
-msgstr "ÊÍÐíÑ: ÊÍÊÇÌ Åáì ÕáÇÍíÇÊ ÇáãÏíÑ áÅÊãÇã ÇáÊËÈíÊ"
+"Warning: It is recommended to install Gpg4win system-wide with administrator "
+"rights.\n"
+"\n"
+"Do you want to continue installing Gpg4win without administrator rights?"
+msgstr ""
 
 #, fuzzy
 msgctxt "T_CloseOtherApps"
@@ -281,6 +284,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
+msgctxt "T_XPisDeprecated"
+msgid ""
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version."
+msgstr ""
+
 msgctxt "T_Installing_GnuPG"
 msgid "Installing GnuPG"
 msgstr ""
@@ -377,6 +386,11 @@ msgctxt "DESC_Menu_compendium_en_pdf"
 msgid "Show the Gpg4win Compendium (pdf, English)"
 msgstr "ÇÚÑÖ Ïáíá Gpg4Win Úáì ÇáæÈ ááãÓÊÎÏãíä ÇáãÈÊÏÆíä"
 
+#~ msgctxt "T_AdminNeeded"
+#~ msgid ""
+#~ "Warning: Administrator permissions required for a successful installation"
+#~ msgstr "ÊÍÐíÑ: ÊÍÊÇÌ Åáì ÕáÇÍíÇÊ ÇáãÏíÑ áÅÊãÇã ÇáÊËÈíÊ"
+
 #~ msgctxt "T_RunKeyManager"
 #~ msgid "Run the key manager"
 #~ msgstr "ÔÛøá ãÏíÑ ÇáãÝÇÊíÍ"
diff --git a/po/cz.po b/po/cz.po
index be8b39c..9490c12 100644
--- a/po/cz.po
+++ b/po/cz.po
@@ -256,10 +256,13 @@ msgstr ""
 "Beta verze jsou urèeny pouze pro testování a nemìly by být použity v "
 "produkèním prostøedí."
 
-msgctxt "T_AdminNeeded"
+msgctxt "T_AdminWanted"
 msgid ""
-"Warning: Administrator permissions required for a successful installation"
-msgstr "Upozornìní: Pro úspìšnou instalaci jsou vyžadována práva Administrátora."
+"Warning: It is recommended to install Gpg4win system-wide with administrator "
+"rights.\n"
+"\n"
+"Do you want to continue installing Gpg4win without administrator rights?"
+msgstr ""
 
 msgctxt "T_CloseOtherApps"
 msgid ""
@@ -287,6 +290,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
+msgctxt "T_XPisDeprecated"
+msgid ""
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version."
+msgstr ""
+
 msgctxt "T_Installing_GnuPG"
 msgid "Installing GnuPG"
 msgstr ""
@@ -379,6 +388,12 @@ msgctxt "DESC_Menu_compendium_en_pdf"
 msgid "Show the Gpg4win Compendium (pdf, English)"
 msgstr "Ukázat Gpg4win Compendium (pdf, anglicky)"
 
+#~ msgctxt "T_AdminNeeded"
+#~ msgid ""
+#~ "Warning: Administrator permissions required for a successful installation"
+#~ msgstr ""
+#~ "Upozornìní: Pro úspìšnou instalaci jsou vyžadována práva Administrátora."
+
 #~ msgctxt "T_RunKeyManager"
 #~ msgid "Run the key manager"
 #~ msgstr "Spustit manažer klíèù"
diff --git a/po/de.po b/po/de.po
index 629d7a7..e9889e8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -305,12 +305,13 @@ msgstr ""
 "\n"
 "  http://www.gpg4win.de/download-de.html  "
 
-msgctxt "T_AdminNeeded"
+msgctxt "T_AdminWanted"
 msgid ""
-"Warning: Administrator permissions required for a successful installation"
+"Warning: It is recommended to install Gpg4win system-wide with administrator "
+"rights.\n"
+"\n"
+"Do you want to continue installing Gpg4win without administrator rights?"
 msgstr ""
-"Achtung: Für eine erfolgreiche Installation werden Administratorrechte "
-"benötigt."
 
 msgctxt "T_CloseOtherApps"
 msgid ""
@@ -350,6 +351,12 @@ msgstr ""
 "\n"
 "Claws Mail aus Gpg4win jetzt deinstallieren?"
 
+msgctxt "T_XPisDeprecated"
+msgid ""
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version."
+msgstr ""
+
 msgctxt "T_Installing_GnuPG"
 msgid "Installing GnuPG"
 msgstr ""
@@ -448,6 +455,13 @@ msgctxt "DESC_Menu_compendium_en_pdf"
 msgid "Show the Gpg4win Compendium (pdf, English)"
 msgstr "Gpg4win-Kompendium (pdf, englisch)"
 
+#~ msgctxt "T_AdminNeeded"
+#~ msgid ""
+#~ "Warning: Administrator permissions required for a successful installation"
+#~ msgstr ""
+#~ "Achtung: Für eine erfolgreiche Installation werden Administratorrechte "
+#~ "benötigt."
+
 #~ msgctxt "T_RunKeyManager"
 #~ msgid "Run the key manager"
 #~ msgstr "Die Schlüsselverwaltung aufrufen"
diff --git a/po/es.po b/po/es.po
index cf92be3..4cdcd2f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -254,11 +254,13 @@ msgid ""
 "production environment."
 msgstr ""
 
-msgctxt "T_AdminNeeded"
+msgctxt "T_AdminWanted"
 msgid ""
-"Warning: Administrator permissions required for a successful installation"
+"Warning: It is recommended to install Gpg4win system-wide with administrator "
+"rights.\n"
+"\n"
+"Do you want to continue installing Gpg4win without administrator rights?"
 msgstr ""
-"Advertencia: Necesita permisos de administrador para una instalación exitosa."
 
 #, fuzzy
 msgctxt "T_CloseOtherApps"
@@ -288,6 +290,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
+msgctxt "T_XPisDeprecated"
+msgid ""
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version."
+msgstr ""
+
 msgctxt "T_Installing_GnuPG"
 msgid "Installing GnuPG"
 msgstr ""
@@ -377,6 +385,13 @@ msgctxt "DESC_Menu_compendium_en_pdf"
 msgid "Show the Gpg4win Compendium (pdf, English)"
 msgstr ""
 
+#~ msgctxt "T_AdminNeeded"
+#~ msgid ""
+#~ "Warning: Administrator permissions required for a successful installation"
+#~ msgstr ""
+#~ "Advertencia: Necesita permisos de administrador para una instalación "
+#~ "exitosa."
+
 #~ msgctxt "T_RunKeyManager"
 #~ msgid "Run the key manager"
 #~ msgstr "Ejecutar el gestor de llaves"
diff --git a/po/fr.po b/po/fr.po
index d8082de..ddd087a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -259,10 +259,13 @@ msgstr ""
 "Les versions bêta sont uniquement prévues pour être testées, elles ne "
 "doivent pas être utilisées dans un environnement de production."
 
-msgctxt "T_AdminNeeded"
+msgctxt "T_AdminWanted"
 msgid ""
-"Warning: Administrator permissions required for a successful installation"
-msgstr "Avertissement : l'installation requiert des droits d'administrateur"
+"Warning: It is recommended to install Gpg4win system-wide with administrator "
+"rights.\n"
+"\n"
+"Do you want to continue installing Gpg4win without administrator rights?"
+msgstr ""
 
 msgctxt "T_CloseOtherApps"
 msgid ""
@@ -292,6 +295,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
+msgctxt "T_XPisDeprecated"
+msgid ""
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version."
+msgstr ""
+
 msgctxt "T_Installing_GnuPG"
 msgid "Installing GnuPG"
 msgstr ""
@@ -380,6 +389,11 @@ 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 ""
+#~ "Warning: Administrator permissions required for a successful installation"
+#~ msgstr "Avertissement : l'installation requiert des droits d'administrateur"
+
 #~ msgctxt "T_RunKeyManager"
 #~ msgid "Run the key manager"
 #~ msgstr "Lancer le gestionnaire de clés"
diff --git a/po/it.po b/po/it.po
index 6ec0771..c2dadad 100644
--- a/po/it.po
+++ b/po/it.po
@@ -260,12 +260,13 @@ msgstr ""
 "Le versioni beta sono intese soltanto per le prove e non dovrebbero essere "
 "utilizzate in un ambiente di produzione."
 
-msgctxt "T_AdminNeeded"
+msgctxt "T_AdminWanted"
 msgid ""
-"Warning: Administrator permissions required for a successful installation"
+"Warning: It is recommended to install Gpg4win system-wide with administrator "
+"rights.\n"
+"\n"
+"Do you want to continue installing Gpg4win without administrator rights?"
 msgstr ""
-"Avvertenza: Sono necessari i permessi di amministratore per la riuscita "
-"dell'installazione"
 
 msgctxt "T_CloseOtherApps"
 msgid ""
@@ -293,6 +294,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
+msgctxt "T_XPisDeprecated"
+msgid ""
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version."
+msgstr ""
+
 msgctxt "T_Installing_GnuPG"
 msgid "Installing GnuPG"
 msgstr ""
@@ -381,6 +388,13 @@ 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 ""
+#~ "Warning: Administrator permissions required for a successful installation"
+#~ msgstr ""
+#~ "Avvertenza: Sono necessari i permessi di amministratore per la riuscita "
+#~ "dell'installazione"
+
 #~ msgctxt "T_RunKeyManager"
 #~ msgid "Run the key manager"
 #~ msgstr "Esegui l'amministratore delle chiavi"
diff --git a/po/no.po b/po/no.po
index 007bd52..16fb22d 100644
--- a/po/no.po
+++ b/po/no.po
@@ -256,11 +256,13 @@ msgstr ""
 "Beta versjons er beregnet på testmiljø og bør ikke brukes i produksjonsmiljø"
 "er."
 
-msgctxt "T_AdminNeeded"
+msgctxt "T_AdminWanted"
 msgid ""
-"Warning: Administrator permissions required for a successful installation"
+"Warning: It is recommended to install Gpg4win system-wide with administrator "
+"rights.\n"
+"\n"
+"Do you want to continue installing Gpg4win without administrator rights?"
 msgstr ""
-"Advarsel: Administratorrettigheter kreves for å fullføre installasjonen"
 
 msgctxt "T_CloseOtherApps"
 msgid ""
@@ -294,6 +296,12 @@ msgstr ""
 "installere en oppdatert versjon fra: http://www.claws-mail.org/win32 Vil du "
 "avinstallere 'Claws Mail' fra Gpg4win nå?"
 
+msgctxt "T_XPisDeprecated"
+msgid ""
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version."
+msgstr ""
+
 msgctxt "T_Installing_GnuPG"
 msgid "Installing GnuPG"
 msgstr "Installerer GnuPG"
@@ -379,6 +387,12 @@ msgctxt "DESC_Menu_compendium_en_pdf"
 msgid "Show the Gpg4win Compendium (pdf, English)"
 msgstr "Vis Gpg4win Compendium (pdf, Engelsk)"
 
+#~ msgctxt "T_AdminNeeded"
+#~ msgid ""
+#~ "Warning: Administrator permissions required for a successful installation"
+#~ msgstr ""
+#~ "Advarsel: Administratorrettigheter kreves for å fullføre installasjonen"
+
 #, fuzzy
 #~ msgctxt "T_RunKeyManager"
 #~ msgid "Run the key manager"
diff --git a/po/pt.po b/po/pt.po
index 706f799..9ad8f74 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -258,12 +258,13 @@ msgstr ""
 "As versões beta são apenas destinadas para testes e não devem ser utilizadas "
 "num ambiente de produção."
 
-msgctxt "T_AdminNeeded"
+msgctxt "T_AdminWanted"
 msgid ""
-"Warning: Administrator permissions required for a successful installation"
+"Warning: It is recommended to install Gpg4win system-wide with administrator "
+"rights.\n"
+"\n"
+"Do you want to continue installing Gpg4win without administrator rights?"
 msgstr ""
-"Aviso: São necessárias permissões de Administrador para uma instalação bem-"
-"sucedida."
 
 msgctxt "T_CloseOtherApps"
 msgid ""
@@ -301,6 +302,12 @@ msgstr ""
 "\n"
 "Desinstalar o Claws Mail do Gpg4win agora?"
 
+msgctxt "T_XPisDeprecated"
+msgid ""
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version."
+msgstr ""
+
 msgctxt "T_Installing_GnuPG"
 msgid "Installing GnuPG"
 msgstr "Instalar o GnuPG"
@@ -385,6 +392,13 @@ 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 ""
+#~ "Warning: Administrator permissions required for a successful installation"
+#~ msgstr ""
+#~ "Aviso: São necessárias permissões de Administrador para uma instalação "
+#~ "bem-sucedida."
+
 #~ msgctxt "T_FoundExistingVersionB"
 #~ msgid ""
 #~ "A version of Gpg4Win has already been installed on the system. There will "
diff --git a/po/ru.po b/po/ru.po
index 302fea3..4342927 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -258,10 +258,13 @@ msgid ""
 "production environment."
 msgstr ""
 
-msgctxt "T_AdminNeeded"
+msgctxt "T_AdminWanted"
 msgid ""
-"Warning: Administrator permissions required for a successful installation"
-msgstr "Äëÿ óñïåøíîé óñòàíîâêè òðåáóþòñÿ ïðàâà àäìèíèñòðàòîðà"
+"Warning: It is recommended to install Gpg4win system-wide with administrator "
+"rights.\n"
+"\n"
+"Do you want to continue installing Gpg4win without administrator rights?"
+msgstr ""
 
 msgctxt "T_CloseOtherApps"
 msgid ""
@@ -289,6 +292,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
+msgctxt "T_XPisDeprecated"
+msgid ""
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version."
+msgstr ""
+
 msgctxt "T_Installing_GnuPG"
 msgid "Installing GnuPG"
 msgstr ""
@@ -385,6 +394,11 @@ msgctxt "DESC_Menu_compendium_en_pdf"
 msgid "Show the Gpg4win Compendium (pdf, English)"
 msgstr "Ïîêàçàòü îíëàéíîâûå èíñòðóêöèè Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ"
 
+#~ msgctxt "T_AdminNeeded"
+#~ msgid ""
+#~ "Warning: Administrator permissions required for a successful installation"
+#~ msgstr "Äëÿ óñïåøíîé óñòàíîâêè òðåáóþòñÿ ïðàâà àäìèíèñòðàòîðà"
+
 #~ msgctxt "T_RunKeyManager"
 #~ msgid "Run the key manager"
 #~ msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ae4ee73..25b3041 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -242,10 +242,13 @@ msgstr ""
 "\n"
 "Beta °æ±¾ÓÃÓÚ²âÊÔ£¬²»Ó¦ÔÚÉú²ú»·¾³Ê¹ÓÃ¡£"
 
-msgctxt "T_AdminNeeded"
+msgctxt "T_AdminWanted"
 msgid ""
-"Warning: Administrator permissions required for a successful installation"
-msgstr "¾¯¸æ£ºÐèÒª¹ÜÀíÔ±È¨ÏÞ²ÅÄÜ³É¹¦°²×°¡£"
+"Warning: It is recommended to install Gpg4win system-wide with administrator "
+"rights.\n"
+"\n"
+"Do you want to continue installing Gpg4win without administrator rights?"
+msgstr ""
 
 msgctxt "T_CloseOtherApps"
 msgid ""
@@ -272,6 +275,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
+msgctxt "T_XPisDeprecated"
+msgid ""
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version."
+msgstr ""
+
 msgctxt "T_Installing_GnuPG"
 msgid "Installing GnuPG"
 msgstr ""
@@ -358,6 +367,11 @@ msgctxt "DESC_Menu_compendium_en_pdf"
 msgid "Show the Gpg4win Compendium (pdf, English)"
 msgstr "ÏÔÊ¾ Gpg4win Ê¹ÓÃ¸ÙÒª£¨PDF£¬Ó¢Óï£©"
 
+#~ msgctxt "T_AdminNeeded"
+#~ msgid ""
+#~ "Warning: Administrator permissions required for a successful installation"
+#~ msgstr "¾¯¸æ£ºÐèÒª¹ÜÀíÔ±È¨ÏÞ²ÅÄÜ³É¹¦°²×°¡£"
+
 #~ msgctxt "T_RunKeyManager"
 #~ msgid "Run the key manager"
 #~ msgstr "ÔËÐÐÃÜÔ¿¹ÜÀíÆ÷"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4ea49eb..f708e95 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -242,10 +242,13 @@ msgstr ""
 "\n"
 "Beta ª©¥»¥Î©ó´ú¸Õ¡A¤£À³¦b¥Í²£Àô¹Ò¨Ï¥Î¡C"
 
-msgctxt "T_AdminNeeded"
+msgctxt "T_AdminWanted"
 msgid ""
-"Warning: Administrator permissions required for a successful installation"
-msgstr "Äµ§i¡G»ÝnºÞ²zû³\¥iÅv¤~¯à¦¨¥\¦w¸Ë¡C"
+"Warning: It is recommended to install Gpg4win system-wide with administrator "
+"rights.\n"
+"\n"
+"Do you want to continue installing Gpg4win without administrator rights?"
+msgstr ""
 
 msgctxt "T_CloseOtherApps"
 msgid ""
@@ -272,6 +275,12 @@ msgid ""
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
 
+msgctxt "T_XPisDeprecated"
+msgid ""
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
+"Support for them may be removed in a future version."
+msgstr ""
+
 msgctxt "T_Installing_GnuPG"
 msgid "Installing GnuPG"
 msgstr ""
@@ -358,6 +367,11 @@ msgctxt "DESC_Menu_compendium_en_pdf"
 msgid "Show the Gpg4win Compendium (pdf, English)"
 msgstr "Åã¥Ü Gpg4win ¨Ï¥Îºõn¡]PDF¡A^»y¡^"
 
+#~ msgctxt "T_AdminNeeded"
+#~ msgid ""
+#~ "Warning: Administrator permissions required for a successful installation"
+#~ msgstr "Äµ§i¡G»ÝnºÞ²zû³\¥iÅv¤~¯à¦¨¥\¦w¸Ë¡C"
+
 #~ msgctxt "T_RunKeyManager"
 #~ msgid "Run the key manager"
 #~ msgstr "°õ¦æª÷Æ_ºÞ²z¾¹"

commit ab144aa35f77270ed2753c72bf00a9b245c1f7f8
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jun 9 13:09:29 2017 +0200

    Update GnuPG and GpgME to unreleased versions
    
    * packages/packages.current (gnupg, gpgme): Update to current master.

diff --git a/packages/packages.current b/packages/packages.current
index 11e5a83..6d423a2 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -295,23 +295,24 @@ chk  22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71
 
 # last changed: 2017-04-18
 # by: ah
-name gnupg-w32-2.1.20-20170403-bin.exe
-file binary/gnupg-w32-2.1.20_20170403.exe
-chk  e99ded9c749da2d29cb3fc531ceccb04009f61f263cc76a3bf7ab5c95d93b75f
+# TODO switch back to released version
+#name gnupg-w32-2.1.20-20170403-bin.exe
+#file binary/gnupg-w32-2.1.20_20170403.exe
+#chk  e99ded9c749da2d29cb3fc531ceccb04009f61f263cc76a3bf7ab5c95d93b75f
 
-name gnupg-w32-2.1.20-20170403-src.tar.xz
-file binary/gnupg-w32-2.1.20_20170403.tar.xz
-chk  c8cc121e0e42e55aa9099f687e2f5a1726f10b243253810bc0157afefe77c309
+#name gnupg-w32-2.1.20-20170403-src.tar.xz
+#file binary/gnupg-w32-2.1.20_20170403.tar.xz
+#chk  c8cc121e0e42e55aa9099f687e2f5a1726f10b243253810bc0157afefe77c309
 
 # last changed: 2016-01-17
 # by: ah
 file pinentry/pinentry-1.0.0.tar.bz2
 chk  1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a
 
-# last changed: 2017-03-28
+# TODO switch back to released version
 # by: ah
-file gpgme/gpgme-1.9.0.tar.bz2
-chk  1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
+#file gpgme/gpgme-1.9.0.tar.bz2
+#chk  1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
 
 # last changed: 2017-01-04
 # by: ah
@@ -516,6 +517,16 @@ server http://files.intevation.de/projects/gpg4all
 file gpgol/gpgol-2.0.0-beta259.tar.bz2
 chk f89a57cc57124e2bd4e506c4b26c8ca2ee4f7c3a8b987b0816762ea57251a8bf
 
+file gpgme/gpgme-1.9.1-beta42.tar.bz2
+chk  8ffec90a9f4db222e7dd76b29c2fcd5b169cc074cbad8dcb1c66a31794cf324f
+
+name gnupg-w32-2.1.22-beta30-20170606-bin.exe
+file gnupg/gnupg-w32-2.1.22-beta30_20170606.exe
+chk  a3829fc30ddeeeff48e05ed16f81910c282b8ebfc4c6f7985508a1c4a295ac97
+
+name gnupg-w32-2.1.22-beta30-20170606-src.tar.xz
+file gnupg/gnupg-w32-2.1.22-beta30_20170606.tar.xz
+chk  1b504eb36f38066d660fb804fe1f171d14982e928cf998a284458e05df48b69b
 
 # Libkleo
 # last changed: see package date.

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

Summary of changes:
 packages/packages.current | 29 ++++++++++++++++++++---------
 po/ar.po                  | 20 +++++++++++++++++---
 po/cz.po                  | 21 ++++++++++++++++++---
 po/de.po                  | 22 ++++++++++++++++++----
 po/es.po                  | 21 ++++++++++++++++++---
 po/fr.po                  | 20 +++++++++++++++++---
 po/it.po                  | 22 ++++++++++++++++++----
 po/no.po                  | 20 +++++++++++++++++---
 po/pt.po                  | 22 ++++++++++++++++++----
 po/ru.po                  | 20 +++++++++++++++++---
 po/zh_CN.po               | 20 +++++++++++++++++---
 po/zh_TW.po               | 20 +++++++++++++++++---
 src/Makefile.am           |  2 +-
 src/installer.nsi         | 10 +++++++++-
 14 files changed, 222 insertions(+), 47 deletions(-)


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

