[Gpg4win-commits] r1001 - in trunk: . doc/manual packages po src

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Oct 27 21:09:15 CET 2008


Author: werner
Date: 2008-10-27 21:09:14 +0100 (Mon, 27 Oct 2008)
New Revision: 1001

Modified:
   trunk/ChangeLog
   trunk/doc/manual/Makefile.am
   trunk/packages/packages.current
   trunk/po/ChangeLog
   trunk/po/ar.po
   trunk/po/de.po
   trunk/po/es.po
   trunk/po/fr.po
   trunk/po/ru.po
   trunk/src/inst-compendium_de.nsi
   trunk/src/inst-gpg4win.nsi
   trunk/src/inst-man_novice_en.nsi
   trunk/src/inst-sections.nsi
Log:
Latest changes.  Buils and work for me as long as all gnutls based
stuff is disabled.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-10-27 18:23:40 UTC (rev 1000)
+++ trunk/ChangeLog	2008-10-27 20:09:14 UTC (rev 1001)
@@ -7,6 +7,10 @@
 
 2008-10-27  Werner Koch  <wk at g10code.com>
 
+	* src/inst-sections.nsi: Install PDF versions of the compendium.
+	* src/inst-compendium_de.nsi: Change the strings.
+	* src/inst-man_novice_en.nsi: Ditto.
+
 	* src/inst-kleopatra.nsi: Install kdeqt.mo.
 	* src/uninst-kleopatra.nsi: Uninstall kdeqt.mo.
 

Modified: trunk/doc/manual/Makefile.am
===================================================================
--- trunk/doc/manual/Makefile.am	2008-10-27 18:23:40 UTC (rev 1000)
+++ trunk/doc/manual/Makefile.am	2008-10-27 20:09:14 UTC (rev 1001)
@@ -97,7 +97,7 @@
 
 
 web_png_files = blank.png next.png previous.png up.png \
-                 home.png nonext.png noprevious.png noup.png
+                home.png nonext.png noprevious.png noup.png
 
 
 eps_files = adele01.eps.gz adele02.eps.gz man-with-signed-key.eps.gz \
@@ -227,7 +227,7 @@
             sed -n 's/.*\\IncludeImage{\([^}]*\).*/\1.png/p' $$src ;\
             sed -n 's/.*\\input{\([^}]*\).*/\1/p' $$src ) \
           | sort | uniq) ;\
-	 for f in $$files; do \
+	 for f in $$files $(web_png_files); do \
 	   if [ -f "$$f" ]; then cp "$$f" $$wdir ;\
 	   elif [ -f "$(srcdir)/$$f" ]; then cp "$(srcdir)/$$f" $$wdir ;\
 	   fi ;\

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2008-10-27 18:23:40 UTC (rev 1000)
+++ trunk/packages/packages.current	2008-10-27 20:09:14 UTC (rev 1001)
@@ -274,8 +274,8 @@
 #chk  0dd28112046fd69d9ca2108c0fda7a835cb3c569
 
 server ftp://ftp.g10code.com/g10code/scratch
-file gpgol-0.10.16-svn277.tar.bz2
-chk  004866206677b70232f0205f15671afd15f17aa2 
+file gpgol-0.10.16-svn280.tar.bz2
+chk  6204b69300ff6b15751229abc80c50fe4052a471
 
 
 #

Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog	2008-10-27 18:23:40 UTC (rev 1000)
+++ trunk/po/ChangeLog	2008-10-27 20:09:14 UTC (rev 1001)
@@ -1,3 +1,7 @@
+2008-10-27  Werner Koch  <wk at g10code.com>
+
+	* de.po: Updated.
+
 2008-10-07  Marcus Brinkmann  <marcus at g10code.com>
 
 	* de.po: Add string for T_FoundExistingOldVersion.

Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po	2008-10-27 18:23:40 UTC (rev 1000)
+++ trunk/po/ar.po	2008-10-27 20:09:14 UTC (rev 1001)
@@ -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-27 10:01+0100\n"
+"POT-Creation-Date: 2008-10-27 19:49+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"
@@ -354,13 +354,15 @@
 "WinPT."
 
 #: src/inst-gpg4win.nsi:70
