Update to 3.4.1:

2012-08-23
Version 3.4.1 -- The "A tiger? In Africa?!" bug fix release.
Mention in the release that upgrading is advised for two critical issues:
 -> error in export to xml of family order in 3.4.0, now fixed
 -> crash in windows after some use due to too much terminal output in 3.4.0, now fixed
* Some platform-specific fixes (Windows, OSX)
* Bug fixes
* Translation updates
* Changelog: http://www.gramps-project.org/bugs/changelog_page.php?version_id=31

2012-05-21
Version 3.4.0 -- The "always look on the bright side of life" feature release.
* Lots of changes and bug fixes to every part of Gramps, including XML
  import/export, image handling, gedom handling, Gramplets, date handling,
  citations, reports, more!
* Some platform-specific fixes (Windows, OSX, Linux)
* What's new (and what to do before you upgrade):  http://goo.gl/K3RDV
* Roadmap:  http://goo.gl/GJhjH
* Many translation updates

4 files changed, 183 insertions, 54 deletions

diff --git a/databases/gramps3/Makefile b/databases/gramps3/Makefile
index b04a25fd0ac..e4ba87d4cce 100644
--- a/databases/gramps3/Makefile
+++ b/databases/gramps3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2012/09/07 19:16:19 adam Exp $
+# $NetBSD: Makefile,v 1.33 2012/09/13 19:56:54 wiz Exp $
 #
 
-DISTNAME=		gramps-3.3.2
-PKGREVISION=		3
+DISTNAME=		gramps-3.4.1
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gramps/}
 
@@ -22,6 +21,11 @@ GNU_CONFIGURE=		yes
 REPLACE_PYTHON=		src/DateHandler/_Date_fr.py
 REPLACE_PYTHON+=	src/plugins/quickview/Reporef.py
 REPLACE_PYTHON+=	src/plugins/rel/rel_fr.py
+REPLACE_PYTHON+=	src/PlaceUtils.py
+REPLACE_PYTHON+=	src/plugins/gramplet/MetadataViewer.py
+REPLACE_PYTHON+=	src/plugins/lib/libhtml.py
+REPLACE_PYTHON+=	src/plugins/lib/libmetadata.py
+REPLACE_PYTHON+=	src/plugins/webreport/WebCal.py
 
 # pkgsrc registers mime files using mimedb.mk (see below)
 CONFIGURE_ARGS+=	--enable-packager-mode
diff --git a/databases/gramps3/PLIST b/databases/gramps3/PLIST
index e6baf05e520..8bd82cacc0d 100644
--- a/databases/gramps3/PLIST
+++ b/databases/gramps3/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2012/06/01 20:28:26 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/09/13 19:56:54 wiz Exp $
 bin/gramps
 man/cs/man1/gramps.1
 man/fr/man1/gramps.1
 man/man1/gramps.1
 man/nl/man1/gramps.1
 man/pl/man1/gramps.1
+man/pt_BR/man1/gramps.1
 man/sv/man1/gramps.1
 share/application-registry/gramps.applications
 share/applications/gramps.desktop
@@ -117,6 +118,54 @@ share/gramps/ExportAssistant.pyo
 share/gramps/ExportOptions.py
 share/gramps/ExportOptions.pyc
 share/gramps/ExportOptions.pyo
+share/gramps/Filters/Rules/Citation/_AllCitations.py
+share/gramps/Filters/Rules/Citation/_AllCitations.pyc
+share/gramps/Filters/Rules/Citation/_AllCitations.pyo
+share/gramps/Filters/Rules/Citation/_ChangedSince.py
+share/gramps/Filters/Rules/Citation/_ChangedSince.pyc
+share/gramps/Filters/Rules/Citation/_ChangedSince.pyo
+share/gramps/Filters/Rules/Citation/_CitationPrivate.py
+share/gramps/Filters/Rules/Citation/_CitationPrivate.pyc
+share/gramps/Filters/Rules/Citation/_CitationPrivate.pyo
+share/gramps/Filters/Rules/Citation/_HasGallery.py
+share/gramps/Filters/Rules/Citation/_HasGallery.pyc
+share/gramps/Filters/Rules/Citation/_HasGallery.pyo
+share/gramps/Filters/Rules/Citation/_HasIdOf.py
+share/gramps/Filters/Rules/Citation/_HasIdOf.pyc
+share/gramps/Filters/Rules/Citation/_HasIdOf.pyo
+share/gramps/Filters/Rules/Citation/_HasNote.py
+share/gramps/Filters/Rules/Citation/_HasNote.pyc
+share/gramps/Filters/Rules/Citation/_HasNote.pyo
+share/gramps/Filters/Rules/Citation/_HasNoteMatchingSubstringOf.py
+share/gramps/Filters/Rules/Citation/_HasNoteMatchingSubstringOf.pyc
+share/gramps/Filters/Rules/Citation/_HasNoteMatchingSubstringOf.pyo
+share/gramps/Filters/Rules/Citation/_HasNoteRegexp.py
+share/gramps/Filters/Rules/Citation/_HasNoteRegexp.pyc
+share/gramps/Filters/Rules/Citation/_HasNoteRegexp.pyo
+share/gramps/Filters/Rules/Citation/_HasReferenceCountOf.py
+share/gramps/Filters/Rules/Citation/_HasReferenceCountOf.pyc
+share/gramps/Filters/Rules/Citation/_HasReferenceCountOf.pyo
+share/gramps/Filters/Rules/Citation/_HasSource.py
+share/gramps/Filters/Rules/Citation/_HasSource.pyc
+share/gramps/Filters/Rules/Citation/_HasSource.pyo
+share/gramps/Filters/Rules/Citation/_MatchesFilter.py
+share/gramps/Filters/Rules/Citation/_MatchesFilter.pyc
+share/gramps/Filters/Rules/Citation/_MatchesFilter.pyo
+share/gramps/Filters/Rules/Citation/_MatchesPageSubstringOf.py
+share/gramps/Filters/Rules/Citation/_MatchesPageSubstringOf.pyc
+share/gramps/Filters/Rules/Citation/_MatchesPageSubstringOf.pyo
+share/gramps/Filters/Rules/Citation/_MatchesRepositoryFilter.py
+share/gramps/Filters/Rules/Citation/_MatchesRepositoryFilter.pyc
+share/gramps/Filters/Rules/Citation/_MatchesRepositoryFilter.pyo
+share/gramps/Filters/Rules/Citation/_MatchesSourceFilter.py
+share/gramps/Filters/Rules/Citation/_MatchesSourceFilter.pyc
+share/gramps/Filters/Rules/Citation/_MatchesSourceFilter.pyo
+share/gramps/Filters/Rules/Citation/_RegExpIdOf.py
+share/gramps/Filters/Rules/Citation/_RegExpIdOf.pyc
+share/gramps/Filters/Rules/Citation/_RegExpIdOf.pyo
+share/gramps/Filters/Rules/Citation/__init__.py
+share/gramps/Filters/Rules/Citation/__init__.pyc
+share/gramps/Filters/Rules/Citation/__init__.pyo
 share/gramps/Filters/Rules/Event/_AllEvents.py
 share/gramps/Filters/Rules/Event/_AllEvents.pyc
 share/gramps/Filters/Rules/Event/_AllEvents.pyo
