[Gpg4win-commits] r1033 - in trunk: . packages po src

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue Nov 11 18:50:56 CET 2008


Author: werner
Date: 2008-11-11 18:50:56 +0100 (Tue, 11 Nov 2008)
New Revision: 1033

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.ac
   trunk/packages/packages.current
   trunk/po/ar.po
   trunk/po/de.po
   trunk/po/es.po
   trunk/po/fr.po
   trunk/po/ru.po
   trunk/src/inst-kleopatra.nsi
Log:
Preparing a release.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-11-11 17:45:15 UTC (rev 1032)
+++ trunk/ChangeLog	2008-11-11 17:50:56 UTC (rev 1033)
@@ -1,3 +1,13 @@
+2008-11-11  Werner Koch  <wk at g10code.com>
+
+	Release 1.9.11.
+
+	* packages/packages.current: Update GpgOL.
+
+	* src/Makefile.am (gpg4win_pkg_gnupg2_post_install): Do not let a
+	mkdir -p or rm fail.  Use mkdir_p and not MKDIR_P for automake
+	compatibility.
+
 2008-11-11  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 
 	* packages/packages.current: Update kleopatra.and kdelibs.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2008-11-11 17:45:15 UTC (rev 1032)
+++ trunk/NEWS	2008-11-11 17:50:56 UTC (rev 1033)
@@ -3,8 +3,8 @@
 # The version number given below are for the standard installers as
 # distributed by www.gpg4win.org.
 
-Noteworthy changes in version 1.9.10
-------------------------------------------------
+Noteworthy changes in version 1.9.11 (2008-11-11)
+-------------------------------------------------
 
 (en) This is a BETA version of the new Gpg4win/2 architecture.
      This version shall not be used in a production environment. 
@@ -14,12 +14,12 @@
 
 ~~~~~~~~~~~~~~~
 GnuPG:        2.0.10-svn4870
-DirMngr:      1.0.3-svn309
-Kleopatra:    
+DirMngr:      1.0.3-svn310
+Kleopatra:    20081111
 GPA:          0.8.0
-GpgOL:        0.10.16-svn283
+GpgOL:        0.10.16
 GpgEX:        0.9.1
-Claws-Mail:   3.6.0cvs7
+Claws-Mail:   3.6.1cvs20
 Kompendium:   3.0.0-beta
 ~~~~~~~~~~~~~~~
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-11-11 17:45:15 UTC (rev 1032)
+++ trunk/configure.ac	2008-11-11 17:50:56 UTC (rev 1033)
@@ -25,8 +25,8 @@
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 # Right after a release the make target "copy-news" is to be called!
-m4_define([my_version], [1.9.10])
-m4_define([my_issvn], [yes])
+m4_define([my_version], [1.9.11-beta])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
           ||echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2008-11-11 17:45:15 UTC (rev 1032)
+++ trunk/packages/packages.current	2008-11-11 17:50:56 UTC (rev 1033)
@@ -268,16 +268,18 @@
 #
 # GpgOL
 #
-#server ftp://ftp.g10code.com/g10code/gpgol/alpha
+server ftp://ftp.g10code.com/g10code/gpgol/alpha
 
-#file gpgol-0.10.15.tar.bz2
-#chk  0dd28112046fd69d9ca2108c0fda7a835cb3c569
+file gpgol-0.10.16.tar.bz2
+chk  64ecf9b1e8bddab9380f205d90df888e9096d874  
 
-server ftp://ftp.g10code.com/g10code/scratch
-file gpgol-0.10.16-svn283.tar.bz2
-chk  2458ed8b1a8b4b006003c8b91a396743ded9dd88 
 
+#server ftp://ftp.g10code.com/g10code/scratch
+#file gpgol-0.10.16-svn283.tar.bz2
+#chk  2458ed8b1a8b4b006003c8b91a396743ded9dd88 
 
+
+
 #
 # GpgEX
 #

Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po	2008-11-11 17:45:15 UTC (rev 1032)
+++ trunk/po/ar.po	2008-11-11 17:50:56 UTC (rev 1033)
@@ -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-10-28 18:46+0100\n"
+"POT-Creation-Date: 2008-11-11 17:52+0100\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"
@@ -87,12 +87,12 @@
 msgid "release date ${_BUILD_ISODATE}"
 msgstr "ÊÇÑíÎ ÇáÅÕÏÇÑ ${_BUILD_ISODATE}"
 
-#: src/installer.nsi:217
+#: src/installer.nsi:221
 msgctxt "T_LangCode"
 msgid "en"
 msgstr "ar"
 
-#: src/installer.nsi:220
+#: src/installer.nsi:224
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
@@ -101,7 +101,7 @@
 "åÐå ÇáÈÑãÌíÉ ãÑÎÕÉ ÈÑÎÕÉ Ìäæ ÇáÚãæãíÉ ÇáÚÇãÉ (GPL) æÇáÊí ÊãäÍß ÍÑíÉ ãÔÇÑßÉ "
 "æÊÚÏíá ÇáÈÑãÌíÇÊ ÇáÍÑÉ."
 
-#: src/installer.nsi:225
+#: src/installer.nsi:229
 msgctxt "T_GPLShort"
 msgid ""
 "In short: You are allowed to run this software for any purpose. You may "
@@ -111,77 +111,77 @@
 "ÈÇÎÊÕÇÑ: ÊÓÊØíÚ ÊÔÛíá åÐå ÇáÈÑãÌíÉ áÃí ÛÑÖ. æíãßäß ÊæÒíÚåÇ ãÇ ÏãÊ ÊÚØí "
 "ÇáãÊáÞíä äÝÓ ÇáÍÞæÞ ÇáÊí ÍÕáÊ ÚáíåÇ."
 
-#: src/installer.nsi:230
+#: src/installer.nsi:234
 msgctxt "T_RunKeyManager"
 msgid "Run the key manager"
 msgstr "ÔÛøá ãÏíÑ ÇáãÝÇÊíÍ"
 
-#: src/installer.nsi:233
+#: src/installer.nsi:237
 msgctxt "T_MoreInfo"
 msgid "Click here for the project's homepage"
 msgstr "ÇäÞÑ åäÇ áÊÒæÑ ÕÝÍÉ ÇáãÔÑæÚ"
 
-#: src/installer.nsi:235
+#: src/installer.nsi:239
 msgctxt "T_MoreInfoURL"
 msgid "http://www.gpg4win.org"
 msgstr "http://www.gpg4win.org"
 
-#: src/installer.nsi:237
+#: src/installer.nsi:241
 msgctxt "T_ShowReadme"
 msgid "Show the README file"
 msgstr "ØÇáÚ ãáÝ README"
 
-#: src/installer.nsi:240
+#: src/installer.nsi:244
 msgctxt "T_NoKeyManager"
 msgid "No key manager has been installed, thus we can't run one now."
 msgstr "áã íõËÈøÊ Ãí ãÏíÑ ãÝÇÊíÍ¡ áÐÇ áÇ äÓÊØíÚ ÊÔÛíáå."
 
-#: src/installer.nsi:245
+#: src/installer.nsi:249
 msgctxt "DESC_Menu_manuals"
 msgid "Documentation"
 msgstr "ÇáÊæËíÞ"
 
