[Gpg4win-commits] r275 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2006-04-20 16:29:10 +0200 (Thu, 20 Apr 2006)
New Revision: 275

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/installer.nsi
Log:
Print warning before stopping WinPT


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-04-19 16:49:09 UTC (rev 274)
+++ trunk/ChangeLog	2006-04-20 14:29:10 UTC (rev 275)
@@ -1,3 +1,7 @@
+2006-04-20  Werner Koch  <wk at g10code.com>
+
+	* src/installer.nsi: Pop up a message before shutting down winpt.
+
 2006-04-19  Werner Koch  <wk at g10code.com>
 
 	* src/installer.nsi: Abort installation if not run as Admin.

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2006-04-19 16:49:09 UTC (rev 274)
+++ trunk/TODO	2006-04-20 14:29:10 UTC (rev 275)
@@ -1,4 +1,7 @@
                                                           -*- outline -*-
+* next release
+** Update GPGee to 1.3.1
+** Update GPGol
 
 * Build system
 ** Some versions of strip don't work.

Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi	2006-04-19 16:49:09 UTC (rev 274)
+++ trunk/src/installer.nsi	2006-04-20 14:29:10 UTC (rev 275)
@@ -403,7 +403,8 @@
     Return
    print_warning:
     MessageBox MB_OK|MB_ICONEXCLAMATION "$(T_CloseOtherApps)"
-    IfFileExists $INSTDIR\winpt.exe 0 +2
+    IfFileExists $INSTDIR\winpt.exe 0 +3
+      MessageBox MB_OK "$(T_ShuttingDownWinPT)"
       ExecWait '"$INSTDIR\winpt.exe" --stop'
    leave:
 FunctionEnd
@@ -592,7 +593,12 @@
     schliessen bevor Sie die Installation fortsetzen.  Gpg4Win wird auf \
     jeden Fall versuchen, eine Installation durchzuführen; es ist dann aber \
     u.U. notwendig, das System neu zu starten."
+LangString T_ShuttingDownWinPT ${LANG_ENGLISH} \
+   "Trying to shutdown a possible running instance of WinPT."
+LangString T_ShuttingDownWinPT ${LANG_GERMAN} \
+   "Ein möglicherweise laufendes WinPT wird jetzt automatisch beendet."
 
+
 # FIXME: The GetAfterChar function comes from the NSIS wiki.
 Function un.GetAfterChar
   Exch $0 ; chop char