2008-10-20 Marcus Brinkmann <marcus@g10code.com>

        * Makefile.am (EXTRA_DIST): Add gpgme-1.1.7/01-registry.patch.

diff --git a/ChangeLog b/ChangeLog
index 9050e5f..3402ab8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-10-20  Marcus Brinkmann  <marcus@g10code.com>
 
+       * Makefile.am (EXTRA_DIST): Add gpgme-1.1.7/01-registry.patch.
+
+2008-10-20  Marcus Brinkmann  <marcus@g10code.com>
+
        * packages/packages.current: Fix gpgme location.
 
 2008-10-17  Marcus Brinkmann  <marcus@g10code.com>

diff --git a/Makefile.am b/Makefile.am
index d5d1a48..555c550 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,7 @@ EXTRA_DIST = autogen.sh README.SVN \
        patches/claws-mail-3.5.0cvs114/99-auto.patch \
        patches/gpgme/01-gpg2.patch \
        patches/gpgme/02-kleo-bugs-workaround.patch \
+       patches/gpgme-1.1.7/01-registry.patch \
        patches/libetpan-0.54/01-config.patch \
        patches/libetpan-0.54/02-index.patch \
        patches/winpt/01-gpg-path.patch \

diff --git a/patches/gpgme-1.1.7/01-registry.patch b/patches/gpgme-1.1.7/01-registry.patch
new file mode 100755 (executable)
index 0000000..0235f6e
--- /dev/null
+++ b/patches/gpgme-1.1.7/01-registry.patch
@@ -0,0 +1,66 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+2008-10-18  Marcus Brinkmann  <marcus@g10code.com>
+
+       * w32-util.c (find_program_in_registry): Don't define.
+       (_gpgme_get_gpg_path, _gpgme_get_gpgsm_path)
+       (_gpgme_get_gpgconf_path): Do not check for fooProgram in the
+       registry anymore.  It is now no longer possible to overwrite the
+       default location in that way.
+
+
+Index: gpgme/w32-util.c
+===================================================================
+--- gpgme/w32-util.c   (revision 1337)
++++ gpgme/w32-util.c   (revision 1338)
+@@ -225,6 +225,7 @@
+ }
+ 
+ 
++#if 0
+ static char *
+ find_program_in_registry (const char *name)
+ {
+@@ -245,6 +246,7 @@
+     }
+   return program;
+ }
++#endif
+ 
+ 
+ static char *
+@@ -307,8 +309,10 @@
+   static char *gpg_program;
+ 
+   LOCK (get_path_lock);
++#if 0
+   if (!gpg_program)
+     gpg_program = find_program_in_registry ("gpgProgram");
++#endif
+   if (!gpg_program)
+     gpg_program = find_program_in_inst_dir ("gpg.exe");
+   if (!gpg_program)
+@@ -324,8 +328,10 @@
+   static char *gpgsm_program;
+ 
+   LOCK (get_path_lock);
++#if 0
+   if (!gpgsm_program)
+     gpgsm_program = find_program_in_registry ("gpgsmProgram");
++#endif
+   if (!gpgsm_program)
+     gpgsm_program = find_program_in_inst_dir ("gpgsm.exe");
+   if (!gpgsm_program)
+@@ -341,8 +347,10 @@
+   static char *gpgconf_program;
+ 
+   LOCK (get_path_lock);
++#if 0
+   if (!gpgconf_program)
+     gpgconf_program = find_program_in_registry ("gpgconfProgram");
++#endif
+   if (!gpgconf_program)
+     gpgconf_program = find_program_in_inst_dir ("gpgconf.exe");
+   if (!gpgconf_program)

diff --git a/po/ar.po b/po/ar.po
index c5e987b..82e7c2f 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gpg4Win\n"
 "Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
-"POT-Creation-Date: 2008-09-30 08:41+0200\n"
+"POT-Creation-Date: 2008-10-20 12:14+0200\n"
 "PO-Revision-Date: 2008-03-11 23:52+0200\n"
 "Last-Translator: Ahmad Gharbeia <ahmad@gharbeia.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -23,12 +23,12 @@ msgctxt "T_AlreadyRunning"
 msgid "An instance of this installer is already running."
 msgstr "ÊÚãá ÓíÑæÑÉ ÃÎÑì ãä åÐÇ ÇáãõËÈøöÊ ÈÇáÝÚá."
 
-#: src/gpg4win.nsi:110
+#: src/gpg4win.nsi:114
 msgctxt "T_WelcomeTitleGpg4win"
 msgid "Welcome to the installation of Gpg4win"
 msgstr "ãÑÍÈÇ Ýí ÊËÈíÊ Gpg4win"
 
-#: src/gpg4win.nsi:114
+#: src/gpg4win.nsi:118
 msgctxt "T_AboutGpg4win"
 msgid ""
 "GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -40,17 +40,17 @@ msgstr ""
 "ÇáÈíÇäÇÊ æ ÇáÊæÞíÚ ÇáÑÞãíº æ åæ íÔÊãá Úáì æÓíáÉ ãÊÞÏãÉ áÅÏÇÑÉ ÇáãÝÇÊíÍ¡ "
 "æíÊæÇÝÞ ãÚ ãÚíÇÑ ÇáÅäÊÑäÊ OpenPGP ÇáãÞÊÑÍ ßãÇ æõÕöÝ Ýí RFC2440."
 