@@ -129,6 +178,9 @@ share/gramps/Filters/Rules/Event/_EventPrivate.pyo
 share/gramps/Filters/Rules/Event/_HasAttribute.py
 share/gramps/Filters/Rules/Event/_HasAttribute.pyc
 share/gramps/Filters/Rules/Event/_HasAttribute.pyo
+share/gramps/Filters/Rules/Event/_HasCitation.py
+share/gramps/Filters/Rules/Event/_HasCitation.pyc
+share/gramps/Filters/Rules/Event/_HasCitation.pyo
 share/gramps/Filters/Rules/Event/_HasData.py
 share/gramps/Filters/Rules/Event/_HasData.pyc
 share/gramps/Filters/Rules/Event/_HasData.pyo
@@ -150,9 +202,9 @@ share/gramps/Filters/Rules/Event/_HasNoteRegexp.pyo
 share/gramps/Filters/Rules/Event/_HasReferenceCountOf.py
 share/gramps/Filters/Rules/Event/_HasReferenceCountOf.pyc
 share/gramps/Filters/Rules/Event/_HasReferenceCountOf.pyo
-share/gramps/Filters/Rules/Event/_HasSource.py
-share/gramps/Filters/Rules/Event/_HasSource.pyc
-share/gramps/Filters/Rules/Event/_HasSource.pyo
+share/gramps/Filters/Rules/Event/_HasSourceCount.py
+share/gramps/Filters/Rules/Event/_HasSourceCount.pyc
+share/gramps/Filters/Rules/Event/_HasSourceCount.pyo
 share/gramps/Filters/Rules/Event/_HasType.py
 share/gramps/Filters/Rules/Event/_HasType.pyc
 share/gramps/Filters/Rules/Event/_HasType.pyo
@@ -198,6 +250,9 @@ share/gramps/Filters/Rules/Family/_FatherHasNameOf.pyo
 share/gramps/Filters/Rules/Family/_HasAttribute.py
 share/gramps/Filters/Rules/Family/_HasAttribute.pyc
 share/gramps/Filters/Rules/Family/_HasAttribute.pyo
+share/gramps/Filters/Rules/Family/_HasCitation.py
+share/gramps/Filters/Rules/Family/_HasCitation.pyc
+share/gramps/Filters/Rules/Family/_HasCitation.pyo
 share/gramps/Filters/Rules/Family/_HasEvent.py
 share/gramps/Filters/Rules/Family/_HasEvent.pyc
 share/gramps/Filters/Rules/Family/_HasEvent.pyo
@@ -225,9 +280,9 @@ share/gramps/Filters/Rules/Family/_HasReferenceCountOf.pyo
 share/gramps/Filters/Rules/Family/_HasRelType.py
 share/gramps/Filters/Rules/Family/_HasRelType.pyc
 share/gramps/Filters/Rules/Family/_HasRelType.pyo
-share/gramps/Filters/Rules/Family/_HasSource.py
-share/gramps/Filters/Rules/Family/_HasSource.pyc
-share/gramps/Filters/Rules/Family/_HasSource.pyo
+share/gramps/Filters/Rules/Family/_HasSourceCount.py
+share/gramps/Filters/Rules/Family/_HasSourceCount.pyc
+share/gramps/Filters/Rules/Family/_HasSourceCount.pyo
 share/gramps/Filters/Rules/Family/_HasTag.py
 share/gramps/Filters/Rules/Family/_HasTag.pyc
 share/gramps/Filters/Rules/Family/_HasTag.pyo