+#, fuzzy
 msgctxt "DESC_Menu_gpg4win_readme"
-msgid "General information on Gpg4Win"
+msgid "General information on Gpg4win"
 msgstr "ãÚáæãÇÊ ÚÇãÉ Úä Gpg4Win"
 
 #: src/inst-gpg4win.nsi:73
+#, fuzzy
 msgctxt "DESC_Menu_gnupg_faq"
-msgid "Show the Frequently Asked Questions Document for GnuPG"
+msgid "Show the Frequently Asked Questions document for GnuPG"
 msgstr "ØÇáÚ ÇáÃÓÆáÉ ÇáÔÇÆÚÉ Íæá GnuPG"
 
 #: src/inst-gpgee.nsi:65
@@ -454,36 +456,50 @@
 msgstr "ÇÚÑÖ Ïáíá Gpg4Win ÈÇáÃáãÇäíÉ Úáì ÇáæÈ ááãÓÊÎÏãíä ÇáãÈÊÏÆíä"
 
 #: src/inst-man_novice_en.nsi:39
+#, fuzzy
 msgctxt "DESC_Name_man_novice_en"
-msgid "Novice Manual"
-msgstr "Ïáíá ÇáãÈÊÏÆíä"
+msgid "Novice Manual (pdf, English)"
+msgstr "Ïáíá ÇáãÈÊÏÆíä (ÈÇáÃáãÇäíÉ)"
 
 #: src/inst-man_novice_en.nsi:42
+#, fuzzy
 msgctxt "DESC_SEC_man_novice_en"
-msgid "Gpg4Win Manual for the Novice User"
-msgstr "Ïáíá Gpg4Win ááãÓÊÎÏãíä ÇáãÈÊÏÆíä"
+msgid "Gpg4win Manual for the Novice User (English)"
+msgstr "Ïáíá Gpg4Win ááãÓÊÎÏãíä ÇáãÈÊÏÆíä (ÈÇáÃáãÇäíÉ)"
 
 #: src/inst-man_novice_en.nsi:45
+#, fuzzy
 msgctxt "DESC_Menu_man_novice_en"
-msgid "Show the online manual of Gpg4Win for novice users"
+msgid "Show the Gpg4win manual for novice users (pdf, English)"
 msgstr "ÇÚÑÖ Ïáíá Gpg4Win Úáì ÇáæÈ ááãÓÊÎÏãíä ÇáãÈÊÏÆíä"
 
-#: src/inst-compendium_de.nsi:39
+#: src/inst-compendium_de.nsi:40
 #, fuzzy
 msgctxt "DESC_Name_compendium_de"
-msgid "Gpg4win Kompendium"
+msgid "Gpg4win Kompendium (pdf, German)"
 msgstr "æËÇÆÞ Gpg4win"
 
-#: src/inst-compendium_de.nsi:42
+#: src/inst-compendium_de.nsi:44
+#, fuzzy
+msgctxt "DESC_Name_compendium_de_html"
+msgid "Gpg4win Kompendium (html, German)"
+msgstr "æËÇÆÞ Gpg4win"
+
+#: src/inst-compendium_de.nsi:48
 msgctxt "DESC_SEC_compendium_de"
 msgid "Gpg4win compendium (German)"
 msgstr ""
 
-#: src/inst-compendium_de.nsi:45
-msgctxt "DESC_Menu_compendum_de"
-msgid "Show the German Gpg4win compendium (PDF)"
+#: src/inst-compendium_de.nsi:52
+msgctxt "DESC_Menu_compendium_de"
+msgid "Show the Gpg4win compendium (pdf, German)"
 msgstr ""
 
+#: src/inst-compendium_de.nsi:56
+msgctxt "DESC_Menu_compendium_de_html"
+msgid "Show the Gpg4win compendium (html, German)"
+msgstr ""
+
 #: src/inst-winpt.nsi:46
 msgctxt "DESC_SEC_winpt"
 msgid "Windows Privacy Tray"
@@ -498,6 +514,14 @@
 "ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ áæÍÉ ÎÕæÕíÉ æíäÏæÒ. åÐå ÃÏÇÉ ÅÏÇÑÉ ãÝÇÊíÍ æÊÚãíÉ "
 "ãÊÚÏÏÉ ÇáÇÓÊÚãÇáÇÊ."
 