-#: src/gpg4win.nsi:120
+#: src/gpg4win.nsi:124
 msgctxt "T_AboutGpg4winVersion"
 msgid "This is Gpg4win version ${VERSION}"
 msgstr "åÐå ÇáÅÕÏÇÑÉ ${VERSION} ãä Gpg4win"
 
-#: src/gpg4win.nsi:123
+#: src/gpg4win.nsi:127
 msgctxt "T_AboutGpg4winFileVersion"
 msgid "file version ${PROD_VERSION}"
 msgstr "ÅÕÏÇÑÉ ÇáãáÝ ${PROD_VERSION}"
 
-#: src/gpg4win.nsi:126
+#: src/gpg4win.nsi:130
 msgctxt "T_AboutGpg4winReleaseDate"
 msgid "release date ${_BUILD_ISODATE}"
 msgstr "ÊÇÑíÎ ÇáÅÕÏÇÑ ${_BUILD_ISODATE}"
@@ -146,42 +146,42 @@ msgctxt "DESC_Desktop_manuals"
 msgid "Gpg4win Documentation"
 msgstr "æËÇÆÞ Gpg4win"
 
-#: src/installer.nsi:446
+#: src/installer.nsi:453
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "ÎíÇÑÇÊ ÇáÊËÈíÊ"
 
-#: src/installer.nsi:449
+#: src/installer.nsi:456
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "æÕáÇÊ ÇáÈÏÁ"
 
-#: src/installer.nsi:451
+#: src/installer.nsi:458
 msgctxt "T_InstOptLabelA"
 msgid "Please select where Gpg4win shall install links:"
 msgstr "ÇÎÊÑ Ãíä íÊÚíä ËÈíÊ ÇáæÕáÇÊ:"
 
-#: src/installer.nsi:454
+#: src/installer.nsi:461
 msgctxt "T_InstOptLabelB"
 msgid "(Only programs will be linked into the quick launch bar.)"
 msgstr "(ÝÞØ ÇáÈÑãÌíÇÊ ÓíÑÈØ ÅáíåÇ Ýí ÔÑíØ ÇáÈÏÁ ÇáÓÑíÚ.)"
 
-#: src/installer.nsi:457
+#: src/installer.nsi:464
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "ÞÇÆãÉ ÇÈÏÃ"
 
-#: src/installer.nsi:460
+#: src/installer.nsi:467
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "ÓØÍ ÇáãßÊÈ"
 
-#: src/installer.nsi:463
+#: src/installer.nsi:470
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "ÔÑíØ ÇáÈÏÁ ÇáÓÑíÚ"
 
-#: src/installer.nsi:469
+#: src/installer.nsi:476
 msgctxt "T_FoundExistingVersion"
 msgid ""
 "Version $R1 has already been installed.\n"
@@ -190,7 +190,20 @@ msgstr ""
 "ÇáÅÕÏÇÑÉ $R1 ãËÈÊÉ ÈÇáÝÚá.\n"
 "ÃÊÑíÏ ÇÓÊÈÏÇáåÇ ÈÇáÅÕÏÇÑÉ  ${VERSION}¿"
 
-#: src/installer.nsi:472
+#: src/installer.nsi:479
+#, fuzzy
+msgctxt "T_FoundExistingOldVersion"
+msgid ""
+"An old version $R1 has already been installed.  It is strongly recommended "
+"to deinstall previous versions on major upgrades.\n"
+"Do you want to continue installing Gpg4win ${VERSION} anyway?"
+msgstr ""
+"Êã ÊËÈíÊ ÅÕÏÇÑÉ ãä Gpg4Win Úáì åÐÇ ÇáäÙÇã ãä ÞÈá. áÇ ãÔÇßá Ýí ÇáÊËÈíÊ "
+"æÇÓÊÈÏÇá Êáß ÇáÅÕÏÇÑÉ.\n"
+"\n"
+"ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win¿"
+
+#: src/installer.nsi:484
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -203,7 +216,7 @@ msgstr ""
 "\n"
 "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win¿"
 
-#: src/installer.nsi:483
+#: src/installer.nsi:495
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -212,7 +225,7 @@ msgstr ""
 "ãä ÝÖáß ØÇáÚ Ïáíá ãÓÊÎÏã Gpg4win áÊÞÑà Úä ØÑíÞÉ äÞá ÇáãÝÇÊíÍ ÇáãæÌæÏÉ ãä ÞÈá "
 "ãä ÊËÈíÊÇÊ ÓÇÈÞÉ ãÈäíÉ Úáì GnuPG Åáì Gpg4win."
 
-#: src/installer.nsi:488
+#: src/installer.nsi:500
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -226,7 +239,7 @@ msgstr ""
 "\n"
 "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win æÇáÊÚÇãá ãÚ ÇáÊËÈíÊ ÇáÞÏíã áÇÍÞÇ¿"
 
-#: src/installer.nsi:497
+#: src/installer.nsi:509
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -238,7 +251,7 @@ msgstr ""
 "\n"
 "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win¿"
 
-#: src/installer.nsi:504
+#: src/installer.nsi:516
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -252,7 +265,7 @@ msgstr ""
 "\n"
 "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win æÇáÊÚÇãá ãÚ ÇáÊËÈíÊ ÇáÞÏíã áÇÍÞÇ¿"
 
-#: src/installer.nsi:514
+#: src/installer.nsi:526
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -264,7 +277,7 @@ msgstr ""
 "\n"
 "ÓíæÞÝ ÇáÊËÈíÊ ÇáÂä!"
 
-#: src/installer.nsi:523
+#: src/installer.nsi:535
 msgctxt "T_BetaWarning"
 msgid ""
 "Note: This is a BETA version of Gpg4win.\n"
