From 6d5fa2aca7f16554ee65fb7c75b85d53713ad59f Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Tue, 29 Nov 2005 20:05:10 +0000
Subject: [PATCH] * doc/xmldocs.make: Revert help path to keep under gramps
 dir. * doc/gramps-manual/Makefile.am: Add symlink to keep all gnome versions
 happy with the help path. * src/po/de.po: Typos: missing "n".

svn: r5453
---
 gramps2/ChangeLog                     | 6 ++++++
 gramps2/doc/gramps-manual/Makefile.am | 9 +++++++++
 gramps2/doc/xmldocs.make              | 2 +-
 gramps2/src/po/de.po                  | 4 ++--
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 8a4e6e7b2..c2343d624 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-29  Alex Roitman  <shura@gramps-project.org>
+	* doc/xmldocs.make: Revert help path to keep under gramps dir.
+	* doc/gramps-manual/Makefile.am: Add symlink to keep all gnome
+	versions happy with the help path.
+	* src/po/de.po: Typos: missing "\n".
+
 2005-11-29  Don Allingham  <don@gramps-project.org>
 	* src/GrampsBSDDB.py: change rebuilding of secondary indices
 	to use keys instead of cursors.
diff --git a/gramps2/doc/gramps-manual/Makefile.am b/gramps2/doc/gramps-manual/Makefile.am
index 03a426c20..92a6bc27f 100644
--- a/gramps2/doc/gramps-manual/Makefile.am
+++ b/gramps2/doc/gramps-manual/Makefile.am
@@ -1,3 +1,12 @@
 # Process this file with automake to produce Makefile.in
 
 SUBDIRS = C fr
+
+topdocdir1=$(datadir)/@PACKAGE@/gnome/help/@PACKAGE@
+topdocdir2=$(datadir)/@PACKAGE@/gnome/help/@PACKAGE@/@PACKAGE@
+
+install-data-local:
+	ln -s $(DESTDIR)$(topdocdir1) $(DESTDIR)$(topdocdir2)
+
+uninstall-local:
+	-rm $(DESTDIR)$(topdocdir2)
diff --git a/gramps2/doc/xmldocs.make b/gramps2/doc/xmldocs.make
index 6ab499c3d..39b42ac04 100644
--- a/gramps2/doc/xmldocs.make
+++ b/gramps2/doc/xmldocs.make
@@ -37,7 +37,7 @@
 # ************* Begin of section some packagers may need to modify  **************
 # This variable (docdir) specifies where the documents should be installed.
 # This default value should work for most packages.
-docdir = $(datadir)/gnome/help/@PACKAGE@/$(lang)
+docdir = $(datadir)/@PACKAGE@/gnome/help/@PACKAGE@/$(lang)
 
 # **************  You should not have to edit below this line  *******************
 xml_files = $(entities) $(docname).xml
diff --git a/gramps2/src/po/de.po b/gramps2/src/po/de.po
index 2fece197b..b949f6745 100644
--- a/gramps2/src/po/de.po
+++ b/gramps2/src/po/de.po
@@ -1825,7 +1825,7 @@ msgid ""
 msgstr ""
 "Das GRAMPs Prefix wird in einem unüblichen Format angezeigt und es kann "
 "deshalb beim Exportieren der Datebank in das GEDCOM Format zu Problemen "
-"kommen."
+"kommen.\n"
 
 #: GrampsCfg.py:361
 msgid "Unsuited GRAMPS ID prefix"
@@ -1837,7 +1837,7 @@ msgid ""
 "different objects.\n"
 msgstr ""
 "Das GRAMPS ID Prefix wurde nicht eingeordnet, da nicht zwischen "
-"verschiedenen Objekten unterschieden werden konnte. "
+"verschiedenen Objekten unterschieden werden konnte.\n"
 
 #: GrampsDbBase.py:1009 GrampsDbBase.py:1047
 msgid "_Undo %s"