-#: src/installer.nsi:249
+#: src/installer.nsi:253
 msgctxt "DESC_Desktop_manuals"
 msgid "Gpg4win Documentation"
 msgstr "æËÇÆÞ Gpg4win"
 
-#: src/installer.nsi:453
+#: src/installer.nsi:457
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "ÎíÇÑÇÊ ÇáÊËÈíÊ"
 
-#: src/installer.nsi:456
+#: src/installer.nsi:460
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "æÕáÇÊ ÇáÈÏÁ"
 
-#: src/installer.nsi:458
+#: src/installer.nsi:462
 msgctxt "T_InstOptLabelA"
 msgid "Please select where Gpg4win shall install links:"
 msgstr "ÇÎÊÑ Ãíä íÊÚíä ËÈíÊ ÇáæÕáÇÊ:"
 
-#: src/installer.nsi:461
+#: src/installer.nsi:465
 msgctxt "T_InstOptLabelB"
 msgid "(Only programs will be linked into the quick launch bar.)"
 msgstr "(ÝÞØ ÇáÈÑãÌíÇÊ ÓíÑÈØ ÅáíåÇ Ýí ÔÑíØ ÇáÈÏÁ ÇáÓÑíÚ.)"
 
-#: src/installer.nsi:464
+#: src/installer.nsi:468
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "ÞÇÆãÉ ÇÈÏÃ"
 
-#: src/installer.nsi:467
+#: src/installer.nsi:471
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "ÓØÍ ÇáãßÊÈ"
 
-#: src/installer.nsi:470
+#: src/installer.nsi:474
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "ÔÑíØ ÇáÈÏÁ ÇáÓÑíÚ"
 
-#: src/installer.nsi:476
+#: src/installer.nsi:480
 msgctxt "T_FoundExistingVersion"
 msgid ""
 "Version $R1 has already been installed.\n"
@@ -190,7 +190,7 @@
 "ÇáÅÕÏÇÑÉ $R1 ãËÈÊÉ ÈÇáÝÚá.\n"
 "ÃÊÑíÏ ÇÓÊÈÏÇáåÇ ÈÇáÅÕÏÇÑÉ  ${VERSION}¿"
 
-#: src/installer.nsi:479
+#: src/installer.nsi:483
 #, fuzzy
 msgctxt "T_FoundExistingOldVersion"
 msgid ""
@@ -203,7 +203,7 @@
 "\n"
 "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win¿"
 
-#: src/installer.nsi:484
+#: src/installer.nsi:488
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -216,7 +216,7 @@
 "\n"
 "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win¿"
 
-#: src/installer.nsi:495
+#: src/installer.nsi:499
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -225,7 +225,7 @@
 "ãä ÝÖáß ØÇáÚ Ïáíá ãÓÊÎÏã Gpg4win áÊÞÑà Úä ØÑíÞÉ äÞá ÇáãÝÇÊíÍ ÇáãæÌæÏÉ ãä ÞÈá "
 "ãä ÊËÈíÊÇÊ ÓÇÈÞÉ ãÈäíÉ Úáì GnuPG Åáì Gpg4win."
 
-#: src/installer.nsi:500
+#: src/installer.nsi:504
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -239,7 +239,7 @@
 "\n"
 "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win æÇáÊÚÇãá ãÚ ÇáÊËÈíÊ ÇáÞÏíã áÇÍÞÇ¿"
 
-#: src/installer.nsi:509
+#: src/installer.nsi:513
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -251,7 +251,7 @@
 "\n"
 "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win¿"
 
-#: src/installer.nsi:516
+#: src/installer.nsi:520
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -265,7 +265,7 @@
 "\n"
 "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win æÇáÊÚÇãá ãÚ ÇáÊËÈíÊ ÇáÞÏíã áÇÍÞÇ¿"
 
-#: src/installer.nsi:526
+#: src/installer.nsi:530
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -277,7 +277,7 @@
 "\n"
 "ÓíæÞÝ ÇáÊËÈíÊ ÇáÂä!"
 
-#: src/installer.nsi:535
+#: src/installer.nsi:539
 msgctxt "T_BetaWarning"
 msgid ""
 "Note: This is a BETA version of Gpg4win.\n"
@@ -286,13 +286,13 @@
 "production environment."
 msgstr ""
 
-#: src/installer.nsi:542
+#: src/installer.nsi:546
 msgctxt "T_AdminNeeded"
 msgid ""
 "Warning: Administrator permissions required for a successful installation"
 msgstr "ÊÍÐíÑ: ÊÍÊÇÌ Åáì ÕáÇÍíÇÊ ÇáãÏíÑ áÅÊãÇã ÇáÊËÈíÊ"
 
-#: src/installer.nsi:546
+#: src/installer.nsi:550
 #, fuzzy
 msgctxt "T_CloseOtherApps"
 msgid ""
@@ -303,27 +303,32 @@
 "ÑÌÇÁ ÊÃßÏ ãä ÚÏã ÊÔÛíá Ãí ÊØÈíÞÇÊ ÃÎÑì. Úáíß ÎÕæÕÇ ÅÛáÇÞ ßá äæÇÝÐ ÃæÊáæß Ãæ "
 "ÅßÓÈáæÑÑ.  ÓíÍÇæá Gpg4Win ÇáËÈíÊ Úáì Ãí ÍÇá áßä ÓÊÍÊÇÌ Åáì ÅÚÇÏÉ ÇáÊÔÛíá."
 
-#: src/installer.nsi:551
+#: src/installer.nsi:555
 msgctxt "T_ShuttingDownWinPT"
 msgid "Trying to shutdown a possible running instance of WinPT."
 msgstr "ÊÌÑí ãÍÇæáÉ ÅÛáÇÞ ÓíÑæÑÉ ãÍÊãáÉ ÚÇãáÉ ãä WinPT."
 
-#: src/installer.nsi:553
+#: src/installer.nsi:557
 msgctxt "T_ShuttingDownDirMngr"
 msgid "Trying to shutdown a possible running instance of DirMngr."
 msgstr "ÊÌÑí ãÍÇæáÉ ÅÛáÇÞ ÓíÑæÑÉ ãÍÊãáÉ ÚÇãáÉ ãä DirMngr."
 
-#: src/inst-claws-mail.nsi:55
+#: src/inst-claws-mail.nsi:26
+msgctxt "T_SetDefaultClient"
+msgid "Do you want to make Claws Mail your default mail client?"
+msgstr ""
+
+#: src/inst-claws-mail.nsi:82
 msgctxt "DESC_SEC_claws_mail"
 msgid "Claws Mail-User-Agent"
 msgstr "ÈÑãÌíÉ ÇáÈÑíÏ Claws"
 
-#: src/inst-claws-mail.nsi:58
+#: src/inst-claws-mail.nsi:85
 msgctxt "DESC_Menu_claws_mail"
 msgid "Run the Claws mailprogram."
 msgstr "ÔÛá ÈÑãÌíÉ ÇáÈÑíÏ Claws"
 
-#: src/inst-claws-mail.nsi:61
+#: src/inst-claws-mail.nsi:88
 msgctxt "DESC_Menu_claws_mail_pdf"
 msgid "Show the online manual of Claws Mail"
 msgstr "ÇÚÑÖ ßÊíøÈ ÈÑíÏ Claws Úáì ÇáæÈ"
