[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.0.0-14-gdfaaae7
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Nov 10 15:38:34 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 dfaaae781616a81a622b1c17b79dbd11d3909e80 (commit)
via 21b0b6aeb2c0f91449378e56f42af093f1b3b4aa (commit)
via 181b76fa0186eeb625a845e06dd215c22c4ac6a6 (commit)
from bab26a58c600b07ffb553c360e3b24a91f6a62b6 (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 dfaaae781616a81a622b1c17b79dbd11d3909e80
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Nov 10 15:36:27 2017 +0100
Disable Kleo and Qt for < Win7
* src/inst-sections.nsi: Unselect kleo/qt and select gpa
based on windows version.
* src/installer.nsi: Update warning message.
--
Qt no longer supports Vista or earlier versions. So let's
use GPA on these versions.
GnuPG-Bug-Id: T3434
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index e7ce303..d057f3b 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -738,6 +738,11 @@ Function CalcDepends
# This drags in all the other KDE and Qt stuff.
!insertmacro SelectSection ${SEC_kleopatra}
skip_kleopatra:
+ ${IfNot} ${AtLeastWin7}
+ # Disable Kleo for Windows below 7
+ SectionSetFlags ${SEC_kleopatra} 16
+ !insertmacro SelectSection ${SEC_gpa}
+ ${Endif}
!endif
!ifdef HAVE_PKG_GNUPG_W32
@@ -823,6 +828,10 @@ Function CalcDepends
!endif
!ifdef HAVE_PKG_QTBASE
+ ${IfNot} ${AtLeastWin7}
+ # Disable qt for Windows below 7
+ !insertmacro UnSelectSection ${SEC_qtbase}
+ ${Endif}
!insertmacro SectionFlagIsSet ${SEC_qtbase} \
${SF_SELECTED} have_qt skip_qt
have_qt:
diff --git a/src/installer.nsi b/src/installer.nsi
index 918b822..5e52c8b 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -550,9 +550,10 @@ LangString T_FoundOldClaws ${LANG_ENGLISH} \
Uninstall Claws Mail from Gpg4win now?"
# From Function CheckClawsUninstall
-LangString T_XPisDeprecated ${LANG_ENGLISH} \
- "Windows Versions before Windows Vista are no longer maintained by Gpg4win. \
- $\r$\nSupport for them may be removed in a future version."
+LangString T_WinisDeprecated ${LANG_ENGLISH} \
+ "Windows Versions before Windows 7 are no longer maintained by Gpg4win. \
+ $\r$\nSupport for them may be removed in a future version.\
+ $\r$\n$\r$\nKleopatra is disabled."
# FIXME: The GetAfterChar function comes from the NSIS wiki.
Function un.GetAfterChar
@@ -701,8 +702,8 @@ initDone:
!endif
!insertmacro MUI_LANGDLL_DISPLAY
-${IfNot} ${AtLeastWinVista}
- MessageBox MB_OK "$(T_XPisDeprecated)"
+${IfNot} ${AtLeastWin7}
+ MessageBox MB_OK "$(T_WinisDeprecated)"
${Endif}
${MementoSectionRestore}
commit 21b0b6aeb2c0f91449378e56f42af093f1b3b4aa
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Nov 10 15:35:21 2017 +0100
Revert Vista warning
--
This reverts commit 5e0aec3be6628deb18a553d4ea67dfb73dd47bcc.
Let's fix this better by disabling pinentry-qt and kleopatra
on these versions and by updating the message better.
diff --git a/po/ar.po b/po/ar.po
index f1bce1c..d0081e8 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -286,7 +286,7 @@ msgstr ""
msgctxt "T_XPisDeprecated"
msgid ""
-"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
"Support for them may be removed in a future version."
msgstr ""
diff --git a/po/cz.po b/po/cz.po
index 92db029..2cd0934 100644
--- a/po/cz.po
+++ b/po/cz.po
@@ -292,7 +292,7 @@ msgstr ""
msgctxt "T_XPisDeprecated"
msgid ""
-"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
"Support for them may be removed in a future version."
msgstr ""
diff --git a/po/de.po b/po/de.po
index ae48676..c1f1f69 100644
--- a/po/de.po
+++ b/po/de.po
@@ -348,7 +348,7 @@ msgstr ""
msgctxt "T_XPisDeprecated"
msgid ""
-"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
"Support for them may be removed in a future version."
msgstr ""
diff --git a/po/es.po b/po/es.po
index d7160d0..08ff2f5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -292,7 +292,7 @@ msgstr ""
msgctxt "T_XPisDeprecated"
msgid ""
-"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
"Support for them may be removed in a future version."
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 92a8fd3..c614581 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -297,7 +297,7 @@ msgstr ""
msgctxt "T_XPisDeprecated"
msgid ""
-"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
"Support for them may be removed in a future version."
msgstr ""
diff --git a/po/it.po b/po/it.po
index 0d5b72e..4181864 100644
--- a/po/it.po
+++ b/po/it.po
@@ -296,7 +296,7 @@ msgstr ""
msgctxt "T_XPisDeprecated"
msgid ""
-"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
"Support for them may be removed in a future version."
msgstr ""
diff --git a/po/no.po b/po/no.po
index 61b2a2f..1719086 100644
--- a/po/no.po
+++ b/po/no.po
@@ -298,7 +298,7 @@ msgstr ""
msgctxt "T_XPisDeprecated"
msgid ""
-"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
"Support for them may be removed in a future version."
msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 4f59644..fd299ec 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -309,7 +309,7 @@ msgid ""
"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
"Support for them may be removed in a future version."
msgstr ""
-"Versões do Windows anteriores ao Vista já não são mantidas pelo Gpg4win.\n"
+"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."
msgctxt "T_Installing_GnuPG"
diff --git a/po/ru.po b/po/ru.po
index 248f581..8006c2c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -294,7 +294,7 @@ msgstr ""
msgctxt "T_XPisDeprecated"
msgid ""
-"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
"Support for them may be removed in a future version."
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 80c7eac..04b064d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -277,7 +277,7 @@ msgstr ""
msgctxt "T_XPisDeprecated"
msgid ""
-"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
"Support for them may be removed in a future version."
msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 20d1c2b..876f3de 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -277,7 +277,7 @@ msgstr ""
msgctxt "T_XPisDeprecated"
msgid ""
-"Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
+"Windows Versions before Windows Vista are no longer maintained by Gpg4win.\n"
"Support for them may be removed in a future version."
msgstr ""
diff --git a/src/installer.nsi b/src/installer.nsi
index 3e40d4c..918b822 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -551,7 +551,7 @@ LangString T_FoundOldClaws ${LANG_ENGLISH} \
# From Function CheckClawsUninstall
LangString T_XPisDeprecated ${LANG_ENGLISH} \
- "Windows Versions before Windows 7 are no longer maintained by Gpg4win. \
+ "Windows Versions before Windows Vista are no longer maintained by Gpg4win. \
$\r$\nSupport for them may be removed in a future version."
# FIXME: The GetAfterChar function comes from the NSIS wiki.
@@ -701,7 +701,7 @@ initDone:
!endif
!insertmacro MUI_LANGDLL_DISPLAY
-${IfNot} ${AtLeastWin7}
+${IfNot} ${AtLeastWinVista}
MessageBox MB_OK "$(T_XPisDeprecated)"
${Endif}
commit 181b76fa0186eeb625a845e06dd215c22c4ac6a6
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Nov 10 15:33:25 2017 +0100
po: Remove strange creation date line
--
This line somehow messes with my git
diff --git a/po/pt.po b/po/pt.po
index 63f6d7d..4f59644 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -15,7 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-SourceCharset: ISO-8859-1\n"
"X-Generator: Poedit 2.0.4\n"
-"POT-Creation-Date: \n"
msgctxt "T_AlreadyRunning"
msgid "An instance of this installer is already running."
-----------------------------------------------------------------------
Summary of changes:
po/ar.po | 2 +-
po/cz.po | 2 +-
po/de.po | 2 +-
po/es.po | 2 +-
po/fr.po | 2 +-
po/it.po | 2 +-
po/no.po | 2 +-
po/pt.po | 3 +--
po/ru.po | 2 +-
po/zh_CN.po | 2 +-
po/zh_TW.po | 2 +-
src/inst-sections.nsi | 9 +++++++++
src/installer.nsi | 7 ++++---
13 files changed, 24 insertions(+), 15 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list