+#~ msgctxt "DESC_Name_man_novice_en"
+#~ msgid "Novice Manual"
+#~ msgstr "Ïáíá ÇáãÈÊÏÆíä"
+
+#~ msgctxt "DESC_SEC_man_novice_en"
+#~ msgid "Gpg4Win Manual for the Novice User"
+#~ msgstr "Ïáíá Gpg4Win ááãÓÊÎÏãíä ÇáãÈÊÏÆíä"
+
 #~ msgctxt "DESC_SEC_gnupg2"
 #~ msgid "GNU Privacy Guard with S/MIME support"
 #~ msgstr "ÍÇÑÓ ÎÕæÕíÉ Ìäæ ãÚ ÏÚã S/MIME"

Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po	2008-10-27 18:23:40 UTC (rev 1000)
+++ trunk/po/de.po	2008-10-27 20:09:14 UTC (rev 1001)
@@ -4,11 +4,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gpg4win 1.1.1-svn417\n"
+"Project-Id-Version: gpg4win 2.0\n"
 "Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-10-27 10:01+0100\n"
-"PO-Revision-Date: 2008-09-09 13:24+0200\n"
-"Last-Translator: Marcus Brinkmann <mb at g10code.com>\n"
+"POT-Creation-Date: 2008-10-27 19:49+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -418,12 +418,12 @@
 
 #: src/inst-gpg4win.nsi:70
 msgctxt "DESC_Menu_gpg4win_readme"
-msgid "General information on Gpg4Win"
+msgid "General information on Gpg4win"
 msgstr "Allgemeine Informationen zu Gpg4win"
 
 #: src/inst-gpg4win.nsi:73
 msgctxt "DESC_Menu_gnupg_faq"
-msgid "Show the Frequently Asked Questions Document for GnuPG"
+msgid "Show the Frequently Asked Questions document for GnuPG"
 msgstr "Das Dokument mit den häufig gestellten Fragen (FAQ) zu GnuPG anzeigen"
 
 #: src/inst-gpgee.nsi:65
@@ -502,7 +502,7 @@
 #: src/inst-man_advanced_en.nsi:42
 msgctxt "DESC_SEC_man_advanced_en"
 msgid "Gpg4Win Manual for the Advanced User"
-msgstr "Gpg4win Handbuch für den Durchblicker (Englisch)"
+msgstr "Gpg4win Handbuch für den Durchblicker (englisch)"
 
 #: src/inst-man_advanced_en.nsi:45
 msgctxt "DESC_Menu_man_advanced_en"
@@ -527,34 +527,44 @@
 
 #: src/inst-man_novice_en.nsi:39
 msgctxt "DESC_Name_man_novice_en"
-msgid "Novice Manual"
-msgstr "Einsteigerhandbuch (Englisch)"
+msgid "Novice Manual (pdf, English)"
+msgstr "Gpg4win Einsteigerhandbuch (pdf, englisch)"
 
 #: src/inst-man_novice_en.nsi:42
 msgctxt "DESC_SEC_man_novice_en"
-msgid "Gpg4Win Manual for the Novice User"
-msgstr "Englisches Gpg4win Handbuch für den Einsteiger"
+msgid "Gpg4win Manual for the Novice User (English)"
+msgstr "Gpg4win Einsteigerhandbuch (englisch)"
 
 #: src/inst-man_novice_en.nsi:45
 msgctxt "DESC_Menu_man_novice_en"
-msgid "Show the online manual of Gpg4Win for novice users"
-msgstr "Das englische Online-Handbuch von Gpg4win für den Einsteiger anzeigen"
+msgid "Show the Gpg4win manual for novice users (pdf, English)"
+msgstr "Gpg4win  Einsteigerhandbuch (pdf, englisch)"
 
-#: src/inst-compendium_de.nsi:39
+#: src/inst-compendium_de.nsi:40
 msgctxt "DESC_Name_compendium_de"
-msgid "Gpg4win Kompendium"
-msgstr "Gpg4win Kompendium"
+msgid "Gpg4win Kompendium (pdf, German)"
+msgstr "Gpg4win Kompendium (pdf, deutsch)"
 