@@ -333,7 +338,7 @@
 msgid "EudoraGPG is a plugin for the Eudora mail program"
 msgstr "þEudoraGPG åí ãáÍÞÉ áÈÑãÌíÉ ÇáÈÑíÏ Eudora"
 
-#: src/inst-gnupg2.nsi:148
+#: src/inst-gnupg2.nsi:210
 #, fuzzy
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard"
@@ -345,13 +350,10 @@
 msgstr "ãÓÇÚÏ ÎÕæÕíÉ Ìäæ"
 
 #: src/inst-gpa.nsi:75
+#, fuzzy
 msgctxt "DESC_Menu_gpa"
-msgid ""
-"Run the GNU Privacy Assistant key management tool. This is an alternative to "
-"the WinPT key management tool."
-msgstr ""
-"ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ ãÓÇÚÏ ÎÕæÕíÉ Ìäæ. åÐå ÈÏíá áÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ "
-"WinPT."
+msgid "Run the GNU Privacy Assistant key management tool."
+msgstr "ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ ßáíæÈÇÊÑÇ."
 
 #: src/inst-gpg4win.nsi:70
 #, fuzzy
@@ -514,6 +516,14 @@
 "ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ áæÍÉ ÎÕæÕíÉ æíäÏæÒ. åÐå ÃÏÇÉ ÅÏÇÑÉ ãÝÇÊíÍ æÊÚãíÉ "
 "ãÊÚÏÏÉ ÇáÇÓÊÚãÇáÇÊ."
 
+#~ msgctxt "DESC_Menu_gpa"
+#~ msgid ""
+#~ "Run the GNU Privacy Assistant key management tool. This is an alternative "
+#~ "to the WinPT key management tool."
+#~ msgstr ""
+#~ "ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ ãÓÇÚÏ ÎÕæÕíÉ Ìäæ. åÐå ÈÏíá áÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ "
+#~ "WinPT."
+
 #~ msgctxt "DESC_Name_man_novice_en"
 #~ msgid "Novice Manual"
 #~ msgstr "Ïáíá ÇáãÈÊÏÆíä"

Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po	2008-11-11 17:45:15 UTC (rev 1032)
+++ trunk/po/de.po	2008-11-11 17:50:56 UTC (rev 1033)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gpg4win 2.0\n"
 "Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-10-28 18:46+0100\n"
+"POT-Creation-Date: 2008-11-11 17:52+0100\n"
 "PO-Revision-Date: 2008-10-27 20:16+0100\n"
 "Last-Translator: Werner Koch <wk at g10code.com>\n"
 "Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
@@ -82,12 +82,12 @@
 msgid "release date ${_BUILD_ISODATE}"
 msgstr "Releasedatum ${_BUILD_ISODATE}"
 
-#: src/installer.nsi:217
+#: src/installer.nsi:221
 msgctxt "T_LangCode"
 msgid "en"
 msgstr "de"
 
-#: src/installer.nsi:220
+#: src/installer.nsi:224
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
@@ -96,7 +96,7 @@
 "Diese Software ist unter der GNU General Public License (GPL) lizensiert; "
 "dies gibt Ihnen die Freiheit, sie zu ändern und weiterzugeben."
 
-#: src/installer.nsi:225
+#: src/installer.nsi:229
 msgctxt "T_GPLShort"
 msgid ""
 "In short: You are allowed to run this software for any purpose. You may "
@@ -107,80 +107,80 @@
 "einzusetzen.  Sie können die Software weitergeben, sofern Sie dem Empfänger "
 "dieselben Rechte einräumen, die auch Sie erhalten haben."
 
-#: src/installer.nsi:230
+#: src/installer.nsi:234
 msgctxt "T_RunKeyManager"
 msgid "Run the key manager"
 msgstr "Die Schlüsselverwaltung aufrufen"
 
-#: src/installer.nsi:233
+#: src/installer.nsi:237
 msgctxt "T_MoreInfo"
 msgid "Click here for the project's homepage"
 msgstr "Hier klicken um zur Homepage des Projekts zu gelangen"
 
-#: src/installer.nsi:235
+#: src/installer.nsi:239
 msgctxt "T_MoreInfoURL"
 msgid "http://www.gpg4win.org"
 msgstr "http://www.gpg4win.de"
 
-#: src/installer.nsi:237
+#: src/installer.nsi:241
 msgctxt "T_ShowReadme"
 msgid "Show the README file"
 msgstr "Die README Datei anzeigen"
 
-#: src/installer.nsi:240
+#: src/installer.nsi:244
 msgctxt "T_NoKeyManager"
 msgid "No key manager has been installed, thus we can't run one now."
 msgstr ""
 "Es wurde keine Schlüsselverwaltung installiert.  Deswegen kann sie jetzt "
 "auch nicht ausgeführt werden."
 
-#: src/installer.nsi:245
+#: src/installer.nsi:249
 msgctxt "DESC_Menu_manuals"
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: src/installer.nsi:249
+#: src/installer.nsi:253
 msgctxt "DESC_Desktop_manuals"
 msgid "Gpg4win Documentation"
 msgstr "Gpg4win Dokumentation"
 
-#: src/installer.nsi:453
+#: src/installer.nsi:457
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "Installationsoptionen"
 
-#: src/installer.nsi:456
+#: src/installer.nsi:460
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "Startlinks"
 
-#: src/installer.nsi:458
+#: src/installer.nsi:462
 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:461
+#: src/installer.nsi:465
 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:464
+#: src/installer.nsi:468
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "Startmenü"
 
-#: src/installer.nsi:467
+#: src/installer.nsi:471
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "Arbeitsfläche"
 
-#: src/installer.nsi:470
+#: src/installer.nsi:474
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "Schnellstartleiste"
 
-#: src/installer.nsi:476
+#: src/installer.nsi:480
 msgctxt "T_FoundExistingVersion"
 msgid ""
 "Version $R1 has already been installed.\n"
@@ -192,7 +192,7 @@
 "(Sie können in jedem Fall mit JA antworten, falls es sich um eine neuere "
 "oder dieselbe Version handelt.)"
 
-#: src/installer.nsi:479
+#: src/installer.nsi:483
 msgctxt "T_FoundExistingOldVersion"
 msgid ""
 "An old version $R1 has already been installed.  It is strongly recommended "
@@ -204,7 +204,7 @@
 "deinstallieren.\n"
 "Möchten Sie trotzdem fortfahren, Version ${VERSION} zu installieren?"
 
-#: src/installer.nsi:484
+#: src/installer.nsi:488
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -217,7 +217,7 @@
 "\n"
 "Möchten die die Installation von Gpg4win fortführen?"
 
-#: src/installer.nsi:495
+#: src/installer.nsi:499
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -228,7 +228,7 @@
 "überführen.  Es wird dringend geraten Gpg4win nicht zusammen mit diesen "
 "anderen Installation zu betreiben."
 
-#: src/installer.nsi:500
+#: src/installer.nsi:504
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -251,7 +251,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:509
+#: src/installer.nsi:513
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -274,7 +274,7 @@
 "\n"
 "Möchten Sie die Installation von Gpg4win fortführen?"
 
-#: src/installer.nsi:516
+#: src/installer.nsi:520
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -299,7 +299,7 @@
 "\n"
 "Möchten Sie die Installation von Gpg4win trotzdem jetzt weiter durchführen?"
 