@@ -378,6 +433,9 @@ share/gramps/Filters/Rules/Person/_HasAttribute.pyo
 share/gramps/Filters/Rules/Person/_HasBirth.py
 share/gramps/Filters/Rules/Person/_HasBirth.pyc
 share/gramps/Filters/Rules/Person/_HasBirth.pyo
+share/gramps/Filters/Rules/Person/_HasCitation.py
+share/gramps/Filters/Rules/Person/_HasCitation.pyc
+share/gramps/Filters/Rules/Person/_HasCitation.pyo
 share/gramps/Filters/Rules/Person/_HasCommonAncestorWith.py
 share/gramps/Filters/Rules/Person/_HasCommonAncestorWith.pyc
 share/gramps/Filters/Rules/Person/_HasCommonAncestorWith.pyo
@@ -429,9 +487,9 @@ share/gramps/Filters/Rules/Person/_HasNoteRegexp.pyo
 share/gramps/Filters/Rules/Person/_HasRelationship.py
 share/gramps/Filters/Rules/Person/_HasRelationship.pyc
 share/gramps/Filters/Rules/Person/_HasRelationship.pyo
-share/gramps/Filters/Rules/Person/_HasSource.py
-share/gramps/Filters/Rules/Person/_HasSource.pyc
-share/gramps/Filters/Rules/Person/_HasSource.pyo
+share/gramps/Filters/Rules/Person/_HasSourceCount.py
+share/gramps/Filters/Rules/Person/_HasSourceCount.pyc
+share/gramps/Filters/Rules/Person/_HasSourceCount.pyo
 share/gramps/Filters/Rules/Person/_HasSourceOf.py
 share/gramps/Filters/Rules/Person/_HasSourceOf.pyc
 share/gramps/Filters/Rules/Person/_HasSourceOf.pyo
@@ -510,6 +568,9 @@ share/gramps/Filters/Rules/Person/_IsMoreThanNthGenerationDescendantOf.pyo
 share/gramps/Filters/Rules/Person/_IsParentOfFilterMatch.py
 share/gramps/Filters/Rules/Person/_IsParentOfFilterMatch.pyc
 share/gramps/Filters/Rules/Person/_IsParentOfFilterMatch.pyo
+share/gramps/Filters/Rules/Person/_IsRelatedWith.py
+share/gramps/Filters/Rules/Person/_IsRelatedWith.pyc
+share/gramps/Filters/Rules/Person/_IsRelatedWith.pyo
 share/gramps/Filters/Rules/Person/_IsSiblingOfFilterMatch.py
 share/gramps/Filters/Rules/Person/_IsSiblingOfFilterMatch.pyc
 share/gramps/Filters/Rules/Person/_IsSiblingOfFilterMatch.pyo
@@ -549,6 +610,9 @@ share/gramps/Filters/Rules/Person/_NoDeathdate.pyo
 share/gramps/Filters/Rules/Person/_PeoplePrivate.py
 share/gramps/Filters/Rules/Person/_PeoplePrivate.pyc
 share/gramps/Filters/Rules/Person/_PeoplePrivate.pyo
+share/gramps/Filters/Rules/Person/_PeoplePublic.py
+share/gramps/Filters/Rules/Person/_PeoplePublic.pyc
+share/gramps/Filters/Rules/Person/_PeoplePublic.pyo
 share/gramps/Filters/Rules/Person/_PersonWithIncompleteEvent.py
 share/gramps/Filters/Rules/Person/_PersonWithIncompleteEvent.pyc
 share/gramps/Filters/Rules/Person/_PersonWithIncompleteEvent.pyo
@@ -687,9 +751,6 @@ share/gramps/Filters/Rules/Source/_HasRepository.pyo
 share/gramps/Filters/Rules/Source/_HasRepositoryCallNumberRef.py
 share/gramps/Filters/Rules/Source/_HasRepositoryCallNumberRef.pyc
 share/gramps/Filters/Rules/Source/_HasRepositoryCallNumberRef.pyo
-share/gramps/Filters/Rules/Source/_HasSource.py
-share/gramps/Filters/Rules/Source/_HasSource.pyc
-share/gramps/Filters/Rules/Source/_HasSource.pyo
 share/gramps/Filters/Rules/Source/_MatchesFilter.py
 share/gramps/Filters/Rules/Source/_MatchesFilter.pyc
 share/gramps/Filters/Rules/Source/_MatchesFilter.pyo
@@ -717,6 +778,9 @@ share/gramps/Filters/Rules/_Everything.pyo
 share/gramps/Filters/Rules/_HasAttributeBase.py
 share/gramps/Filters/Rules/_HasAttributeBase.pyc
 share/gramps/Filters/Rules/_HasAttributeBase.pyo
+share/gramps/Filters/Rules/_HasCitationBase.py
+share/gramps/Filters/Rules/_HasCitationBase.pyc
+share/gramps/Filters/Rules/_HasCitationBase.pyo
 share/gramps/Filters/Rules/_HasEventBase.py
 share/gramps/Filters/Rules/_HasEventBase.pyc
 share/gramps/Filters/Rules/_HasEventBase.pyo