@@ -273,13 +286,13 @@ msgid ""
 "production environment."
 msgstr ""
 
-#: src/installer.nsi:530
+#: src/installer.nsi:542
 msgctxt "T_AdminNeeded"
 msgid ""
 "Warning: Administrator permissions required for a successful installation"
 msgstr "ÊÍÐíÑ: ÊÍÊÇÌ Åáì ÕáÇÍíÇÊ ÇáãÏíÑ áÅÊãÇã ÇáÊËÈíÊ"
 
-#: src/installer.nsi:534
+#: src/installer.nsi:546
 #, fuzzy
 msgctxt "T_CloseOtherApps"
 msgid ""
@@ -290,27 +303,27 @@ msgstr ""
 "ÑÌÇÁ ÊÃßÏ ãä ÚÏã ÊÔÛíá Ãí ÊØÈíÞÇÊ ÃÎÑì. Úáíß ÎÕæÕÇ ÅÛáÇÞ ßá äæÇÝÐ ÃæÊáæß Ãæ "
 "ÅßÓÈáæÑÑ.  ÓíÍÇæá Gpg4Win ÇáËÈíÊ Úáì Ãí ÍÇá áßä ÓÊÍÊÇÌ Åáì ÅÚÇÏÉ ÇáÊÔÛíá."
 
-#: src/installer.nsi:539
+#: src/installer.nsi:551
 msgctxt "T_ShuttingDownWinPT"
 msgid "Trying to shutdown a possible running instance of WinPT."
 msgstr "ÊÌÑí ãÍÇæáÉ ÅÛáÇÞ ÓíÑæÑÉ ãÍÊãáÉ ÚÇãáÉ ãä WinPT."
 
-#: src/installer.nsi:541
+#: src/installer.nsi:553
 msgctxt "T_ShuttingDownDirMngr"
 msgid "Trying to shutdown a possible running instance of DirMngr."
 msgstr "ÊÌÑí ãÍÇæáÉ ÅÛáÇÞ ÓíÑæÑÉ ãÍÊãáÉ ÚÇãáÉ ãä DirMngr."
 
-#: src/inst-claws-mail.nsi:53
+#: src/inst-claws-mail.nsi:55
 msgctxt "DESC_SEC_claws_mail"
 msgid "Claws Mail-User-Agent"
 msgstr "ÈÑãÌíÉ ÇáÈÑíÏ Claws"
 
-#: src/inst-claws-mail.nsi:56
+#: src/inst-claws-mail.nsi:58
 msgctxt "DESC_Menu_claws_mail"
 msgid "Run the Claws mailprogram."
 msgstr "ÔÛá ÈÑãÌíÉ ÇáÈÑíÏ Claws"
 
-#: src/inst-claws-mail.nsi:59
+#: src/inst-claws-mail.nsi:61
 msgctxt "DESC_Menu_claws_mail_pdf"
 msgid "Show the online manual of Claws Mail"
 msgstr "ÇÚÑÖ ßÊíøÈ ÈÑíÏ Claws Úáì ÇáæÈ"
@@ -340,12 +353,12 @@ msgstr ""
 "ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ ãÓÇÚÏ ÎÕæÕíÉ Ìäæ. åÐå ÈÏíá áÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ "
 "WinPT."
 
-#: src/inst-gpg4win.nsi:66
+#: src/inst-gpg4win.nsi:70
 msgctxt "DESC_Menu_gpg4win_readme"
 msgid "General information on Gpg4Win"
 msgstr "ãÚáæãÇÊ ÚÇãÉ Úä Gpg4Win"
 
-#: src/inst-gpg4win.nsi:69
+#: src/inst-gpg4win.nsi:73
 msgctxt "DESC_Menu_gnupg_faq"
 msgid "Show the Frequently Asked Questions Document for GnuPG"
 msgstr "ØÇáÚ ÇáÃÓÆáÉ ÇáÔÇÆÚÉ Íæá GnuPG"
@@ -385,12 +398,12 @@ msgctxt "DESC_SEC_gpgol"
 msgid "GnuPG for Outlook"
 msgstr "þGnuPG áÃæÊáæß"
 
-#: src/inst-kleopatra.nsi:227
+#: src/inst-kleopatra.nsi:299
 msgctxt "DESC_SEC_kleopatra"
 msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
 msgstr ""
 
-#: src/inst-kleopatra.nsi:231
+#: src/inst-kleopatra.nsi:303
 msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ ßáíæÈÇÊÑÇ."

diff --git a/po/de.po b/po/de.po
index 460f1b0..bc34f64 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpg4win 1.1.1-svn417\n"
 "Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
-"POT-Creation-Date: 2008-10-07 19:57+0200\n"
+"POT-Creation-Date: 2008-10-20 12:14+0200\n"
 "PO-Revision-Date: 2008-09-09 13:24+0200\n"
 "Last-Translator: Marcus Brinkmann <mb@g10code.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -416,12 +416,12 @@ msgstr ""
 "Das Schlüsselverwaltungsprogramm GNU Privacy Assistent aufrufen.  Dies ist "
 "eine Alternative zu dem WinPT Programm."
 
-#: src/inst-gpg4win.nsi:66
+#: src/inst-gpg4win.nsi:70
 msgctxt "DESC_Menu_gpg4win_readme"
 msgid "General information on Gpg4Win"
 msgstr "Allgemeine Informationen zu Gpg4win"
 
