[Gpg4win-commits] r932 - in trunk: . po src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Sep 30 09:13:04 CEST 2008
Author: werner
Date: 2008-09-30 09:13:03 +0200 (Tue, 30 Sep 2008)
New Revision: 932
Modified:
trunk/ChangeLog
trunk/po/ar.po
trunk/po/de.po
trunk/po/es.po
trunk/po/fr.po
trunk/po/ru.po
trunk/src/inst-scute.nsi
trunk/src/uninst-scute.nsi
Log:
Fix Scute installation
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-29 19:05:58 UTC (rev 931)
+++ trunk/ChangeLog 2008-09-30 07:13:03 UTC (rev 932)
@@ -1,3 +1,8 @@
+2008-09-30 Werner Koch <wk at g10code.com>
+
+ * src/uninst-scute.nsi, src/inst-scute.nsi: Fix DLL name. Always
+ install Scute.
+
2008-09-29 Werner Koch <wk at g10code.com>
* patches/gnupg2/02-p12-hack.patch: Remove.
Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po 2008-09-29 19:05:58 UTC (rev 931)
+++ trunk/po/ar.po 2008-09-30 07:13:03 UTC (rev 932)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Gpg4Win\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-09-03 18:38+0200\n"
+"POT-Creation-Date: 2008-09-30 08:41+0200\n"
"PO-Revision-Date: 2008-03-11 23:52+0200\n"
"Last-Translator: Ahmad Gharbeia <ahmad at gharbeia.org>\n"
"Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -23,12 +23,12 @@
msgid "An instance of this installer is already running."
msgstr "ÊÚãá ÓíÑæÑÉ ÃÎÑì ãä åÐÇ ÇáãõËÈøöÊ ÈÇáÝÚá."
-#: src/gpg4win.nsi:113
+#: src/gpg4win.nsi:110
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "ãÑÍÈÇ Ýí ÊËÈíÊ Gpg4win"
-#: src/gpg4win.nsi:117
+#: src/gpg4win.nsi:114
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -40,17 +40,17 @@
"ÇáÈíÇäÇÊ æ ÇáÊæÞíÚ ÇáÑÞãíº æ åæ íÔÊãá Úáì æÓíáÉ ãÊÞÏãÉ áÅÏÇÑÉ ÇáãÝÇÊíÍ¡ "
"æíÊæÇÝÞ ãÚ ãÚíÇÑ ÇáÅäÊÑäÊ OpenPGP ÇáãÞÊÑÍ ßãÇ æõÕöÝ Ýí RFC2440."
-#: src/gpg4win.nsi:123
+#: src/gpg4win.nsi:120
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "åÐå ÇáÅÕÏÇÑÉ ${VERSION} ãä Gpg4win"
-#: src/gpg4win.nsi:126
+#: src/gpg4win.nsi:123
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "ÅÕÏÇÑÉ ÇáãáÝ ${PROD_VERSION}"
-#: src/gpg4win.nsi:129
+#: src/gpg4win.nsi:126
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "ÊÇÑíÎ ÇáÅÕÏÇÑ ${_BUILD_ISODATE}"
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2008-09-29 19:05:58 UTC (rev 931)
+++ trunk/po/de.po 2008-09-30 07:13:03 UTC (rev 932)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-09-03 18:38+0200\n"
+"POT-Creation-Date: 2008-09-30 08:41+0200\n"
"PO-Revision-Date: 2008-09-09 13:24+0200\n"
"Last-Translator: Marcus Brinkmann <mb at g10code.com>\n"
"Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
@@ -20,12 +20,12 @@
msgid "An instance of this installer is already running."
msgstr "Ein Exemplar dieses Installers läuft bereits."
-#: src/gpg4win.nsi:113
+#: src/gpg4win.nsi:110
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Willkommen bei der Installation von Gpg4win"
-#: src/gpg4win.nsi:117
+#: src/gpg4win.nsi:114
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -36,17 +36,17 @@
"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation sowie "
"zum sicheren Speichern von Daten."
-#: src/gpg4win.nsi:123
+#: src/gpg4win.nsi:120
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "Dies ist Gpg4win Version ${VERSION}"
-#: src/gpg4win.nsi:126
+#: src/gpg4win.nsi:123
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "Dateiversion ${PROD_VERSION}"
-#: src/gpg4win.nsi:129
+#: src/gpg4win.nsi:126
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "Releasedatum ${_BUILD_ISODATE}"
Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po 2008-09-29 19:05:58 UTC (rev 931)
+++ trunk/po/es.po 2008-09-30 07:13:03 UTC (rev 932)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-09-03 18:38+0200\n"
+"POT-Creation-Date: 2008-09-30 08:41+0200\n"
"PO-Revision-Date: 2008-01-30 17:07+0100\n"
"Last-Translator: Diego Escalante Urrelo <diegoe at gnome.org>\n"
"Language-Team: Spanish <diegoe at gnome.org>\n"
@@ -20,12 +20,12 @@
msgid "An instance of this installer is already running."
msgstr "Una instancia del instalador ya está ejecutándose."
-#: src/gpg4win.nsi:113
+#: src/gpg4win.nsi:110
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Bienvenido a la instalación de Gpg4win"
-#: src/gpg4win.nsi:117
+#: src/gpg4win.nsi:114
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -38,17 +38,17 @@
"Incluye un gestor de llaves avanzado y cumple con la propuesta de estándar "
"de Internet: OpenGPG, descrito en el RFC2440."
-#: src/gpg4win.nsi:123
+#: src/gpg4win.nsi:120
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "Este es Gpg4win versión ${VERSION}"
-#: src/gpg4win.nsi:126
+#: src/gpg4win.nsi:123
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "versión del archivo ${PROD_VERSION}"
-#: src/gpg4win.nsi:129
+#: src/gpg4win.nsi:126
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "fecha de publicación ${_BUILD_ISODATE}"
Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po 2008-09-29 19:05:58 UTC (rev 931)
+++ trunk/po/fr.po 2008-09-30 07:13:03 UTC (rev 932)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ngoinabox\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-09-03 18:38+0200\n"
+"POT-Creation-Date: 2008-09-30 08:41+0200\n"
"PO-Revision-Date: 2008-03-10 16:46+0100\n"
"Last-Translator: Fabian Rodriguez <magicfab at member.fsf.org>\n"
"Language-Team: FRENCH <aep.lists at it46.se>\n"
@@ -20,12 +20,12 @@
msgid "An instance of this installer is already running."
msgstr "Une instance de cet installateur fonctionne déjà."
-#: src/gpg4win.nsi:113
+#: src/gpg4win.nsi:110
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Bienvenue à l'installation de Gpg4win"
-#: src/gpg4win.nsi:117
+#: src/gpg4win.nsi:114
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -39,17 +39,17 @@
"est conforme avec l'OpenPGP proposé Internet standard as described in "
"RFC2440."
-#: src/gpg4win.nsi:123
+#: src/gpg4win.nsi:120
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "This is Gpg4win version ${VERSION}"
-#: src/gpg4win.nsi:126
+#: src/gpg4win.nsi:123
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "file version ${PROD_VERSION}"
-#: src/gpg4win.nsi:129
+#: src/gpg4win.nsi:126
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "release date ${_BUILD_ISODATE}"
Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po 2008-09-29 19:05:58 UTC (rev 931)
+++ trunk/po/ru.po 2008-09-30 07:13:03 UTC (rev 932)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Gpg4Win Installer\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-09-03 18:38+0200\n"
+"POT-Creation-Date: 2008-09-30 08:41+0200\n"
"PO-Revision-Date: 2008-04-22 11:57+0200\n"
"Last-Translator: Sergei Smirnov <moscow at hro.org>\n"
"Language-Team: Human Rights Network <moscow at hro.org>\n"
@@ -21,12 +21,12 @@
msgid "An instance of this installer is already running."
msgstr "Óñòàíîâêà ïðîãðàììû óæå çàïóùåíà."
-#: src/gpg4win.nsi:113
+#: src/gpg4win.nsi:110
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Äîáðî ïîæàëîâàòü â ïðîãðàììó óñòàíîâêè Gpg4win!"
-#: src/gpg4win.nsi:117
+#: src/gpg4win.nsi:114
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -40,17 +40,17 @@
"øèôðîâàëüíûìè êëþ÷àìè è ñîâìåñòèìà ñî ñòàíäàðòîì OpenPGP, îïèñàííûì â "
"äîêóìåíòå RFC2440."
-#: src/gpg4win.nsi:123
+#: src/gpg4win.nsi:120
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "Âåðñèÿ Gpg4win ${VERSION}"
-#: src/gpg4win.nsi:126
+#: src/gpg4win.nsi:123
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "Âåðñèÿ ôàéëà ${PROD_VERSION}"
-#: src/gpg4win.nsi:129
+#: src/gpg4win.nsi:126
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "Äàòà ðåëèçà ${_BUILD_ISODATE}"
Modified: trunk/src/inst-scute.nsi
===================================================================
--- trunk/src/inst-scute.nsi 2008-09-29 19:05:58 UTC (rev 931)
+++ trunk/src/inst-scute.nsi 2008-09-30 07:13:03 UTC (rev 932)
@@ -23,22 +23,27 @@
!endif
!define prefix ${ipdir}/scute-${gpg4win_pkg_scute_version}
-${MementoSection} "Scute" SEC_scute
+
+!ifdef DEBUG
+Section "Scute" SEC_scute
+!else
+Section "-Scute" SEC_scute
+!endif
SetOutPath "$INSTDIR"
!ifdef SOURCES
File "${gpg4win_pkg_scute}"
!else
ClearErrors
SetOverwrite try
- File "${prefix}/bin/libscute-0.dll"
+ File "${prefix}/bin/scute.dll"
SetOverwrite lastused
ifErrors 0 +3
- File /oname=libscute-0.dll.tmp "${prefix}/bin/libscute-0.dll"
- Rename /REBOOTOK libscute-0.dll.tmp libscute-0.dll
+ File /oname=scute.dll.tmp "${prefix}/bin/scute.dll"
+ Rename /REBOOTOK scute.dll.tmp scute.dll
!endif
-${MementoSectionEnd}
+SectionEnd
LangString DESC_SEC_scute ${LANG_ENGLISH} \
Modified: trunk/src/uninst-scute.nsi
===================================================================
--- trunk/src/uninst-scute.nsi 2008-09-29 19:05:58 UTC (rev 931)
+++ trunk/src/uninst-scute.nsi 2008-09-30 07:13:03 UTC (rev 932)
@@ -30,7 +30,7 @@
Push "${gpg4win_pkg_scute}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libscute-0.dll"
+ Delete "$INSTDIR\scute.dll"
RMDir "$INSTDIR"
!endif
SectionEnd
More information about the Gpg4win-commits
mailing list