[Gpg4win-commits] r778 - in trunk: . po src

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue Apr 22 11:59:19 CEST 2008 

Author: werner
Date: 2008-04-22 11:59:18 +0200 (Tue, 22 Apr 2008)
New Revision: 778

Modified:
   trunk/ChangeLog
   trunk/po/ar.po
   trunk/po/de.po
   trunk/po/es.po
   trunk/po/fr.po
   trunk/po/ru.po
   trunk/src/installer.nsi
   trunk/src/uninst-gnupg2.nsi
Log:
Add Beta warning


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-04-21 18:37:09 UTC (rev 777)
+++ trunk/ChangeLog	2008-04-22 09:59:18 UTC (rev 778)
@@ -1,3 +1,8 @@
+2008-04-22  Werner Koch  <wk at g10code.com>
+
+	* src/installer.nsi (PrintBetaWarning): New.
+	(PrintNonAdminWarning): Call it.
+
 2008-04-21  Werner Koch  <wk at g10code.com>
 
 	* patches/gnupg2-2.0.9/05-w32-http.patch: New.

Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po	2008-04-21 18:37:09 UTC (rev 777)
+++ trunk/po/ar.po	2008-04-22 09:59:18 UTC (rev 778)
@@ -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-03-25 12:42+0100\n"
+"POT-Creation-Date: 2008-04-22 11:55+0200\n"
 "PO-Revision-Date: 2008-03-11 23:52+0200\n"
 "Last-Translator: Ahmad Gharbeia <ahmad at gharbeia.org>\n"
 "Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -146,42 +146,42 @@
 msgid "Gpg4win Documentation"
 msgstr "æËÇÆÞ Gpg4win"
 
-#: src/installer.nsi:438
+#: src/installer.nsi:449
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "ÎíÇÑÇÊ ÇáÊËÈíÊ"
 
-#: src/installer.nsi:441
+#: src/installer.nsi:452
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "æÕáÇÊ ÇáÈÏÁ"
 
-#: src/installer.nsi:443
+#: src/installer.nsi:454
 msgctxt "T_InstOptLabelA"
 msgid "Please select where Gpg4win shall install links:"
 msgstr "ÇÎÊÑ Ãíä íÊÚíä ËÈíÊ ÇáæÕáÇÊ:"
 
-#: src/installer.nsi:446
+#: src/installer.nsi:457
 msgctxt "T_InstOptLabelB"
 msgid "(Only programs will be linked into the quick launch bar.)"
 msgstr "(ÝÞØ ÇáÈÑãÌíÇÊ ÓíÑÈØ ÅáíåÇ Ýí ÔÑíØ ÇáÈÏÁ ÇáÓÑíÚ.)"
 
-#: src/installer.nsi:449
+#: src/installer.nsi:460
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "ÞÇÆãÉ ÇÈÏÃ"
 
-#: src/installer.nsi:452
+#: src/installer.nsi:463
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "ÓØÍ ÇáãßÊÈ"
 
-#: src/installer.nsi:455
+#: src/installer.nsi:466
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "ÔÑíØ ÇáÈÏÁ ÇáÓÑíÚ"
 
-#: src/installer.nsi:461
+#: src/installer.nsi:472
 msgctxt "T_FoundExistingVersion"
 msgid ""
 "Version $R1 has already been installed.\n"
@@ -190,7 +190,7 @@
 "ÇáÅÕÏÇÑÉ $R1 ãËÈÊÉ ÈÇáÝÚá.\n"
 "ÃÊÑíÏ ÇÓÊÈÏÇáåÇ ÈÇáÅÕÏÇÑÉ  ${VERSION}¿"
 
-#: src/installer.nsi:464
+#: src/installer.nsi:475
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -203,7 +203,7 @@
 "\n"
 "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win¿"
 
-#: src/installer.nsi:475
+#: src/installer.nsi:486
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -212,7 +212,7 @@
 "ãä ÝÖáß ØÇáÚ Ïáíá ãÓÊÎÏã Gpg4win áÊÞÑà Úä ØÑíÞÉ äÞá ÇáãÝÇÊíÍ ÇáãæÌæÏÉ ãä ÞÈá "
 "ãä ÊËÈíÊÇÊ ÓÇÈÞÉ ãÈäíÉ Úáì GnuPG Åáì Gpg4win."
 
-#: src/installer.nsi:480
+#: src/installer.nsi:491
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -226,7 +226,7 @@
 "\n"
 "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win æÇáÊÚÇãá ãÚ ÇáÊËÈíÊ ÇáÞÏíã áÇÍÞÇ¿"
 