-#: src/inst-compendium_de.nsi:42
+#: src/inst-compendium_de.nsi:44
+msgctxt "DESC_Name_compendium_de_html"
+msgid "Gpg4win Kompendium (html, German)"
+msgstr "Gpg4win Kompendium (html, deutsch)"
+
+#: src/inst-compendium_de.nsi:48
 msgctxt "DESC_SEC_compendium_de"
 msgid "Gpg4win compendium (German)"
 msgstr "Gpg4win Kompendium (deutsch)"
 
-#: src/inst-compendium_de.nsi:45
-msgctxt "DESC_Menu_compendum_de"
-msgid "Show the German Gpg4win compendium (PDF)"
-msgstr "Das deutsche Gpg4win Kompendium anzeigen"
+#: src/inst-compendium_de.nsi:52
+msgctxt "DESC_Menu_compendium_de"
+msgid "Show the Gpg4win compendium (pdf, German)"
+msgstr "Gpg4win Kompendium (pdf, deutsch)"
 
+#: src/inst-compendium_de.nsi:56
+msgctxt "DESC_Menu_compendium_de_html"
+msgid "Show the Gpg4win compendium (html, German)"
+msgstr "Gpg4win Kompendium (html, deutsch)"
+
 #: src/inst-winpt.nsi:46
 msgctxt "DESC_SEC_winpt"
 msgid "Windows Privacy Tray"

Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po	2008-10-27 18:23:40 UTC (rev 1000)
+++ trunk/po/es.po	2008-10-27 20:09:14 UTC (rev 1001)
@@ -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-27 10:01+0100\n"
+"POT-Creation-Date: 2008-10-27 19:49+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"
@@ -364,13 +364,15 @@
 "una alternativa a la herramienta de manejo de llaves WinPT."
 
 #: src/inst-gpg4win.nsi:70
+#, fuzzy
 msgctxt "DESC_Menu_gpg4win_readme"
-msgid "General information on Gpg4Win"
+msgid "General information on Gpg4win"
 msgstr "Información general de Gpg4Win"
 
 #: src/inst-gpg4win.nsi:73
+#, fuzzy
 msgctxt "DESC_Menu_gnupg_faq"
-msgid "Show the Frequently Asked Questions Document for GnuPG"
+msgid "Show the Frequently Asked Questions document for GnuPG"
 msgstr "Mostrar las preguntas frecuentes (FAQ) sobre GnuPG"
 
 #: src/inst-gpgee.nsi:65
@@ -467,36 +469,50 @@
 msgstr "Mostrar el manual del principiante de Gpg4Win, en línea (en Alemán)"
 
 #: src/inst-man_novice_en.nsi:39
+#, fuzzy
 msgctxt "DESC_Name_man_novice_en"
-msgid "Novice Manual"
-msgstr "Manuel del principiante (Inglés)"
+msgid "Novice Manual (pdf, English)"
+msgstr "Manual del principiante (Alemán)"
 
 #: src/inst-man_novice_en.nsi:42
+#, fuzzy
 msgctxt "DESC_SEC_man_novice_en"
-msgid "Gpg4Win Manual for the Novice User"
-msgstr "Manual de Gpg4Win para el principiante (Inglés)"
+msgid "Gpg4win Manual for the Novice User (English)"
+msgstr "Manual del principiante de Gpg4Win (Alemán)"
 
 #: src/inst-man_novice_en.nsi:45
+#, fuzzy
 msgctxt "DESC_Menu_man_novice_en"
-msgid "Show the online manual of Gpg4Win for novice users"
+msgid "Show the Gpg4win manual for novice users (pdf, English)"
 msgstr "Mostrar el manual en línea de Gpg4Win para principiantes"
 
-#: src/inst-compendium_de.nsi:39
+#: src/inst-compendium_de.nsi:40
 #, fuzzy
 msgctxt "DESC_Name_compendium_de"
-msgid "Gpg4win Kompendium"
+msgid "Gpg4win Kompendium (pdf, German)"
 msgstr "Documentación de Gpg4win"
 