-#: src/installer.nsi:526
+#: src/installer.nsi:530
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -313,7 +313,7 @@
 "\n"
 "Die Installation von Gpg4win wird nun abgebrochen!"
 
-#: src/installer.nsi:535
+#: src/installer.nsi:539
 msgctxt "T_BetaWarning"
 msgid ""
 "Note: This is a BETA version of Gpg4win.\n"
@@ -337,7 +337,7 @@
 "\n"
 "  http://www.gpg4win.de/download-de.html  "
 
-#: src/installer.nsi:542
+#: src/installer.nsi:546
 msgctxt "T_AdminNeeded"
 msgid ""
 "Warning: Administrator permissions required for a successful installation"
@@ -345,7 +345,7 @@
 "Achtung: Für eine erfolgreiche Installation werden Administratorrechte "
 "benötigt."
 
-#: src/installer.nsi:546
+#: src/installer.nsi:550
 msgctxt "T_CloseOtherApps"
 msgid ""
 "Please make sure that other applications are not running. In particular you "
@@ -358,29 +358,34 @@
 "eine Installation durchzuführen; es ist dann aber u.U. notwendig, das System "
 "neu zu starten."
 
-#: src/installer.nsi:551
+#: src/installer.nsi:555
 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:553
+#: src/installer.nsi:557
 msgctxt "T_ShuttingDownDirMngr"
 msgid "Trying to shutdown a possible running instance of DirMngr."
 msgstr "Ein möglicherweise laufender DirMngr wird jetzt automatisch beendet."
 
-#: src/inst-claws-mail.nsi:55
+#: src/inst-claws-mail.nsi:26
+msgctxt "T_SetDefaultClient"
+msgid "Do you want to make Claws Mail your default mail client?"
+msgstr ""
+
+#: src/inst-claws-mail.nsi:82
 msgctxt "DESC_SEC_claws_mail"
 msgid "Claws Mail-User-Agent"
 msgstr ""
 "Claws Mail ist ein vollständiges Mail- und News-Programm mit sehr guter "
 "Unterstützung für GnuPG."
 
-#: src/inst-claws-mail.nsi:58
+#: src/inst-claws-mail.nsi:85
 msgctxt "DESC_Menu_claws_mail"
 msgid "Run the Claws mailprogram."
 msgstr "Das Mailprogramm Claws Mail aufrufen."
 
-#: src/inst-claws-mail.nsi:61
+#: src/inst-claws-mail.nsi:88
 msgctxt "DESC_Menu_claws_mail_pdf"
 msgid "Show the online manual of Claws Mail"
 msgstr "Das englische Handbuch zu Claws Mail anzeigen"
@@ -391,7 +396,7 @@
 msgstr ""
 "EudoraGPG ist ein Plugin zur Verschlüsselung für das Eudora Mailprogramm"
 
-#: src/inst-gnupg2.nsi:148
+#: src/inst-gnupg2.nsi:210
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard"
 msgstr ""
@@ -408,13 +413,10 @@
 "anstatt von WinPT benutzt werden."
 
 #: src/inst-gpa.nsi:75
+#, fuzzy
 msgctxt "DESC_Menu_gpa"
-msgid ""
-"Run the GNU Privacy Assistant key management tool. This is an alternative to "
-"the WinPT key management tool."
-msgstr ""
-"Das Schlüsselverwaltungsprogramm GNU Privacy Assistent aufrufen.  Dies ist "
-"eine Alternative zu dem WinPT Programm."
+msgid "Run the GNU Privacy Assistant key management tool."
+msgstr "Das Schlüsselverwaltungsprogramm Kleopatra aufrufen."
 
 #: src/inst-gpg4win.nsi:70
 msgctxt "DESC_Menu_gpg4win_readme"
@@ -582,3 +584,11 @@
 "Das Schlüsselverwaltungsprogramm Windows Privacy Tray aufrufen.  Dies ist "
 "ein vielseitiges Programm zur Schlüsselverwaltung und Verschlüsselung.  Es "
 "installiert sich in die Startleiste."
+
+#~ msgctxt "DESC_Menu_gpa"
+#~ msgid ""
+#~ "Run the GNU Privacy Assistant key management tool. This is an alternative "
+#~ "to the WinPT key management tool."
+#~ msgstr ""
+#~ "Das Schlüsselverwaltungsprogramm GNU Privacy Assistent aufrufen.  Dies "
+#~ "ist eine Alternative zu dem WinPT Programm."

Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po	2008-11-11 17:45:15 UTC (rev 1032)
+++ trunk/po/es.po	2008-11-11 17:50:56 UTC (rev 1033)
@@ -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-10-28 18:46+0100\n"
+"POT-Creation-Date: 2008-11-11 17:52+0100\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"
@@ -86,12 +86,12 @@
 msgid "release date ${_BUILD_ISODATE}"
 msgstr "fecha de publicación ${_BUILD_ISODATE}"
 
-#: src/installer.nsi:217
+#: src/installer.nsi:221
 msgctxt "T_LangCode"
 msgid "en"
 msgstr "es"
 
-#: src/installer.nsi:220
+#: src/installer.nsi:224
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
@@ -101,7 +101,7 @@
 "License (GPL) que garantiza su libertad para compartir y cambiar Software "
 "Libre"
 
-#: src/installer.nsi:225
+#: src/installer.nsi:229
 msgctxt "T_GPLShort"
 msgid ""
 "In short: You are allowed to run this software for any purpose. You may "
@@ -112,78 +112,78 @@
 "Puede distribuirlo en tanto dé al receptor los mismos derechos que usted ha "
 "recibido."
 
-#: src/installer.nsi:230
+#: src/installer.nsi:234
 msgctxt "T_RunKeyManager"
 msgid "Run the key manager"
 msgstr "Ejecutar el gestor de llaves"
 
-#: src/installer.nsi:233
+#: src/installer.nsi:237
 msgctxt "T_MoreInfo"
 msgid "Click here for the project's homepage"
 msgstr "Siga este enlace para ver el sitio web del proyecto"
 
-#: src/installer.nsi:235
+#: src/installer.nsi:239
 msgctxt "T_MoreInfoURL"
 msgid "http://www.gpg4win.org"
 msgstr "http://www.gpg4win.org"
 
-#: src/installer.nsi:237
+#: src/installer.nsi:241
 msgctxt "T_ShowReadme"
 msgid "Show the README file"
 msgstr "Ver el archivo README"
 
-#: src/installer.nsi:240
+#: src/installer.nsi:244
 msgctxt "T_NoKeyManager"
 msgid "No key manager has been installed, thus we can't run one now."
 msgstr ""
 "No se puede ejecutar el gestor de llaves.No se encuentra ninguno instalado."
 
-#: src/installer.nsi:245
+#: src/installer.nsi:249
 msgctxt "DESC_Menu_manuals"
 msgid "Documentation"
 msgstr "Documentación"
 
-#: src/installer.nsi:249
+#: src/installer.nsi:253
 msgctxt "DESC_Desktop_manuals"
 msgid "Gpg4win Documentation"
 msgstr "Documentación de Gpg4win"
 
-#: src/installer.nsi:453
+#: src/installer.nsi:457
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "Opciones de instalación"
 
-#: src/installer.nsi:456
+#: src/installer.nsi:460
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "Vínculos de inicio"
 