-#: src/installer.nsi:489
+#: src/installer.nsi:500
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -238,7 +238,7 @@
 "\n"
 "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win¿"
 
-#: src/installer.nsi:496
+#: src/installer.nsi:507
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -252,7 +252,7 @@
 "\n"
 "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Gpg4win æÇáÊÚÇãá ãÚ ÇáÊËÈíÊ ÇáÞÏíã áÇÍÞÇ¿"
 
-#: src/installer.nsi:506
+#: src/installer.nsi:517
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -264,28 +264,38 @@
 "\n"
 "ÓíæÞÝ ÇáÊËÈíÊ ÇáÂä!"
 
-#: src/installer.nsi:515
+#: src/installer.nsi:526
+msgctxt "T_BetaWarning"
+msgid ""
+"Note: This is a BETA version of Gpg4win.\n"
+"\n"
+"Beta versions are only intended for testing and shall not be used in a "
+"production environment."
+msgstr ""
+
+#: src/installer.nsi:533
 msgctxt "T_AdminNeeded"
 msgid ""
 "Warning: Administrator permissions required for a successful installation"
 msgstr "ÊÍÐíÑ: ÊÍÊÇÌ Åáì ÕáÇÍíÇÊ ÇáãÏíÑ áÅÊãÇã ÇáÊËÈíÊ"
 
-#: src/installer.nsi:519
+#: src/installer.nsi:537
+#, fuzzy
 msgctxt "T_CloseOtherApps"
 msgid ""
 "Please make sure that other applications are not running. In particular you "
-"should close Outlook and all Explorer windows.  Gpg4Win will try to install "
+"should close Outlook and all Explorer windows.  Gpg4win will try to install "
 "anyway but a reboot will be required then."
 msgstr ""
 "ÑÌÇÁ ÊÃßÏ ãä ÚÏã ÊÔÛíá Ãí ÊØÈíÞÇÊ ÃÎÑì. Úáíß ÎÕæÕÇ ÅÛáÇÞ ßá äæÇÝÐ ÃæÊáæß Ãæ "
 "ÅßÓÈáæÑÑ.  ÓíÍÇæá Gpg4Win ÇáËÈíÊ Úáì Ãí ÍÇá áßä ÓÊÍÊÇÌ Åáì ÅÚÇÏÉ ÇáÊÔÛíá."
 
-#: src/installer.nsi:524
+#: src/installer.nsi:542
 msgctxt "T_ShuttingDownWinPT"
 msgid "Trying to shutdown a possible running instance of WinPT."
 msgstr "ÊÌÑí ãÍÇæáÉ ÅÛáÇÞ ÓíÑæÑÉ ãÍÊãáÉ ÚÇãáÉ ãä WinPT."
 
-#: src/installer.nsi:526
+#: src/installer.nsi:544
 msgctxt "T_ShuttingDownDirMngr"
 msgid "Trying to shutdown a possible running instance of DirMngr."
 msgstr "ÊÌÑí ãÍÇæáÉ ÅÛáÇÞ ÓíÑæÑÉ ãÍÊãáÉ ÚÇãáÉ ãä DirMngr."
@@ -310,12 +320,12 @@
 msgid "EudoraGPG is a plugin for the Eudora mail program"
 msgstr "þEudoraGPG åí ãáÍÞÉ áÈÑãÌíÉ ÇáÈÑíÏ Eudora"
 
-#: src/inst-gnupg2.nsi:113
+#: src/inst-gnupg2.nsi:117
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard with S/MIME support"
 msgstr "ÍÇÑÓ ÎÕæÕíÉ Ìäæ ãÚ ÏÚã S/MIME"
 
-#: src/inst-gnupg.nsi:102
+#: src/inst-gnupg.nsi:108
 msgctxt "DESC_SEC_gnupg"
 msgid "GNU Privacy Guard"
 msgstr "ÍÇÑÓ ÎÕæÕíÉ Ìäæ"
@@ -359,12 +369,12 @@
 msgid "Show the online manual of GPGee"
 msgstr "ÇÚÑÖ ßÊíøÈ GPGee Úáì ÇáæÈ"
 
-#: src/inst-gpgex.nsi:74
+#: src/inst-gpgex.nsi:80
 msgctxt "T_GpgEX_RegFailed"
 msgid "Warning: Registration of the GpgEX plugin failed."
 msgstr "ÊÍÐíÑ: ÝÔá ÊÓÌíá ãáÍÞÉ GpgEX."
 