-#: src/inst-gpg4win.nsi:69
+#: src/inst-gpg4win.nsi:73
 msgctxt "DESC_Menu_gnupg_faq"
 msgid "Show the Frequently Asked Questions Document for GnuPG"
 msgstr "Das Dokument mit den häufig gestellten Fragen (FAQ) zu GnuPG anzeigen"

diff --git a/po/es.po b/po/es.po
index 281d433..22e89fe 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpg4win 1.1.1-svn417\n"
 "Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
-"POT-Creation-Date: 2008-09-30 08:41+0200\n"
+"POT-Creation-Date: 2008-10-20 12:14+0200\n"
 "PO-Revision-Date: 2008-01-30 17:07+0100\n"
 "Last-Translator: Diego Escalante Urrelo <diegoe@gnome.org>\n"
 "Language-Team: Spanish <diegoe@gnome.org>\n"
@@ -20,12 +20,12 @@ msgctxt "T_AlreadyRunning"
 msgid "An instance of this installer is already running."
 msgstr "Una instancia del instalador ya está ejecutándose."
 
-#: src/gpg4win.nsi:110
+#: src/gpg4win.nsi:114
 msgctxt "T_WelcomeTitleGpg4win"
 msgid "Welcome to the installation of Gpg4win"
 msgstr "Bienvenido a la instalación de Gpg4win"
 
-#: src/gpg4win.nsi:114
+#: src/gpg4win.nsi:118
 msgctxt "T_AboutGpg4win"
 msgid ""
 "GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -38,17 +38,17 @@ msgstr ""
 "Incluye un gestor de llaves avanzado y cumple con la propuesta de estándar "
 "de Internet: OpenGPG, descrito en el RFC2440."
 
-#: src/gpg4win.nsi:120
+#: src/gpg4win.nsi:124
 msgctxt "T_AboutGpg4winVersion"
 msgid "This is Gpg4win version ${VERSION}"
 msgstr "Este es Gpg4win versión ${VERSION}"
 
-#: src/gpg4win.nsi:123
+#: src/gpg4win.nsi:127
 msgctxt "T_AboutGpg4winFileVersion"
 msgid "file version ${PROD_VERSION}"
 msgstr "versión del archivo ${PROD_VERSION}"
 
-#: src/gpg4win.nsi:126
+#: src/gpg4win.nsi:130
 msgctxt "T_AboutGpg4winReleaseDate"
 msgid "release date ${_BUILD_ISODATE}"
 msgstr "fecha de publicación ${_BUILD_ISODATE}"
@@ -148,42 +148,42 @@ msgctxt "DESC_Desktop_manuals"
 msgid "Gpg4win Documentation"
 msgstr "Documentación de Gpg4win"
 
-#: src/installer.nsi:446
+#: src/installer.nsi:453
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "Opciones de instalación"
 
-#: src/installer.nsi:449
+#: src/installer.nsi:456
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "Vínculos de inicio"
 
-#: src/installer.nsi:451
+#: src/installer.nsi:458
 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:454
+#: src/installer.nsi:461
 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:457
+#: src/installer.nsi:464
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "Menú inicio"
 
-#: src/installer.nsi:460
+#: src/installer.nsi:467
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: src/installer.nsi:463
+#: src/installer.nsi:470
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "Barra de inicio rápido"
 
-#: src/installer.nsi:469
+#: src/installer.nsi:476
 msgctxt "T_FoundExistingVersion"
 msgid ""
 "Version $R1 has already been installed.\n"
@@ -192,7 +192,20 @@ msgstr ""
 "La versión $R1 ya está instalada.\n"
 "¿Desea sobreescribirla con la versión ${VERSION}?"
 
-#: src/installer.nsi:472
+#: src/installer.nsi:479
+#, fuzzy
+msgctxt "T_FoundExistingOldVersion"
+msgid ""
+"An old version $R1 has already been installed.  It is strongly recommended "
+"to deinstall previous versions on major upgrades.\n"
+"Do you want to continue installing Gpg4win ${VERSION} anyway?"
+msgstr ""
+"Una versión de Gpg4Win ya se encuentra instalada en este sistema.No habrá "
+"problema si instala y por ende, sobreescribe esta versión.\n"
+"\n"
+"¿Desea continuar con la instalación?"
+
+#: src/installer.nsi:484
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -205,7 +218,7 @@ msgstr ""
 "\n"
 "¿Desea continuar con la instalación?"
 
-#: src/installer.nsi:483
+#: src/installer.nsi:495
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -214,7 +227,7 @@ msgstr ""
 "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:488
+#: src/installer.nsi:500
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -229,7 +242,7 @@ msgstr ""
 "¿Desea continuar con la instalación de Gpg4Win y dejar para mas tarde la "
 "instalación antigua de GnuPP?"
 
-#: src/installer.nsi:497
+#: src/installer.nsi:509
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -242,7 +255,7 @@ msgstr ""
 "\n"
 "¿Desea continuar instalando Gpg4Win?"
 
-#: src/installer.nsi:504
+#: src/installer.nsi:516
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -257,7 +270,7 @@ msgstr ""
 "¿Desea continuar con la instalación de Gpg4Win y dejar para más tarde la "
 "instalación antigua de WinPT?"
 
-#: src/installer.nsi:514
+#: src/installer.nsi:526
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -270,7 +283,7 @@ msgstr ""
 "\n"
 "La instalación se detendrá ahora."
 
-#: src/installer.nsi:523
+#: src/installer.nsi:535
 msgctxt "T_BetaWarning"
 msgid ""
 "Note: This is a BETA version of Gpg4win.\n"
