From 9e65f8a7e36d192b74e803c52e042eddd6e88647 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Sun, 4 Feb 2007 02:17:51 +0000 Subject: [PATCH] * src/plugins/NarrativeWeb.py: fix 0000894: syntax error on Narrative web plugin svn: r8043 --- ChangeLog | 9 +++++++++ src/plugins/NarrativeWeb.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9d7d2203b..e6d1682e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2007-02-03 Brian Matherly + * src/plugins/NarrativeWeb.py: fix 0000894: syntax error on Narrative web plugin + 2007-02-03 Don Allingham * src/GrampsDb/_GrampsDbBase.py: convert DbState to its own file * src/GrampsDb/__init__.py: convert DbState to its own file @@ -8,6 +11,7 @@ * src/GrampsDb/Makefile.am: update * src/Makefile.am: update +>>>>>>> .r8042 2007-01-26 Richard Taylor * src/GrampsDb/Makefile.am: remove files * src/GrampsDb/_GrampsDbConst.py: add license @@ -69,6 +73,11 @@ * src/GrampsLocale.py: refactor GrampsDb and clean RelLib deps * src/DbLoader.py: refactor GrampsDb and clean RelLib deps +======= +2007-02-03 Brian Matherly + * src/plugins/NarrativeWeb.py: fix 0000894: syntax error on Narrative web plugin + +>>>>>>> .merge-right.r8042 2007-02-03 Don Allingham * src/Editors/_EditFamily.py (EditFamily.check_for_family_change): fix warning message. diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py index 9e9b367c3..9679d9ac5 100644 --- a/src/plugins/NarrativeWeb.py +++ b/src/plugins/NarrativeWeb.py @@ -172,7 +172,7 @@ class BasePage: shutil.copyfile(from_path,dest) elif self.warn_dir: WarningDialog( - _("Possible destination error") + _("Possible destination error") + "\n" + _("You appear to have set your target directory " "to a directory used for data storage. This " "could create problems with file management. "