-#: src/inst-gpgex.nsi:77
+#: src/inst-gpgex.nsi:83
 msgctxt "DESC_SEC_gpgex"
 msgid "GnuPG Shell Extension"
 msgstr "ãáÍÞ GnuPG ááÕøóÏóÝÉ"

Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po	2008-04-21 18:37:09 UTC (rev 777)
+++ trunk/po/de.po	2008-04-22 09:59:18 UTC (rev 778)
@@ -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: 2008-03-25 12:42+0100\n"
-"PO-Revision-Date: 2008-02-28 11:40+0100\n"
+"POT-Creation-Date: 2008-04-22 11:55+0200\n"
+"PO-Revision-Date: 2008-04-22 11:56+0200\n"
 "Last-Translator: Marcus Brinkmann <mb at g10code.com>\n"
 "Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -144,43 +144,43 @@
 msgid "Gpg4win Documentation"
 msgstr "Gpg4win Dokumentation"
 
-#: src/installer.nsi:438
+#: src/installer.nsi:449
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "Installationsoptionen"
 
-#: src/installer.nsi:441
+#: src/installer.nsi:452
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "Startlinks"
 
-#: src/installer.nsi:443
+#: src/installer.nsi:454
 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:446
+#: src/installer.nsi:457
 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:449
+#: src/installer.nsi:460
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "Startmenü"
 
-#: src/installer.nsi:452
+#: src/installer.nsi:463
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "Arbeitsfläche"
 
-#: src/installer.nsi:455
+#: src/installer.nsi:466
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "Schnellstartleiste"
 
-#: src/installer.nsi:461
+#: src/installer.nsi:472
 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:464
+#: src/installer.nsi:475
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -205,7 +205,7 @@
 "\n"
 "Möchten die die Installation von Gpg4Win fortführen?"
 
-#: src/installer.nsi:475
+#: src/installer.nsi:486
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -216,7 +216,7 @@
 "überführen.  Es wird dringend geraten Gpg4Win nicht zusammen mit diesen "
 "anderen Installation zu betreiben."
 
-#: src/installer.nsi:480
+#: src/installer.nsi:491
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -239,7 +239,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:489
+#: src/installer.nsi:500
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -262,7 +262,7 @@
 "\n"
 "Möchten Sie die Installation von Gpg4win fortführen?"
 
-#: src/installer.nsi:496
+#: src/installer.nsi:507
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -287,7 +287,7 @@
 "\n"
 "Möchten Sie die Installation von Gpg4win trotzdem jetzt weiter durchführen?"
 
-#: src/installer.nsi:506
+#: src/installer.nsi:517
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -301,7 +301,31 @@
 "\n"
 "Die Installation von Gpg4win wird nun abgebrochen!"
 
-#: src/installer.nsi:515
+#: src/installer.nsi:526
+msgctxt "T_BetaWarning"
+msgid ""
+"Note: This is a BETA version of Gpg4win.\n"
+"\n"
+"Beta versions are only intended for testing and shall not be used in a "
+"production environment."
+msgstr ""
+"Achtung: Dies ist eine BETA-Version von Gpg4win\n"
+"\n"
+"Das bedeutet, dass der Funktionsumfang an einigen\n"
+"Stellen nicht vollständig implementiert sein könnte oder auch\n"
+"noch Fehler vorliegen könnten.\n"
+"\n"
+"Eine BETA-Version dient dem Test durch erfahrene\n"
+"Anwender oder Administratoren um die künftige\n"
+"neue Version kennenzulernen und Verbesserungsvorschläge\n"
+"einzubringen.\n"
+"\n"
+"Bitte lesen Sie die Hinweise zur BETA-Version auf der\n"
+"Gpg4win Download-Seite:\n"
+"\n"
+"  http://www.gpg4win.de/download-de.html  "
+
+#: src/installer.nsi:533
 msgctxt "T_AdminNeeded"
 msgid ""
 "Warning: Administrator permissions required for a successful installation"
@@ -309,25 +333,25 @@
 "Achtung: Für eine erfolgreiche Installation werden Administratorrechte "
 "benötigt."
 
-#: src/installer.nsi:519
+#: src/installer.nsi:537
 msgctxt "T_CloseOtherApps"
 msgid ""
 "Please make sure that other applications are not running. In particular you "
-"should close Outlook and all Explorer windows.  Gpg4Win will try to install "
+"should close Outlook and all Explorer windows.  Gpg4win will try to install "
 "anyway but a reboot will be required then."
 msgstr ""
 "Bitte stellen Sie sicher, daß alle anderen Anwendugen geschlossen sind.  "
 "Insbesondere sollten Sie Outlook und alle Explorer Fenster schliessen bevor "