@@ -279,14 +292,14 @@ msgid ""
 "production environment."
 msgstr ""
 
-#: src/installer.nsi:530
+#: src/installer.nsi:542
 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:534
+#: src/installer.nsi:546
 #, fuzzy
 msgctxt "T_CloseOtherApps"
 msgid ""
@@ -299,28 +312,28 @@ msgstr ""
 "intentará instalarse de todas formas, pero será necesario que reinicie su "
 "sistema una vez terminado el proceso. "
 
-#: src/installer.nsi:539
+#: src/installer.nsi:551
 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:541
+#: src/installer.nsi:553
 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:53
+#: src/inst-claws-mail.nsi:55
 msgctxt "DESC_SEC_claws_mail"
 msgid "Claws Mail-User-Agent"
 msgstr "Cliente de correo Claws."
 
-#: src/inst-claws-mail.nsi:56
+#: src/inst-claws-mail.nsi:58
 msgctxt "DESC_Menu_claws_mail"
 msgid "Run the Claws mailprogram."
 msgstr "Ejecutar el cliente de correo Claws."
 
-#: src/inst-claws-mail.nsi:59
+#: src/inst-claws-mail.nsi:61
 msgctxt "DESC_Menu_claws_mail_pdf"
 msgid "Show the online manual of Claws Mail"
 msgstr "Mostrar el manual en línea de Claws"
@@ -350,12 +363,12 @@ msgstr ""
 "Ejecutar la herramienta de gestión de llaves GNU Privacy Assistant. Ésta es "
 "una alternativa a la herramienta de manejo de llaves WinPT."
 
-#: src/inst-gpg4win.nsi:66
+#: src/inst-gpg4win.nsi:70
 msgctxt "DESC_Menu_gpg4win_readme"
 msgid "General information on Gpg4Win"
 msgstr "Información general de Gpg4Win"
 
-#: src/inst-gpg4win.nsi:69
+#: src/inst-gpg4win.nsi:73
 msgctxt "DESC_Menu_gnupg_faq"
 msgid "Show the Frequently Asked Questions Document for GnuPG"
 msgstr "Mostrar las preguntas frecuentes (FAQ) sobre GnuPG"
@@ -397,12 +410,12 @@ msgctxt "DESC_SEC_gpgol"
 msgid "GnuPG for Outlook"
 msgstr "GnuPG para Outlook (GpgOL)"
 
-#: src/inst-kleopatra.nsi:227
+#: src/inst-kleopatra.nsi:299
 msgctxt "DESC_SEC_kleopatra"
 msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
 msgstr ""
 
-#: src/inst-kleopatra.nsi:231
+#: src/inst-kleopatra.nsi:303
 msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "Ejecutar la herramienta de gestión de llaves Kleopatra."

diff --git a/po/fr.po b/po/fr.po
index 308d9f2..c2e0413 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ngoinabox\n"
 "Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
-"POT-Creation-Date: 2008-09-30 08:41+0200\n"
+"POT-Creation-Date: 2008-10-20 12:14+0200\n"
 "PO-Revision-Date: 2008-03-10 16:46+0100\n"
 "Last-Translator: Fabian Rodriguez <magicfab@member.fsf.org>\n"
 "Language-Team: FRENCH <aep.lists@it46.se>\n"
@@ -20,12 +20,12 @@ msgctxt "T_AlreadyRunning"
 msgid "An instance of this installer is already running."
 msgstr "Une instance de cet installateur fonctionne déjà."
 
-#: src/gpg4win.nsi:110
+#: src/gpg4win.nsi:114
 msgctxt "T_WelcomeTitleGpg4win"
 msgid "Welcome to the installation of Gpg4win"
 msgstr "Bienvenue à l'installation de Gpg4win"
 
-#: src/gpg4win.nsi:114
+#: src/gpg4win.nsi:118
 msgctxt "T_AboutGpg4win"
 msgid ""
 "GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -39,17 +39,17 @@ msgstr ""
 "est conforme avec l'OpenPGP proposé Internet standard as described in "
 "RFC2440."
 
-#: src/gpg4win.nsi:120
+#: src/gpg4win.nsi:124
 msgctxt "T_AboutGpg4winVersion"
 msgid "This is Gpg4win version ${VERSION}"
 msgstr "This is Gpg4win version ${VERSION}"
 
-#: src/gpg4win.nsi:123
+#: src/gpg4win.nsi:127
 msgctxt "T_AboutGpg4winFileVersion"
 msgid "file version ${PROD_VERSION}"
 msgstr "file version ${PROD_VERSION}"
 
-#: src/gpg4win.nsi:126
+#: src/gpg4win.nsi:130
 msgctxt "T_AboutGpg4winReleaseDate"
 msgid "release date ${_BUILD_ISODATE}"
 msgstr "release date ${_BUILD_ISODATE}"
@@ -149,44 +149,44 @@ msgctxt "DESC_Desktop_manuals"
 msgid "Gpg4win Documentation"
 msgstr "Guides pour l'installation du logiciel Gpg4win"
 
-#: src/installer.nsi:446
+#: src/installer.nsi:453
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "Installer les options"
 
-#: src/installer.nsi:449
+#: src/installer.nsi:456
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "Démarrage Liens"
 
-#: src/installer.nsi:451
+#: src/installer.nsi:458
 msgctxt "T_InstOptLabelA"
 msgid "Please select where Gpg4win shall install links:"
 msgstr "Veuillez choisir où Gpg4win installera des liens:"
 