@@ -744,6 +808,9 @@ share/gramps/Filters/Rules/_HasReferenceCountBase.pyo
 share/gramps/Filters/Rules/_HasSourceBase.py
 share/gramps/Filters/Rules/_HasSourceBase.pyc
 share/gramps/Filters/Rules/_HasSourceBase.pyo
+share/gramps/Filters/Rules/_HasSourceCountBase.py
+share/gramps/Filters/Rules/_HasSourceCountBase.pyc
+share/gramps/Filters/Rules/_HasSourceCountBase.pyo
 share/gramps/Filters/Rules/_HasTagBase.py
 share/gramps/Filters/Rules/_HasTagBase.pyc
 share/gramps/Filters/Rules/_HasTagBase.pyo
@@ -756,6 +823,9 @@ share/gramps/Filters/Rules/_HasTextMatchingSubstringOf.pyo
 share/gramps/Filters/Rules/_IsPrivate.py
 share/gramps/Filters/Rules/_IsPrivate.pyc
 share/gramps/Filters/Rules/_IsPrivate.pyo
+share/gramps/Filters/Rules/_IsPublic.py
+share/gramps/Filters/Rules/_IsPublic.pyc
+share/gramps/Filters/Rules/_IsPublic.pyo
 share/gramps/Filters/Rules/_MatchesEventFilterBase.py
 share/gramps/Filters/Rules/_MatchesEventFilterBase.pyc
 share/gramps/Filters/Rules/_MatchesEventFilterBase.pyo
@@ -777,6 +847,9 @@ share/gramps/Filters/Rules/_Rule.pyo
 share/gramps/Filters/Rules/__init__.py
 share/gramps/Filters/Rules/__init__.pyc
 share/gramps/Filters/Rules/__init__.pyo
+share/gramps/Filters/SideBar/_CitationSidebarFilter.py
+share/gramps/Filters/SideBar/_CitationSidebarFilter.pyc
+share/gramps/Filters/SideBar/_CitationSidebarFilter.pyo
 share/gramps/Filters/SideBar/_EventSidebarFilter.py
 share/gramps/Filters/SideBar/_EventSidebarFilter.pyc
 share/gramps/Filters/SideBar/_EventSidebarFilter.pyo
@@ -882,6 +955,9 @@ share/gramps/ManagedWindow.pyo
 share/gramps/Merge/__init__.py
 share/gramps/Merge/__init__.pyc
 share/gramps/Merge/__init__.pyo
+share/gramps/Merge/mergecitation.py
+share/gramps/Merge/mergecitation.pyc
+share/gramps/Merge/mergecitation.pyo
 share/gramps/Merge/mergeevent.py
 share/gramps/Merge/mergeevent.pyc
 share/gramps/Merge/mergeevent.pyo
@@ -984,6 +1060,9 @@ share/gramps/cli/grampscli.pyo
 share/gramps/cli/plug/__init__.py
 share/gramps/cli/plug/__init__.pyc
 share/gramps/cli/plug/__init__.pyo
+share/gramps/cli/user.py
+share/gramps/cli/user.pyc
+share/gramps/cli/user.pyo
 share/gramps/config.py
 share/gramps/config.pyc
 share/gramps/config.pyo
@@ -1097,6 +1176,12 @@ share/gramps/gen/lib/childref.pyo
 share/gramps/gen/lib/childreftype.py
 share/gramps/gen/lib/childreftype.pyc
 share/gramps/gen/lib/childreftype.pyo
+share/gramps/gen/lib/citation.py
+share/gramps/gen/lib/citation.pyc
+share/gramps/gen/lib/citation.pyo
+share/gramps/gen/lib/citationbase.py
+share/gramps/gen/lib/citationbase.pyc
+share/gramps/gen/lib/citationbase.pyo
 share/gramps/gen/lib/const.py
 share/gramps/gen/lib/const.pyc
 share/gramps/gen/lib/const.pyo
@@ -1214,18 +1299,12 @@ share/gramps/gen/lib/secondaryobj.pyo
 share/gramps/gen/lib/src.py
 share/gramps/gen/lib/src.pyc
 share/gramps/gen/lib/src.pyo
-share/gramps/gen/lib/srcbase.py
-share/gramps/gen/lib/srcbase.pyc
-share/gramps/gen/lib/srcbase.pyo
 share/gramps/gen/lib/srcmediatype.py
 share/gramps/gen/lib/srcmediatype.pyc
 share/gramps/gen/lib/srcmediatype.pyo
 share/gramps/gen/lib/srcnote.py
 share/gramps/gen/lib/srcnote.pyc
 share/gramps/gen/lib/srcnote.pyo
-share/gramps/gen/lib/srcref.py
-share/gramps/gen/lib/srcref.pyc
-share/gramps/gen/lib/srcref.pyo
 share/gramps/gen/lib/styledtext.py
 share/gramps/gen/lib/styledtext.pyc
 share/gramps/gen/lib/styledtext.pyo
@@ -1448,15 +1527,15 @@ share/gramps/gen/proxy/private.pyo
 share/gramps/gen/proxy/proxybase.py
 share/gramps/gen/proxy/proxybase.pyc
 share/gramps/gen/proxy/proxybase.pyo