-"Sie die Installation fortsetzen.  Gpg4Win wird auf jeden Fall versuchen, "
+"Sie die Installation fortsetzen.  Gpg4win wird auf jeden Fall versuchen, "
 "eine Installation durchzuführen; es ist dann aber u.U. notwendig, das System "
 "neu zu starten."
 
-#: src/installer.nsi:524
+#: src/installer.nsi:542
 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:526
+#: src/installer.nsi:544
 msgctxt "T_ShuttingDownDirMngr"
 msgid "Trying to shutdown a possible running instance of DirMngr."
 msgstr "Ein möglicherweise laufender DirMngr wird jetzt automatisch beendet."
@@ -355,7 +379,7 @@
 msgstr ""
 "EudoraGPG ist ein Plugin zur Verschlüsselung für das Eudora Mailprogramm"
 
-#: src/inst-gnupg2.nsi:113
+#: src/inst-gnupg2.nsi:117
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard with S/MIME support"
 msgstr ""
@@ -363,7 +387,7 @@
 "Verschlüsselung mittels S/MIME bereitzustellen.  Bitte beachten Sie, daß "
 "diese Option noch nicht vollständig unterstützt ist."
 
-#: src/inst-gnupg.nsi:102
+#: src/inst-gnupg.nsi:108
 msgctxt "DESC_SEC_gnupg"
 msgid "GNU Privacy Guard"
 msgstr ""
@@ -415,12 +439,12 @@
 msgid "Show the online manual of GPGee"
 msgstr "Das englische Handbuch zu GPGee anzeigen"
 
-#: src/inst-gpgex.nsi:74
+#: src/inst-gpgex.nsi:80
 msgctxt "T_GpgEX_RegFailed"
 msgid "Warning: Registration of the GpgEX plugin failed."
 msgstr "Warnung: Registration des GpgEX Plugin ist fehlgeschlagen."
 
-#: src/inst-gpgex.nsi:77
+#: src/inst-gpgex.nsi:83
 msgctxt "DESC_SEC_gpgex"
 msgid "GnuPG Shell Extension"
 msgstr ""

Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po	2008-04-21 18:37:09 UTC (rev 777)
+++ trunk/po/es.po	2008-04-22 09:59:18 UTC (rev 778)
@@ -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-03-25 12:42+0100\n"
+"POT-Creation-Date: 2008-04-22 11:55+0200\n"
 "PO-Revision-Date: 2008-01-30 17:07+0100\n"
 "Last-Translator: Diego Escalante Urrelo <diegoe at gnome.org>\n"
 "Language-Team: Spanish <diegoe at gnome.org>\n"
@@ -148,42 +148,42 @@
 msgid "Gpg4win Documentation"
 msgstr "Documentación de Gpg4win"
 
-#: src/installer.nsi:438
+#: src/installer.nsi:449
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "Opciones de instalación"
 
-#: src/installer.nsi:441
+#: src/installer.nsi:452
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "Vínculos de inicio"
 
-#: src/installer.nsi:443
+#: src/installer.nsi:454
 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:446
+#: src/installer.nsi:457
 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:449
+#: src/installer.nsi:460
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "Menú inicio"
 
-#: src/installer.nsi:452
+#: src/installer.nsi:463
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: src/installer.nsi:455
+#: src/installer.nsi:466
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "Barra de inicio rápido"
 
-#: src/installer.nsi:461
+#: src/installer.nsi:472
 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:464
+#: src/installer.nsi:475
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -205,7 +205,7 @@
 "\n"
 "¿Desea continuar con la instalación?"
 
-#: src/installer.nsi:475
+#: src/installer.nsi:486
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -214,7 +214,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:480
+#: src/installer.nsi:491
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -229,7 +229,7 @@
 "¿Desea continuar con la instalación de Gpg4Win y dejar para mas tarde la "
 "instalación antigua de GnuPP?"
 
-#: src/installer.nsi:489
+#: src/installer.nsi:500
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -242,7 +242,7 @@
 "\n"
 "¿Desea continuar instalando Gpg4Win?"
 
-#: src/installer.nsi:496
+#: src/installer.nsi:507
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -257,7 +257,7 @@
 "¿Desea continuar con la instalación de Gpg4Win y dejar para más tarde la "
 "instalación antigua de WinPT?"
 
-#: src/installer.nsi:506
+#: src/installer.nsi:517
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -270,18 +270,28 @@
 "\n"
 "La instalación se detendrá ahora."
 
-#: src/installer.nsi:515
+#: src/installer.nsi:526
+msgctxt "T_BetaWarning"
+msgid ""
+"Note: This is a BETA version of Gpg4win.\n"
+"\n"
+"Beta versions are only intended for testing and shall not be used in a "
+"production environment."
+msgstr ""
+
+#: src/installer.nsi:533
 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:519