-#: src/installer.nsi:458
+#: src/installer.nsi:462
 msgctxt "T_InstOptLabelA"
 msgid "Please select where Gpg4win shall install links:"
 msgstr "Por favor seleccione dónde debe Gpg4win instalar los vínculos:"
 
-#: src/installer.nsi:461
+#: src/installer.nsi:465
 msgctxt "T_InstOptLabelB"
 msgid "(Only programs will be linked into the quick launch bar.)"
 msgstr "(Sólo las aplicaciones serán vinculadas en la barra de inicio rápido.)"
 
-#: src/installer.nsi:464
+#: src/installer.nsi:468
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "Menú inicio"
 
-#: src/installer.nsi:467
+#: src/installer.nsi:471
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: src/installer.nsi:470
+#: src/installer.nsi:474
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "Barra de inicio rápido"
 
-#: src/installer.nsi:476
+#: src/installer.nsi:480
 msgctxt "T_FoundExistingVersion"
 msgid ""
 "Version $R1 has already been installed.\n"
@@ -192,7 +192,7 @@
 "La versión $R1 ya está instalada.\n"
 "¿Desea sobreescribirla con la versión ${VERSION}?"
 
-#: src/installer.nsi:479
+#: src/installer.nsi:483
 #, fuzzy
 msgctxt "T_FoundExistingOldVersion"
 msgid ""
@@ -205,7 +205,7 @@
 "\n"
 "¿Desea continuar con la instalación?"
 
-#: src/installer.nsi:484
+#: src/installer.nsi:488
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -218,7 +218,7 @@
 "\n"
 "¿Desea continuar con la instalación?"
 
-#: src/installer.nsi:495
+#: src/installer.nsi:499
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -227,7 +227,7 @@
 "Por favor revise el manual del usuario de Gpg4Win para que aprenda cómo "
 "migrar las llaves existentes de una instalación basada en GnuPG a Gpg4Win."
 
-#: src/installer.nsi:500
+#: src/installer.nsi:504
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -242,7 +242,7 @@
 "¿Desea continuar con la instalación de Gpg4Win y dejar para mas tarde la "
 "instalación antigua de GnuPP?"
 
-#: src/installer.nsi:509
+#: src/installer.nsi:513
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -255,7 +255,7 @@
 "\n"
 "¿Desea continuar instalando Gpg4Win?"
 
-#: src/installer.nsi:516
+#: src/installer.nsi:520
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -270,7 +270,7 @@
 "¿Desea continuar con la instalación de Gpg4Win y dejar para más tarde la "
 "instalación antigua de WinPT?"
 
-#: src/installer.nsi:526
+#: src/installer.nsi:530
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -283,7 +283,7 @@
 "\n"
 "La instalación se detendrá ahora."
 
-#: src/installer.nsi:535
+#: src/installer.nsi:539
 msgctxt "T_BetaWarning"
 msgid ""
 "Note: This is a BETA version of Gpg4win.\n"
@@ -292,14 +292,14 @@
 "production environment."
 msgstr ""
 
-#: src/installer.nsi:542
+#: src/installer.nsi:546
 msgctxt "T_AdminNeeded"
 msgid ""
 "Warning: Administrator permissions required for a successful installation"
 msgstr ""
 "Advertencia: Necesita permisos de administrador para una instalación exitosa."
 
-#: src/installer.nsi:546
+#: src/installer.nsi:550
 #, fuzzy
 msgctxt "T_CloseOtherApps"
 msgid ""
@@ -312,28 +312,33 @@
 "intentará instalarse de todas formas, pero será necesario que reinicie su "
 "sistema una vez terminado el proceso. "
 
-#: src/installer.nsi:551
+#: src/installer.nsi:555
 msgctxt "T_ShuttingDownWinPT"
 msgid "Trying to shutdown a possible running instance of WinPT."
 msgstr "Intentado cerrar instancias de WinPT que podrían estar ejecutándose."
 
-#: src/installer.nsi:553
+#: src/installer.nsi:557
 msgctxt "T_ShuttingDownDirMngr"
 msgid "Trying to shutdown a possible running instance of DirMngr."
 msgstr ""
 "Intentando cerrar instancias de DirMngr que podrían estar ejecutándose."
 
-#: src/inst-claws-mail.nsi:55
+#: src/inst-claws-mail.nsi:26
+msgctxt "T_SetDefaultClient"
+msgid "Do you want to make Claws Mail your default mail client?"
+msgstr ""
+
+#: src/inst-claws-mail.nsi:82
 msgctxt "DESC_SEC_claws_mail"
 msgid "Claws Mail-User-Agent"
 msgstr "Cliente de correo Claws."
 
-#: src/inst-claws-mail.nsi:58
+#: src/inst-claws-mail.nsi:85
 msgctxt "DESC_Menu_claws_mail"
 msgid "Run the Claws mailprogram."
 msgstr "Ejecutar el cliente de correo Claws."
 
-#: src/inst-claws-mail.nsi:61
+#: src/inst-claws-mail.nsi:88
 msgctxt "DESC_Menu_claws_mail_pdf"
 msgid "Show the online manual of Claws Mail"
 msgstr "Mostrar el manual en línea de Claws"
@@ -343,7 +348,7 @@
 msgid "EudoraGPG is a plugin for the Eudora mail program"
 msgstr "EudoraGPG es un plugin para el cliente de correo Eudora"
 
-#: src/inst-gnupg2.nsi:148
+#: src/inst-gnupg2.nsi:210
 #, fuzzy
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard"
@@ -355,13 +360,10 @@
 msgstr "GNU Privacy Assistant"
 
 #: src/inst-gpa.nsi:75
+#, fuzzy
 msgctxt "DESC_Menu_gpa"
-msgid ""
-"Run the GNU Privacy Assistant key management tool. This is an alternative to "
-"the WinPT key management tool."
-msgstr ""
-"Ejecutar la herramienta de gestión de llaves GNU Privacy Assistant. Ésta es "
-"una alternativa a la herramienta de manejo de llaves WinPT."
+msgid "Run the GNU Privacy Assistant key management tool."
+msgstr "Ejecutar la herramienta de gestión de llaves Kleopatra."
 
 #: src/inst-gpg4win.nsi:70
 #, fuzzy
@@ -527,6 +529,14 @@
 "Ejecutar la herramienta de gestión de llaves Windows Privacy Tray. Ésta es "
 "una herramienta  versátil para la gestión de llaves y cifrado."
 
+#~ msgctxt "DESC_Menu_gpa"
+#~ msgid ""
+#~ "Run the GNU Privacy Assistant key management tool. This is an alternative "
+#~ "to the WinPT key management tool."
+#~ msgstr ""
+#~ "Ejecutar la herramienta de gestión de llaves GNU Privacy Assistant. Ésta "
+#~ "es una alternativa a la herramienta de manejo de llaves WinPT."
+
 #~ msgctxt "DESC_Name_man_novice_en"
 #~ msgid "Novice Manual"
 #~ msgstr "Manuel del principiante (Inglés)"

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2008-11-11 17:45:15 UTC (rev 1032)
+++ trunk/po/fr.po	2008-11-11 17:50:56 UTC (rev 1033)
@@ -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-10-28 18:46+0100\n"
+"POT-Creation-Date: 2008-11-11 17:52+0100\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"
@@ -88,12 +88,12 @@
 msgid "release date ${_BUILD_ISODATE}"
 msgstr "release date ${_BUILD_ISODATE}"
 
