[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-91-gbea3b7c

by Werner Koch cvs at cvs.gnupg.org
Fri Aug 26 16:02:43 CEST 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  bea3b7c93f0a611dcd5921d04596ab2dc6e3d547 (commit)
       via  4379c01a24570c01a355f47e5e187d09676d64d6 (commit)
      from  816bee1fa0d833ac72ea4e7d52465e6e1da2645d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bea3b7c93f0a611dcd5921d04596ab2dc6e3d547
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 26 15:20:41 2011 +0200

    Mark component descriptions for translation.

diff --git a/tools/ChangeLog b/tools/ChangeLog
index 3888802..9ae75d1 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-26  Werner Koch  <wk at g10code.com>
+
+	* gpgconf-comp.c (gc_component): Mark for translation.  Suggested
+	by Yuri Chornoivan.
+
 2011-03-08  Werner Koch  <wk at g10code.com>
 
 	* symcryptrun.c [HAVE_UTMP_H]: Include utmp.h.
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index bcdecfd..0b39ac4 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1023,12 +1023,12 @@ static struct
   gc_option_t *options;
 } gc_component[] =
   {
-    { "gpg", NULL,   "GPG for OpenPGP", gc_options_gpg },
-    { "gpg-agent", NULL, "GPG Agent", gc_options_gpg_agent },
-    { "scdaemon", NULL, "Smartcard Daemon", gc_options_scdaemon },
-    { "gpgsm", NULL, "GPG for S/MIME", gc_options_gpgsm },
-    { "dirmngr", NULL, "Directory Manager", gc_options_dirmngr },
-    { "pinentry", NULL, "PIN and Passphrase Entry", gc_options_pinentry }
+    { "gpg",      "gnupg", N_("GPG for OpenPGP"), gc_options_gpg },
+    { "gpg-agent","gnupg", N_("GPG Agent"), gc_options_gpg_agent },
+    { "scdaemon", "gnupg", N_("Smartcard Daemon"), gc_options_scdaemon },
+    { "gpgsm",    "gnupg", N_("GPG for S/MIME"), gc_options_gpgsm },
+    { "dirmngr",  "gnupg", N_("Directory Manager"), gc_options_dirmngr },
+    { "pinentry", "gnupg", N_("PIN and Passphrase Entry"), gc_options_pinentry }
   };
 
 

commit 4379c01a24570c01a355f47e5e187d09676d64d6
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 12 14:40:47 2011 +0200

    Beautified the online html manual

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 32ce715..39c8dec 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-12  Werner Koch  <wk at g10code.com>
+
+	* texi.css: Override some elements.
+	* gnupg-log-tr.png: New.
+	* gnupg.texi:  Use transparent logo.
+
 2011-03-01  Werner Koch  <wk at g10code.com>
 
 	* gpgsm.texi (CSR and certificate creation): New.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9c15c64..f9fd008 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -29,7 +29,7 @@ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt		\
             help.sv.txt help.tr.txt help.zh_CN.txt help.zh_TW.txt
 
 EXTRA_DIST = samplekeys.asc \
-	     gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png \
+	     gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png gnupg-logo-tr.png\
              gnupg-card-architecture.eps gnupg-card-architecture.png \
              gnupg-card-architecture.pdf \
              FAQ gnupg7.texi \
@@ -129,7 +129,7 @@ gnupg.texi : $(gnupg_TEXINFOS)
 online: gnupg.html gnupg.pdf
 	set -e; \
 	echo "Uploading current manuals to www.gnupg.org ..."; \
-	cp $(srcdir)/gnupg-logo.png gnupg.html/; \
+	cp $(srcdir)/gnupg-logo-tr.png gnupg.html/; \
         user=werner ; dashdevel="" ; \
         if echo "@PACKAGE_VERSION@" | grep -- "-git" >/dev/null; then \
 	  dashdevel="-devel" ; \
diff --git a/doc/gnupg-logo-tr.png b/doc/gnupg-logo-tr.png
new file mode 100644
index 0000000..af21af9
Binary files /dev/null and b/doc/gnupg-logo-tr.png differ
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index 7bb54af..1f0682b 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -5,12 +5,12 @@
 @settitle Using the GNU Privacy Guard
 
 @c A couple of macros with no effect on texinfo
- at c but used by the yat2m processor. 
+ at c but used by the yat2m processor.
 @macro manpage {a}
 @end macro
 @macro mansect {a}
 @end macro
- at macro manpause 
+ at macro manpause
 @end macro
 @macro mancont
 @end macro
@@ -110,12 +110,12 @@ section entitled ``Copying''.
 @end ifnothtml
 
 @ifhtml
- at center @image{gnupg-logo,6cm,,The GnuPG Logo}
+ at center @image{gnupg-logo-tr,6cm,,The GnuPG Logo}
 @end ifhtml
 
 @ifnottex
 @node Top
- at top 
+ at top
 @insertcopying
 
 This manual documents how to use the GNU Privacy Guard system as well as
@@ -207,14 +207,14 @@ the administration and the architecture.
 
 @c @node History
 @c @unnumbered History
- at c 
- at c Here are the notices from the old dirmngr manual: 
+ at c
+ at c Here are the notices from the old dirmngr manual:
 @c
 @c @itemize
 @c @item Using DirMngr, 2002, Steffen Hansen, Klar"alvdalens Datakonsult AB.
 @c @item Using DirMngr, 2004, 2005, 2006, 2008 Werner Koch, g10 Code GmbH.
 @c @end itemize
- at c 
+ at c
 
 
 @bye
diff --git a/doc/texi.css b/doc/texi.css
index a369abc..c1e9f48 100644
--- a/doc/texi.css
+++ b/doc/texi.css
@@ -1,6 +1,23 @@
 /* The gnupg.org standard stylesheet.  */
   @import url(/share/site.css);
 
+/* The gnupg site sets body margins to zero.  Because we don't have
+   the table layout here we have to set our own margins for the body.  */
+body {
+    margin-left: 1em;
+    margin-right: 1em;
+}
+
+/* Make the top header larger.  */
+h1 {
+  text-align: center;
+  font-size: 200%;
+}
+
+h1:first-letter {
+  font-size: 120%;
+}
+
 
 
 

-----------------------------------------------------------------------

Summary of changes:
 doc/ChangeLog         |    6 ++++++
 doc/Makefile.am       |    4 ++--
 doc/gnupg-logo-tr.png |  Bin 0 -> 9415 bytes
 doc/gnupg.texi        |   14 +++++++-------
 doc/texi.css          |   17 +++++++++++++++++
 tools/ChangeLog       |    5 +++++
 tools/gpgconf-comp.c  |   12 ++++++------
 7 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 doc/gnupg-logo-tr.png


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list