+#: src/installer.nsi:537
+#, fuzzy
 msgctxt "T_CloseOtherApps"
 msgid ""
 "Please make sure that other applications are not running. In particular you "
-"should close Outlook and all Explorer windows.  Gpg4Win will try to install "
+"should close Outlook and all Explorer windows.  Gpg4win will try to install "
 "anyway but a reboot will be required then."
 msgstr ""
 "Por favor asegúrese que otras aplicaciones no están ejecutándose.  En "
@@ -289,12 +299,12 @@
 "intentará instalarse de todas formas, pero será necesario que reinicie su "
 "sistema una vez terminado el proceso. "
 
-#: src/installer.nsi:524
+#: src/installer.nsi:542
 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:526
+#: src/installer.nsi:544
 msgctxt "T_ShuttingDownDirMngr"
 msgid "Trying to shutdown a possible running instance of DirMngr."
 msgstr ""
@@ -320,12 +330,12 @@
 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:113
+#: src/inst-gnupg2.nsi:117
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard with S/MIME support"
 msgstr "GNU Privacy Guard (GnuPG) con soporte para S/MIME"
 
-#: src/inst-gnupg.nsi:102
+#: src/inst-gnupg.nsi:108
 msgctxt "DESC_SEC_gnupg"
 msgid "GNU Privacy Guard"
 msgstr "GNU Privacy Guard (GnuPG)"
@@ -371,12 +381,12 @@
 msgid "Show the online manual of GPGee"
 msgstr "Mostrar el manual en línea de GPGee"
 
-#: src/inst-gpgex.nsi:74
+#: src/inst-gpgex.nsi:80
 msgctxt "T_GpgEX_RegFailed"
 msgid "Warning: Registration of the GpgEX plugin failed."
 msgstr "Advertencia: El intento de registrar el plugin GpgEx fracasó."
 
-#: src/inst-gpgex.nsi:77
+#: src/inst-gpgex.nsi:83
 msgctxt "DESC_SEC_gpgex"
 msgid "GnuPG Shell Extension"
 msgstr "GPG Shell Extension (GpgEX)."

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2008-04-21 18:37:09 UTC (rev 777)
+++ trunk/po/fr.po	2008-04-22 09:59:18 UTC (rev 778)
@@ -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-03-25 12:42+0100\n"
+"POT-Creation-Date: 2008-04-22 11:55+0200\n"
 "PO-Revision-Date: 2008-03-10 16:46+0100\n"
 "Last-Translator: Fabian Rodriguez <magicfab at member.fsf.org>\n"
 "Language-Team: FRENCH <aep.lists at it46.se>\n"
@@ -149,44 +149,44 @@
 msgid "Gpg4win Documentation"
 msgstr "Guides pour l'installation du logiciel Gpg4win"
 
-#: src/installer.nsi:438
+#: src/installer.nsi:449
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "Installer les options"
 
-#: src/installer.nsi:441
+#: src/installer.nsi:452
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "Démarrage Liens"
 
-#: src/installer.nsi:443
+#: src/installer.nsi:454
 msgctxt "T_InstOptLabelA"
 msgid "Please select where Gpg4win shall install links:"
 msgstr "Veuillez choisir où Gpg4win installera des liens:"
 
-#: src/installer.nsi:446
+#: src/installer.nsi:457
 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:449
+#: src/installer.nsi:460
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "Menu Démarrage"
 
-#: src/installer.nsi:452
+#: src/installer.nsi:463
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "Desktop"
 
-#: src/installer.nsi:455
+#: src/installer.nsi:466
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "Barre rapide de Lancement"
 
-#: src/installer.nsi:461
+#: src/installer.nsi:472
 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:464
+#: src/installer.nsi:475
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -208,7 +208,7 @@
 "\n"
 "Voulez-vous poursuivre l'installation Gpg4win?"
 
-#: src/installer.nsi:475
+#: src/installer.nsi:486
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -217,7 +217,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:480
+#: src/installer.nsi:491
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -232,7 +232,7 @@
 "Voulez-vous continuer d'installer Gpg4win et prendre soin de la vieille "
 "installation plus tard?"
 
-#: src/installer.nsi:489
+#: src/installer.nsi:500
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -245,7 +245,7 @@
 "\n"
 "Voulez-vous continuer d'installer Gpg4win?"
 
-#: src/installer.nsi:496
+#: src/installer.nsi:507
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -260,7 +260,7 @@
 "Vous voulez continuer d'installer Gpg4win et prendre soin de la vieille "
 "installation plus tard?"
 
