[Gpg4win-commits] r570 - in trunk: . po src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Oct 17 12:51:58 CEST 2007
Author: werner
Date: 2007-10-17 12:51:57 +0200 (Wed, 17 Oct 2007)
New Revision: 570
Modified:
trunk/ChangeLog
trunk/po/ChangeLog
trunk/po/de.po
trunk/src/inst-gpgol.nsi
trunk/src/inst-kdesupport.nsi
trunk/src/uninst-kdesupport.nsi
Log:
Update some strings.
Removed SSLeay.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-10-17 09:08:50 UTC (rev 569)
+++ trunk/ChangeLog 2007-10-17 10:51:57 UTC (rev 570)
@@ -1,5 +1,10 @@
2007-10-17 Werner Koch <wk at g10code.com>
+ * src/inst-kdesupport.nsi: Remove libeay32.dll and ssleay32/dll;
+ they seems not to be necessary and conflict with the GPL anyway.
+
+ * src/inst-gpgol.nsi: s/GPGol/GpgOL/.
+
* src/inst-pinentry.nsi: Install native pinentry.
* src/Makefile.am: Disable pinnetry-gtk-2 for now.
* configure.ac: Make pinentry depend on glib.
Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog 2007-10-17 09:08:50 UTC (rev 569)
+++ trunk/po/ChangeLog 2007-10-17 10:51:57 UTC (rev 570)
@@ -1,3 +1,7 @@
+2007-10-17 Werner Koch <wk at g10code.com>
+
+ * de.po: Change an "GPGol" to "GpgOL".
+
2007-09-13 Marcus Brinkmann <marcus at g10code.de>
* POTFILES.in: Add inst-gpgex.nsi.
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2007-10-17 09:08:50 UTC (rev 569)
+++ trunk/po/de.po 2007-10-17 10:51:57 UTC (rev 570)
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2007-09-17 16:26+0200\n"
-"PO-Revision-Date: 2007-09-13 00:05+0200\n"
+"POT-Creation-Date: 2007-10-17 13:13+0200\n"
+"PO-Revision-Date: 2007-10-17 13:15+0200\n"
"Last-Translator: Marcus Brinkmann <mb at g10code.com>\n"
"Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -284,7 +284,7 @@
"GnuPG stellt die eigentliche Verschlüsselung sowie die Verwaltung der "
"Schlüssel bereit."
-#: src/inst-gnupg2.nsi:105
+#: src/inst-gnupg2.nsi:106
msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard with S/MIME support"
msgstr ""
@@ -349,16 +349,14 @@
"ermöglicht, Dateien über das Kontextmenü zu verschlüsseln."
#: src/inst-gpgol.nsi:54
-msgctxt "T_GPGol_RegFailed"
-msgid "Warning: Registration of the GPGol Outlook pluginfailed."
-msgstr "Warnung: Registration des GPGol Outlook Plugin ist fehlgeschlagen."
+msgctxt "T_GpgOL_RegFailed"
+msgid "Warning: Registration of the GpgOL Outlook pluginfailed."
+msgstr "Warnung: Registration des GpgOL Outlook Plugin ist fehlgeschlagen."
#: src/inst-gpgol.nsi:57
msgctxt "DESC_SEC_gpgol"
msgid "GnuPG for Outlook"
-msgstr ""
-"GnuPG für Outlook (GPGol) is eine Erweiterung für Outlook 2003, die "
-"verwendet wird um Nachrichten mit OpenPGP zu verschlüsseln."
+msgstr "GnuPG für Outlook (GpgOL) is eine Erweiterung für Outlook 2003, die verwendet wird um Nachrichten mit OpenPGP oder S/MIME zu verschlüsseln."
#: src/inst-man_advanced_de.nsi:39
msgctxt "DESC_Name_man_advanced_de"
Modified: trunk/src/inst-gpgol.nsi
===================================================================
--- trunk/src/inst-gpgol.nsi 2007-10-17 09:08:50 UTC (rev 569)
+++ trunk/src/inst-gpgol.nsi 2007-10-17 10:51:57 UTC (rev 570)
@@ -23,7 +23,7 @@
!define prefix ${ipdir}/gpgol-${gpg4win_pkg_gpgol_version}
-Section "GPGol" SEC_gpgol
+Section "GpgOL" SEC_gpgol
SetOutPath "$INSTDIR"
!ifdef SOURCES
File "${gpg4win_pkg_gpgol}"
@@ -41,7 +41,7 @@
# Register the DLL.
RegDLL "$INSTDIR\gpgol.dll"
ifErrors 0 +2
- MessageBox MB_OK "$(T_GPGol_RegFailed)"
+ MessageBox MB_OK "$(T_GpgOL_RegFailed)"
SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
File ${prefix}/share/locale/de/LC_MESSAGES/gpgol.mo
@@ -51,8 +51,8 @@
SectionEnd
-LangString T_GPGol_RegFailed ${LANG_ENGLISH} \
- "Warning: Registration of the GPGol Outlook pluginfailed."
+LangString T_GpgOL_RegFailed ${LANG_ENGLISH} \
+ "Warning: Registration of the GpgOL Outlook pluginfailed."
LangString DESC_SEC_gpgol ${LANG_ENGLISH} \
"GnuPG for Outlook"
Modified: trunk/src/inst-kdesupport.nsi
===================================================================
--- trunk/src/inst-kdesupport.nsi 2007-10-17 09:08:50 UTC (rev 569)
+++ trunk/src/inst-kdesupport.nsi 2007-10-17 10:51:57 UTC (rev 570)
@@ -53,7 +53,6 @@
SetOutPath "$INSTDIR"
File ${prefix}/bin/giflib4.dll
File ${prefix}/bin/libdbus-1.dll
- File ${prefix}/bin/libeay32.dll
File ${prefix}/bin/libexpat.dll
File ${prefix}/bin/libexpatw.dll
File ${prefix}/bin/libexslt.dll
@@ -64,7 +63,6 @@
File ${prefix}/bin/pcre.dll
File ${prefix}/bin/pcrecpp.dll
File ${prefix}/bin/pcreposix.dll
- File ${prefix}/bin/ssleay32.dll
SetOutPath "$INSTDIR\etc"
File ${prefix}/etc/session.conf
Modified: trunk/src/uninst-kdesupport.nsi
===================================================================
--- trunk/src/uninst-kdesupport.nsi 2007-10-17 09:08:50 UTC (rev 569)
+++ trunk/src/uninst-kdesupport.nsi 2007-10-17 10:51:57 UTC (rev 570)
@@ -45,7 +45,6 @@
Delete "$INSTDIR\giflib4.dll"
Delete "$INSTDIR\libdbus-1.dll"
- Delete "$INSTDIR\libeay32.dll"
Delete "$INSTDIR\libexpat.dll"
Delete "$INSTDIR\libexpatw.dll"
Delete "$INSTDIR\libexslt.dll"
@@ -56,7 +55,11 @@
Delete "$INSTDIR\pcre.dll"
Delete "$INSTDIR\pcrecpp.dll"
Delete "$INSTDIR\pcreposix.dll"
+
+ # Some test installers installed these files:
+ # fixme: Remove them when releasing 2.0.
Delete "$INSTDIR\ssleay32.dll"
+ Delete "$INSTDIR\libeay32.dll"
Delete "$INSTDIR\etc\session.conf"
Delete "$INSTDIR\etc\system.conf"
More information about the Gpg4win-commits
mailing list