-#: src/installer.nsi:454
+#: src/installer.nsi:461
 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:457
+#: src/installer.nsi:464
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "Menu Démarrage"
 
-#: src/installer.nsi:460
+#: src/installer.nsi:467
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "Desktop"
 
-#: src/installer.nsi:463
+#: src/installer.nsi:470
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "Barre rapide de Lancement"
 
-#: src/installer.nsi:469
+#: src/installer.nsi:476
 msgctxt "T_FoundExistingVersion"
 msgid ""
 "Version $R1 has already been installed.\n"
@@ -195,7 +195,20 @@ msgstr ""
 "La version $R1 a déjà été installée.\n"
 "Voulez-vous la remplacer avec la version ${VERSION}?"
 
-#: src/installer.nsi:472
+#: src/installer.nsi:479
+#, fuzzy
+msgctxt "T_FoundExistingOldVersion"
+msgid ""
+"An old version $R1 has already been installed.  It is strongly recommended "
+"to deinstall previous versions on major upgrades.\n"
+"Do you want to continue installing Gpg4win ${VERSION} anyway?"
+msgstr ""
+"Une version de Gpg4Win a été déjà installée sur le système. Le remplacement "
+"de cette version s'effectuera sans problème.\n"
+"\n"
+"Voulez-vous poursuivre l'installation Gpg4win?"
+
+#: src/installer.nsi:484
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -208,7 +221,7 @@ msgstr ""
 "\n"
 "Voulez-vous poursuivre l'installation Gpg4win?"
 
-#: src/installer.nsi:483
+#: src/installer.nsi:495
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -217,7 +230,7 @@ msgstr ""
 "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:488
+#: src/installer.nsi:500
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -232,7 +245,7 @@ msgstr ""
 "Voulez-vous continuer d'installer Gpg4win et prendre soin de la vieille "
 "installation plus tard?"
 
-#: src/installer.nsi:497
+#: src/installer.nsi:509
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -245,7 +258,7 @@ msgstr ""
 "\n"
 "Voulez-vous continuer d'installer Gpg4win?"
 
-#: src/installer.nsi:504
+#: src/installer.nsi:516
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -260,7 +273,7 @@ msgstr ""
 "Vous voulez continuer d'installer Gpg4win et prendre soin de la vieille "
 "installation plus tard?"
 
-#: src/installer.nsi:514
+#: src/installer.nsi:526
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -273,7 +286,7 @@ msgstr ""
 "\n"
 "L'installation sera annulée maintenant!"
 
-#: src/installer.nsi:523
+#: src/installer.nsi:535
 msgctxt "T_BetaWarning"
 msgid ""
 "Note: This is a BETA version of Gpg4win.\n"
@@ -282,7 +295,7 @@ msgid ""
 "production environment."
 msgstr ""
 
-#: src/installer.nsi:530
+#: src/installer.nsi:542
 msgctxt "T_AdminNeeded"
 msgid ""
 "Warning: Administrator permissions required for a successful installation"
@@ -290,7 +303,7 @@ msgstr ""
 "Avertissement : Permissions d'administrateur requises pour une installation "
 "réussie"
 
-#: src/installer.nsi:534
+#: src/installer.nsi:546
 msgctxt "T_CloseOtherApps"
 msgid ""
 "Please make sure that other applications are not running. In particular you "
@@ -302,27 +315,27 @@ msgstr ""
 "Gpg4win essayera d'installer quoi qu'il en soit mais une réinitialisation "
 "sera exigé alors."
 
-#: src/installer.nsi:539
+#: src/installer.nsi:551
 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:541
+#: src/installer.nsi:553
 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:53
+#: src/inst-claws-mail.nsi:55
 msgctxt "DESC_SEC_claws_mail"
 msgid "Claws Mail-User-Agent"
 msgstr "Claws Mail-User-Agent"
 
-#: src/inst-claws-mail.nsi:56
+#: src/inst-claws-mail.nsi:58
 msgctxt "DESC_Menu_claws_mail"
 msgid "Run the Claws mailprogram."
 msgstr "Courez le Claws mailprogram."
 
-#: src/inst-claws-mail.nsi:59
+#: src/inst-claws-mail.nsi:61
 msgctxt "DESC_Menu_claws_mail_pdf"
 msgid "Show the online manual of Claws Mail"
 msgstr "Montrez le guide en ligne du Claws Mail"
@@ -353,12 +366,12 @@ msgstr ""
 "Courez le GNU Privacy Assistant outil pour gestionner le clé. C'est une "
 "alternative à l'outil de gestion de clé de WinPT."
 
-#: src/inst-gpg4win.nsi:66
+#: src/inst-gpg4win.nsi:70
 msgctxt "DESC_Menu_gpg4win_readme"
 msgid "General information on Gpg4Win"
 msgstr "Informations générales sur Gpg4Win"
 
-#: src/inst-gpg4win.nsi:69
+#: src/inst-gpg4win.nsi:73
 msgctxt "DESC_Menu_gnupg_faq"
 msgid "Show the Frequently Asked Questions Document for GnuPG"
 msgstr "Montrez le document fréquemment demandé de questions pour GnuPG"
@@ -401,12 +414,12 @@ msgctxt "DESC_SEC_gpgol"
 msgid "GnuPG for Outlook"
 msgstr "GnuPG pour Outlook"
 
-#: src/inst-kleopatra.nsi:227
+#: src/inst-kleopatra.nsi:299
 msgctxt "DESC_SEC_kleopatra"
 msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
 msgstr ""
 