-#: src/installer.nsi:506
+#: src/installer.nsi:517
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -273,7 +273,16 @@
 "\n"
 "L'installation sera annulée maintenant!"
 
-#: src/installer.nsi:515
+#: src/installer.nsi:526
+msgctxt "T_BetaWarning"
+msgid ""
+"Note: This is a BETA version of Gpg4win.\n"
+"\n"
+"Beta versions are only intended for testing and shall not be used in a "
+"production environment."
+msgstr ""
+
+#: src/installer.nsi:533
 msgctxt "T_AdminNeeded"
 msgid ""
 "Warning: Administrator permissions required for a successful installation"
@@ -281,24 +290,24 @@
 "Avertissement : Permissions d'administrateur requises pour une installation "
 "réussie"
 
-#: src/installer.nsi:519
+#: src/installer.nsi:537
 msgctxt "T_CloseOtherApps"
 msgid ""
 "Please make sure that other applications are not running. In particular you "
-"should close Outlook and all Explorer windows.  Gpg4Win will try to install "
+"should close Outlook and all Explorer windows.  Gpg4win will try to install "
 "anyway but a reboot will be required then."
 msgstr ""
 "Veuillez s'assurer que d'autres applications ne fonctionnent pas. En "
 "particulier vérifiez que vous avez fermé Outlook et les fenêtres Explorer. "
-"Gpg4Win essayera d'installer quoi qu'il en soit mais une réinitialisation "
+"Gpg4win essayera d'installer quoi qu'il en soit mais une réinitialisation "
 "sera exigé alors."
 
-#: src/installer.nsi:524
+#: src/installer.nsi:542
 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:526
+#: src/installer.nsi:544
 msgctxt "T_ShuttingDownDirMngr"
 msgid "Trying to shutdown a possible running instance of DirMngr."
 msgstr "Essayant à l'arrêt un instance courant possible de DirMngr."
@@ -324,12 +333,12 @@
 msgstr ""
 "EudoraGPG est un plugin pour le logiciel de courrier électronique d'Eudora"
 
-#: src/inst-gnupg2.nsi:113
+#: src/inst-gnupg2.nsi:117
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard with S/MIME support"
 msgstr "GNU Privacy Guard avec l'appui de S/MIME"
 
-#: src/inst-gnupg.nsi:102
+#: src/inst-gnupg.nsi:108
 msgctxt "DESC_SEC_gnupg"
 msgid "GNU Privacy Guard"
 msgstr "GNU Privacy Guard"
@@ -375,12 +384,12 @@
 msgid "Show the online manual of GPGee"
 msgstr "Montrez le guide en ligne de GPGee"
 
-#: src/inst-gpgex.nsi:74
+#: src/inst-gpgex.nsi:80
 msgctxt "T_GpgEX_RegFailed"
 msgid "Warning: Registration of the GpgEX plugin failed."
 msgstr "Avertissement : Enregistrement du plugin de GpgEX échoué."
 
-#: src/inst-gpgex.nsi:77
+#: src/inst-gpgex.nsi:83
 msgctxt "DESC_SEC_gpgex"
 msgid "GnuPG Shell Extension"
 msgstr "GnuPG Shell Extension"

Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po	2008-04-21 18:37:09 UTC (rev 777)
+++ trunk/po/ru.po	2008-04-22 09:59:18 UTC (rev 778)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Gpg4Win Installer\n"
 "Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-03-25 12:42+0100\n"
-"PO-Revision-Date: 2008-03-20 23:50+0300\n"
+"POT-Creation-Date: 2008-04-22 11:55+0200\n"
+"PO-Revision-Date: 2008-04-22 11:57+0200\n"
 "Last-Translator: Sergei Smirnov <moscow at hro.org>\n"
 "Language-Team: Human Rights Network <moscow at hro.org>\n"
 "MIME-Version: 1.0\n"
@@ -150,42 +150,42 @@
 msgid "Gpg4win Documentation"
 msgstr "Äîêóìåíòàöèÿ Gpg4win"
 
-#: src/installer.nsi:438
+#: src/installer.nsi:449
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "Ïàðàìåòðû óñòàíîâêè"
 
-#: src/installer.nsi:441
+#: src/installer.nsi:452
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "ßðëûêè Gpg4win"
 
-#: src/installer.nsi:443
+#: src/installer.nsi:454
 msgctxt "T_InstOptLabelA"
 msgid "Please select where Gpg4win shall install links:"
 msgstr "Ãäå ñîçäàâàòü ÿðëûêè Gpg4win:"
 