-share/gramps/gen/proxy/referenced.py
-share/gramps/gen/proxy/referenced.pyc
-share/gramps/gen/proxy/referenced.pyo
 share/gramps/gen/proxy/referencedbyselection.py
 share/gramps/gen/proxy/referencedbyselection.pyc
 share/gramps/gen/proxy/referencedbyselection.pyo
 share/gramps/gen/updatecallback.py
 share/gramps/gen/updatecallback.pyc
 share/gramps/gen/updatecallback.pyo
+share/gramps/gen/user.py
+share/gramps/gen/user.pyc
+share/gramps/gen/user.pyo
 share/gramps/gen/utils/__init__.py
 share/gramps/gen/utils/__init__.pyc
 share/gramps/gen/utils/__init__.pyo
@@ -1484,6 +1563,7 @@ share/gramps/glade/displaystate.glade
 share/gramps/glade/editaddress.glade
 share/gramps/glade/editattribute.glade
 share/gramps/glade/editchildref.glade
+share/gramps/glade/editcitation.glade
 share/gramps/glade/editevent.glade
 share/gramps/glade/editeventref.glade
 share/gramps/glade/editfamily.glade
@@ -1504,6 +1584,7 @@ share/gramps/glade/editsourceref.glade
 share/gramps/glade/editurl.glade
 share/gramps/glade/grampletpane.glade
 share/gramps/glade/gramps.glade
+share/gramps/glade/mergecitation.glade
 share/gramps/glade/mergedata.glade
 share/gramps/glade/mergeevent.glade
 share/gramps/glade/mergefamily.glade
@@ -1582,6 +1663,15 @@ share/gramps/gui/editors/displaytabs/buttontab.pyo
 share/gramps/gui/editors/displaytabs/childmodel.py
 share/gramps/gui/editors/displaytabs/childmodel.pyc
 share/gramps/gui/editors/displaytabs/childmodel.pyo
+share/gramps/gui/editors/displaytabs/citationbackreflist.py
+share/gramps/gui/editors/displaytabs/citationbackreflist.pyc
+share/gramps/gui/editors/displaytabs/citationbackreflist.pyo
+share/gramps/gui/editors/displaytabs/citationembedlist.py
+share/gramps/gui/editors/displaytabs/citationembedlist.pyc
+share/gramps/gui/editors/displaytabs/citationembedlist.pyo
+share/gramps/gui/editors/displaytabs/citationrefmodel.py
+share/gramps/gui/editors/displaytabs/citationrefmodel.pyc
+share/gramps/gui/editors/displaytabs/citationrefmodel.pyo
 share/gramps/gui/editors/displaytabs/dataembedlist.py
 share/gramps/gui/editors/displaytabs/dataembedlist.pyc
 share/gramps/gui/editors/displaytabs/dataembedlist.pyo
@@ -1669,12 +1759,6 @@ share/gramps/gui/editors/displaytabs/reporefmodel.pyo
 share/gramps/gui/editors/displaytabs/sourcebackreflist.py
 share/gramps/gui/editors/displaytabs/sourcebackreflist.pyc
 share/gramps/gui/editors/displaytabs/sourcebackreflist.pyo
-share/gramps/gui/editors/displaytabs/sourceembedlist.py
-share/gramps/gui/editors/displaytabs/sourceembedlist.pyc
-share/gramps/gui/editors/displaytabs/sourceembedlist.pyo
-share/gramps/gui/editors/displaytabs/sourcerefmodel.py
-share/gramps/gui/editors/displaytabs/sourcerefmodel.pyc
-share/gramps/gui/editors/displaytabs/sourcerefmodel.pyo
 share/gramps/gui/editors/displaytabs/surnamemodel.py
 share/gramps/gui/editors/displaytabs/surnamemodel.pyc
 share/gramps/gui/editors/displaytabs/surnamemodel.pyo
@@ -1696,6 +1780,9 @@ share/gramps/gui/editors/editattribute.pyo
 share/gramps/gui/editors/editchildref.py
 share/gramps/gui/editors/editchildref.pyc
 share/gramps/gui/editors/editchildref.pyo
+share/gramps/gui/editors/editcitation.py
+share/gramps/gui/editors/editcitation.pyc
+share/gramps/gui/editors/editcitation.pyo
 share/gramps/gui/editors/editevent.py
 share/gramps/gui/editors/editevent.pyc
 share/gramps/gui/editors/editevent.pyo
@@ -1753,9 +1840,6 @@ share/gramps/gui/editors/editsecondary.pyo
 share/gramps/gui/editors/editsource.py
 share/gramps/gui/editors/editsource.pyc
 share/gramps/gui/editors/editsource.pyo
-share/gramps/gui/editors/editsourceref.py
-share/gramps/gui/editors/editsourceref.pyc
-share/gramps/gui/editors/editsourceref.pyo
 share/gramps/gui/editors/editurl.py
 share/gramps/gui/editors/editurl.pyc
 share/gramps/gui/editors/editurl.pyo
@@ -1804,9 +1888,6 @@ share/gramps/gui/plug/report/_fileentry.pyo
 share/gramps/gui/plug/report/_graphvizreportdialog.py
 share/gramps/gui/plug/report/_graphvizreportdialog.pyc
 share/gramps/gui/plug/report/_graphvizreportdialog.pyo
