[pan2: 13/14] Merge branch 'help'

[Heinrich MÃller <henmull src gnome org>]

commit 965d4340f6ce401c959e70aa22765754184a265d
Merge: 074ec67 8734ff2
Author: Heinrich MÃller <henmull src gnome org>
Date:   Tue Jan 10 19:08:08 2012 +0100

    Merge branch 'help'
    
    Conflicts:
    	.gitignore
    	AUTHORS
    	ChangeLog
    	MAINTAINERS
    	README
    	configure.in

 .gitignore                    |    3 +
 Makefile.am                   |    7 +-
 configure.in                  |    5 +-
 help/C/figures/pan_window.png |  Bin 0 -> 120407 bytes
 help/C/legal.xml              |   76 ++
 help/C/pan.xml                | 2095 +++++++++++++++++++++++++++++++++++++++++
 help/Makefile.am              |   10 +
 help/pan.omf.in               |   11 +
 pan/gui/actions.cc            |    6 +
 pan/gui/gui.cc                |   15 +-
 pan/gui/gui.h                 |    1 +
 pan/gui/pan-ui.h              |    1 +
 pan/gui/pan.ui.h              |    1 +
 po/TRANSLATORS.txt            |   17 -
 14 files changed, 2227 insertions(+), 21 deletions(-)
---
diff --cc .gitignore
index afadf31,8ff914b..36f85cd
--- a/.gitignore
+++ b/.gitignore
@@@ -19,5 -17,6 +19,8 @@@ pan_git_re
  build/
  .waf*/
  waf*/
 +pan/icons/pan-pixbufs.h
 +pan/icons/pan-pixbufs-internal.h
+ gnome-doc-utils.m4
+ gnome-doc-utils.make
+ help/*.omf
diff --cc Makefile.am
index 3db545f,9284c2a..ab90417
--- a/Makefile.am
+++ b/Makefile.am
@@@ -22,9 -23,10 +23,11 @@@ EXTRA_DIST = 
   pan.png \
   $(DESKTOP_IN_FILES) \
   $(DESKTOP_FILES) \
 - intltool-extract.in intltool-merge.in intltool-update.in
 + intltool-extract.in intltool-merge.in intltool-update.in \
 + pan_git_rev
  
+ DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper"
+ 
  Productivitydir = $(datadir)/applications
  Productivity_DATA = $(DESKTOP_FILES)
  
diff --cc pan/gui/actions.cc
index f48de02,05125f4..6a1ee8f
--- a/pan/gui/actions.cc
+++ b/pan/gui/actions.cc
@@@ -639,8 -578,13 +640,13 @@@ namespac
        NULL,
        G_CALLBACK(do_reply_to) },
  
+     { "pan-manual", NULL,
+       N_("_Contents"), "F1", 
+       NULL,
+       G_CALLBACK(do_pan_manual) },
+ 
      { "pan-web-page", NULL,
 -      N_("_Pan Home Page"), NULL, 
 +      N_("_Pan Home Page"), NULL,
        NULL,
        G_CALLBACK(do_pan_web) },