-#: src/inst-kleopatra.nsi:231
+#: src/inst-kleopatra.nsi:303
 msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "Courez l'outil de gestion de clé de Kleopatra."

diff --git a/po/ru.po b/po/ru.po
index 25d5769..80d9d66 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gpg4Win Installer\n"
 "Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
-"POT-Creation-Date: 2008-09-30 08:41+0200\n"
+"POT-Creation-Date: 2008-10-20 12:14+0200\n"
 "PO-Revision-Date: 2008-04-22 11:57+0200\n"
 "Last-Translator: Sergei Smirnov <moscow@hro.org>\n"
 "Language-Team: Human Rights Network <moscow@hro.org>\n"
@@ -21,12 +21,12 @@ msgctxt "T_AlreadyRunning"
 msgid "An instance of this installer is already running."
 msgstr "Óñòàíîâêà ïðîãðàììû óæå çàïóùåíà."
 
-#: src/gpg4win.nsi:110
+#: src/gpg4win.nsi:114
 msgctxt "T_WelcomeTitleGpg4win"
 msgid "Welcome to the installation of Gpg4win"
 msgstr "Äîáðî ïîæàëîâàòü â ïðîãðàììó óñòàíîâêè Gpg4win!"
 
-#: src/gpg4win.nsi:114
+#: src/gpg4win.nsi:118
 msgctxt "T_AboutGpg4win"
 msgid ""
 "GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -40,17 +40,17 @@ msgstr ""
 "øèôðîâàëüíûìè êëþ÷àìè è ñîâìåñòèìà ñî ñòàíäàðòîì OpenPGP, îïèñàííûì â "
 "äîêóìåíòå RFC2440."
 
-#: src/gpg4win.nsi:120
+#: src/gpg4win.nsi:124
 msgctxt "T_AboutGpg4winVersion"
 msgid "This is Gpg4win version ${VERSION}"
 msgstr "Âåðñèÿ Gpg4win ${VERSION}"
 
-#: src/gpg4win.nsi:123
+#: src/gpg4win.nsi:127
 msgctxt "T_AboutGpg4winFileVersion"
 msgid "file version ${PROD_VERSION}"
 msgstr "Âåðñèÿ ôàéëà ${PROD_VERSION}"
 
-#: src/gpg4win.nsi:126
+#: src/gpg4win.nsi:130
 msgctxt "T_AboutGpg4winReleaseDate"
 msgid "release date ${_BUILD_ISODATE}"
 msgstr "Äàòà ðåëèçà ${_BUILD_ISODATE}"
@@ -150,42 +150,42 @@ msgctxt "DESC_Desktop_manuals"
 msgid "Gpg4win Documentation"
 msgstr "Äîêóìåíòàöèÿ Gpg4win"
 
-#: src/installer.nsi:446
+#: src/installer.nsi:453
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "Ïàðàìåòðû óñòàíîâêè"
 
-#: src/installer.nsi:449
+#: src/installer.nsi:456
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "ßðëûêè Gpg4win"
 
-#: src/installer.nsi:451
+#: src/installer.nsi:458
 msgctxt "T_InstOptLabelA"
 msgid "Please select where Gpg4win shall install links:"
 msgstr "Ãäå ñîçäàâàòü ÿðëûêè Gpg4win:"
 
-#: src/installer.nsi:454
+#: src/installer.nsi:461
 msgctxt "T_InstOptLabelB"
 msgid "(Only programs will be linked into the quick launch bar.)"
 msgstr "(Â ïàíåëè áûñòðîãî çàïóñêà áóäóò ññûëêè òîëüêî íà ïðîãðàììû)."
 
-#: src/installer.nsi:457
+#: src/installer.nsi:464
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "Ìåíþ Ïóñê"
 
-#: src/installer.nsi:460
+#: src/installer.nsi:467
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "Ðàáî÷èé ñòîë"
 
-#: src/installer.nsi:463
+#: src/installer.nsi:470
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "Ïàíåëü áûñòðîãî çàïóñêà"
 
-#: src/installer.nsi:469
+#: src/installer.nsi:476
 msgctxt "T_FoundExistingVersion"
 msgid ""
 "Version $R1 has already been installed.\n"
@@ -194,7 +194,20 @@ msgstr ""
 "Âåðñèÿ $R1 óæå óñòàíîâëåíà.\n"
 "Ïåðåçàïèñàòü åå âåðñèåé ${VERSION}?"
 
-#: src/installer.nsi:472
+#: src/installer.nsi:479
+#, fuzzy
+msgctxt "T_FoundExistingOldVersion"
+msgid ""
+"An old version $R1 has already been installed.  It is strongly recommended "
+"to deinstall previous versions on major upgrades.\n"
+"Do you want to continue installing Gpg4win ${VERSION} anyway?"
+msgstr ""
+"Gpg4Win óæå óñòàíîâëåíà íà ýòîì êîìïüþòåðå. Äàëüíåéøàÿ óñòàíîâêà ïåðåçàïèøåò "
+"ýòó âåðñèþ íîâîé.\n"
+"\n"
+"Ïðîäîëæèòü óñòàíîâêó Gpg4Win?"
+
+#: src/installer.nsi:484
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -207,7 +220,7 @@ msgstr ""
 "\n"
 "Ïðîäîëæèòü óñòàíîâêó Gpg4Win?"
 