-#: src/installer.nsi:217
+#: src/installer.nsi:221
 msgctxt "T_LangCode"
 msgid "en"
 msgstr "fr"
 
-#: src/installer.nsi:220
+#: src/installer.nsi:224
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
@@ -102,7 +102,7 @@
 "Ce logiciel est autorisé en vertu du permis Licence publique général de GNU "
 "(GPL) qui garantit le droit de partager et de modifier les logiciels libres."
 
-#: src/installer.nsi:225
+#: src/installer.nsi:229
 msgctxt "T_GPLShort"
 msgid ""
 "In short: You are allowed to run this software for any purpose. You may "
@@ -113,80 +113,80 @@
 "pouvez le distribuer pour autant que vous donniez aux destinataires les "
 "mêmes droits que vous avez"
 
-#: src/installer.nsi:230
+#: src/installer.nsi:234
 msgctxt "T_RunKeyManager"
 msgid "Run the key manager"
 msgstr "Lancer le gestionnaire de clés"
 
-#: src/installer.nsi:233
+#: src/installer.nsi:237
 msgctxt "T_MoreInfo"
 msgid "Click here for the project's homepage"
 msgstr "Cliquer ici pour la page d'accueil du projet"
 
-#: src/installer.nsi:235
+#: src/installer.nsi:239
 msgctxt "T_MoreInfoURL"
 msgid "http://www.gpg4win.org"
 msgstr "http://www.gpg4win.org"
 
-#: src/installer.nsi:237
+#: src/installer.nsi:241
 msgctxt "T_ShowReadme"
 msgid "Show the README file"
 msgstr "Montrez le dossier de README"
 
-#: src/installer.nsi:240
+#: src/installer.nsi:244
 msgctxt "T_NoKeyManager"
 msgid "No key manager has been installed, thus we can't run one now."
 msgstr ""
 "Directeur de clés n'a été installé. Impossible de le exécuter maintenant."
 
-#: src/installer.nsi:245
+#: src/installer.nsi:249
 msgctxt "DESC_Menu_manuals"
 msgid "Documentation"
 msgstr "Guides"
 
-#: src/installer.nsi:249
+#: src/installer.nsi:253
 msgctxt "DESC_Desktop_manuals"
 msgid "Gpg4win Documentation"
 msgstr "Guides pour l'installation du logiciel Gpg4win"
 
-#: src/installer.nsi:453
+#: src/installer.nsi:457
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "Installer les options"
 
-#: src/installer.nsi:456
+#: src/installer.nsi:460
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "Démarrage Liens"
 
-#: src/installer.nsi:458
+#: src/installer.nsi:462
 msgctxt "T_InstOptLabelA"
 msgid "Please select where Gpg4win shall install links:"
 msgstr "Veuillez choisir où Gpg4win installera des liens:"
 
-#: src/installer.nsi:461
+#: src/installer.nsi:465
 msgctxt "T_InstOptLabelB"
 msgid "(Only programs will be linked into the quick launch bar.)"
 msgstr ""
 "(Seulement des programmes seront incorporés dans la barre rapide de "
 "lancement.)"
 
-#: src/installer.nsi:464
+#: src/installer.nsi:468
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "Menu Démarrage"
 
-#: src/installer.nsi:467
+#: src/installer.nsi:471
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "Desktop"
 
-#: src/installer.nsi:470
+#: src/installer.nsi:474
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "Barre rapide de Lancement"
 
-#: src/installer.nsi:476
+#: src/installer.nsi:480
 msgctxt "T_FoundExistingVersion"
 msgid ""
 "Version $R1 has already been installed.\n"
@@ -195,7 +195,7 @@
 "La version $R1 a déjà été installée.\n"
 "Voulez-vous la remplacer avec la version ${VERSION}?"
 
-#: src/installer.nsi:479
+#: src/installer.nsi:483
 #, fuzzy
 msgctxt "T_FoundExistingOldVersion"
 msgid ""
@@ -208,7 +208,7 @@
 "\n"
 "Voulez-vous poursuivre l'installation Gpg4win?"
 
-#: src/installer.nsi:484
+#: src/installer.nsi:488
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -221,7 +221,7 @@
 "\n"
 "Voulez-vous poursuivre l'installation Gpg4win?"
 
-#: src/installer.nsi:495
+#: src/installer.nsi:499
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -230,7 +230,7 @@
 "Veuillez consulter le guide d'utilisateur de Gpg4win pour apprendre comment "
 "déplacer des clés existantes dans une installation GnuPG vers Gpg4win."
 
-#: src/installer.nsi:500
+#: src/installer.nsi:504
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -245,7 +245,7 @@
 "Voulez-vous continuer d'installer Gpg4win et prendre soin de la vieille "
 "installation plus tard?"
 
-#: src/installer.nsi:509
+#: src/installer.nsi:513
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -258,7 +258,7 @@
 "\n"
 "Voulez-vous continuer d'installer Gpg4win?"
 
-#: src/installer.nsi:516
+#: src/installer.nsi:520
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -273,7 +273,7 @@
 "Vous voulez continuer d'installer Gpg4win et prendre soin de la vieille "
 "installation plus tard?"
 
-#: src/installer.nsi:526
+#: src/installer.nsi:530
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -286,7 +286,7 @@
 "\n"
 "L'installation sera annulée maintenant!"
 
-#: src/installer.nsi:535
+#: src/installer.nsi:539
 msgctxt "T_BetaWarning"
 msgid ""
 "Note: This is a BETA version of Gpg4win.\n"
@@ -295,7 +295,7 @@
 "production environment."
 msgstr ""
 
-#: src/installer.nsi:542
+#: src/installer.nsi:546
 msgctxt "T_AdminNeeded"
 msgid ""
 "Warning: Administrator permissions required for a successful installation"
@@ -303,7 +303,7 @@
 "Avertissement : Permissions d'administrateur requises pour une installation "
 "réussie"
 
-#: src/installer.nsi:546
+#: src/installer.nsi:550
 msgctxt "T_CloseOtherApps"
 msgid ""
 "Please make sure that other applications are not running. In particular you "
@@ -315,27 +315,32 @@
 "Gpg4win essayera d'installer quoi qu'il en soit mais une réinitialisation "
 "sera exigé alors."
 
-#: src/installer.nsi:551
+#: src/installer.nsi:555
 msgctxt "T_ShuttingDownWinPT"
 msgid "Trying to shutdown a possible running instance of WinPT."
 msgstr "Essayant à l'arrêt un instance courant possible de WinPT."
 
-#: src/installer.nsi:553
+#: src/installer.nsi:557
 msgctxt "T_ShuttingDownDirMngr"
 msgid "Trying to shutdown a possible running instance of DirMngr."
 msgstr "Essayant à l'arrêt un instance courant possible de DirMngr."
 
-#: src/inst-claws-mail.nsi:55
+#: src/inst-claws-mail.nsi:26
+msgctxt "T_SetDefaultClient"
+msgid "Do you want to make Claws Mail your default mail client?"
+msgstr ""
+
+#: src/inst-claws-mail.nsi:82
 msgctxt "DESC_SEC_claws_mail"
 msgid "Claws Mail-User-Agent"
 msgstr "Claws Mail-User-Agent"
 