-share/gramps/gui/plug/report/_options.py
-share/gramps/gui/plug/report/_options.pyc
-share/gramps/gui/plug/report/_options.pyo
 share/gramps/gui/plug/report/_papermenu.py
 share/gramps/gui/plug/report/_papermenu.pyc
 share/gramps/gui/plug/report/_papermenu.pyo
@@ -1837,6 +1918,9 @@ share/gramps/gui/selectors/__init__.pyo
 share/gramps/gui/selectors/baseselector.py
 share/gramps/gui/selectors/baseselector.pyc
 share/gramps/gui/selectors/baseselector.pyo
+share/gramps/gui/selectors/selectcitation.py
+share/gramps/gui/selectors/selectcitation.pyc
+share/gramps/gui/selectors/selectcitation.pyo
 share/gramps/gui/selectors/selectevent.py
 share/gramps/gui/selectors/selectevent.pyc
 share/gramps/gui/selectors/selectevent.pyo
@@ -1867,6 +1951,9 @@ share/gramps/gui/selectors/selectrepository.pyo
 share/gramps/gui/selectors/selectsource.py
 share/gramps/gui/selectors/selectsource.pyc
 share/gramps/gui/selectors/selectsource.pyo
+share/gramps/gui/user.py
+share/gramps/gui/user.pyc
+share/gramps/gui/user.pyo
 share/gramps/gui/utils.py
 share/gramps/gui/utils.pyc
 share/gramps/gui/utils.pyo
@@ -1891,6 +1978,15 @@ share/gramps/gui/views/tags.pyo
 share/gramps/gui/views/treemodels/__init__.py
 share/gramps/gui/views/treemodels/__init__.pyc
 share/gramps/gui/views/treemodels/__init__.pyo
+share/gramps/gui/views/treemodels/citationbasemodel.py
+share/gramps/gui/views/treemodels/citationbasemodel.pyc
+share/gramps/gui/views/treemodels/citationbasemodel.pyo
+share/gramps/gui/views/treemodels/citationlistmodel.py
+share/gramps/gui/views/treemodels/citationlistmodel.pyc
+share/gramps/gui/views/treemodels/citationlistmodel.pyo
+share/gramps/gui/views/treemodels/citationtreemodel.py
+share/gramps/gui/views/treemodels/citationtreemodel.pyc
+share/gramps/gui/views/treemodels/citationtreemodel.pyo
 share/gramps/gui/views/treemodels/eventmodel.py
 share/gramps/gui/views/treemodels/eventmodel.pyc
 share/gramps/gui/views/treemodels/eventmodel.pyo
@@ -1924,6 +2020,9 @@ share/gramps/gui/views/treemodels/treebasemodel.pyo
 share/gramps/gui/widgets/__init__.py
 share/gramps/gui/widgets/__init__.pyc
 share/gramps/gui/widgets/__init__.pyo
+share/gramps/gui/widgets/basicentry.py
+share/gramps/gui/widgets/basicentry.pyc
+share/gramps/gui/widgets/basicentry.pyo
 share/gramps/gui/widgets/buttons.py
 share/gramps/gui/widgets/buttons.pyc
 share/gramps/gui/widgets/buttons.pyo
@@ -2010,6 +2109,7 @@ share/gramps/images/16x16/gramps-bookmark-delete.png
 share/gramps/images/16x16/gramps-bookmark-edit.png
 share/gramps/images/16x16/gramps-bookmark-new.png
 share/gramps/images/16x16/gramps-bookmark.png
+share/gramps/images/16x16/gramps-citation.png
 share/gramps/images/16x16/gramps-config.png
 share/gramps/images/16x16/gramps-date-edit.png
 share/gramps/images/16x16/gramps-date.png
@@ -2064,6 +2164,7 @@ share/gramps/images/22x22/gramps-bookmark-delete.png
 share/gramps/images/22x22/gramps-bookmark-edit.png
 share/gramps/images/22x22/gramps-bookmark-new.png
 share/gramps/images/22x22/gramps-bookmark.png
+share/gramps/images/22x22/gramps-citation.png
 share/gramps/images/22x22/gramps-config.png
 share/gramps/images/22x22/gramps-date-edit.png
 share/gramps/images/22x22/gramps-date.png
@@ -2123,6 +2224,7 @@ share/gramps/images/48x48/gramps-bookmark-delete.png
 share/gramps/images/48x48/gramps-bookmark-edit.png
 share/gramps/images/48x48/gramps-bookmark-new.png
 share/gramps/images/48x48/gramps-bookmark.png
+share/gramps/images/48x48/gramps-citation.png
 share/gramps/images/48x48/gramps-config.png
 share/gramps/images/48x48/gramps-date-edit.png
 share/gramps/images/48x48/gramps-date.png
@@ -2193,6 +2295,7 @@ share/gramps/images/scalable/gramps-bookmark-delete.svg
 share/gramps/images/scalable/gramps-bookmark-edit.svg
 share/gramps/images/scalable/gramps-bookmark-new.svg
 share/gramps/images/scalable/gramps-bookmark.svg
+share/gramps/images/scalable/gramps-citation.svg
 share/gramps/images/scalable/gramps-config.svg
 share/gramps/images/scalable/gramps-date-edit.svg
 share/gramps/images/scalable/gramps-date.svg