-#: src/inst-compendium_de.nsi:42
+#: src/inst-compendium_de.nsi:44
+#, fuzzy
+msgctxt "DESC_Name_compendium_de_html"
+msgid "Gpg4win Kompendium (html, German)"
+msgstr "Documentación de Gpg4win"
+
+#: src/inst-compendium_de.nsi:48
 msgctxt "DESC_SEC_compendium_de"
 msgid "Gpg4win compendium (German)"
 msgstr ""
 
-#: src/inst-compendium_de.nsi:45
-msgctxt "DESC_Menu_compendum_de"
-msgid "Show the German Gpg4win compendium (PDF)"
+#: src/inst-compendium_de.nsi:52
+msgctxt "DESC_Menu_compendium_de"
+msgid "Show the Gpg4win compendium (pdf, German)"
 msgstr ""
 
+#: src/inst-compendium_de.nsi:56
+msgctxt "DESC_Menu_compendium_de_html"
+msgid "Show the Gpg4win compendium (html, German)"
+msgstr ""
+
 #: src/inst-winpt.nsi:46
 msgctxt "DESC_SEC_winpt"
 msgid "Windows Privacy Tray"
@@ -511,6 +527,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_Name_man_novice_en"
+#~ msgid "Novice Manual"
+#~ msgstr "Manuel del principiante (Inglés)"
+
+#~ msgctxt "DESC_SEC_man_novice_en"
+#~ msgid "Gpg4Win Manual for the Novice User"
+#~ msgstr "Manual de Gpg4Win para el principiante (Inglés)"
+
 #~ msgctxt "DESC_SEC_gnupg2"
 #~ msgid "GNU Privacy Guard with S/MIME support"
 #~ msgstr "GNU Privacy Guard (GnuPG) con soporte para S/MIME"

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2008-10-27 18:23:40 UTC (rev 1000)
+++ trunk/po/fr.po	2008-10-27 20:09:14 UTC (rev 1001)
@@ -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-27 10:01+0100\n"
+"POT-Creation-Date: 2008-10-27 19:49+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"
@@ -367,13 +367,15 @@
 "alternative à l'outil de gestion de clé de WinPT."
 
 #: src/inst-gpg4win.nsi:70
+#, fuzzy
 msgctxt "DESC_Menu_gpg4win_readme"
-msgid "General information on Gpg4Win"
+msgid "General information on Gpg4win"
 msgstr "Informations générales sur Gpg4Win"
 
 #: src/inst-gpg4win.nsi:73
+#, fuzzy
 msgctxt "DESC_Menu_gnupg_faq"
-msgid "Show the Frequently Asked Questions Document for GnuPG"
+msgid "Show the Frequently Asked Questions document for GnuPG"
 msgstr "Montrez le document fréquemment demandé de questions pour GnuPG"
 
 #: src/inst-gpgee.nsi:65
@@ -473,36 +475,50 @@
 "débutant"
 
 #: src/inst-man_novice_en.nsi:39
+#, fuzzy
 msgctxt "DESC_Name_man_novice_en"
-msgid "Novice Manual"
-msgstr "Guide de débutant"
+msgid "Novice Manual (pdf, English)"
+msgstr "Gpg4Win Guide du débutant (Allemand)"
 
 #: src/inst-man_novice_en.nsi:42
+#, fuzzy
 msgctxt "DESC_SEC_man_novice_en"
-msgid "Gpg4Win Manual for the Novice User"
-msgstr "Guide de Gpg4Win pour l'utilisateur de débutant"
+msgid "Gpg4win Manual for the Novice User (English)"
+msgstr "Guide de Gpg4Win pour l'utilisateur de débutant (Allemand)"
 
 #: src/inst-man_novice_en.nsi:45
+#, fuzzy
 msgctxt "DESC_Menu_man_novice_en"
-msgid "Show the online manual of Gpg4Win for novice users"
+msgid "Show the Gpg4win manual for novice users (pdf, English)"
 msgstr "Montrez le guide en ligne de Gpg4Win pour des utilisateurs de débutant"
 
-#: src/inst-compendium_de.nsi:39
+#: src/inst-compendium_de.nsi:40
 #, fuzzy
 msgctxt "DESC_Name_compendium_de"