-#: src/inst-claws-mail.nsi:58
+#: src/inst-claws-mail.nsi:85
 msgctxt "DESC_Menu_claws_mail"
 msgid "Run the Claws mailprogram."
 msgstr "Courez le Claws mailprogram."
 
-#: src/inst-claws-mail.nsi:61
+#: src/inst-claws-mail.nsi:88
 msgctxt "DESC_Menu_claws_mail_pdf"
 msgid "Show the online manual of Claws Mail"
 msgstr "Montrez le guide en ligne du Claws Mail"
@@ -346,7 +351,7 @@
 msgstr ""
 "EudoraGPG est un plugin pour le logiciel de courrier électronique d'Eudora"
 
-#: src/inst-gnupg2.nsi:148
+#: src/inst-gnupg2.nsi:210
 #, fuzzy
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard"
@@ -358,13 +363,10 @@
 msgstr "GNU Privacy Assistant"
 
 #: src/inst-gpa.nsi:75
+#, fuzzy
 msgctxt "DESC_Menu_gpa"
-msgid ""
-"Run the GNU Privacy Assistant key management tool. This is an alternative to "
-"the WinPT key management tool."
-msgstr ""
-"Courez le GNU Privacy Assistant outil pour gestionner le clé. C'est une "
-"alternative à l'outil de gestion de clé de WinPT."
+msgid "Run the GNU Privacy Assistant key management tool."
+msgstr "Courez l'outil de gestion de clé de Kleopatra."
 
 #: src/inst-gpg4win.nsi:70
 #, fuzzy
@@ -533,6 +535,14 @@
 "Courez l'outil de gestion de clé de plateau d'privé de Windows. C'est une "
 "clé souple outil de gestion de clé et de cryptage."
 
+#~ msgctxt "DESC_Menu_gpa"
+#~ msgid ""
+#~ "Run the GNU Privacy Assistant key management tool. This is an alternative "
+#~ "to the WinPT key management tool."
+#~ msgstr ""
+#~ "Courez le GNU Privacy Assistant outil pour gestionner le clé. C'est une "
+#~ "alternative à l'outil de gestion de clé de WinPT."
+
 #~ msgctxt "DESC_Name_man_novice_en"
 #~ msgid "Novice Manual"
 #~ msgstr "Guide de débutant"

Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po	2008-11-11 17:45:15 UTC (rev 1032)
+++ trunk/po/ru.po	2008-11-11 17:50:56 UTC (rev 1033)
@@ -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-10-28 18:46+0100\n"
+"POT-Creation-Date: 2008-11-11 17:52+0100\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"
@@ -89,12 +89,12 @@
 msgid "release date ${_BUILD_ISODATE}"
 msgstr "Äàòà ðåëèçà ${_BUILD_ISODATE}"
 
-#: src/installer.nsi:217
+#: src/installer.nsi:221
 msgctxt "T_LangCode"
 msgid "en"
 msgstr "ru"
 
-#: src/installer.nsi:220
+#: src/installer.nsi:224
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
@@ -104,7 +104,7 @@
 "License (GPL). Âû ìîæåòå ñâîáîäíî ðàñïðîñòðàíÿòü ýòó ïðîãðàììó è âíîñèòü â "
 "íåå èçìåíåíèÿ."
 
-#: src/installer.nsi:225
+#: src/installer.nsi:229
 msgctxt "T_GPLShort"
 msgid ""
 "In short: You are allowed to run this software for any purpose. You may "
@@ -115,77 +115,77 @@
 "ðàñïðîñòðàíÿòü åå ïðè óñëîâèè, ÷òî íå áóäåòå îãðàíè÷èâàòü ïðàâà äðóãèõ "
 "ïîëüçîâàòåëåé ïðîãðàììû."
 
-#: src/installer.nsi:230
+#: src/installer.nsi:234
 msgctxt "T_RunKeyManager"
 msgid "Run the key manager"
 msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé"
 
-#: src/installer.nsi:233
+#: src/installer.nsi:237
 msgctxt "T_MoreInfo"
 msgid "Click here for the project's homepage"
 msgstr "Âåá-ñàéò ïðîåêòà"
 
-#: src/installer.nsi:235
+#: src/installer.nsi:239
 msgctxt "T_MoreInfoURL"
 msgid "http://www.gpg4win.org"
 msgstr "http://www.gpg4win.org"
 
-#: src/installer.nsi:237
+#: src/installer.nsi:241
 msgctxt "T_ShowReadme"
 msgid "Show the README file"
 msgstr "Ïîêàçàòü ôàéë README"
 
-#: src/installer.nsi:240
+#: src/installer.nsi:244
 msgctxt "T_NoKeyManager"
 msgid "No key manager has been installed, thus we can't run one now."
 msgstr "Îøèáêà çàïóñêà ìåíåäæåðà êëþ÷åé: íè îäèí èç ìåíåäæåðîâ íå óñòàíîâëåí."
 
-#: src/installer.nsi:245
+#: src/installer.nsi:249
 msgctxt "DESC_Menu_manuals"
 msgid "Documentation"
 msgstr "Äîêóìåíòàöèÿ"
 
-#: src/installer.nsi:249
+#: src/installer.nsi:253
 msgctxt "DESC_Desktop_manuals"
 msgid "Gpg4win Documentation"
 msgstr "Äîêóìåíòàöèÿ Gpg4win"
 
-#: src/installer.nsi:453
+#: src/installer.nsi:457
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "Ïàðàìåòðû óñòàíîâêè"
 
-#: src/installer.nsi:456
+#: src/installer.nsi:460
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "ßðëûêè Gpg4win"
 
-#: src/installer.nsi:458
+#: src/installer.nsi:462
 msgctxt "T_InstOptLabelA"
 msgid "Please select where Gpg4win shall install links:"
 msgstr "Ãäå ñîçäàâàòü ÿðëûêè Gpg4win:"
 
-#: src/installer.nsi:461
+#: src/installer.nsi:465
 msgctxt "T_InstOptLabelB"
 msgid "(Only programs will be linked into the quick launch bar.)"
 msgstr "(Â ïàíåëè áûñòðîãî çàïóñêà áóäóò ññûëêè òîëüêî íà ïðîãðàììû)."
 
-#: src/installer.nsi:464
+#: src/installer.nsi:468
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "Ìåíþ Ïóñê"
 
-#: src/installer.nsi:467
+#: src/installer.nsi:471
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "Ðàáî÷èé ñòîë"
 
-#: src/installer.nsi:470
+#: src/installer.nsi:474
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "Ïàíåëü áûñòðîãî çàïóñêà"
 
-#: src/installer.nsi:476
+#: src/installer.nsi:480
 msgctxt "T_FoundExistingVersion"
 msgid ""
 "Version $R1 has already been installed.\n"
@@ -194,7 +194,7 @@
 "Âåðñèÿ $R1 óæå óñòàíîâëåíà.\n"
 "Ïåðåçàïèñàòü åå âåðñèåé ${VERSION}?"
 
-#: src/installer.nsi:479
+#: src/installer.nsi:483
 #, fuzzy
 msgctxt "T_FoundExistingOldVersion"
 msgid ""
@@ -207,7 +207,7 @@
 "\n"
 "Ïðîäîëæèòü óñòàíîâêó Gpg4Win?"
 