@@ -2351,6 +2454,9 @@ share/gramps/plugins/gramplet/CalendarGramplet.pyo
 share/gramps/plugins/gramplet/Children.py
 share/gramps/plugins/gramplet/Children.pyc
 share/gramps/plugins/gramplet/Children.pyo
+share/gramps/plugins/gramplet/Citations.py
+share/gramps/plugins/gramplet/Citations.pyc
+share/gramps/plugins/gramplet/Citations.pyo
 share/gramps/plugins/gramplet/DescendGramplet.py
 share/gramps/plugins/gramplet/DescendGramplet.pyc
 share/gramps/plugins/gramplet/DescendGramplet.pyo
@@ -2396,9 +2502,6 @@ share/gramps/plugins/gramplet/PersonResidence.pyo
 share/gramps/plugins/gramplet/PlaceDetails.py
 share/gramps/plugins/gramplet/PlaceDetails.pyc
 share/gramps/plugins/gramplet/PlaceDetails.pyo
-share/gramps/plugins/gramplet/PluginManagerGramplet.py
-share/gramps/plugins/gramplet/PluginManagerGramplet.pyc
-share/gramps/plugins/gramplet/PluginManagerGramplet.pyo
 share/gramps/plugins/gramplet/QuickViewGramplet.py
 share/gramps/plugins/gramplet/QuickViewGramplet.pyc
 share/gramps/plugins/gramplet/QuickViewGramplet.pyo
@@ -2411,9 +2514,6 @@ share/gramps/plugins/gramplet/RepositoryDetails.pyo
 share/gramps/plugins/gramplet/SessionLogGramplet.py
 share/gramps/plugins/gramplet/SessionLogGramplet.pyc
 share/gramps/plugins/gramplet/SessionLogGramplet.pyo
-share/gramps/plugins/gramplet/Sources.py
-share/gramps/plugins/gramplet/Sources.pyc
-share/gramps/plugins/gramplet/Sources.pyo
 share/gramps/plugins/gramplet/StatsGramplet.py
 share/gramps/plugins/gramplet/StatsGramplet.pyc
 share/gramps/plugins/gramplet/StatsGramplet.pyo
@@ -2509,6 +2609,9 @@ share/gramps/plugins/lib/libhtmlconst.pyo
 share/gramps/plugins/lib/libmapservice.py
 share/gramps/plugins/lib/libmapservice.pyc
 share/gramps/plugins/lib/libmapservice.pyo
+share/gramps/plugins/lib/libmetadata.py
+share/gramps/plugins/lib/libmetadata.pyc
+share/gramps/plugins/lib/libmetadata.pyo
 share/gramps/plugins/lib/libmixin.py
 share/gramps/plugins/lib/libmixin.pyc
 share/gramps/plugins/lib/libmixin.pyo
@@ -2665,6 +2768,9 @@ share/gramps/plugins/sidebar/categorysidebar.pyo
 share/gramps/plugins/sidebar/sidebar.gpr.py
 share/gramps/plugins/sidebar/sidebar.gpr.pyc
 share/gramps/plugins/sidebar/sidebar.gpr.pyo
+share/gramps/plugins/textreport/AlphabeticalIndex.py
+share/gramps/plugins/textreport/AlphabeticalIndex.pyc
+share/gramps/plugins/textreport/AlphabeticalIndex.pyo
 share/gramps/plugins/textreport/AncestorReport.py
 share/gramps/plugins/textreport/AncestorReport.pyc
 share/gramps/plugins/textreport/AncestorReport.pyo
@@ -2707,6 +2813,9 @@ share/gramps/plugins/textreport/SimpleBookTitle.pyo
 share/gramps/plugins/textreport/Summary.py
 share/gramps/plugins/textreport/Summary.pyc
 share/gramps/plugins/textreport/Summary.pyo
+share/gramps/plugins/textreport/TableOfContents.py
+share/gramps/plugins/textreport/TableOfContents.pyc
+share/gramps/plugins/textreport/TableOfContents.pyo
 share/gramps/plugins/textreport/TagReport.py
 share/gramps/plugins/textreport/TagReport.pyc
 share/gramps/plugins/textreport/TagReport.pyo
@@ -2746,6 +2855,9 @@ share/gramps/plugins/tool/Leak.pyo
 share/gramps/plugins/tool/MediaManager.py
 share/gramps/plugins/tool/MediaManager.pyc
 share/gramps/plugins/tool/MediaManager.pyo
+share/gramps/plugins/tool/MergeCitations.py
+share/gramps/plugins/tool/MergeCitations.pyc
+share/gramps/plugins/tool/MergeCitations.pyo
 share/gramps/plugins/tool/NotRelated.py
 share/gramps/plugins/tool/NotRelated.pyc
 share/gramps/plugins/tool/NotRelated.pyo
@@ -2787,6 +2899,7 @@ share/gramps/plugins/tool/eval.glade
 share/gramps/plugins/tool/eventcmp.glade
 share/gramps/plugins/tool/finddupes.glade
 share/gramps/plugins/tool/leak.glade
+share/gramps/plugins/tool/mergecitations.glade
 share/gramps/plugins/tool/notrelated.glade
 share/gramps/plugins/tool/ownereditor.glade
 share/gramps/plugins/tool/patchnames.glade