-#: src/installer.nsi:483
+#: src/installer.nsi:495
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -216,7 +229,7 @@ msgstr ""
 "Âîïðîñû ïåðåíîñà êëþ÷åé èç äðóãèõ ïðîãðàìì â Gpg4Win ðàññìàòðèâàþòñÿ â "
 "ðóêîâîäñòâå ïîëüçîâàòåëÿ Gpg4Win."
 
-#: src/installer.nsi:488
+#: src/installer.nsi:500
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -230,7 +243,7 @@ msgstr ""
 "\n"
 "Ïðîäîëæèòü óñòàíîâêó Gpg4Win (à ñ GnuPP ðàçáåðåìñÿ ïîòîì)?"
 
-#: src/installer.nsi:497
+#: src/installer.nsi:509
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -243,7 +256,7 @@ msgstr ""
 "\n"
 "Ïðîäîëæèòü óñòàíîâêó Gpg4win?"
 
-#: src/installer.nsi:504
+#: src/installer.nsi:516
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -258,7 +271,7 @@ msgstr ""
 "\n"
 "Ïðîäîëæèòü óñòàíîâêó Gpg4win (à ñî ñòàðîé ïðîãðàììîé ðàçáåðåìñÿ ïîòîì)?"
 
-#: src/installer.nsi:514
+#: src/installer.nsi:526
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -272,7 +285,7 @@ msgstr ""
 "\n"
 "Óñòàíîâêà ïðåðâàíà!"
 
-#: src/installer.nsi:523
+#: src/installer.nsi:535
 msgctxt "T_BetaWarning"
 msgid ""
 "Note: This is a BETA version of Gpg4win.\n"
@@ -281,13 +294,13 @@ msgid ""
 "production environment."
 msgstr ""
 
-#: src/installer.nsi:530
+#: src/installer.nsi:542
 msgctxt "T_AdminNeeded"
 msgid ""
 "Warning: Administrator permissions required for a successful installation"
 msgstr "Äëÿ óñïåøíîé óñòàíîâêè òðåáóþòñÿ ïðàâà àäìèíèñòðàòîðà"
 
-#: src/installer.nsi:534
+#: src/installer.nsi:546
 msgctxt "T_CloseOtherApps"
 msgid ""
 "Please make sure that other applications are not running. In particular you "
@@ -298,27 +311,27 @@ msgstr ""
 "Outlook è Explorer. Åñëè ýòî íå ñäåëàòü, Gpg4Win âñå ðàâíî áóäåò "
 "óñòàíîâëåíà, íî ïîòðåáóåòñÿ ïåðåçàãðóçêà."
 
-#: src/installer.nsi:539
+#: src/installer.nsi:551
 msgctxt "T_ShuttingDownWinPT"
 msgid "Trying to shutdown a possible running instance of WinPT."
 msgstr "Âîçìîæíî, çàïóùåíà ïðîãðàììà WinPT. Ïîïðîáóåì çàêðûòü åå."
 
-#: src/installer.nsi:541
+#: src/installer.nsi:553
 msgctxt "T_ShuttingDownDirMngr"
 msgid "Trying to shutdown a possible running instance of DirMngr."
 msgstr "Âîçìîæíî, çàïóùåíà ïðîãðàììà DirMngr. Ïîïðîáóåì çàêðûòü åå."
 
-#: src/inst-claws-mail.nsi:53
+#: src/inst-claws-mail.nsi:55
 msgctxt "DESC_SEC_claws_mail"
 msgid "Claws Mail-User-Agent"
 msgstr "Ïî÷òîâûé êëèåíò Claws"
 
-#: src/inst-claws-mail.nsi:56
+#: src/inst-claws-mail.nsi:58
 msgctxt "DESC_Menu_claws_mail"
 msgid "Run the Claws mailprogram."
 msgstr "Çàïóñê ïî÷òîâîé ïðîãðàììû Claws."
 
-#: src/inst-claws-mail.nsi:59
+#: src/inst-claws-mail.nsi:61
 msgctxt "DESC_Menu_claws_mail_pdf"
 msgid "Show the online manual of Claws Mail"
 msgstr "Ïîêàçàòü îíëàéíîâîå ðóêîâîäñòâî ê ïî÷òîâîìó êëèåíòó Claws Mail"
@@ -346,12 +359,12 @@ msgid ""
 "the WinPT key management tool."
 msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé GNU Privacy Assistant (àëüòåðíàòèâà WinPT)."
 
-#: src/inst-gpg4win.nsi:66
+#: src/inst-gpg4win.nsi:70
 msgctxt "DESC_Menu_gpg4win_readme"
 msgid "General information on Gpg4Win"
 msgstr "Îáùàÿ èíôîðìàöèÿ î Gpg4Win"
 
-#: src/inst-gpg4win.nsi:69
+#: src/inst-gpg4win.nsi:73
 msgctxt "DESC_Menu_gnupg_faq"
 msgid "Show the Frequently Asked Questions Document for GnuPG"
 msgstr "FAQ ïî ïðîãðàììå GnuPG"
@@ -391,12 +404,12 @@ msgctxt "DESC_SEC_gpgol"
 msgid "GnuPG for Outlook"
 msgstr "GnuPG äëÿ MS Outlook"
 
-#: src/inst-kleopatra.nsi:227
+#: src/inst-kleopatra.nsi:299
 msgctxt "DESC_SEC_kleopatra"
 msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
 msgstr ""
 
-#: src/inst-kleopatra.nsi:231
+#: src/inst-kleopatra.nsi:303
 msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé Kleopatra."