-#: src/installer.nsi:484
+#: src/installer.nsi:488
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -220,7 +220,7 @@
 "\n"
 "Ïðîäîëæèòü óñòàíîâêó Gpg4Win?"
 
-#: src/installer.nsi:495
+#: src/installer.nsi:499
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -229,7 +229,7 @@
 "Âîïðîñû ïåðåíîñà êëþ÷åé èç äðóãèõ ïðîãðàìì â Gpg4Win ðàññìàòðèâàþòñÿ â "
 "ðóêîâîäñòâå ïîëüçîâàòåëÿ Gpg4Win."
 
-#: src/installer.nsi:500
+#: src/installer.nsi:504
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -243,7 +243,7 @@
 "\n"
 "Ïðîäîëæèòü óñòàíîâêó Gpg4Win (à ñ GnuPP ðàçáåðåìñÿ ïîòîì)?"
 
-#: src/installer.nsi:509
+#: src/installer.nsi:513
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -256,7 +256,7 @@
 "\n"
 "Ïðîäîëæèòü óñòàíîâêó Gpg4win?"
 
-#: src/installer.nsi:516
+#: src/installer.nsi:520
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -271,7 +271,7 @@
 "\n"
 "Ïðîäîëæèòü óñòàíîâêó Gpg4win (à ñî ñòàðîé ïðîãðàììîé ðàçáåðåìñÿ ïîòîì)?"
 
-#: src/installer.nsi:526
+#: src/installer.nsi:530
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -285,7 +285,7 @@
 "\n"
 "Óñòàíîâêà ïðåðâàíà!"
 
-#: src/installer.nsi:535
+#: src/installer.nsi:539
 msgctxt "T_BetaWarning"
 msgid ""
 "Note: This is a BETA version of Gpg4win.\n"
@@ -294,13 +294,13 @@
 "production environment."
 msgstr ""
 
-#: src/installer.nsi:542
+#: src/installer.nsi:546
 msgctxt "T_AdminNeeded"
 msgid ""
 "Warning: Administrator permissions required for a successful installation"
 msgstr "Äëÿ óñïåøíîé óñòàíîâêè òðåáóþòñÿ ïðàâà àäìèíèñòðàòîðà"
 
-#: src/installer.nsi:546
+#: src/installer.nsi:550
 msgctxt "T_CloseOtherApps"
 msgid ""
 "Please make sure that other applications are not running. In particular you "
@@ -311,27 +311,32 @@
 "Outlook è Explorer. Åñëè ýòî íå ñäåëàòü, Gpg4Win âñå ðàâíî áóäåò "
 "óñòàíîâëåíà, íî ïîòðåáóåòñÿ ïåðåçàãðóçêà."
 
-#: src/installer.nsi:551
+#: src/installer.nsi:555
 msgctxt "T_ShuttingDownWinPT"
 msgid "Trying to shutdown a possible running instance of WinPT."
 msgstr "Âîçìîæíî, çàïóùåíà ïðîãðàììà WinPT. Ïîïðîáóåì çàêðûòü åå."
 
-#: src/installer.nsi:553
+#: src/installer.nsi:557
 msgctxt "T_ShuttingDownDirMngr"
 msgid "Trying to shutdown a possible running instance of DirMngr."
 msgstr "Âîçìîæíî, çàïóùåíà ïðîãðàììà DirMngr. Ïîïðîáóåì çàêðûòü åå."
 
-#: src/inst-claws-mail.nsi:55
+#: src/inst-claws-mail.nsi:26
+msgctxt "T_SetDefaultClient"
+msgid "Do you want to make Claws Mail your default mail client?"
+msgstr ""
+
+#: src/inst-claws-mail.nsi:82
 msgctxt "DESC_SEC_claws_mail"
 msgid "Claws Mail-User-Agent"
 msgstr "Ïî÷òîâûé êëèåíò Claws"
 
-#: src/inst-claws-mail.nsi:58
+#: src/inst-claws-mail.nsi:85
 msgctxt "DESC_Menu_claws_mail"
 msgid "Run the Claws mailprogram."
 msgstr "Çàïóñê ïî÷òîâîé ïðîãðàììû Claws."
 
-#: src/inst-claws-mail.nsi:61
+#: src/inst-claws-mail.nsi:88
 msgctxt "DESC_Menu_claws_mail_pdf"
 msgid "Show the online manual of Claws Mail"
 msgstr "Ïîêàçàòü îíëàéíîâîå ðóêîâîäñòâî ê ïî÷òîâîìó êëèåíòó Claws Mail"
@@ -341,7 +346,7 @@
 msgid "EudoraGPG is a plugin for the Eudora mail program"
 msgstr "EudoraGPG - ðàñøèðåíèå ïî÷òîâîãî êëèåíòà Eudora"
 
-#: src/inst-gnupg2.nsi:148
+#: src/inst-gnupg2.nsi:210
 #, fuzzy
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard"
@@ -353,11 +358,10 @@
 msgstr "GNU Privacy Assistant"
 
 #: src/inst-gpa.nsi:75
+#, fuzzy
 msgctxt "DESC_Menu_gpa"
-msgid ""
-"Run the GNU Privacy Assistant key management tool. This is an alternative to "
-"the WinPT key management tool."
-msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé GNU Privacy Assistant (àëüòåðíàòèâà WinPT)."
+msgid "Run the GNU Privacy Assistant key management tool."
+msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé Kleopatra."
 
 #: src/inst-gpg4win.nsi:70
 #, fuzzy
@@ -522,6 +526,12 @@
 "Çàïóñê Windows Privacy Tray. Ýòî óíèâåðñàëüíûé èíñòðóìåíò óïðàâëåíèÿ êëþ÷àìè "
 "è øèôðîâàíèÿ äàííûõ."
 
+#~ msgctxt "DESC_Menu_gpa"
+#~ msgid ""
+#~ "Run the GNU Privacy Assistant key management tool. This is an alternative "
+#~ "to the WinPT key management tool."
+#~ msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé GNU Privacy Assistant (àëüòåðíàòèâà WinPT)."
+
 #~ msgctxt "DESC_Name_man_novice_en"
 #~ msgid "Novice Manual"
 #~ msgstr "Áûñòðûå èíñòðóêöèè"

Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi	2008-11-11 17:45:15 UTC (rev 1032)
+++ trunk/src/inst-kleopatra.nsi	2008-11-11 17:50:56 UTC (rev 1033)
@@ -117,6 +117,11 @@
   File ${prefix}/share/kde4/services/kleopatra_signencryptfiles.desktop
   File ${prefix}/share/kde4/services/kleopatra_decryptverifyfiles.desktop
 
+  # FIXME: From the lib package.  This is wrong.
+!undef prefix
+!define prefix ${ipdir}/kleopatra-dev-${gpg4win_pkg_kleopatra_version}
+
+
   SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
 
   File ${prefix}/share/locale/de/LC_MESSAGES/akonaditray.mo
@@ -200,13 +205,6 @@
   File ${prefix}/share/locale/de/LC_MESSAGES/libkxmlrpcclient.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/libmailtransport.mo
 
-
-  # FIXME: From the lib package.  This is wrong.
-!undef prefix
-!define prefix ${ipdir}/kleopatra-dev-${gpg4win_pkg_kleopatra_version}
-
-  SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
-
   File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdelibs.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/desktop_l10n.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/katepart4.mo



More information about the Gpg4win-commits mailing list