-msgid "Gpg4win Kompendium"
+msgid "Gpg4win Kompendium (pdf, German)"
 msgstr "Guides pour l'installation du logiciel Gpg4win"
 
-#: src/inst-compendium_de.nsi:42
+#: src/inst-compendium_de.nsi:44
+#, fuzzy
+msgctxt "DESC_Name_compendium_de_html"
+msgid "Gpg4win Kompendium (html, German)"
+msgstr "Guides pour l'installation du logiciel Gpg4win"
+
+#: src/inst-compendium_de.nsi:48
 msgctxt "DESC_SEC_compendium_de"
 msgid "Gpg4win compendium (German)"
 msgstr ""
 
-#: src/inst-compendium_de.nsi:45
-msgctxt "DESC_Menu_compendum_de"
-msgid "Show the German Gpg4win compendium (PDF)"
+#: src/inst-compendium_de.nsi:52
+msgctxt "DESC_Menu_compendium_de"
+msgid "Show the Gpg4win compendium (pdf, German)"
 msgstr ""
 
+#: src/inst-compendium_de.nsi:56
+msgctxt "DESC_Menu_compendium_de_html"
+msgid "Show the Gpg4win compendium (html, German)"
+msgstr ""
+
 #: src/inst-winpt.nsi:46
 msgctxt "DESC_SEC_winpt"
 msgid "Windows Privacy Tray"
@@ -517,6 +533,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_Name_man_novice_en"
+#~ msgid "Novice Manual"
+#~ msgstr "Guide de débutant"
+
+#~ msgctxt "DESC_SEC_man_novice_en"
+#~ msgid "Gpg4Win Manual for the Novice User"
+#~ msgstr "Guide de Gpg4Win pour l'utilisateur de débutant"
+
 #~ msgctxt "DESC_SEC_gnupg2"
 #~ msgid "GNU Privacy Guard with S/MIME support"
 #~ msgstr "GNU Privacy Guard avec l'appui de S/MIME"

Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po	2008-10-27 18:23:40 UTC (rev 1000)
+++ trunk/po/ru.po	2008-10-27 20:09:14 UTC (rev 1001)
@@ -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-27 10:01+0100\n"
+"POT-Creation-Date: 2008-10-27 19:49+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"
@@ -360,13 +360,15 @@
 msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé GNU Privacy Assistant (àëüòåðíàòèâà WinPT)."
 
 #: src/inst-gpg4win.nsi:70
+#, fuzzy
 msgctxt "DESC_Menu_gpg4win_readme"
-msgid "General information on Gpg4Win"
+msgid "General information on Gpg4win"
 msgstr "Îáùàÿ èíôîðìàöèÿ î Gpg4Win"
 
 #: src/inst-gpg4win.nsi:73
+#, fuzzy
 msgctxt "DESC_Menu_gnupg_faq"
-msgid "Show the Frequently Asked Questions Document for GnuPG"
+msgid "Show the Frequently Asked Questions document for GnuPG"
 msgstr "FAQ ïî ïðîãðàììå GnuPG"
 
 #: src/inst-gpgee.nsi:65
@@ -462,36 +464,50 @@
 "Ïîêàçàòü îíëàéíîâûå èíñòðóêöèè Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ (íåì.)"
 
 #: src/inst-man_novice_en.nsi:39
+#, fuzzy
 msgctxt "DESC_Name_man_novice_en"
-msgid "Novice Manual"
-msgstr "Áûñòðûå èíñòðóêöèè"
+msgid "Novice Manual (pdf, English)"
+msgstr "Áûñòðûå èíñòðóêöèè (íåì.)"
 
 #: src/inst-man_novice_en.nsi:42
+#, fuzzy
 msgctxt "DESC_SEC_man_novice_en"
-msgid "Gpg4Win Manual for the Novice User"
-msgstr "Èíñòðóêöèè Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ"
+msgid "Gpg4win Manual for the Novice User (English)"
+msgstr "Èíñòðóêöèè ïî Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ (íåì.)"
 
 #: src/inst-man_novice_en.nsi:45
+#, fuzzy
 msgctxt "DESC_Menu_man_novice_en"
-msgid "Show the online manual of Gpg4Win for novice users"
+msgid "Show the Gpg4win manual for novice users (pdf, English)"
 msgstr "Ïîêàçàòü îíëàéíîâûå èíñòðóêöèè Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ"
 