-#: src/installer.nsi:446
+#: src/installer.nsi:457
 msgctxt "T_InstOptLabelB"
 msgid "(Only programs will be linked into the quick launch bar.)"
 msgstr "(Â ïàíåëè áûñòðîãî çàïóñêà áóäóò ññûëêè òîëüêî íà ïðîãðàììû)."
 
-#: src/installer.nsi:449
+#: src/installer.nsi:460
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "Ìåíþ Ïóñê"
 
-#: src/installer.nsi:452
+#: src/installer.nsi:463
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "Ðàáî÷èé ñòîë"
 
-#: src/installer.nsi:455
+#: src/installer.nsi:466
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "Ïàíåëü áûñòðîãî çàïóñêà"
 
-#: src/installer.nsi:461
+#: src/installer.nsi:472
 msgctxt "T_FoundExistingVersion"
 msgid ""
 "Version $R1 has already been installed.\n"
@@ -194,7 +194,7 @@
 "Âåðñèÿ $R1 óæå óñòàíîâëåíà.\n"
 "Ïåðåçàïèñàòü åå âåðñèåé ${VERSION}?"
 
-#: src/installer.nsi:464
+#: src/installer.nsi:475
 msgctxt "T_FoundExistingVersionB"
 msgid ""
 "A version of Gpg4Win has already been installed on the system. There will be "
@@ -207,7 +207,7 @@
 "\n"
 "Ïðîäîëæèòü óñòàíîâêó Gpg4Win?"
 
-#: src/installer.nsi:475
+#: src/installer.nsi:486
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -216,7 +216,7 @@
 "Âîïðîñû ïåðåíîñà êëþ÷åé èç äðóãèõ ïðîãðàìì â Gpg4Win ðàññìàòðèâàþòñÿ â "
 "ðóêîâîäñòâå ïîëüçîâàòåëÿ Gpg4Win."
 
-#: src/installer.nsi:480
+#: src/installer.nsi:491
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been been detected.  "
@@ -230,7 +230,7 @@
 "\n"
 "Ïðîäîëæèòü óñòàíîâêó Gpg4Win (à ñ GnuPP ðàçáåðåìñÿ ïîòîì)?"
 
-#: src/installer.nsi:489
+#: src/installer.nsi:500
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been been detected.  This may cause problems "
@@ -243,7 +243,7 @@
 "\n"
 "Ïðîäîëæèòü óñòàíîâêó Gpg4win?"
 
-#: src/installer.nsi:496
+#: src/installer.nsi:507
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been been detected.  "
@@ -258,7 +258,7 @@
 "\n"
 "Ïðîäîëæèòü óñòàíîâêó Gpg4win (à ñî ñòàðîé ïðîãðàììîé ðàçáåðåìñÿ ïîòîì)?"
 
-#: src/installer.nsi:506
+#: src/installer.nsi:517
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -272,29 +272,38 @@
 "\n"
 "Óñòàíîâêà ïðåðâàíà!"
 
-#: src/installer.nsi:515
+#: src/installer.nsi:526
+msgctxt "T_BetaWarning"
+msgid ""
+"Note: This is a BETA version of Gpg4win.\n"
+"\n"
+"Beta versions are only intended for testing and shall not be used in a "
+"production environment."
+msgstr ""
+
+#: src/installer.nsi:533
 msgctxt "T_AdminNeeded"
 msgid ""
 "Warning: Administrator permissions required for a successful installation"
 msgstr "Äëÿ óñïåøíîé óñòàíîâêè òðåáóþòñÿ ïðàâà àäìèíèñòðàòîðà"
 
-#: src/installer.nsi:519
+#: src/installer.nsi:537
 msgctxt "T_CloseOtherApps"
 msgid ""
 "Please make sure that other applications are not running. In particular you "
-"should close Outlook and all Explorer windows.  Gpg4Win will try to install "
+"should close Outlook and all Explorer windows.  Gpg4win will try to install "
 "anyway but a reboot will be required then."
 msgstr ""
 "Óáåäèòåñü, ÷òî íå çàïóùåíû äðóãèå ïðèëîæåíèÿ.  ÷àñòíîñòè, ñëåäóåò çàêðûòü "
 "Outlook è Explorer. Åñëè ýòî íå ñäåëàòü, Gpg4Win âñå ðàâíî áóäåò "
 "óñòàíîâëåíà, íî ïîòðåáóåòñÿ ïåðåçàãðóçêà."
 
-#: src/installer.nsi:524
+#: src/installer.nsi:542
 msgctxt "T_ShuttingDownWinPT"
 msgid "Trying to shutdown a possible running instance of WinPT."
 msgstr "Âîçìîæíî, çàïóùåíà ïðîãðàììà WinPT. Ïîïðîáóåì çàêðûòü åå."
 
