[Gpg4win-commits] r633 - in trunk: . po src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Dec 7 18:56:05 CET 2007
Author: marcus
Date: 2007-12-07 18:56:04 +0100 (Fri, 07 Dec 2007)
New Revision: 633
Modified:
trunk/ChangeLog
trunk/po/de.po
trunk/src/inst-sections.nsi
trunk/src/installer-finish.nsi
trunk/src/installer.nsi
Log:
2007-12-07 Marcus Brinkmann <marcus at g10code.de>
* src/inst-sections.nsi: Install manuals in subdirectories for
start menu and desktop.
* src/installer-finish.nsi: Uninstall the manuals in those
subdirectories.
* src/installer.nsi: Add language strings for the subdirectory
names.
* po/de.po: Update.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-12-07 17:47:43 UTC (rev 632)
+++ trunk/ChangeLog 2007-12-07 17:56:04 UTC (rev 633)
@@ -1,5 +1,13 @@
2007-12-07 Marcus Brinkmann <marcus at g10code.de>
+ * src/inst-sections.nsi: Install manuals in subdirectories for
+ start menu and desktop.
+ * src/installer-finish.nsi: Uninstall the manuals in those
+ subdirectories.
+ * src/installer.nsi: Add language strings for the subdirectory
+ names.
+ * po/de.po: Update.
+
* packages/packages.current: Update kleopatra to 20071207.
* src/inst-gpgex.nsi: Detect and uninstall a previously installed
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2007-12-07 17:47:43 UTC (rev 632)
+++ trunk/po/de.po 2007-12-07 17:56:04 UTC (rev 633)
@@ -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-11-23 14:39+0100\n"
-"PO-Revision-Date: 2007-10-17 13:15+0200\n"
+"POT-Creation-Date: 2007-12-07 18:54+0100\n"
+"PO-Revision-Date: 2007-12-07 18:55+0100\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"
@@ -82,43 +82,53 @@
"Es wurde keine Schlüsselverwaltung installiert. Deswegen kann sie jetzt "
"auch nicht ausgeführt werden."
-#: src/installer.nsi:419
+#: src/installer.nsi:235
+msgctxt "DESC_Menu_manuals"
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#: src/installer.nsi:239
+msgctxt "DESC_Desktop_manuals"
+msgid "Gpg4win Documentation"
+msgstr "Gpg4win Dokumentation"
+
+#: src/installer.nsi:428
msgctxt "T_InstallOptions"
msgid "Install Options"
msgstr "Installationsoptionen"
-#: src/installer.nsi:422
+#: src/installer.nsi:431
msgctxt "T_InstallOptLinks"
msgid "Start links"
msgstr "Startlinks"
-#: src/installer.nsi:424
+#: src/installer.nsi:433
msgctxt "T_InstOptLabelA"
msgid "Please select where Gpg4win shall install links:"
msgstr "Bitte wählen Sie, welche Verknüpfungen angelegt werden sollen:"
-#: src/installer.nsi:427
+#: src/installer.nsi:436
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
msgstr ""
"(In die Schnellstartleiste werden nur Verknüpfungen für Programme angelegt.)"
-#: src/installer.nsi:430
+#: src/installer.nsi:439
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
msgstr "Startmenü"
-#: src/installer.nsi:433
+#: src/installer.nsi:442
msgctxt "T_InstOptFieldB"
msgid "Desktop"
msgstr "Arbeitsfläche"
-#: src/installer.nsi:436
+#: src/installer.nsi:445
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
msgstr "Schnellstartleiste"
-#: src/installer.nsi:442
+#: src/installer.nsi:451
msgctxt "T_FoundExistingVersion"
msgid ""
"Version $R1 has already been installed.\n"
@@ -130,7 +140,7 @@
"(Sie können in jedem Fall mit JA antworten, falls es sich um eine neuere "
"oder dieselbe Version handelt.)"
-#: src/installer.nsi:445
+#: src/installer.nsi:454
msgctxt "T_FoundExistingVersionB"
msgid ""
"A version of Gpg4Win has already been installed on the system. There will be "
@@ -143,7 +153,7 @@
"\n"
"Möchten die die Installation von Gpg4Win fortführen?"
-#: src/installer.nsi:456
+#: src/installer.nsi:465
msgctxt "T_FoundOldSeeManual"
msgid ""
"Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -154,7 +164,7 @@
"überführen. Es wird dringend geraten Gpg4Win nicht zusammen mit diesen "
"anderen Installation zu betreiben."
-#: src/installer.nsi:461
+#: src/installer.nsi:470
msgctxt "T_FoundOldGnuPP"
msgid ""
"An old installation of GnuPP (GNU Privacy Project) has been been detected. "
@@ -177,7 +187,7 @@
"Möchten Sie die Installation von Gpg4win weiter durchführen und sich dann "
"später um die Entfernung von GnuPP kümmern?"
-#: src/installer.nsi:470
+#: src/installer.nsi:479
msgctxt "T_FoundOldGnuPT"
msgid ""
"An installation of GnuPT has been been detected. This may cause problems "
@@ -200,7 +210,7 @@
"\n"
"Möchten Sie die Installation von Gpg4win fortführen?"
-#: src/installer.nsi:477
+#: src/installer.nsi:486
msgctxt "T_FoundOldWinPTSF"
msgid ""
"An old installation of the Sourceforge hosted WinPT has been been detected. "
@@ -225,7 +235,7 @@
"\n"
"Möchten Sie die Installation von Gpg4win trotzdem jetzt weiter durchführen?"
-#: src/installer.nsi:487
+#: src/installer.nsi:496
msgctxt "T_FoundOldGnuPack"
msgid ""
"An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -239,7 +249,7 @@
"\n"
"Die Installation von Gpg4win wird nun abgebrochen!"
-#: src/installer.nsi:496
+#: src/installer.nsi:505
msgctxt "T_AdminNeeded"
msgid ""
"Warning: Administrator permissions required for a successful installation"
@@ -247,7 +257,7 @@
"Achtung: Für eine erfolgreiche Installation werden Administratorrechte "
"benötigt."
-#: src/installer.nsi:500
+#: src/installer.nsi:509
msgctxt "T_CloseOtherApps"
msgid ""
"Please make sure that other applications are not running. In particular you "
@@ -260,12 +270,12 @@
"eine Installation durchzuführen; es ist dann aber u.U. notwendig, das System "
"neu zu starten."
-#: src/installer.nsi:505
+#: src/installer.nsi:514
msgctxt "T_ShuttingDownWinPT"
msgid "Trying to shutdown a possible running instance of WinPT."
msgstr "Ein möglicherweise laufendes WinPT wird jetzt automatisch beendet."
-#: src/installer.nsi:507
+#: src/installer.nsi:516
msgctxt "T_ShuttingDownDirMngr"
msgid "Trying to shutdown a possible running instance of DirMngr."
msgstr "Ein möglicherweise laufender DirMngr wird jetzt automatisch beendet."
@@ -336,12 +346,12 @@
msgid "Show the online manual of GPGee"
msgstr "Das englische Handbuch zu GPGee anzeigen"
-#: src/inst-gpgex.nsi:57
+#: src/inst-gpgex.nsi:74
msgctxt "T_GpgEX_RegFailed"
msgid "Warning: Registration of the GpgEX plugin failed."
msgstr "Warnung: Registration des GpgEX Plugin ist fehlgeschlagen."
-#: src/inst-gpgex.nsi:60
+#: src/inst-gpgex.nsi:77
msgctxt "DESC_SEC_gpgex"
msgid "GnuPG Shell Extension"
msgstr ""
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2007-12-07 17:47:43 UTC (rev 632)
+++ trunk/src/inst-sections.nsi 2007-12-07 17:56:04 UTC (rev 633)
@@ -876,6 +876,7 @@
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+ CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)"
!ifdef HAVE_PKG_WINPT
SectionGetFlags ${SEC_winpt} $R0
@@ -915,7 +916,8 @@
"$INSTDIR\sylpheed-claws.exe" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_sylpheed)
!ifndef GPG4WIN_LIGHT
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Sylpheed-Claws Manual.lnk" \
+ CreateShortCut \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Sylpheed-Claws Manual.lnk" \
"$INSTDIR\sylpheed-claws-manual.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_sylpheed_pdf)
!endif
@@ -930,7 +932,8 @@
"$INSTDIR\claws-mail.exe" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail)
!ifndef GPG4WIN_LIGHT
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Claws-Mail Manual.lnk" \
+ CreateShortCut \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Claws-Mail Manual.lnk" \
"$INSTDIR\claws-mail-manual.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail_pdf)
!endif
@@ -952,7 +955,7 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_en_menu
CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Name_man_novice_en).lnk" \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_man_novice_en).lnk" \
"$INSTDIR\share\gpg4win\novices.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_novice_en)
no_man_novice_en_menu:
@@ -963,7 +966,7 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_en_menu
CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Name_man_advanced_en).lnk" \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_man_advanced_en).lnk" \
"$INSTDIR\share\gpg4win\advanced.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_advanced_en)
no_man_advanced_en_menu:
@@ -974,7 +977,7 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_de_menu
CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Name_man_novice_de).lnk" \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_man_novice_de).lnk" \
"$INSTDIR\share\gpg4win\einsteiger.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_novice_de)
no_man_novice_de_menu:
@@ -985,7 +988,7 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_de_menu
CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Name_man_advanced_de).lnk" \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_man_advanced_de).lnk" \
"$INSTDIR\share\gpg4win\durchblicker.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_advanced_de)
no_man_advanced_de_menu:
@@ -995,18 +998,21 @@
SectionGetFlags ${SEC_gpgee} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_gpgee_menu
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GPGee Manual.lnk" \
+ CreateShortCut \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\GPGee Manual.lnk" \
"$INSTDIR\GPGee.hlp" "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpgee_hlp)
no_gpgee_menu:
!endif
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG FAQ.lnk" \
- "$INSTDIR\share\gnupg\faq.html" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gnupg_faq)
+ CreateShortCut \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\GnuPG FAQ.lnk" \
+ "$INSTDIR\share\gnupg\faq.html" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gnupg_faq)
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Gpg4Win README.lnk" \
- "$INSTDIR\share\gpg4win\README.$(T_LangCode).txt" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_readme)
+ CreateShortCut \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Gpg4Win README.lnk" \
+ "$INSTDIR\share\gpg4win\README.$(T_LangCode).txt" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_readme)
# No more uninstall link because Windows has its own feature to call
# the uninstaller.
@@ -1023,6 +1029,8 @@
"Field 3" "State"
IntCmp $R0 0 no_desktop
+ CreateDirectory "$DESKTOP\$(DESC_Desktop_manuals)"
+
!ifdef HAVE_PKG_WINPT
SectionGetFlags ${SEC_winpt} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
@@ -1078,7 +1086,8 @@
"$INSTDIR\claws-mail.exe" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail)
!ifndef GPG4WIN_LIGHT
- CreateShortCut "$DESKTOP\Claws-Mail Manual.lnk" \
+ CreateShortCut \
+ "$DESKTOP\$(DESC_Desktop_manuals)\Claws-Mail Manual.lnk" \
"$INSTDIR\claws-mail-manual.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail_pdf)
!endif
@@ -1090,7 +1099,7 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_en_desktop
CreateShortCut \
- "$DESKTOP\$(DESC_Name_man_novice_en).lnk" \
+ "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_en).lnk" \
"$INSTDIR\share\gpg4win\novices.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_novice_en)
no_man_novice_en_desktop:
@@ -1101,7 +1110,7 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_en_desktop
CreateShortCut \
- "$DESKTOP\$(DESC_Name_man_advanced_en).lnk" \
+ "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_advanced_en).lnk" \
"$INSTDIR\share\gpg4win\advanced.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_advanced_en)
no_man_advanced_en_desktop:
@@ -1112,7 +1121,7 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_de_desktop
CreateShortCut \
- "$DESKTOP\$(DESC_Name_man_novice_de).lnk" \
+ "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_de).lnk" \
"$INSTDIR\share\gpg4win\einsteiger.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_novice_de)
no_man_novice_de_desktop:
@@ -1123,7 +1132,7 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_de_desktop
CreateShortCut \
- "$DESKTOP\$(DESC_Name_man_advanced_de).lnk" \
+ "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_advanced_de).lnk" \
"$INSTDIR\share\gpg4win\durchblicker.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_advanced_de)
no_man_advanced_de_desktop:
@@ -1138,7 +1147,7 @@
no_gpgee_desktop:
!endif
- CreateShortCut "$DESKTOP\GnuPG FAQ.lnk" \
+ CreateShortCut "$DESKTOP\$(DESC_Desktop_manuals)\GnuPG FAQ.lnk" \
"$INSTDIR\share\gnupg\faq.html" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gnupg_faq)
@@ -1211,4 +1220,3 @@
# FIXME: Now write desktop and quick launch bar.
# Don't forget to delete the corr. entries in installer-finish. Uninstall.
-
Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi 2007-12-07 17:47:43 UTC (rev 632)
+++ trunk/src/installer-finish.nsi 2007-12-07 17:56:04 UTC (rev 633)
@@ -54,6 +54,10 @@
StrCmp $R0 "" +2
StrCpy $MYTMP $R0
Delete "$SMPROGRAMS\$MYTMP\*.lnk"
+ Delete "$SMPROGRAMS\$MYTMP\$(DESC_Menu_manuals)\*.lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_de).lnk"
+
+ RMDir "$SMPROGRAMS\$MYTMP\$(DESC_Desktop_manuals)"
StrCpy $MYTMP "$SMPROGRAMS\$MYTMP"
startMenuDeleteLoop:
ClearErrors
@@ -84,22 +88,23 @@
!endif
!ifdef HAVE_PKG_CLAWS_MAIL
Delete "$DESKTOP\Claws-Mail.lnk"
- Delete "$DESKTOP\Claws-Mail Manual.lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\Claws-Mail Manual.lnk"
!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
- Delete "$DESKTOP\$(DESC_Name_man_novice_de).lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_de).lnk"
!endif
!ifdef HAVE_PKG_MAN_NOVICE_EN
- Delete "$DESKTOP\$(DESC_Name_man_novice_en).lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_en).lnk"
!endif
!ifdef HAVE_PKG_MAN_ADVANCED_DE
- Delete "$DESKTOP\$(DESC_Name_man_advanced_de).lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_advanced_de).lnk"
!endif
!ifdef HAVE_PKG_GPGEE
- Delete "$DESKTOP\GPGee Manual.lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\GPGee Manual.lnk"
!endif
- Delete "$DESKTOP\GnuPG FAQ.lnk"
- Delete "$DESKTOP\Gpg4Win README.lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\GnuPG FAQ.lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\Gpg4Win README.lnk"
+ RMDir "$DESKTOP\$(DESC_Desktop_manuals)"
# Delete Quick Launch Bar links.
StrCmp $QUICKLAUNCH $TEMP no_quick_launch_uninstall
Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi 2007-12-07 17:47:43 UTC (rev 632)
+++ trunk/src/installer.nsi 2007-12-07 17:56:04 UTC (rev 633)
@@ -230,7 +230,16 @@
LangString T_NoKeyManager ${LANG_ENGLISH} \
"No key manager has been installed, thus we can't run one now."
+# Used as subdirectory name in Start Menu.
+LangString DESC_Menu_manuals ${LANG_ENGLISH} \
+ "Documentation"
+
+# Used as subdirectory name on Desktop.
+LangString DESC_Desktop_manuals ${LANG_ENGLISH} \
+ "Gpg4win Documentation"
+
+
# Functions
# Custom functions and macros for gpg4win.
More information about the Gpg4win-commits
mailing list