-#: src/inst-compendium_de.nsi:39
+#: src/inst-compendium_de.nsi:40
 #, fuzzy
 msgctxt "DESC_Name_compendium_de"
-msgid "Gpg4win Kompendium"
+msgid "Gpg4win Kompendium (pdf, German)"
 msgstr "Äîêóìåíòàöèÿ Gpg4win"
 
-#: src/inst-compendium_de.nsi:42
+#: src/inst-compendium_de.nsi:44
+#, fuzzy
+msgctxt "DESC_Name_compendium_de_html"
+msgid "Gpg4win Kompendium (html, German)"
+msgstr "Äîêóìåíòàöèÿ Gpg4win"
+
+#: src/inst-compendium_de.nsi:48
 msgctxt "DESC_SEC_compendium_de"
 msgid "Gpg4win compendium (German)"
 msgstr ""
 
-#: src/inst-compendium_de.nsi:45
-msgctxt "DESC_Menu_compendum_de"
-msgid "Show the German Gpg4win compendium (PDF)"
+#: src/inst-compendium_de.nsi:52
+msgctxt "DESC_Menu_compendium_de"
+msgid "Show the Gpg4win compendium (pdf, German)"
 msgstr ""
 
+#: src/inst-compendium_de.nsi:56
+msgctxt "DESC_Menu_compendium_de_html"
+msgid "Show the Gpg4win compendium (html, German)"
+msgstr ""
+
 #: src/inst-winpt.nsi:46
 msgctxt "DESC_SEC_winpt"
 msgid "Windows Privacy Tray"
@@ -506,6 +522,14 @@
 "Çàïóñê Windows Privacy Tray. Ýòî óíèâåðñàëüíûé èíñòðóìåíò óïðàâëåíèÿ êëþ÷àìè "
 "è øèôðîâàíèÿ äàííûõ."
 
+#~ msgctxt "DESC_Name_man_novice_en"
+#~ msgid "Novice Manual"
+#~ msgstr "Áûñòðûå èíñòðóêöèè"
+
+#~ msgctxt "DESC_SEC_man_novice_en"
+#~ msgid "Gpg4Win Manual for the Novice User"
+#~ msgstr "Èíñòðóêöèè Gpg4Win äëÿ ïîëüçîâàòåëåé-íîâè÷êîâ"
+
 #~ msgctxt "DESC_SEC_gnupg2"
 #~ msgid "GNU Privacy Guard with S/MIME support"
 #~ msgstr "GNU Privacy Guard ñ ïîääåðæêîé S/MIME"

Modified: trunk/src/inst-compendium_de.nsi
===================================================================
--- trunk/src/inst-compendium_de.nsi	2008-10-27 18:23:40 UTC (rev 1000)
+++ trunk/src/inst-compendium_de.nsi	2008-10-27 20:09:14 UTC (rev 1001)
@@ -36,11 +36,23 @@
 ${MementoSectionEnd}
 
 
+# The name of the link.
 LangString DESC_Name_compendium_de ${LANG_ENGLISH} \
-   "Gpg4win Kompendium"
+   "Gpg4win Kompendium (pdf, German)"
 
+# The name of the HTML version of the link
+LangString DESC_Name_compendium_de_html ${LANG_ENGLISH} \
+   "Gpg4win Kompendium (html, German)"
+
+# The text used in the installer selection dialog.
 LangString DESC_SEC_compendium_de ${LANG_ENGLISH} \
    "Gpg4win compendium (German)"
 
-LangString DESC_Menu_compendum_de ${LANG_ENGLISH} \
-   "Show the German Gpg4win compendium (PDF)"
+# The string displayed in the startmenu for the PDF version.
+LangString DESC_Menu_compendium_de ${LANG_ENGLISH} \
+   "Show the Gpg4win compendium (pdf, German)"
+
+# The string displayed in the startmenu for the HTML version.
+LangString DESC_Menu_compendium_de_html ${LANG_ENGLISH} \
+   "Show the Gpg4win compendium (html, German)"
+