@@ -2798,6 +2911,12 @@ share/gramps/plugins/tool/tools.gpr.py
 share/gramps/plugins/tool/tools.gpr.pyc
 share/gramps/plugins/tool/tools.gpr.pyo
 share/gramps/plugins/tool/verify.glade
+share/gramps/plugins/view/citationlistview.py
+share/gramps/plugins/view/citationlistview.pyc
+share/gramps/plugins/view/citationlistview.pyo
+share/gramps/plugins/view/citationtreeview.py
+share/gramps/plugins/view/citationtreeview.pyc
+share/gramps/plugins/view/citationtreeview.pyo
 share/gramps/plugins/view/eventview.py
 share/gramps/plugins/view/eventview.pyc
 share/gramps/plugins/view/eventview.pyo
@@ -2886,11 +3005,13 @@ share/gramps/plugins/webstuff/css/Web_Basic-Cypress.css
 share/gramps/plugins/webstuff/css/Web_Basic-Lilac.css
 share/gramps/plugins/webstuff/css/Web_Basic-Peach.css
 share/gramps/plugins/webstuff/css/Web_Basic-Spruce.css
+share/gramps/plugins/webstuff/css/Web_DropDown-Menus.css
+share/gramps/plugins/webstuff/css/Web_Fade-Menus.css
+share/gramps/plugins/webstuff/css/Web_Horizontal-Menus.css
 share/gramps/plugins/webstuff/css/Web_Mainz.css
-share/gramps/plugins/webstuff/css/Web_Navigation-Horizontal.css
-share/gramps/plugins/webstuff/css/Web_Navigation-Vertical.css
 share/gramps/plugins/webstuff/css/Web_Nebraska.css
 share/gramps/plugins/webstuff/css/Web_Print-Default.css
+share/gramps/plugins/webstuff/css/Web_Vertical-Menus.css
 share/gramps/plugins/webstuff/css/Web_Visually.css
 share/gramps/plugins/webstuff/css/ancestortree.css
 share/gramps/plugins/webstuff/css/behaviour.css
@@ -2917,6 +3038,10 @@ share/gramps/plugins/webstuff/images/gramps-geo-mainmap.svg
 share/gramps/plugins/webstuff/images/gramps-geo-marriage.png
 share/gramps/plugins/webstuff/images/gramps-geo-marriage.svg
 share/gramps/plugins/webstuff/images/somerights20.gif
+share/gramps/plugins/webstuff/js/jquery-1.3.2.min.js
+share/gramps/plugins/webstuff/js/jquery-1.7.1.js
+share/gramps/plugins/webstuff/js/jquery-1.7.min.js
+share/gramps/plugins/webstuff/js/jquery-ui-1.7.2.custom.min.js
 share/gramps/plugins/webstuff/webstuff.gpr.py
 share/gramps/plugins/webstuff/webstuff.gpr.pyc
 share/gramps/plugins/webstuff/webstuff.gpr.pyo
diff --git a/databases/gramps3/distinfo b/databases/gramps3/distinfo
index 06534a3aa69..0933d453329 100644
--- a/databases/gramps3/distinfo
+++ b/databases/gramps3/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2012/06/01 20:28:26 drochner Exp $
+$NetBSD: distinfo,v 1.12 2012/09/13 19:56:54 wiz Exp $
 
-SHA1 (gramps-3.3.2.tar.gz) = ae72c9b5e4ad932635388da392ddcaa22d859f17
-RMD160 (gramps-3.3.2.tar.gz) = b099566314cd3b3733d4d8b3390a16b8f52b6de2
-Size (gramps-3.3.2.tar.gz) = 8860068 bytes
-SHA1 (patch-ba) = 41e2238c2de95272e5996098d16f508b0fea96fb
+SHA1 (gramps-3.4.1.tar.gz) = c2e1905cd19e479edfe4db66b2c2595183f1a07e
+RMD160 (gramps-3.4.1.tar.gz) = 4d23236317c30e63a13939637c055791f334bd3c
+Size (gramps-3.4.1.tar.gz) = 10024633 bytes
+SHA1 (patch-ba) = eb94a275c814f37a9f21e1dd238f2ce9e2a0c8f7
diff --git a/databases/gramps3/patches/patch-ba b/databases/gramps3/patches/patch-ba
index c5ddbd421b1..5565e60823c 100644
--- a/databases/gramps3/patches/patch-ba
+++ b/databases/gramps3/patches/patch-ba
@@ -1,13 +1,13 @@
-$NetBSD: patch-ba,v 1.3 2012/06/01 20:28:27 drochner Exp $
+$NetBSD: patch-ba,v 1.4 2012/09/13 19:56:54 wiz Exp $
 
---- src/config.py.orig	2012-02-25 16:06:52.000000000 +0000
+--- src/config.py.orig	2012-07-16 17:53:43.000000000 +0000
 +++ src/config.py
-@@ -292,7 +292,7 @@ register('preferences.sprefix', 'S%04d')
+@@ -303,7 +303,7 @@ register('preferences.sprefix', 'S%04d')
  register('preferences.use-last-view', True)
  register('preferences.last-view', '')
  register('preferences.last-views', [])
 -register('preferences.use-bsddb3', False)
 +register('preferences.use-bsddb3', True)
+ register('preferences.family-relation-type', 3) # UNKNOWN
  
  register('researcher.researcher-addr', '')
- register('researcher.researcher-locality', '')