-#: src/installer.nsi:526
+#: src/installer.nsi:544
 msgctxt "T_ShuttingDownDirMngr"
 msgid "Trying to shutdown a possible running instance of DirMngr."
 msgstr "Âîçìîæíî, çàïóùåíà ïðîãðàììà DirMngr. Ïîïðîáóåì çàêðûòü åå."
@@ -319,12 +328,12 @@
 msgid "EudoraGPG is a plugin for the Eudora mail program"
 msgstr "EudoraGPG - ðàñøèðåíèå ïî÷òîâîãî êëèåíòà Eudora"
 
-#: src/inst-gnupg2.nsi:113
+#: src/inst-gnupg2.nsi:117
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard with S/MIME support"
 msgstr "GNU Privacy Guard ñ ïîääåðæêîé S/MIME"
 
-#: src/inst-gnupg.nsi:102
+#: src/inst-gnupg.nsi:108
 msgctxt "DESC_SEC_gnupg"
 msgid "GNU Privacy Guard"
 msgstr "GNU Privacy Guard"
@@ -366,12 +375,12 @@
 msgid "Show the online manual of GPGee"
 msgstr "Ïîêàçàòü îíëàéíîâîå ðóêîâîäñòâî ïî GPGee"
 
-#: src/inst-gpgex.nsi:74
+#: src/inst-gpgex.nsi:80
 msgctxt "T_GpgEX_RegFailed"
 msgid "Warning: Registration of the GpgEX plugin failed."
 msgstr "Îøèáêà ðåãèñòðàöèè GpgEX."
 
-#: src/inst-gpgex.nsi:77
+#: src/inst-gpgex.nsi:83
 msgctxt "DESC_SEC_gpgex"
 msgid "GnuPG Shell Extension"
 msgstr "Îáîëî÷êà GnuPG"

Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi	2008-04-21 18:37:09 UTC (rev 777)
+++ trunk/src/installer.nsi	2008-04-22 09:59:18 UTC (rev 778)
@@ -277,7 +277,15 @@
   !insertmacro MUI_INSTALLOPTIONS_DISPLAY "installer-options.ini"
 FunctionEnd
 
+# Display a warning if this is a Beta version and allow the user to
+# abort the installation.
+Function PrintBetaWarning
+   MessageBox MB_YESNO "$(T_BetaWarning)" IDYES cont
+     Abort
+ cont:
+FunctionEnd
 
+
 # Display a warning if GnuPP has been detected and allow the user to abort
 # the installation.
 Function PrintGnuPPWarning
@@ -378,6 +386,9 @@
 # OS version without the need for an Administrator is in use.  Print a
 # diagnostic if this is not the case and abort installation.
 Function PrintNonAdminWarning
+
+  Call PrintBetaWarning
+
   ClearErrors
   UserInfo::GetName
   IfErrors leave
@@ -511,6 +522,13 @@
 
 
 
+# From Function PrintBetaWarning
+LangString T_BetaWarning ${LANG_ENGLISH} \
+   "Note: This is a BETA version of Gpg4win. $\r$\n\
+     $\r$\n\
+    Beta versions are only intended for testing and \
+    shall not be used in a production environment."
+
 # From Function PrintNonAdminWarning
 LangString T_AdminNeeded ${LANG_ENGLISH} \
    "Warning: Administrator permissions required for a successful installation"
@@ -519,7 +537,7 @@
 LangString T_CloseOtherApps ${LANG_ENGLISH} \
    "Please make sure that other applications are not running. \
     In particular you should close Outlook and all Explorer \
-    windows.  Gpg4Win will try to install anyway but a reboot \
+    windows.  Gpg4win will try to install anyway but a reboot \
     will be required then."
 LangString T_ShuttingDownWinPT ${LANG_ENGLISH} \
    "Trying to shutdown a possible running instance of WinPT."

Modified: trunk/src/uninst-gnupg2.nsi
===================================================================
--- trunk/src/uninst-gnupg2.nsi	2008-04-21 18:37:09 UTC (rev 777)
+++ trunk/src/uninst-gnupg2.nsi	2008-04-22 09:59:18 UTC (rev 778)
@@ -53,6 +53,7 @@
   Delete "$INSTDIR\share\gnupg\qualified.txt"
   Delete "$INSTDIR\share\gnupg\com-certs.pem"
   Delete "$INSTDIR\share\gnupg\gpg-conf.skel"
+  Delete "$INSTDIR\share\gnupg\help.*.txt"
   RMDir "$INSTDIR\share\gnupg"
   RMDir "$INSTDIR\share"

More information about the Gpg4win-commits mailing list