Modified: trunk/src/inst-gpg4win.nsi
===================================================================
--- trunk/src/inst-gpg4win.nsi	2008-10-27 18:23:40 UTC (rev 1000)
+++ trunk/src/inst-gpg4win.nsi	2008-10-27 20:09:14 UTC (rev 1001)
@@ -68,7 +68,7 @@
 SectionEnd
 
 LangString DESC_Menu_gpg4win_readme ${LANG_ENGLISH} \
-   "General information on Gpg4Win"
+   "General information on Gpg4win"
 
 LangString DESC_Menu_gnupg_faq ${LANG_ENGLISH} \
-   "Show the Frequently Asked Questions Document for GnuPG"
+   "Show the Frequently Asked Questions document for GnuPG"

Modified: trunk/src/inst-man_novice_en.nsi
===================================================================
--- trunk/src/inst-man_novice_en.nsi	2008-10-27 18:23:40 UTC (rev 1000)
+++ trunk/src/inst-man_novice_en.nsi	2008-10-27 20:09:14 UTC (rev 1001)
@@ -37,10 +37,10 @@
 
 
 LangString DESC_Name_man_novice_en ${LANG_ENGLISH} \
-   "Novice Manual"
+   "Novice Manual (pdf, English)"
 
 LangString DESC_SEC_man_novice_en ${LANG_ENGLISH} \
-   "Gpg4Win Manual for the Novice User"
+   "Gpg4win Manual for the Novice User (English)"
 
 LangString DESC_Menu_man_novice_en ${LANG_ENGLISH} \
-   "Show the online manual of Gpg4Win for novice users"
+   "Show the Gpg4win manual for novice users (pdf, English)"

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2008-10-27 18:23:40 UTC (rev 1000)
+++ trunk/src/inst-sections.nsi	2008-10-27 20:09:14 UTC (rev 1001)
@@ -1239,8 +1239,12 @@
     IntOp $R0 $R0 & ${SF_SELECTED} 
     IntCmp $R0 ${SF_SELECTED} 0 no_compendium_de_menu 
     CreateShortCut \
+        "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_compendium_de_html).lnk" \
+	"$INSTDIR\share\gpg4win\html-de\gpg4win-compendium-de.html" \
+        "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_de_html)
+    CreateShortCut \
         "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_compendium_de).lnk" \
-	"$INSTDIR\share\gpg4win\html-de\gpg4win-compendium-de.html" \
+	"$INSTDIR\share\gpg4win\gpg4win-compendium-de.pdf" \
         "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_de)
   no_compendium_de_menu:
 !endif
@@ -1303,6 +1307,7 @@
   Delete "$DESKTOP\Claws-Mail.lnk"
   Delete "$DESKTOP\Claws-Mail Manual.lnk"
   Delete "$DESKTOP\$(DESC_Name_compendium_de).lnk"
+  Delete "$DESKTOP\$(DESC_Name_compendium_de_html).lnk"
   Delete "$DESKTOP\$(DESC_Name_man_novice_de).lnk"
   Delete "$DESKTOP\$(DESC_Name_man_novice_en).lnk"
   Delete "$DESKTOP\$(DESC_Name_man_advanced_de).lnk"
@@ -1311,6 +1316,7 @@
   Delete "$DESKTOP\Gpg4Win README.lnk"
   Delete "$DESKTOP\$(DESC_Desktop_manuals)\Claws-Mail Manual.lnk"
   Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de).lnk"
+  Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_html).lnk"
   Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_de).lnk"
   Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_en).lnk"
   Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_advanced_de).lnk"
@@ -1395,8 +1401,12 @@
     IntOp $R0 $R0 & ${SF_SELECTED} 
     IntCmp $R0 ${SF_SELECTED} 0 no_compendium_de_desktop
     CreateShortCut \
+        "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_html).lnk" \
+	"$INSTDIR\share\gpg4win\html-de\gpg4win-compendium-de.html" \
+        "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_de_html)
+    CreateShortCut \
         "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de).lnk" \
-	"$INSTDIR\share\gpg4win\html-de\gpg4win-compendium-de.html" \
+	"$INSTDIR\share\gpg4win\gpg4win-compendium-de.pdf" \
         "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_de)
   no_compendium_de_desktop:
 !endif



More information about the Gpg4win-commits mailing list