typo

2014-01-24 17:21:50 -08:00
2894 changed files with 972648 additions and 2093785 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,18 +0,0 @@
-# Make Github recognise Gramps as a Python project,
-# by marking .sql files as text files!
-# See: https://github.com/github/linguist/issues/2462
-# https://github.com/github/linguist/blob/master/README.md
-*.sql linguist-language=txt
-
-# Have Github ignore js vendored files.
-# https://github.com/gramps-project/gramps/tree/master/data/javascript
-#data/javascript/*.js linguist-vendored
-
-# don't mess with line endings for test files
-*.vcs -text
-*.ged -text
-*.GED -text
-*.csv -text
-*.DEF -text
-*.IXI -text
-*.REM -text
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +0,0 @@
-# Python
-*.py[cod]
-
-# Distutils
-MANIFEST
-build/
-dist/
-
-# Gramps
-data/tips.xml
-data/holidays.xml
-po/.intltool-merge-cache
-docs/_build/
-
-# Editing
-tags
-*.swp
-
-# Testing
-test/data
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Glade temp files
-*~
--- a/.mailmap
+++ b/.mailmap
@@ -1,28 +0,0 @@
-<benny.malengier@gramps-project.org> <benny.malengier@gmail.com>
-<doug.blank@gmail.com> <dsblank@bitbucket.org>
-<doug.blank@gmail.com> <dblank@cs.brynmawr.edu>
-<beernarrd@gmail.com> <beernarrd@users.sourceforge.net>
-<igal.shapira@gmail.com> <igalshapira@users.sourceforge.net>
-<romjerome@yahoo.fr> <romjerome@users.noreply.github.com>
-<jralls@ceridwen.us> <john@aeolus.local>
-<josip@pisoj.com> <bpisoj@gmail.com>
-Josip Pisoj <josip@pisoj.com>
-Mirko Leonhaeuser <mirko@leonhaeuser.de>
-<martin.hawlisch@gmx.de> <loshawlos@users.sourceforge.net>
-Matti Niemelä <matti.u.niemela@gmail.com> <niememat@gmail.com>
-<nick-h@gramps-project.org> <nick__hall@hotmail.com>
-<nick-h@gramps-project.org> <Nick-Hall@users.noreply.github.com>
-Ondrej Krč-Jediný <hou@centrum.sk>
-<hou@centrum.sk> <ondrisko@users.sourceforge.com>
-Pierre Bélissent <pierre.belissent@gmail.com>
-Serge Noiraud <Serge.Noiraud@free.fr>
-<Serge.Noiraud@free.fr> <serge.noiraud@free.fr>
-<Serge.Noiraud@free.fr> <serge.noiraud@laposte.net>
-Zdeněk Hataš <zdenek.hatas@gmail.com>
-<zdenek.hatas@gmail.com> <zdenek.hatas@hp.com>
-<zdenek.hatas@gmail.com> <zenhas@users.sourceforge.net>
-<gerald@gkunzmann.de> <g.kunzmann@arcor.de>
-Tim G L Lyons <tim.g.lyons@gmail.com>
-<tim.g.lyons@gmail.com> <guy.linton@gmail.com>
-Elder Evans <elderamevans@gmail.com>
-
--- a/.pylintrc
+++ b/.pylintrc
@@ -1,378 +0,0 @@
-[MASTER]
-
-# Specify a configuration file.
-#rcfile=
-
-# Python code to execute, usually for sys.path manipulation such as
-# pygtk.require().
-#init-hook=
-
-# Add files or directories to the blacklist. They should be base names, not
-# paths.
-ignore=CVS
-
-# Pickle collected data for later comparisons.
-persistent=yes
-
-# List of plugins (as comma separated values of python modules names) to load,
-# usually to register additional checkers.
-load-plugins=
-
-# Use multiple processes to speed up Pylint.
-jobs=1
-
-# Allow loading of arbitrary C extensions. Extensions are imported into the
-# active Python interpreter and may run arbitrary code.
-unsafe-load-any-extension=no
-
-# A comma-separated list of package or module names from where C extensions may
-# be loaded. Extensions are loading into the active Python interpreter and may
-# run arbitrary code
-extension-pkg-whitelist=
-
-# Allow optimization of some AST trees. This will activate a peephole AST
-# optimizer, which will apply various small optimizations. For instance, it can
-# be used to obtain the result of joining multiple strings with the addition
-# operator. Joining a lot of strings can lead to a maximum recursion error in
-# Pylint and this flag can prevent that. It has one side effect, the resulting
-# AST will be different than the one from reality.
-optimize-ast=no
-
-
-[MESSAGES CONTROL]
-
-# Only show warnings with the listed confidence levels. Leave empty to show
-# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
-confidence=
-
-# Enable the message, report, category or checker with the given id(s). You can
-# either give multiple identifier separated by comma (,) or put this option
-# multiple time. See also the "--disable" option for examples.
-#enable=
-
-# Disable the message, report, category or checker with the given id(s). You
-# can either give multiple identifiers separated by comma (,) or put this
-# option multiple times (only on the command line, not in the configuration
-# file where it should appear only once).You can also use "--disable=all" to
-# disable everything first and then reenable specific checks. For example, if
-# you want to run only the similarities checker, you can use "--disable=all
-# --enable=similarities". If you want to run only the classes checker, but have
-# no Warning level messages displayed, use"--disable=all --enable=classes
-# --disable=W"
-disable=suppressed-message,intern-builtin,round-builtin,unicode-builtin,range-builtin-not-iterating,long-builtin,basestring-builtin,setslice-method,print-statement,reload-builtin,metaclass-assignment,raising-string,next-method-called,import-star-module-level,xrange-builtin,getslice-method,zip-builtin-not-iterating,reduce-builtin,dict-iter-method,delslice-method,using-cmp-argument,hex-method,buffer-builtin,old-ne-operator,nonzero-method,backtick,parameter-unpacking,indexing-exception,file-builtin,filter-builtin-not-iterating,raw_input-builtin,execfile-builtin,oct-method,cmp-method,coerce-builtin,long-suffix,cmp-builtin,input-builtin,dict-view-method,standarderror-builtin,apply-builtin,old-raise-syntax,unichr-builtin,old-division,coerce-method,unpacking-in-except,useless-suppression,no-absolute-import,map-builtin-not-iterating,old-octal-literal
-
-
-[REPORTS]
-
-# Set the output format. Available formats are text, parseable, colorized, msvs
-# (visual studio) and html. You can also give a reporter class, eg
-# mypackage.mymodule.MyReporterClass.
-output-format=text
-
-# Put messages in a separate file for each module / package specified on the
-# command line instead of printing them on stdout. Reports (if any) will be
-# written in a file name "pylint_global.[txt|html]".
-files-output=no
-
-# Tells whether to display a full report or only the messages
-reports=yes
-
-# Python expression which should return a note less than 10 (10 is the highest
-# note). You have access to the variables errors warning, statement which
-# respectively contain the number of errors / warnings messages and the total
-# number of statements analyzed. This is used by the global evaluation report
-# (RP0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-
-# Template used to display messages. This is a python new-style format string
-# used to format the message information. See doc for all details
-#msg-template=
-
-
-[BASIC]
-
-# List of builtins function names that should not be used, separated by a comma
-bad-functions=map,filter
-
-# Good variable names which should always be accepted, separated by a comma
-good-names=i,j,k,ex,Run,_,db
-
-# Bad variable names which should always be refused, separated by a comma
-bad-names=foo,bar,baz,toto,tutu,tata
-
-# Colon-delimited sets of names that determine each other's naming style when
-# the name regexes allow several styles.
-name-group=
-
-# Include a hint for the correct naming format with invalid-name
-include-naming-hint=no
-
-# Regular expression matching correct argument names
-argument-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Naming hint for argument names
-argument-name-hint=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression matching correct module names
-module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-
-# Naming hint for module names
-module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-
-# Regular expression matching correct class attribute names
-class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
-
-# Naming hint for class attribute names
-class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
-
-# Regular expression matching correct function names
-function-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Naming hint for function names
-function-name-hint=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression matching correct inline iteration names
-inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
-
-# Naming hint for inline iteration names
-inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
-
-# Regular expression matching correct constant names
-const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-
-# Naming hint for constant names
-const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-
-# Regular expression matching correct method names
-method-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Naming hint for method names
-method-name-hint=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression matching correct class names
-class-rgx=[A-Z_][a-zA-Z0-9]+$
-
-# Naming hint for class names
-class-name-hint=[A-Z_][a-zA-Z0-9]+$
-
-# Regular expression matching correct variable names
-variable-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Naming hint for variable names
-variable-name-hint=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression matching correct attribute names
-attr-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Naming hint for attribute names
-attr-name-hint=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression which should only match function or class names that do
-# not require a docstring.
-no-docstring-rgx=^_
-
-# Minimum line length for functions/classes that require docstrings, shorter
-# ones are exempt.
-docstring-min-length=-1
-
-
-[ELIF]
-
-# Maximum number of nested blocks for function / method body
-max-nested-blocks=5
-
-
-[LOGGING]
-
-# Logging modules to check that the string format arguments are in logging
-# function parameter format
-logging-modules=logging
-
-
-[SPELLING]
-
-# Spelling dictionary name. Available dictionaries: none. To make it working
-# install python-enchant package.
-spelling-dict=
-
-# List of comma separated words that should not be checked.
-spelling-ignore-words=
-
-# A path to a file that contains private dictionary; one word per line.
-spelling-private-dict-file=
-
-# Tells whether to store unknown words to indicated private dictionary in
-# --spelling-private-dict-file option instead of raising a message.
-spelling-store-unknown-words=no
-
-
-[MISCELLANEOUS]
-
-# List of note tags to take in consideration, separated by a comma.
-notes=FIXME,XXX,TODO
-
-
-[TYPECHECK]
-
-# Tells whether missing members accessed in mixin class should be ignored. A
-# mixin class is detected if its name ends with "mixin" (case insensitive).
-ignore-mixin-members=yes
-
-# List of module names for which member attributes should not be checked
-# (useful for modules/projects where namespaces are manipulated during runtime
-# and thus existing member attributes cannot be deduced by static analysis. It
-# supports qualified module names, as well as Unix pattern matching.
-ignored-modules=
-
-# List of classes names for which member attributes should not be checked
-# (useful for classes with attributes dynamically set). This supports can work
-# with qualified names.
-ignored-classes=
-
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E1101 when accessed. Python regular
-# expressions are accepted.
-generated-members=
-
-
-[SIMILARITIES]
-
-# Minimum lines number of a similarity.
-min-similarity-lines=4
-
-# Ignore comments when computing similarities.
-ignore-comments=yes
-
-# Ignore docstrings when computing similarities.
-ignore-docstrings=yes
-
-# Ignore imports when computing similarities.
-ignore-imports=no
-
-
-[FORMAT]
-
-# Maximum number of characters on a single line.
-max-line-length=80
-
-# Regexp for a line that is allowed to be longer than the limit.
-ignore-long-lines=^\s*(# )?<?https?://\S+>?$
-
-# Allow the body of an if to be on the same line as the test if there is no
-# else.
-single-line-if-stmt=no
-
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,dict-separator
-
-# Maximum number of lines in a module
-max-module-lines=1000
-
-# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
-# tab).
-indent-string='    '
-
-# Number of spaces of indent required inside a hanging  or continued line.
-indent-after-paren=4
-
-# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
-expected-line-ending-format=
-
-
-[VARIABLES]
-
-# Tells whether we should check for unused import in __init__ files.
-init-import=no
-
-# A regular expression matching the name of dummy variables (i.e. expectedly
-# not used).
-dummy-variables-rgx=_$|dummy
-
-# List of additional names supposed to be defined in builtins. Remember that
-# you should avoid to define new builtins when possible.
-additional-builtins=
-
-# List of strings which can identify a callback function by name. A callback
-# name must start or end with one of those strings.
-callbacks=cb_,_cb
-
-
-[CLASSES]
-
-# List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,__new__,setUp
-
-# List of valid names for the first argument in a class method.
-valid-classmethod-first-arg=cls
-
-# List of valid names for the first argument in a metaclass class method.
-valid-metaclass-classmethod-first-arg=mcs
-
-# List of member names, which should be excluded from the protected access
-# warning.
-exclude-protected=_asdict,_fields,_replace,_source,_make
-
-
-[IMPORTS]
-
-# Deprecated modules which should not be used, separated by a comma
-deprecated-modules=optparse
-
-# Create a graph of every (i.e. internal and external) dependencies in the
-# given file (report RP0402 must not be disabled)
-import-graph=
-
-# Create a graph of external dependencies in the given file (report RP0402 must
-# not be disabled)
-ext-import-graph=
-
-# Create a graph of internal dependencies in the given file (report RP0402 must
-# not be disabled)
-int-import-graph=
-
-
-[DESIGN]
-
-# Maximum number of arguments for function / method
-max-args=5
-
-# Argument names that match this expression will be ignored. Default to name
-# with leading underscore
-ignored-argument-names=_.*
-
-# Maximum number of locals for function / method body
-max-locals=15
-
-# Maximum number of return / yield for function / method body
-max-returns=6
-
-# Maximum number of branch for function / method body
-max-branches=12
-
-# Maximum number of statements in function / method body
-max-statements=50
-
-# Maximum number of parents for a class (see R0901).
-max-parents=7
-
-# Maximum number of attributes for a class (see R0902).
-max-attributes=7
-
-# Minimum number of public methods for a class (see R0903).
-min-public-methods=2
-
-# Maximum number of public methods for a class (see R0904).
-max-public-methods=20
-
-# Maximum number of boolean expressions in a if statement
-max-bool-expr=5
-
-
-[EXCEPTIONS]
-
-# Exceptions that will emit a warning when being caught. Defaults to
-# "Exception"
-overgeneral-exceptions=Exception
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,129 +0,0 @@
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2015-2015  Doug Blank
-# Copyright (C) 2016       DaAwesomeP
-# Copyright (C) 2016       QuLogic
-# Copyright (C) 2016       Tim G L Lyons
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# After changing this file, check it on:
-#   http://lint.travis-ci.org/
-
-sudo: required
-dist: trusty
-language: python
-python:
- - 3.3 # This is irrelevant, because the virtualenv is not used at all
-
-# FIXME: The minimum requirement for Gramps is Python 3.2, so a test environment
-# for Python 3.2 should be added to this environment which is Python 3.3. It
-# will not be possible to run coverage under Python 3.2, because coverage is
-# Python 3.3 (or above) only.
-
-addons:
-  apt:
-    packages:
-    - gir1.2-pango-1.0
-    - gir1.2-gtk-3.0
-    - xdg-utils
-    - librsvg2-common
-    - libglib2.0-dev
-    - intltool
-    # - python3-gobject Provided by python3-gi
-    - python3-gi
-    - python3-cairo
-    - python3-gi-cairo
-    - python3-bsddb3
-    - python3-dev
-    - python3-nose
-    - python3-mock
-    - python3-pyicu
-    - python3-coverage
-    - python3-jsonschema
-    # lxml dependencies.  for merge_ref_test to work
-    # - libxml2-dev
-    # - libxslt1-dev
-    - libxml2-utils
-    - python3-lxml
-    - python-libxml2
-# ubuntu 14.04 requires this in addition to libxml2-dev and
-# libxslt1-dev for compiling lxml.
-# https://github.com/deanmalmgren/textract/issues/19
-    - zlib1g-dev
-
-before_install:
-
-install:
-# The working directory is set to /home/travis/build/gramps-project/gramps
-# by the automatic git checkout.
-
-# Download Sean Ross-Ross's Pure Python module containing a framework to
-# manipulate and analyze python ast<73>s and bytecode. This is loaded to 
-# /home/travis/build/gramps-project/gramps/meta
-# FIXME: This should be loaded from the release directory at
-# https://pypi.python.org/pypi/meta
- - git clone -b master https://github.com/srossross/meta
-
-# Build Gramps package. This seems to copy everything to
-# /home/travis/build/scripts-3.3
- - python setup.py build
-
-before_script:
-# Create the Gramps database directory.
- - mkdir -p ~/.gramps/grampsdb/
-# set PYTHONPATH so the directly installed module (meta) is picked up from
-# /home/travis/build/gramps-project/gramps/meta
- - export PYTHONPATH=meta
-# set module exclusions. --exclude=TestUser because of older version of mock
-# without configure_mock
- - export EXCLUDE="--exclude=TestcaseGenerator"
-#   --exclude=merge_ref_test"
-# set GRAMPS_RESOURCES for locale, data,image and documentation
- - export GRAMPS_RESOURCES=.
-# Install addons
- - mkdir -p ~/.gramps/gramps50/plugins/
- - wget https://github.com/gramps-project/addons/raw/master/gramps50/download/CliMerge.addon.tgz
- - tar -C ~/.gramps/gramps50/plugins -xzf CliMerge.addon.tgz
- - wget https://github.com/gramps-project/addons/raw/master/gramps50/download/ExportRaw.addon.tgz
- - tar -C ~/.gramps/gramps50/plugins -xzf ExportRaw.addon.tgz
-
-script:
-# Ignore the virtualenv entirely. Use nosetests3, python3 (3.4.0) and coverage
-# from /usr/bin. Use libraries from /usr/lib/python3.4,
-# /usr/local/lib/python3.4/dist-packages and /usr/lib/python3/dist-packages
- - nosetests3 --nologcapture --with-coverage --cover-package=gramps $EXCLUDE
-   gramps
-# FIXME: This should have run from the current directory, rather than from
-# gramps, because there is some test code in that directory.
-
-# give an error for any trailing whitespace
- - if git --no-pager grep --color -n --full-name '[ 	]$' -- \*.py; then
-     echo "ERROR - Trailing whitespace found in source file(s)";
-     exit 1;
-   fi
-
-after_success:
-# apt-get installs python3-coverage, but codecov only invokes coverage, so make
-# a link
- - sudo ln /usr/bin/python3-coverage /usr/bin/coverage
-
-# We have to use the bash script because the apt-get coverage does not install
-# codecov. If we used pip to install codecov, it would run inside the
-# virtualenv, and that doesn't work. Change the path to ensure that codecov
-# picks up coverage from /usr/bin, rather than from
-# /home/travis/virtualenv/python3.3.6/bin/
- - PATH=/usr/bin:$PATH bash <(curl -s https://codecov.io/bash)
--- a/94
+++ b/94
@@ -1,93 +1,17 @@
+Donald N. Allingham ** Concept and main design

+David Hampton ** Autocomp.py and Report.py

-Alex Roitman shura@gramps-project.org
+Donald A. Peterson  ** Makefiles, LaTeXDoc.py

-Arturas Sleinius asleinius@users.sourceforge.net
+Alex Roitman ** BookReport, command line, Gramps manual, bugfixes

-Benny Malengier benny.malengier@gramps-project.org
+Tim Waugh ** Comprehensive Ancestor report, docgen, Makefiles, bugfixes

-Boril Gourinov boril.gourinov@gmail.com
+Martin Hawlisch - Filters

-Brian Matherly brian@gramps-project.org
+Richard Taylor - ScratchPad.py, GrampsDBCallback.py

-Craig J. Anderson ander882@hotmail.com
+Brian Matherly - Reports

-Don Allingham don@gramps-project.org
-
-Donald A. Peterson
-
-Doug Blank doug.blank@gmail.com
-
-Eero Tamminen eerot@users.sourceforge.net
-
-Erik De Richter erikdrgm@users.sourceforge.net
-
-Espen Berg espenbe@gmail.com
-
-Gary Burton gary.burton@zen.co.uk
-
-Gerald Britton gerald.britton@gmail.com
-
-James G Sack jgsack@san.rr.com
-
-Janne Kovesjärvi janne.kovesjarvi@gmail.com
-
-Jason Simanek jsimanek@gmail.com
-
-Jérôme Rapinat romjerome@yahoo.fr
-
-Joan Creus joan.creus@gmail.com
-
-Josip Pisoj josip@pisoj.com
-
-Julio Sánchez julio.sanchez@gmail.com
-
-Kees Bakker kees.bakker@xs4all.nl
-
-Konstantin Dorichev kdorichev@gmail.com
-
-Lubo Vasko pgval@inMail.sk
-
-Luigi Toscano luigi.toscano@tiscali.it
-
-Luiz Gonzaga dos Santos Filho lfilho@gmail.com
-
-Łukasz Rymarczyk yenidai@poczta.onet.pl
-
-Michiel Nauta m.d.nauta@hetnet.nl
-
-Mirko Leonhäuser mirko@leonhaeuser.de
-
-Morten Bo Johansen mbj@spamcop.net
-
-Martin Hawlisch martin.hawlisch@gmx.de
-
-Nick Hall nick__hall@hotmail.com
-
-Peter Landgren peter.talken@telia.com
-
-Raphael Ackermann raphael.ackermann@gmail.com
-
-Richard Taylor rjt-gramps@thegrindstone.me.uk
-
-Rob G. Healey robhealey1@gmail.com
-
-Serge Noiraud Serge.Noiraud@free.fr
-
-Sigmund Lorentsen sigmund.lorentsen@tele2.no
-
-Stefan Bjork betula@users.sourceforge.net
-
-Stéphane Charette stephanecharette@gmail.com
-
-Tim G L Lyons tim.g.lyons@gmail.com
-
-Tim Waugh twaugh@redhat.com
-
-Vassilii Khachaturov vassilii@tarunz.org
-
-Zdeněk Hataš zdenek.hatas@gmail.com
-
-Zsolt Foldvari zfoldvar@users.sourceforge.net
-
-John Ralls jralls@ceridwen.us
+$Id$
--- a/12
+++ b/12
@@ -1,12 +0,0 @@
-See developer documentation at:
-https://gramps-project.org/wiki/index.php?title=Portal:Developers
-https://gramps-project.org/wiki/index.php?title=Brief_introduction_to_Git#Making_a_patchfile
-https://gramps-project.org/wiki/index.php?title=Brief_introduction_to_Git#Making_a_PR
-
-If you are interested in translating:
-* The Gramps program to your language see:
-https://gramps-project.org/wiki/index.php?title=Translating_Gramps
-https://gramps-project.org/wiki/index.php?title=Portal:Translators
-
-* The Gramps user manual to your language see:
-https://gramps-project.org/wiki/index.php?title=Translating_the_Gramps_User_manual
--- a/2
+++ b/2
@@ -2,7 +2,7 @@
 		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+                          675 Mass Ave, Cambridge, MA 02139, USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

--- a/746
+++ b/746
@@ -1,746 +0,0 @@
-2018-12-20  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/configure.py, gramps/gui/display.py,
-	gramps/gui/glade/book.glade, gramps/gui/glade/styleeditor.glade,
-	gramps/gui/plug/report/_bookdialog.py,
-	gramps/gui/plug/report/_styleeditor.py,
-	gramps/gui/selectors/selectperson.py,
-	gramps/gui/selectors/selectrepository.py,
-	gramps/gui/widgets/grampletpane.py,
-	gramps/gui/widgets/reorderfam.py,
-	gramps/plugins/tool/mediamanager.py,
-	gramps/plugins/tool/relcalc.glade, gramps/plugins/tool/relcalc.py,
-	po/ar.po, po/bg.po, po/br.po, po/ca.po, po/cs.po, po/da.po,
-	po/de.po, po/el.po, po/en_GB.po, po/eo.po, po/es.po, po/fi.po,
-	po/fr.po, po/ga.po, po/gramps.pot, po/he.po, po/hr.po, po/hu.po,
-	po/is.po, po/it.po, po/ja.po, po/lt.po, po/mk.po, po/nb.po,
-	po/nl.po, po/nn.po, po/pl.po, po/pt_BR.po, po/pt_PT.po, po/ro.po,
-	po/ru.po, po/sk.po, po/sl.po, po/sq.po, po/sr.po, po/sr_Latn.po,
-	po/sv.po, po/ta.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po,
-	po/zh_HK.po, po/zh_TW.po: Help issues for bug 9042 (#738) * Media Manager: add help button and remove '...' Issue #9042 * Edit/Preferences: add Help button Issue #9042 * Style Editor, Document Styles dialog: add help buttons Issue #9042 * Fix Select Person dialog Help button URL Issue #9042 * Fix Select Repository dialog Help button URL Issue #9042 * Relationship Calculator: Add help button Issue #9042 * Reorder Relationships dialog; add Help button Issue #9042 * Generate Book Dialog; Fix Help URL Issue #9042 * Manage Book dialog; add help button Issue #9042 * Fix Detached Gramplets Help button URL when 'help_url' not in .gpr Issue #9042 * Fix help URLs when they contain illegal characters and to match
-	wiki section targetID algorithm Issue #9042
-
-2018-12-20  prculley <paulr2787@gmail.com>
-
-	* po/hu.po: Updated Hungarian translation
-
-2018-12-20  milotype <43657314+milotype@users.noreply.github.com>
-
-	* gramps/gen/datehandler/_date_hr.py, po/hr.po: Croatian
-	localisation updates (#741) * Update/Completion Croatian translation This is a big update. The croatian translation is now 100% complete.
-	Translated all missing strings, made lots of corrections, improved
-	consistency in the wording, tested thoroughly.  Also, it will work
-	with the updated datehandler file "_date_hr.py", which i'll be
-	updating simultaneously.  * Croatian Datehandler update Made changes to fit croatian specific date handling. Also because
-	i've updated the hr.po file. I've tested it with the present
-	"_datedisplay.py" of the maintainance/gramps50 branch.  Basically it would be great, if next to the obligatory "display_iso"
-	format, only two more formats would show up in the croatian
-	drop-down menus: "dd_dformat01" (numerical) and "dd_dformat04".
-	Other formats are unneeded.  9. 5. 2018.  => ordinal numbers, all separated by spaces 9. svibnja 2018.  => ordinal numbers and genitiv month's form, all
-	separated by spaces
-
-2018-12-20  Nick Hall <nick-h@gramps-project.org>
-
-	* gramps/gen/db/generic.py: Fix contents of enclosed_by secondary
-	dbapi column (#742) The enclosed_by column should contain the first value in the list
-	instead of the last.  Resolves #10907.
-
-2018-12-18  Leonhaeuser <mirko@leonhaeuser.de>
-
-	* po/de.po: update German translation
-
-2018-12-15  SNoiraud <serge.noiraud@laposte.net>
-
-	* gramps/plugins/mapservices/googlemap.py: Google maps URL problem Fixes #10772
-
-2018-12-09  prculley <paulr2787@gmail.com>
-
-	* gramps/gen/plug/docbackend/docbackend.py: Fix ODT reports with
-	links when run in non-English languages Fixes #10911
-
-2018-12-06  prculley <paulr2787@gmail.com>
-
-	* gramps/gui/plug/report/_reportdialog.py: Allow addon Reports to
-	specify a help button URL for options dialog Fixes #10910
-
-2018-12-01  Nick Hall <nick-h@gramps-project.org>
-
-	* gramps/plugins/db/dbapi/dbapi.py, gramps/plugins/tool/rebuild.py: 
-	Fix Rebuild Secondary Indexes tool for dbapi backends For dbapi backends, this tool will update the secondary columns that
-	are used for indexing.  Resolves #10757.
-
-2018-11-15  prculley <paulr2787@gmail.com>
-
-	* gramps/plugins/db/dbapi/dbapi.py: Fix dbapi set_name_group_mapping
-	to properly close transaction Fixes #10730
-
-2018-10-24  prculley <paulr2787@gmail.com>
-
-	* gramps/gen/datehandler/_date_ru.py: Fix Russian date handler crash
-	when Russian .po isn't present Fixes #10855
-
-2018-12-04  Leonhaeuser <mirko@leonhaeuser.de>
-
-	* po/de.po: update German translation
-
-2018-12-04  vantu5z <vantu5z@mail.ru>
-
-	* po/ru.po: update Russian translation
-
-2018-11-29  niememat <niememat@gmail.com>
-
-	* po/fi.po: Update finnish translation
-
-2018-11-28  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/plug/quick/_quicktable.py: Fix Quickview for missing
-	table data on some Gtk Versions (#593) Issue #10448 Issue #7867
-
-2018-11-28  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/cli/arghandler.py, gramps/gui/grampsgui.py: Fix startup
-	messages with bad filename (#720) Fixes #10885
-
-2018-11-28  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/selectors/selectplace.py,
-	gramps/gui/views/treemodels/placemodel.py,
-	gramps/plugins/lib/libplaceview.py: Restrict Place view Name col to
-	the primary name (#673) while allowing searchbar to find alt and primary names related to Issue #9276 while allowing searchbar to find alt and primary names.  Currently, the Place View and Place Selector name column shows a
-	comma separated list of the primary and alt names for a place. With
-	the advent of GeoNames and Gov data, the alt names lists are getting
-	populated with (sometimes long) lists of (sometimes duplicated)
-	names. This doesn't look very good in the view. I've gotten a couple
-	of email complaints about this.  The Name column was originally extended (for Gramps50) to include
-	alt names to allow the use of the top search bar (enabled when
-	sidebar is turned off via 'View/Sidebar'), to perform a search
-	through all the alt names as well as primary name.
-	https://gramps-project.org/bugs/view.php?id=9276 This PR creates a new (hidden) column in the place model containing
-	the full name list, and reverts the 'Name' column to the primary
-	name. It also modifies the PlaceSelector and PlaceView classes to
-	cause the search bar to use the new (hidden) column.
-
-2018-11-28  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/filters/sidebar/_personsidebarfilter.py: Fix Person
-	Sidebarfilter when using 'Event' and Reg expressions (#729) Fixes #10659
-
-2018-11-28  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/plugins/tool/finddupes.py: Fix Find Duplicate People;
-	exception when deleting someone shown (#728) outside of the tool Fixes #10875
-
-2018-11-28  Paul Culley <paulr2787@gmail.com>
-
-	* data/tests/exp_sample_ged.ged,
-	gramps/plugins/export/exportgedcom.py,
-	gramps/plugins/test/exports_test.py: Gedcom export, upgrade OBJE
-	handling to Gedcom 5.5.1 style (#702) Fixes #10797
-
-2018-11-28  Paul Culley <paulr2787@gmail.com>
-
-	* data/tests/imp_sample_csv.gramps,
-	gramps/plugins/importer/importcsv.py: Fix CSV import to set marriage
-	event role to family (#725) Fixes #9952
-
-2018-11-28  Paul Culley <paulr2787@gmail.com>
-
-	* data/tips.xml.in, po/ar.po, po/bg.po, po/br.po, po/ca.po,
-	po/cs.po, po/da.po, po/de.po, po/el.po, po/en_GB.po, po/eo.po,
-	po/es.po, po/fi.po, po/fr.po, po/ga.po, po/gramps.pot, po/he.po,
-	po/hr.po, po/hu.po, po/is.po, po/it.po, po/ja.po, po/lt.po,
-	po/mk.po, po/nb.po, po/nl.po, po/nn.po, po/pl.po, po/pt_BR.po,
-	po/pt_PT.po, po/ro.po, po/ru.po, po/sk.po, po/sl.po, po/sq.po,
-	po/sr.po, po/sr_Latn.po, po/sv.po, po/ta.po, po/tr.po, po/uk.po,
-	po/vi.po, po/zh_CN.po, po/zh_HK.po, po/zh_TW.po: Update gramps
-	bugtracker URL in all po files (#710) Fixes #10543
-
-2018-11-28  Serge Noiraud <Serge.Noiraud@laposte.net>
-
-	* data/css/Web_Basic-Ash.css, data/css/Web_Basic-Blue.css,
-	data/css/Web_Basic-Cypress.css, data/css/Web_Basic-Lilac.css,
-	data/css/Web_Basic-Peach.css, data/css/Web_Basic-Spruce.css,
-	data/css/Web_Mainz.css, data/css/Web_Nebraska.css: Narrative Web :
-	thumbnails bad alignment. (#691) * Narrative Web : thumbnails bad alignment.  Fixes #10854 also solves the following problems in the Nebraska style sheet :  1 - float parameter has no value "center"  2 - "[" instead of ";" at end of line 1100 * overlapping with long titles
-
-2018-11-28  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/views/treemodels/citationlistmodel.py: Fix typo in
-	CitationListModel for sort change (#730)
-
-2018-11-28  Serge Noiraud <Serge.Noiraud@laposte.net>
-
-	* gramps/plugins/gramplet/todo.py: Fix Adding "ToDo" note crash when
-	no active object (#685) * Fix Adding "ToDo" note crash when no active object Fixes #10795 * Better message when no active object.  * resolve conflict: Fixes #10795
-
-2018-11-28  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/views/treemodels/citationbasemodel.py,
-	gramps/gui/views/treemodels/citationlistmodel.py: Fix Citation List
-	view Source Last Changed Column to sort properly (#723) Fixes #10893
-
-2018-11-28  pmraps <43935667+pmraps@users.noreply.github.com>
-
-	* po/pt_PT.po: some pt_PT.po translation changes (#703) * some header changes * more changes
-
-2018-11-28  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/viewmanager.py: Fix for re-entrant main window close
-	when user hits 'x' again (#724) Fixes #10897
-
-2018-11-28  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/managedwindow.py: Fix exception when closing early
-	editor in tree of editors (#706) Fixes #10876
-
-2018-11-28  Serge Noiraud <Serge.Noiraud@laposte.net>
-
-	* gramps/plugins/webreport/basepage.py: Narrative Web: thumbnails
-	problems in some cases. (#722) Fixes #10890
-
-2018-11-27  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/plug/report/_bookdialog.py: Fix 'Generate Book' dialog
-	for crash on 'x' close (#726) Fixes #10901
-
-2018-11-27  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/plugins/gramplet/todo.py: Fix ToDo Gramplet for multiple
-	attempts to edit a note (#719) Fixes #10645
-
-2018-11-27  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/widgets/grampletpane.py: Fix Dashboard for multiple
-	copies of a Gramplet (#718) * Fix Dashboard for multiple copies of a Gramplet Fixes #10650 * Fix Dashboard to recall minimized or undocked Gramplets
-
-2018-11-27  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/displaystate.py: Fix Statusbar update to avoid
-	intermittent exception on closed db (#716) Fixes #10882
-
-2018-11-27  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gen/filters/_filterparser.py: Fix FilterParser for much
-	older 3.x custom_filters.xml files (#715) Fixes #8075 Fixes #10669 Fixes #10516
-
-2018-11-27  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gen/filters/rules/person/_isduplicatedancestorof.py: Fix
-	IsDuplicatedAncestorOf filter rule to avoid crash on tree loop
-	(#714) Fixes #10685
-
-2018-11-28  Serge Noiraud <Serge.Noiraud@laposte.net>
-
-	* gramps/plugins/webreport/person.py,
-	gramps/plugins/webreport/place.py: Narrative web : use latest
-	version from openlayers. (#713) Fixes #10884
-
-2018-11-27  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/editors/editlink.py: Fix StyledTextEditor EditLink for
-	root text changed to zero length (#709) in the background Fixes #9750
-
-2018-11-27  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gen/simple/_simpleaccess.py: Fix AgeOnDate and some reports
-	using SimpleAccess for missing surname (#708) Fixes #9958 Fixes #9800
-
-2018-11-27  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gen/filters/rules/_rule.py: Fix crash when a filter with
-	loop in definition is defined (#707) Fixes #10621
-
-2018-11-27  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gen/proxy/referencedbyselection.py,
-	gramps/plugins/gramplet/citations.py: Fix HandleErrors related to
-	LDS (#697) * Fix ReferencedBySelection proxy for 'None' LDS Parents Fixes #10865 * Fix HandleError in Citations Gramplet for lds place missing
-
-2018-11-27  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/plugins/lib/libplaceview.py: Change PlaceView drag from
-	whole row to just icon during drag (#695) Fixes #10863
-
-2018-11-27  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/editors/displaytabs/embeddedlist.py: Add drag Icon to
-	drags from DisplayTabs Gramplet lists (#694) Fixes #10859
-
-2018-11-27  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/glade/baseselector.glade,
-	gramps/gui/glade/dbman.glade,
-	gramps/gui/plug/report/_bookdialog.py,
-	gramps/gui/selectors/baseselector.py,
-	gramps/gui/selectors/selectcitation.py,
-	gramps/gui/selectors/selectevent.py,
-	gramps/gui/selectors/selectfamily.py,
-	gramps/gui/selectors/selectnote.py,
-	gramps/gui/selectors/selectobject.py,
-	gramps/gui/selectors/selectperson.py,
-	gramps/gui/selectors/selectplace.py,
-	gramps/gui/selectors/selectrepository.py,
-	gramps/gui/selectors/selectsource.py,
-	gramps/plugins/tool/testcasegenerator.py: Fix dialogs for 'Help'
-	button closes the dialog, and non-functional 'Help' (#727) * Fix Family Tree manager for 'Help' button closes dialog Fixes #10589 * Fix selectors for 'Help' button closes dialog Fixes #10589 * Fix 'Generate Book' dialog for 'Help' button closes dialog Fixes #10589 * Fix TestcaseGenerator for 'Help' button closes dialog Fixes #10589 * Fix Selectors to enable the 'Help' buttons to actually work Fixes #10589
-
-2018-10-26  prculley <paulr2787@gmail.com>
-
-	* gramps/gui/editors/editfamily.py: Avoid HandleError when dragging
-	an Added Family from EditFamily Fixes #10858
-
-2018-10-26  prculley <paulr2787@gmail.com>
-
-	* gramps/gui/editors/editperson.py: Avoid HandleError when dragging
-	an Added Person from EditPerson Fixes #10857
-
-2018-10-20  prculley <paulr2787@gmail.com>
-
-	* gramps/gui/clipboard.py: Fix Clipboard rows cannot be sorted via
-	drag/drop Fixes #10849
-
-2018-10-19  prculley <paulr2787@gmail.com>
-
-	* gramps/gen/config.py, gramps/gui/dbloader.py,
-	gramps/gui/plug/export/_exportassistant.py,
-	gramps/gui/views/listview.py: Better default directory choices for
-	import/export Use recent-export-dir as default for Export View instead of the
-	console default directory, which can be where program resides (on
-	Windows), or other inappropriate place.  Use USER_HOME for default directory on 'Export' (recent-export-dir)
-	if first run (default settings) rather than default directory, which
-	can be where program resides (on Windows), or other inappropriate
-	place.  Use USER_HOME for default directory on 'Import' (recent-import-dir)
-	if first run (default settings) rather than recent file which is
-	generally set to the grampsdb path.  Fixes #10802
-
-2018-10-16  SNoiraud <serge.noiraud@laposte.net>
-
-	* gramps/plugins/docgen/htmldoc.py: Records Report: call name not
-	underlined in HTML Fixes #10816
-
-2018-11-20  Christophe <khrys63@gmail.com>
-
-	* po/fr.po: Fix French translation
-
-2018-10-14  prculley <paulr2787@gmail.com>
-
-	* gramps/gui/widgets/interactivesearchbox.py: Fix InteractiveSearch
-	for find before model is populated Fixes #10844
-
-2018-10-07  prculley <paulr2787@gmail.com>
-
-	* gramps/plugins/export/exportgedcom.py: Fix Gedcom export for
-	incorrect escaping with @#DFRENCH R@ Fixes #10833
-
-2018-10-06  prculley <paulr2787@gmail.com>
-
-	* gramps/plugins/textreport/detancestralreport.py,
-	gramps/plugins/textreport/detdescendantreport.py,
-	gramps/plugins/textreport/indivcomplete.py,
-	gramps/plugins/webreport/basepage.py: Fix reports for shared event
-	attribute and note errors Fixes #10720
-
-2018-10-02  prculley <paulr2787@gmail.com>
-
-	* gramps/gui/widgets/fanchart.py,
-	gramps/gui/widgets/fanchartdesc.py: Fix Fan and Descendant Fan
-	charts in Quadrant and Half Circle modes The Descendant Fan chart
-	had several bugs: 1) a bug that affected the centering of the chart for these modes 2) the chart was drawn in the wrong quadrant 3) the centering of the chart for printing was incorrect    (the legend was off the page some of the time).  4) the sizing of the chart for printing was incorrect    (for very small charts of one generation, the legend would     overwrite the chart).  The Fan Chart for the quadrant view: 1) the centering of the chart for printing was incorrect    (the legend was off the page some of the time).  Fixes #10817
-
-2018-09-30  Robin van der Vliet <info@robinvandervliet.com>
-
-	* gramps/plugins/rel/rel_nl.py: Fixed issues in the Dutch
-	relationship calculator Fixed some issues in the Dutch relationship calculator and also
-	extended the ordinal and removed lists till 50, just like the
-	English lists.  * Replaced huge lists by reusable lists.  * Fixed bug in which uncles/aunts, nephews/nieces (niblings),   siblings and cousins with an unknown gender show up as female.  * Fixed some misspellings:     drieÃ«ntwingste > drieÃ«ntwinTIgste     vierentwingste > vierentwinTIgste     edelovergrootOUD > edelovergroot     edeloudvergroot > edeloudOvergroot
-
-2018-11-15  Pär Ekholm <pelle.ekh@koping.net>
-
-	* po/sv.po: Update Swedish translation
-
-2018-11-18  niememat <niememat@gmail.com>
-
-	* po/fi.po: Fix translation in Finnish
-
-2018-11-10  niememat <niememat@gmail.com>
-
-	* po/fi.po: Update finnish translation
-
-2018-11-09  vantu5z <vantu5z@mail.ru>
-
-	* po/ru.po: update Russian translation
-
-2018-09-28  SNoiraud <serge.noiraud@laposte.net>
-
-	* data/css/Web_Basic-Ash.css, data/css/Web_Basic-Blue.css,
-	data/css/Web_Basic-Cypress.css, data/css/Web_Basic-Lilac.css,
-	data/css/Web_Basic-Peach.css, data/css/Web_Basic-Spruce.css,
-	data/css/Web_Horizontal-Menus.css, data/css/Web_Mainz.css,
-	data/css/Web_Nebraska.css, gramps/plugins/webreport/basepage.py: 
-	NarrativeWeb fixes Space between place, description and the event note when there are
-	many sources.  Change the css order between print and screen.  The
-	chosen theme can erase prior values.  Add a width for the source
-	column in all themes.  Fixes #10810
-
-2018-10-17  niememat <niememat@gmail.com>
-
-	* po/fi.po: Fix translation in Finnish
-
-2018-10-07  Paul Franklin <pf.98052@gmail.com>
-
-	* gramps/plugins/drawreport/statisticschart.py,
-	gramps/plugins/graph/gvfamilylines.py,
-	gramps/plugins/graph/gvrelgraph.py,
-	gramps/plugins/webreport/webcal.py: Setting the year as an ordinal
-	number in Croatian With this commit, two more reports now show a year as an ordinal
-	number in Croatian, and a year I missed before in webcal.py is now
-	fixed.  This commit also reverts the Croatian ordinal year fix in the
-	gramps50 statisticschart.py since upon reflection I feel it would be
-	better done in master, since then our translators will have until
-	5.1.0 is released to do the two new strings the fix requires.  Issue #10822
-
-2018-10-07  Paul Franklin <pf.98052@gmail.com>
-
-	* gramps/plugins/textreport/indivcomplete.py: name-note is not being
-	cleared in Complete Individual report I ran gramps with a fresh copy of the example.gramps tree, then ran
-	the Complete Individual report.  The options which matter are
-	"Entire Database" and "Include Notes" but I also included the
-	gramps-ID since that speeds up my work.  Then I noticed that hundreds of names at the end of the output file
-	all had the same note (N0001), whose text said it referred to a
-	specific person.  So I looked higher and the note inclusion started with I0044, the
-	default person.  It was real for him but not for the next person
-	after him, or all the people after her.  I introduced the problem when I fixed 10033, in d6a97cf90e.  Note that this bug is independent of the CIR fix in p.r. 676 and
-	still happens even after that pull request is applied.
-
-2018-10-04  prculley <paulr2787@gmail.com>
-
-	* gramps/gui/columnorder.py, gramps/gui/views/listview.py: Fix View
-	Column sizing so last column size setting is maintained Fixes #10800
-
-2018-08-06  prculley <paulr2787@gmail.com>
-
-	* gramps/gui/views/listview.py: Fix view so column widths are
-	preserved when using filters Fixes #10725
-
-2018-08-29  vantu5z <vantu5z@mail.ru>
-
-	* po/ru.po: update Russian translation
-
-2018-10-04  Paul Franklin <pf.98052@gmail.com>
-
-	* gramps/gen/display/place.py: fix typo in cbac98894bfa7e1969625efceccc19c4d5374a7e
-
-2018-10-04  Paul Franklin <pf.98052@gmail.com>
-
-	* gramps/plugins/lib/libnarrate.py,
-	gramps/plugins/textreport/detancestralreport.py,
-	gramps/plugins/textreport/detdescendantreport.py: fix the
-	place-format option in DDR and DAR The place-format option was added to the Detailed Descendant and
-	Detailed Ancestor text reports in
-	cbac98894bfa7e1969625efceccc19c4d5374a7e But those two reports use the Narrator class to show many of their
-	places (and dates), and that class was not modified to use the
-	user's custom place format.  So if a user had created a custom place format and ran either of
-	those two reports, their places would be shown inconsistently.  This
-	commit fixes that.  (The non-detailed ancestor text report also uses Narrator to show
-	its places but that report has not had the place-format option added
-	to it, so this commit doesn't touch it.)
-
-2018-10-04  Paul Franklin <pf.98052@gmail.com>
-
-	* gramps/plugins/drawreport/fanchart.py,
-	gramps/plugins/drawreport/statisticschart.py,
-	gramps/plugins/drawreport/timeline.py, po/hr.po: Setting the year as
-	an ordinal number in Croatian With this commit, three more reports now show a year as an ordinal
-	number in Croatian.  Issue #10822
-
-2018-05-09  prculley <paulr2787@gmail.com>
-
-	* gramps/plugins/db/bsddb/read.py: Fix bsddb for person sort with
-	empty Surname list Fixes #10078, #10577
-
-2018-10-01  Paul Franklin <pf.98052@gmail.com>
-
-	* gramps/plugins/drawreport/calendarreport.py,
-	gramps/plugins/textreport/birthdayreport.py,
-	gramps/plugins/webreport/webcal.py, po/hr.po: Setting the year as an
-	ordinal number in Croatian When I started investigating 10822, I saw some Croatian dates didn't
-	seem to be working in 5.0.0, to my surprise.  I believe I fixed that
-	in the previous commit.  With this commit, the three reports now show a year as an ordinal
-	number in Croatian, so I consider 10822 fixed.  If there are any additional problems displaying Croatian, please
-	file additional bug reports ("one bug, one report").  Fixes #10822
-
-2018-10-01  Paul Franklin <pf.98052@gmail.com>
-
-	* gramps/gen/datehandler/_date_hr.py,
-	gramps/gen/datehandler/_datedisplay.py, po/hr.po: Setting the year
-	as an ordinal number in Croatian When I started investigating 10822 I saw some Croatian dates didn't
-	seem to be working in 5.0.0, to my surprise.  There seems to have
-	been some kind of regression from 4.2.8.  But the Croatian translation for gramps hasn't been updated in about
-	three years -- except by non-Croatians.  So I don't know why some
-	"translated" strings which control how dates are displayed were
-	disabled (marked as "fuzzy") in this:
-	6c67053e1fa22405bde0fae38e81de7ace222d41 Also, I saw some code in the 4.2.8 Croatian date handler which was
-	not in the 5.0.0 Croatian date handler -- somehow.  So I believe this commit fixes the Croatian date handler.  Issue #10822
-
-2018-09-30  Serge Noiraud <Serge.Noiraud@laposte.net>
-
-	* gramps/plugins/webreport/webcal.py: Webcal: link problems in some
-	cases (#661) * Webcal: link problems in some cases Year 2016 is highlighted by default instead of current year.  Fixes #10801 * Webcal: Missing links when muliyear unselected
-
-2018-09-29  Serge Noiraud <Serge.Noiraud@laposte.net>
-
-	* gramps/plugins/view/geoclose.py: Geoclose: exception when a family
-	has no father (#662)
-
-2018-09-26  Paul Franklin <pf.98052@gmail.com>
-
-	* gramps/plugins/drawreport/descendtree.py: Report plugin krasch Load data.gramps, start with the default person (I0037, Edwin
-	Michael Smith), run Family Descendant Tree, choose "Start with the
-	parent(s) of the selected first", hit OK: .../descendtree.py", line 881, in start     family2 = self.database.get_family_from_handle(family2_h) ...  Or start with I0057 (Anna Louise Smith), run Family Descendant Tree,
-	choose "Start with the parent(s) ...", hit OK: .../descendtree.py", line 773, in start     family2 = self.database.get_family_from_handle(family2_h) ...  Fixes #10811
-
-2018-09-26  Paul Franklin <pf.98052@gmail.com>
-
-	* gramps/gen/datehandler/_date_is.py,
-	gramps/gen/datehandler/_datedisplay.py: [unhandled exception parsing
-	"future dates" in some locales] There is already a check in the MonitoredDate class for years which
-	are more than one year in the future, so such a date is already
-	going to be shown in red.  But some locales use the "datetime" library to parse typed-in dates
-	and that has a maximum year of datetime.MAXYEAR, 9999 currently, so
-	dates greater than that produce a ValueError.  Besides adding checks for that, I have also made it so that locales
-	which don't need that library don't use it.  Fixes #10815
-
-2018-09-24  Paul Franklin <pf.98052@gmail.com>
-
-	* gramps/gen/datehandler/_date_nb.py: Julian/Gregorian calendar
-	issue when entering only year as date when running gramps in Norwegian Fixes #10687
-
-2018-09-23  Serge Noiraud <Serge.Noiraud@laposte.net>
-
-	* gramps/plugins/webreport/basepage.py: Events difficult to read
-	(screen and mobile) (#658)
-
-2018-09-17  Paul Franklin <pf.98052@gmail.com>
-
-	* gramps/gen/plug/report/stdoptions.py,
-	gramps/plugins/textreport/placereport.py: fix typo in cf42e5a4b847e6881f180cd1b776fb02234768be and
-	cbac98894bfa7e1969625efceccc19c4d5374a7e Fixes #10782
-
-2018-09-08  Leonhaeuser <mirko@leonhaeuser.de>
-
-	* po/de.po: update German translation
-
-2018-09-06  niememat <niememat@gmail.com>
-
-	* po/fi.po: New update for Finnish translation
-
-2018-09-06  niememat <niememat@gmail.com>
-
-	* po/fi.po: Update finnish translation
-
-2018-09-05  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/plugins/gramplet/statsgramplet.py: Fix and restore
-	Statistics Gramplet to 4.2.x status (#653) Fixes #10754 A bit of history. bug 2060 was filed a long time ago (2008), and a
-	patch was added to close it in 2016. I believe that the bug had
-	already been patched by then, although I cannot be sure. The patch
-	caused the Gramplet to update anytime the active-changed signal
-	occurred on a person view. I suspect that this caused a fair amount
-	of overhead on very large dbs as the entire person list was
-	rescanned.  In any event, Doug Blank recently removed the original scan code, as
-	well as some useful functionality. And left behind a bug where a
-	value was always zero. The users email list had some complaints
-	about the lost functionality, and I also saw some recent complaints
-	that the gender statistics were incorrect. Turns out that the db's
-	genderstats data was incorrect, probably due to crashes after db
-	updates. The Genderstats don't get saved until db closes normally.
-	In addition, running the Genderstats rebuild tool, did not
-	immediately appear to correct the situation, Gramps had to be
-	restarted to show the updated results.  I added the original statistics code back into the Gramplet,
-	suitably updated for 5.0.x. So the Gramplet no longer depends on dbs
-	genderstats, it scans for it now on its own.  I removed the update on active-changed function, so overhead is only
-	present on actual db updates (which have their own signals). I
-	tested that the add, edit, and delete person changes do properly
-	cause the statistics to update now. So the active-changed signal is
-	not necessary.
-
-2018-09-04  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/plugins/test/tools_test.py, gramps/plugins/tool/check.py: 
-	Fix Check and Repair to deal with bad references empty handle string
-	(#657) Fixes #10783 Check and Repair tool doesn't fix bad references when the reference
-	handle is an empty string.  Found when rewriting the backlinks scan
-	on same tool. I assumed that the prior checks had already corrected
-	any bad forward references, and did not put in a test for them in my
-	new code. The Travis test failed and when I debugged, I found that
-	the tool had an exception on a handle that consisted of an empty
-	string.  Its interesting to note that when I changed the code, a lot more
-	citation and source references were fixed in the test.
-
-2018-09-04  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/plugins/tool/check.py: Speed up Check and Repair, backlinks
-	check stage. (#656) Fixes #10618 * Speed up Check and Repair, backlinks check stage.  * Fix Check and repair; backlinks scan to deal with bad references
-	which should have been fixed in earlier checks!
-
-2018-09-03  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gen/config.py, gramps/gen/datehandler/_date_ar.py,
-	gramps/gen/datehandler/_date_bg.py,
-	gramps/gen/datehandler/_date_ca.py,
-	gramps/gen/datehandler/_date_da.py,
-	gramps/gen/datehandler/_date_de.py,
-	gramps/gen/datehandler/_date_el.py,
-	gramps/gen/datehandler/_date_es.py,
-	gramps/gen/datehandler/_date_fi.py,
-	gramps/gen/datehandler/_date_hr.py,
-	gramps/gen/datehandler/_date_hu.py,
-	gramps/gen/datehandler/_date_is.py,
-	gramps/gen/datehandler/_date_it.py,
-	gramps/gen/datehandler/_date_ja.py,
-	gramps/gen/datehandler/_date_lt.py,
-	gramps/gen/datehandler/_date_nb.py,
-	gramps/gen/datehandler/_date_nl.py,
-	gramps/gen/datehandler/_date_pl.py,
-	gramps/gen/datehandler/_date_pt.py,
-	gramps/gen/datehandler/_date_ru.py,
-	gramps/gen/datehandler/_date_sk.py,
-	gramps/gen/datehandler/_date_sl.py,
-	gramps/gen/datehandler/_date_sr.py,
-	gramps/gen/datehandler/_date_sv.py,
-	gramps/gen/datehandler/_date_uk.py,
-	gramps/gen/datehandler/_date_zh_CN.py,
-	gramps/gen/datehandler/_date_zh_TW.py,
-	gramps/gen/datehandler/_dateparser.py, gramps/gen/display/name.py,
-	gramps/gen/filters/rules/_changedsincebase.py,
-	gramps/gen/lib/place.py, gramps/gen/mime/_winmime.py,
-	gramps/gen/soundex.py, gramps/gen/utils/db.py, gramps/gui/dbman.py,
-	gramps/gui/editors/editlink.py, gramps/plugins/docgen/latexdoc.py,
-	gramps/plugins/docgen/rtfdoc.py,
-	gramps/plugins/export/test/exportvcard_test.py,
-	gramps/plugins/importer/importgeneweb.py,
-	gramps/plugins/importer/importxml.py,
-	gramps/plugins/importer/test/importvcard_test.py,
-	gramps/plugins/tool/reorderids.py, setup.py,
-	windows/nonAIO/builder/build_GrampsWin32.py,
-	windows/nonAIO/builder/check_gtk_install.py,
-	windows/nonAIO/builder/make_launcher.py,
-	windows/nonAIO/check_gtk_install.py: Fix strings containing
-	deprecated illegal escape sequences (#648) Python 3.6 and above has deprecated illegal string escape sequences.
-	Escape sequences are preceded by a '\' and valid ones are "\n\t\r"
-	etc. Illegal ones are not in the list
-
-	https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals.Previous to Python 3.6 these illegal sequences were ignored and the
-	'\' was left in place. Pylint has been noting these for a while now.  This PR corrects these sequences in Gramps. I used find . -name "*.py" | xargs -t -n 1 python3 -Wd -m py_compile 2>&1 |
-	grep Depre to locate the failing strings.
-
-2018-09-04  Ivan <vantu5z@mail.ru>
-
-	* gramps/plugins/gramplet/whatsnext.py: [Whatsnext] check if db is
-	open (#651) Fixes #10732
-
-2018-09-03  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/viewmanager.py,
-	gramps/plugins/gramplet/statsgramplet.py,
-	gramps/plugins/quickview/filterbyname.py,
-	gramps/plugins/textreport/summary.py,
-	gramps/plugins/webreport/statistics.py: Fix usage of posixpath;
-	should be os.path for os independence (#650) Fixes #10740
-
-2018-09-03  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gen/utils/file.py: Fix generate_checksum routine to avoid
-	MemoryError crash (#649) with very large files and 32-bit OS Issue #10690
-
-2018-09-03  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/views/bookmarks.py: Fix corrupted Bookmarks that can
-	happen after Gramps crash (#655) Fixes #10759
-
-2018-09-03  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gen/merge/mergefamilyquery.py: Fix Merge Family when same
-	parent is missing from both families (#654) Fixes #10760
-
-2018-09-03  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/views/pageview.py: Fix <ctrl>c in view to get selected
-	item to clipboard (#652) Fixes #10682
-
-2018-09-03  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/plugins/gramplet/quickviewgramplet.py: Fix Quickview
-	Gramplet so updates work when changing active (#642) Fixes #10713
-
-2018-09-03  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/gui/editors/editplaceref.py: Fix place reference editor for
-	bad cut/paste on set_latlongitude (#644) Fixes #10719
-
-2018-09-03  Paul Culley <paulr2787@gmail.com>
-
-	* gramps/plugins/tool/findloop.py: Fix Find Database Loop Tool (bad
-	import of _collections) (#643) Fixes #10722
-
-2018-09-03  niememat <niememat@gmail.com>
-
-	* po/fi.po: Fix translation in Finnish
-
-2018-08-25  Bernard Banko <beernarrd@gmail.com>
-
-	* po/sl.po: Slovenian translation fixed to allow building mo
-
-2018-08-25  Bernard Banko <beernarrd@gmail.com>
-
-	* po/sl.po: Slovenian translation updated
-
-2018-08-18  niememat <niememat@gmail.com>
-
-	* po/fi.po: Fix translation in Finnish
-
-2018-08-11  niememat <niememat@gmail.com>
-
-	* po/fi.po: Fix translation in Finnish
-
-2018-08-09  John Ralls <jralls@ceridwen.us>
-
-	* mac/gramps.modules: Switch included moduleset to gitlab.gnome.org.  Fixes bug #10733.
-
-2018-08-08  Leonhaeuser <mirko@leonhaeuser.de>
-
-	* po/de.po: Reviewed German translation Thanks to bmendl
-
-2018-08-08  niememat <niememat@gmail.com>
-
-	* po/fi.po: Fix translation in Finnish
-
-2018-08-05  John Ralls <jralls@ceridwen.us>
-
-	* mac/gramps.bundle: File copy doesn't work if the glob can match
-	directories.
-
-2018-08-04  John Ralls <jralls@ceridwen.us>
-
-	* mac/gramps.bundle: Install the docs/gramps directory in the
-	bundle.  Fixes bug #10705.
-
-2018-08-05  niememat <niememat@gmail.com>
-
-	* po/fi.po: Fix and updated translation in Finnish
-
-2018-07-25  Ross Gammon <rossgammon@mail.dk>
-
-	* debian/changelog: Update the Debian changelog after the 5.0.0
-	release
-
-2018-07-25  John Ralls <jralls@ceridwen.us>
-
-	* mac/Info.plist, mac/gramps.modules: Release Gramps-5.0.0 on Mac.
-
-2018-07-24  Nick Hall <nick-h@gramps-project.org>
-
-	* gramps/gen/const.py, gramps/version.py: Bump to 5.0.1
-
-
-
--- a/186
+++ b/186
@@ -1,4 +1,4 @@
-**** This is Gramps Frequently Asked Questions ****
+**** This is GRAMPS Frequently Asked Questions ****

 The questions below frequently come up in mailing list discussions and forums.
 This list is by no means complete. If you would like to add questions/answers 
@@ -9,23 +9,23 @@ to this list, please email your suggestions to gramps-devel@lists.sf.net

 ==General==

- 1. What is Gramps?
+ 1. What is GRAMPS?

 2. Where do I get it and how much does it cost?

- 3. Does Gramps exist in other languages?
+ 3. Does GRAMPS exist in other languages?

 4. How do I keep backups?

 5. Does Gramps support Unicode fonts? In particular, does it support non-Roman Unicode fonts?

- 6. What is needed to install Gramps under Linux, Solaris, or FreeBSD?
+ 6. What is needed to install GRAMPS under Linux, Solaris, or FreeBSD?

 7. Does it work with Windows (tm)?

 8. Does it work with the Mac?

- 9. What are the Minimum Specs to run Gramps?
+ 9. What are the Minimum Specs to run GRAMPS?

 ==Preferences==

@@ -33,43 +33,43 @@ to this list, please email your suggestions to gramps-devel@lists.sf.net

 ==Collaboration-Portability==

- 11. Is Gramps compatible with other genealogical software?
+ 11. Is GRAMPS compatible with other genealogical software?

- 12. Can Gramps read files created by GenApp X?
+ 12. Can GRAMPS read files created by GenApp X?

- 13. Can Gramps write files readable by GenApp X?
+ 13. Can GRAMPS write files readable by GenApp X?

- 14. What standards does Gramps support?
+ 14. What standards does GRAMPS support?

- 15. How do I import data from another genealogy program into Gramps?
+ 15. How do I import data from another genealogy program into GRAMPS?

- 16. Can I install Gramps on a Linux Web Server and use it via a web browser? This would enable my relations worldwide to access and update it.
+ 16. Can I install GRAMPS on a Linux Web Server and use it via a web browser? This would enable my relations worldwide to access and update it.

 ==Reports==

- 17. Can Gramps print a genealogical tree for my family?
+ 17. Can GRAMPS print a genealogical tree for my family?

- 18. In what formats can Gramps output its reports?
+ 18. In what formats can GRAMPS output its reports?

 19. How can I change the default language in reports?

- 20. Is Gramps compatible with the Internet?
+ 20. Is GRAMPS compatible with the Internet?

 21. Can I create custom reports/filters/whatever?

 22. Why are non-latin characters displayed as garbage in PDF/PS reports?

- 23. I would like to contribute to Gramps by writing my favorite report.
+ 23. I would like to contribute to GRAMPS by writing my favorite report.

-==Database - Gramps file formats==
+==Database - GRAMPS file formats==

- 24. What is the maximum database size (bytes) Gramps can handle?
+ 24. What is the maximum database size (bytes) GRAMPS can handle?

- 25. How many people can Gramps database handle? 
+ 25. How many people can GRAMPS database handle? 

 26. My database is really big. Is there a way around loading all the data into memory?

- 27. Can I run Gramps from a database on a NFS share?
+ 27. Can I run GRAMPS from a database on a NFS share?

 28. Why is the database format not portable?

@@ -77,116 +77,123 @@ to this list, please email your suggestions to gramps-devel@lists.sf.net

 29. I found a bug and I want it fixed right now! What do I do?

- 30. Gramps should be a .... type of application
+ 30. GRAMPS should be a .... type of application

-==Gramps Webhosting ==
+==GRAMPS Webhosting ==
+
+ 31. How can I publish web sites generated by GRAMPS?
+
+ 32. How do I submit my pages to the GRAMPS library site (http://library.gramps-project.org)?
+
+ 33. After I upload my Family Web Page to library.gramps-project.org, is the password used for write privileges only or read privileges?
+
+ 34. Do I view the Family Web Page with a url into my browser? Or through a link on a list of Family Web Pages on the GRAMPS-Project.org site?

- 31. How can I publish web sites generated by Gramps?


 **** Questions and answers ****

 ==General==

-1. What is Gramps?
+1. What is GRAMPS?

-Gramps is the Genealogical Research and Analysis Management Program System. 
+GRAMPS is the Genealogical Research and Analysis Management Program System. 
 In other words, it is a personal genealogy program letting you store, edit, 
 and research genealogical data using the powers of your computer. 


 2. Where do I get it and how much does it cost?

-Gramps can be downloaded from http://sf.net/projects/gramps at no charge. 
-Gramps is an Open Source project covered by the GNU General Public License. 
+GRAMPS can be downloaded from http://sf.net/projects/gramps at no charge. 
+GRAMPS is an Open Source project covered by the GNU General Public License. 
 You have full access to the source code and are allowed to distribute the 
 program and source code freely. 


-3. Does Gramps exist in other languages?
+3. Does GRAMPS exist in other languages?

-Yes, at the moment Gramps is translated in 15 languages
+Yes, at the moment GRAMPS is translated in 15 languages


 4. How do I keep backups?

-Use a recent version of Gramps! From 2.2.5 onwards there is an automatic backup utility.
-It is extremely important to keep backups of your data, and keep them in a safe place. Gramps has a specific portable file format which is small, and human readable, denoted by .gramps. If you have allowed this in the preferences (In Edit menu->Preferences->General), Gramps will keep a backup of your database on exit. You can copy this backup file from time to time to a save location (eg a usb stick). 
+Use a recent version of GRAMPS! From 2.2.5 onwards there is an automatic backup utility.
+It is extremely important to keep backups of your data, and keep them in a safe place. GRAMPS has a specific portable file format which is small, and human readable, denoted by .gramps. If you have allowed this in the preferences (In Edit menu->Preferences->General), GRAMPS will keep a backup of your database on exit. You can copy this backup file from time to time to a save location (eg a usb stick). 

-Note: The .gramps files are compressed. Clicking them will open Gramps. To see the XML select them and open them with a decompressing utility (like ark, gunzip), after which you can extract the XML file which is human readable.
-Do not keep backups in GEDCOM. Not all information Gramps stores can be written in the GEDCOM. Hence, an export/import operation Gramps --> GEDCOM --> Gramps, will mean you lose data. Use the .gramps file format for backups!
+Note: The .gramps files are compressed. Clicking them will open GRAMPS. To see the XML select them and open them with a decompressing utility (like ark, gunzip), after which you can extract the XML file which is human readable.
+Do not keep backups in GEDCOM. Not all information GRAMPS stores can be written in the GEDCOM. Hence, an export/import operation GRAMPS --> GEDCOM --> GRAMPS, will mean you lose data. Use the .gramps file format for backups!
 Do not keep backups in GRDB format. GRDB is a database, which might be computer dependent (read, not working on a different PC). Small damage to a GRDB file can also not be repaired. Use the .gramps file format for backups!


 5. Does Gramps support Unicode fonts? In particular, does it support non-Roman Unicode fonts?

-Yes. Gramps works internally with Unicode (UTF-8), so all alphabets can be used on all entry fields. All reports fully support this, although for PDF/PS you need to work with gnome-print or openoffice.
+Yes. GRAMPS works internally with Unicode (UTF-8), so all alphabets can be used on all entry fields. All reports fully support this, although for PDF/PS you need to work with gnome-print or openoffice.

 ==Installation==

-6. What is needed to install Gramps under Linux, Solaris, or FreeBSD?
+6. What is needed to install GRAMPS under Linux, Solaris, or FreeBSD?

-Gramps is a [http://en.wikipedia.org/wiki/Gtk GTK] application. Gramps needs to have the [http://en.wikipedia.org/wiki/Pygtk pygtk] libraries installed on the system. As long as these libraries are installed, Gramps should function. It will operate under the GNOME desktop, KDE desktop, or any other desktop. If the GNOME bindings for Python are installed on the system, Gramps will have additional functionality. The Gramps project recommends version 2.8 or higher of GTK.
+GRAMPS is a [http://en.wikipedia.org/wiki/Gtk GTK] application. GRAMPS needs to have the [http://en.wikipedia.org/wiki/Pygtk pygtk] libraries installed on the system. As long as these libraries are installed, GRAMPS should function. It will operate under the GNOME desktop, KDE desktop, or any other desktop. If the GNOME bindings for Python are installed on the system, GRAMPS will have additional functionality. The GRAMPS project recommends version 2.8 or higher of GTK.


 7. Does it work with Windows (tm)?

-The Linux Genealogy CD can function as a live CD that you boot directly from. You can then run Linux and Gramps off the CD, even if your computer is entirely Windows.
+The Linux Genealogy CD can function as a live CD that you boot directly from. You can then run Linux and GRAMPS off the CD, even if your computer is entirely Windows.

 An experimental Windows installer is available, however we do not have the manpower to offer support for Windows. A windows mailing list is available however and we do do our best to solve windows related problems.


 8. Does it work with the Mac?

-The Fink project has ported some older versions of Gramps to OS X (tm). The Mac OS X port is not directly supported by the Gramps project, primarily because none of the Gramps developers have access to Mac OS X and because OS X is not Free Software.
+The Fink project has ported some older versions of GRAMPS to OS X (tm). The Mac OS X port is not directly supported by the GRAMPS project, primarily because none of the GRAMPS developers have access to Mac OS X and because OS X is not Free Software.

-This present version of Gramps (2.2.x) does not appear to have been ported by the Fink project. Please contact the Fink project for more information. However, some users had success in installing 2.2.x on Mac OSX either running in native mode or running on X11 using some of the fink packages. 
+This present version of GRAMPS (2.2.x) does not appear to have been ported by the Fink project. Please contact the Fink project for more information. However, some users had success in installing 2.2.x on Mac OSX either running in native mode or running on X11 using some of the fink packages. 


-9. What are the Minimum Specs to run Gramps?
+9. What are the Minimum Specs to run GRAMPS?

-We would recommend at least an 800x600 video display. For Gramps 2.0, the memory requirements have been reduced, and Gramps can run quite efficiently on a 256MB system, holding considerably more people. A system with 512MB should be able to hold around 200,000 people. Disk space requirements for databases are however considerably larger, with a typical database being several megabytes in size. For 120.000 people you must consider already 530Mb for the database. Pictures are stored on disk separately, so a large harddisk is necessary.
+We would recommend at least an 800x600 video display. For GRAMPS 2.0, the memory requirements have been reduced, and GRAMPS can run quite efficiently on a 256MB system, holding considerably more people. A system with 512MB should be able to hold around 200,000 people. Disk space requirements for databases are however considerably larger, with a typical database being several megabytes in size. For 120.000 people you must consider already 530Mb for the database. Pictures are stored on disk separately, so a large harddisk is necessary.


 ==Preferences==

 10. Can I change the dates in reports to 'day month year'

-Yes, change in the preferences ("Edit->Preferences") the date for Gramps to the required format (eg YYYY-MM-DD or day mont year), and make the report. Your global date preferences will be used.
+Yes, change in the preferences ("Edit->Preferences") the date for GRAMPS to the required format (eg YYYY-MM-DD or day mont year), and make the report. Your global date preferences will be used.


 ==Collaboration-Portability==

-11. Is Gramps compatible with other genealogical software?
+11. Is GRAMPS compatible with other genealogical software?

-Gramps makes every effort to maintain compatibility with GEDCOM, the general standard of recording genealogical information. We have import and export filters that enable Gramps to read and write GEDCOM files.
+GRAMPS makes every effort to maintain compatibility with GEDCOM, the general standard of recording genealogical information. We have import and export filters that enable GRAMPS to read and write GEDCOM files.

-It is important to understand that the GEDCOM standard is poorly implemented -- virtually every genealogical software has its own "flavor" of GEDCOM. As we learn about new flavor, the import/export filters can be created very quickly. However, finding out about the unknown flavors requires user feedback. Please feel free to inform us about any GEDCOM flavor not supported by Gramps, and we will do our best to support it!
+It is important to understand that the GEDCOM standard is poorly implemented -- virtually every genealogical software has its own "flavor" of GEDCOM. As we learn about new flavor, the import/export filters can be created very quickly. However, finding out about the unknown flavors requires user feedback. Please feel free to inform us about any GEDCOM flavor not supported by GRAMPS, and we will do our best to support it!


-12. Can Gramps read files created by GenApp X?
+12. Can GRAMPS read files created by GenApp X?

 See above.


-13. Can Gramps write files readable by GenApp X?
+13. Can GRAMPS write files readable by GenApp X?

 See above.


-14. What standards does Gramps support?
+14. What standards does GRAMPS support?

-The nice thing about standards is that there never is a shortage of them. Gramps is tested to support the following flavors of GEDCOM: GEDCOM5.5, Brother's Keeper, Family Origins, Family Tree Maker, Ftree, GeneWeb, Legacy, Personal Ancestral File, Pro-Gen, Reunion, and Visual Genealogie.
+The nice thing about standards is that there never is a shortage of them. GRAMPS is tested to support the following flavors of GEDCOM: GEDCOM5.5, Brother's Keeper, Family Origins, Family Tree Maker, Ftree, GeneWeb, Legacy, Personal Ancestral File, Pro-Gen, Reunion, and Visual Genealogie.


-15. How do I import data from another genealogy program into Gramps?
+15. How do I import data from another genealogy program into GRAMPS?

 The best way is to create a new gramps database file (.grdb), and select the import option in the file menu. Here you select the GEDCOM you generated with the other program, and import it. 


-16. Can I install Gramps on a Linux Web Server and use it via a web browser? This would enable my relations worldwide to access and update it.
+16. Can I install GRAMPS on a Linux Web Server and use it via a web browser? This would enable my relations worldwide to access and update it.

-While Gramps can generate web sites, it does not provide a web interface that allows for editing. If this is a requirement, then [http://geneweb.org GeneWeb] or [http://phpgedview.sourceforge.net PhpGedView] are programs more likely to meet your needs. However, you may wish to ask yourself the following questions:
+While GRAMPS can generate web sites, it does not provide a web interface that allows for editing. If this is a requirement, then [http://geneweb.org GeneWeb] or [http://phpgedview.sourceforge.net PhpGedView] are programs more likely to meet your needs. However, you may wish to ask yourself the following questions:
 * Do I really want relatives or other people to directly edit my genealogy database?
 * Do I implicitly trust, without verification, any data that people may enter?
 * Do these people have the same understanding of good genealogy practice that I have?
@@ -197,7 +204,7 @@ You may also want to consider the effects of possible downtime of your site if y

 ==Reports==

-17. Can Gramps print a genealogical tree for my family?
+17. Can GRAMPS print a genealogical tree for my family?

 Yes. Different people have different ideas of what a genealogical tree is. 
 Some think of it as a chart going from the distant ancestor and listing 
@@ -205,14 +212,14 @@ all his/her descendants and their families. Others think it should be a
 chart going from the person back in time, listing the ancestors and their 
 families. Yet other people think of a table, text report, etc. 

-Gramps can produce any of the above, and many more different charts and 
+GRAMPS can produce any of the above, and many more different charts and 
 reports. Moreover, the plugin architechture enables users (you) to create 
 their own plugins which could be new reports, charts, or research tools. 


-18. In what formats can Gramps output its reports?
+18. In what formats can GRAMPS output its reports?

-Text reports are available in HTML, PDF, ODT, LaTeX, and RTF formats. Graphical reports (charts and diagrams) are available in PostScript, PDF, SVG, ODS, and Graphviz formats.
+Text reports are available in HTML, PDF, ODT, LaTeX, and RTF formats. Graphical reports (charts and diagrams) are available in PostScript, PDF, SVG, ODS, and GraphViz formats.


 19. How can I change the default language in reports? 
@@ -220,11 +227,11 @@ Text reports are available in HTML, PDF, ODT, LaTeX, and RTF formats. Graphical
 The reports are in the language of your linux installation. You can change it by installing extra language packs, see [Howto: Change the language of reports] on wiki.


-20. Is Gramps compatible with the Internet?
+20. Is GRAMPS compatible with the Internet?

-Gramps can store web addresses and direct your browser to them. It can import
+GRAMPS can store web addresses and direct your browser to them. It can import
 data that you download from the Internet. It can export data that you could 
-send over the Internet. Gramps is familiar with the standard file formats 
+send over the Internet. GRAMPS is familiar with the standard file formats 
 widely used on the Internet (e.g. JPEG, PNG, and GIF images, MP3, OGG, and 
 WAV sound files, QuickTime, MPEG, and AVI movie files, etc). Other than that, 
 there is little that a genealogical program can do with the Internet :-) 
@@ -234,7 +241,7 @@ there is little that a genealogical program can do with the Internet :-)

 Yes. There are many levels of customization. One is creating or modifying 
 the templates used for the reports. This gives you some control over 
-the fonts, colors, and some layout of the reports. You can also use Gramps 
+the fonts, colors, and some layout of the reports. You can also use GRAMPS 
 controls in the report dialogs to tell what contents should be used for a 
 particular report. In addition to this, you have an ability to create your 
 own filters -- this is useful in selecting people based on criteria set 
@@ -246,47 +253,47 @@ knowledge of programming in Python.

 22. Why are non-latin characters displayed as garbage in PDF/PS reports?

-This is a limitation of the built-in fonts of PS and PDF formats. To print non-Latin text, use the Print... in the format selection menu of the report dialog. This will use the gnome-print backend, which supports PS and PDF creation, as well as direct printing. (Note: you might need to install gnome-print separately as it is not required for Gramps).
+This is a limitation of the built-in fonts of PS and PDF formats. To print non-Latin text, use the Print... in the format selection menu of the report dialog. This will use the gnome-print backend, which supports PS and PDF creation, as well as direct printing. (Note: you might need to install gnome-print separately as it is not required for GRAMPS).

 If you only have Latin text, the PDF option will produce a smaller PDF compared to that created by gnome-print, simply because no font information will be embedded.


-23. I would like to contribute to Gramps by writing my favorite report.
+23. I would like to contribute to GRAMPS by writing my favorite report.
    How do I do that?

-The easiest way to contribute to reports, filters, tools, etc. is to copy an existing Gramps report, filter, or tool. If you can create what you want by modifying existing code -- great! If your idea does not fit into the logic of any existing Gramps tool, you will need to write your own plugin from scratch. Help is available on the [Developers Portal] on wiki, or on the developers mailing list: gramps-devel@lists.sourceforge.net.
+The easiest way to contribute to reports, filters, tools, etc. is to copy an existing GRAMPS report, filter, or tool. If you can create what you want by modifying existing code -- great! If your idea does not fit into the logic of any existing GRAMPS tool, you will need to write your own plugin from scratch. Help is available on the [Developers Portal] on wiki, or on the developers mailing list: gramps-devel@lists.sourceforge.net.

-To test your work in progress, you may save your plugin under $HOME/.gramps/plugins directory and it should be found and imported on startup. The correctly written plugin will register itself with Gramps, create menu item, and so on.
+To test your work in progress, you may save your plugin under $HOME/.gramps/plugins directory and it should be found and imported on startup. The correctly written plugin will register itself with GRAMPS, create menu item, and so on.

-If you are happy with your plugin and would like to contribute your code back to the Gramps project, you are very welcome to do so by contacting us at gramps-devel@lists.sourceforge.net
+If you are happy with your plugin and would like to contribute your code back to the GRAMPS project, you are very welcome to do so by contacting us at gramps-devel@lists.sourceforge.net


-==Database - Gramps file formats==
+==Database - GRAMPS file formats==

-24. What is the maximum database size (bytes) Gramps can handle?
+24. What is the maximum database size (bytes) GRAMPS can handle?

-Gramps has no hard limits on the size of a database that it can handle. Starting with 2.0.0 release, Gramps no longer loads all data into memory, which allows it to work with a much larger database than before. In reality, however, there are practical limits. The main limiting factors are the available memory on the system and the cache size used for BSDDB database access. With common memory sizes these days, Gramps should have no problem using databases with tens of thousands of people.
+GRAMPS has no hard limits on the size of a database that it can handle. Starting with 2.0.0 release, GRAMPS no longer loads all data into memory, which allows it to work with a much larger database than before. In reality, however, there are practical limits. The main limiting factors are the available memory on the system and the cache size used for BSDDB database access. With common memory sizes these days, GRAMPS should have no problem using databases with tens of thousands of people.


-25. How many people can Gramps database handle? 
+25. How many people can GRAMPS database handle? 

-See above. Again, this is dependent on how much memory you have, see [Gramps Performance] on wiki.
+See above. Again, this is dependent on how much memory you have, see [GRAMPS Performance] on wiki.


 26. My database is really big. Is there a way around loading all the data into memory?

-Starting with 2.0.0 release, Gramps no longer loads all data into memory, which allows it to work with a much larger database than before. The fileformat used is .grdb which means gramps database.
+Starting with 2.0.0 release, GRAMPS no longer loads all data into memory, which allows it to work with a much larger database than before. The fileformat used is .grdb which means gramps database.


-27. Can I run Gramps from a database on a NFS share?
+27. Can I run GRAMPS from a database on a NFS share?

 Yes you can.


 28. Why is the database format not portable?

-The biggest issue with Gramps portability lies with 'transactions'. With
-Gramps 2.2, we added support for atomic transactions to protect data.
+The biggest issue with GRAMPS portability lies with 'transactions'. With
+GRAMPS 2.2, we added support for atomic transactions to protect data.
 With atomic transactions, multiple changes are committed as a single
 unit. Either all the changes make it, or none of the changes make it.
 You are never left in a situation with a partial set of changes. A side
@@ -334,24 +341,41 @@ If the above explanations seem vague, please follow this link:
 http://www.chiark.greenend.org.uk/~sgtatham/bugs.html


-30. Gramps should be a .... type of application
+30. GRAMPS should be a .... type of application

-The surest way to see it happen is to get it done by yourself. Since Gramps is free/open source, nobody prevents you from taking all of the code and continuing its development in whatever direction you see fit. In doing so, you may consider giving your new project another name to avoid confusion with the continuing Gramps development. If you would like the Gramps project to provide advice, expertise, filters, etc., we will gladly cooperate with your new project, to ensure compatibility or import/export options to your new format of a project.
+The surest way to see it happen is to get it done by yourself. Since GRAMPS is free/open source, nobody prevents you from taking all of the code and continuing its development in whatever direction you see fit. In doing so, you may consider giving your new project another name to avoid confusion with the continuing GRAMPS development. If you would like the GRAMPS project to provide advice, expertise, filters, etc., we will gladly cooperate with your new project, to ensure compatibility or import/export options to your new format of a project.

-If, however, you would like the Gramps project to adopt your strategy, you would need to convince Gramps developers that your strategy is good for Gramps and superior to the present development strategy.
+If, however, you would like the GRAMPS project to adopt your strategy, you would need to convince GRAMPS developers that your strategy is good for GRAMPS and superior to the present development strategy.
                                                                                
-HINT: if Gramps developers are still not convinced after about three
+HINT: if GRAMPS developers are still not convinced after about three
 messages sent to gramps-devel, maybe you are better off on your own
 rather than with a company of retards who can't fully realize the
 potential of your great idea :-)


-==Gramps Webhosting ==
+==GRAMPS Webhosting ==

-31. How can I publish web sites generated by Gramps?
+31. How can I publish web sites generated by GRAMPS?

-Since Gramps generates HTML pages, you can upload the pages to your personal web site. If you do not have a personal web site, and still wish to have your pages available on the internet.
+Since GRAMPS generates HTML pages, you can upload the pages to your personal web site. If you do not have a personal web site, and still wish to have your pages available on the internet, the GRAMPS project can provide space for you at the http://library.gramps-project.org, see the [webhosting article] on wiki.


-**** End of Gramps Frequently Asked Questions ****
+32. How do I submit my pages to the GRAMPS library site (http://library.gramps-project.org)?

+If you wish to submit pages to the GRAMPS library site, you will need to contact the GRAMPS project, typically by sending a message to the gramps-users mailing list. You will then be given a username and password that will allow you to upload your files to the site. After you upload the files (in a gzip'ed tar file), the GRAMPS project will install the pages for you on the site.
+
+
+33. After I upload my Family Web Page to library.gramps-project.org, is the password used for write privileges only or read privileges?
+
+In order to prevent abuse of the library.gramsp-project.org site, the password given allows uploads only. If you wish to have a username and password combination to restrict read access to your pages, you will need to contact the GRAMPS project, and we could set this up for you. However, the read and write accounts will be separate accounts.
+
+
+34. Do I view the Family Web Page with a url into my browser? Or through a link on a list of Family Web Pages on the GRAMPS-Project.org site?
+
+The main page on the library.gramps-project.org site will contain an index of the available family sites. However, there will be a unique URL for each site as well.
+
+
+
+**** End of GRAMPS Frequently Asked Questions ****
+
+$Id$
--- a/Gramps.py
+++ b/Gramps.py
@@ -1,29 +0,0 @@
-#! /usr/bin/env python3
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2012       Benny Malengier
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-#
-
-"""
-This is a stub to start Gramps. It is provided for the sole reason of being
-able to run gramps from the source directory without setting PYTHONPATH
-
-From this position, import gramps works great
-"""
-import gramps.grampsapp as app
-app.main()
--- a/173
+++ b/173
@@ -1,106 +1,111 @@
+$Id$
+
 This file contains some useful details on the installation from source code
-for Gramps. It does not cover installation of a pre-built binary package.
+for GRAMPS. It does not cover installation of a pre-built binary package.
 For that use your package manager, the rest is already done by the packager.

 Uninstall old version
 ---------------------
-If you do a source install in the same place as an existing install,
+If you do a source install in the same place of an existing install,
 you need to remove the old version first. You can delete the old
-version by deleting the installed directories. For example, if your installation prefix is /usr/local, remove the following:
-        /usr/local/share/gramps
-        /usr/local/lib/pythonx.x/site-packages/gramps
-If you installed with a package manager you might instead need to remove
-        /usr/local/lib/pythonx.x/dist-packages/gramps
+version by:

-replacing pythonx.x with the python version you used, e.g. python3.4.
-Also remove any gramps .egg files that are installed along with the gramps
-directory and the file /usr/local/bin/gramps.
+  * deleting the installed directories (for example,
+    /usr/share/gramps)
+  * OR by running "make uninstall" from the old directory where you
+    ran "make install" (not the new GRAMPS directory)

-
-If you don't know the list of all files that Gramps installed, you can
-reinstall it with the --record option, and take a look at the list this
-produces (so python setup.py install --record grampsfiles.txt
-
-Gramps is a python application, so loading happens on reading the
+GRAMPS is a python application, so loading happens on reading the
 files, meaning that files of a previous version that are no longer
 present in the new version can still be loaded, making the new install
-unstable!
+unstable.

-distutils install
-----------------
-We do not check all dependencies of Gramps, see README for a list of
-all required and optional dependencies. Missing dependencies will
-result in runtime errors.
+Configure vs autogen scripts
+----------------------------
+If you are building from released tarball, you should be able to just
+run "./configure && make". However, if you're building from the SVN,
+the configure is not present. You should auto-generate it by
+running ./autogen.sh and then "make" and, finally, "make install".

-To build and install, whether from a tarball or git repo:
-   python3 setup.py build
-   sudo python3 setup.py install
-
-You can avoid using sudo for the install step by specifying a prefix to which you have write priviledge. The default is /usr/local, which is usually owned by root. You can learn of more options with
-   python3 setup.py --help
-
-One can use gramps from the command line without installing it by
-setting the following environment variables, but that won't provide
-things like MIME type and desktop entries.
-
-   export PYTHONPATH="/top/grampsdir/gramps:$PYTHONPATH"
-   export GRAMPS_RESOURCES="/top/grampsdir"
-
-See below for ways to invoke Gramps.
-
-Typical install directories in linux (ubuntu) are:
-  * /usr/local/lib/python3.4/dist-packages/gramps/  : the gramps python module
-  * /usr/local/share/mime-info    : mime info so gramps opens files automatically
-  * /usr/local/share/icons/gnome  : our icons
-  * /usr/local/share/doc/gramps   : documentation, also example .gramps and .gedcom
-  * /usr/local/bin                : the gramps executable
-  * /usr/local/share/locale/xx/LC_MESSAGES  : xx language code, translation
-  * /usr/local/share/man/man1/xx/man1       : xx language code, man file
-  * /usr/local/share/mime
-  * /usr/local/share/mime-info
-
-Running Gramps
--------------
-Gramps is python only, so no compilation is needed, you can even run gramps
-from the source directory.
-
- a) You installed Gramps, then you can run it with the command
-
-     gramps
-
- b) You installed Gramps, and want to start it from the PYTHONPATH. In this
-    case use the command:
-
-     python3 -c 'from gramps.grampsapp import main; main()'
-
-   The executable 'gramps' in /usr/local/bin or /usr/bin from a) does
-   this for you.
-
- b) You downloaded the Gramps source code to a directory, and want to run it.
-    You can start Gramps from the source code directory with
-
-     python3 Gramps.py
-
-    See gramps/gen/const.py how Gramps finds its resource directories in case
-    you encounter problems.
+Running ./autogen.sh on this branch of gramps requires the following
+packages to be installed:
+   * autoconf >=2.53
+   * automake >=1.9
+   * intltool >=0.25
+   * glib-gettext >=2.2.0, included in libglib2.0-dev (may be called
+differently on other distros) and maybe something else. If autogen.sh
+fails, it should inform you what's missing.

 Custom directory installation
 -------------------------------------
-If you would like to install Gramps without being root, or in an
-alternative location on windows, supply the --root argument to setup.py
+If you would like to install GRAMPS without being root, or in an 
+alternative location on windows, supply the --prefix argument to autogen 
+or configure. 

 For example:
-   python3 setup.py install --root ~/test
+   ./autogen.sh --prefix=$HOME/my_gramps_path
+   or
+   ./autogen.sh --prefix=/cygdrive/c/Projects/gramps
+
+Regular vs local installation
+-----------------------------
+This version of gramps REQUIRES, among other things, the mime types for 
+gramps be properly installed.
+
+The usual ./configure, make, and make install as a root should do the trick.
+
+But be careful if you're using the non-default options or would like
+to install without being root.
+
+The latter is possible, but you should supply additional arguments to
+autogen or configure:
+   --with-mime-dir=$HOME/.local/share/mime
+Most likely, such local install will also need some prefix with write
+permissions for you:
+   --prefix=$HOME/my_gramps_path
+
+Whether you're doing local install or regular install, YOU MUST INSTALL 
+MIME TYPES. YOU HAVE BEEN WARNED!
+
+Installing under non-default prefix
+-----------------------------------
+As hinted above, mime types for gramps MUST be properly installed. 
+The "proper install" means installing them where the shared mime system 
+will find them.
+
+By default, the shared mime systems will look in these places:
+   1. /usr/share/mime
+   2. /usr/local/share/mime   : this may be broken on some systems
+   3. $HOME/.local/share/mime : this is a per-user setup, not system-wide
+There's a number of ways to instruct the shared mime system
+to look in other places, but this is the whole other story.
+
+So if you install some place other than /usr/share, you will most
+likely need to add this option to autogen.sh/configure scripts:
+   --with-mime-dir=/usr/share/mime
+
+Using the --prefix=/usr/share and installing as a root will most
+likely do everything correctly, so no extra care needs to be
+taken. You should take extra care only if you are installing under
+something like --prefix=/usr/local/my_gramps, /var/gramps123/blah, etc.

 Packager's issues
 ------------------
-There is a MANIFEST.in file to indicate the work needed.
-To create a source distribution run:
+The above mime types must be installed. However, the 
+update-mime-database call to process the newly installed types and 
+schemas must be done in POST-INSTALLATION.

-   python3 setup.py sdist
+In packager's world, the install happens on packager's machine
+into something like /tmp/gramps-tmp. However, the postinstall
+should happen on the user's machine.

-If Gramps is built outside of the source tree in a temporary location (e.g. when
-packaging for a distribution), the --resourcepath option can be used to specify
-the path to the installed location of the Gramps resources (e.g. /usr/share):
-
-   python3 setup.py install --resourcepath=/usr/share
+To assist with that, there's an argument available in configure
+(or autogen, which will pass it to configure) which disables
+mime type processing:
+   --enable-packager-mode
+This argument should disable postinstall calls made during
+make install, and print a nasty warning during configure.
+IT IS PACKAGER'S RESPONSIBILITY to follow the advice given
+by the configure output and to copy the appropriate code
+from the data/Makefile.am into the post-install (and post-uninstall)
+of the particular packaging system.
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,33 +0,0 @@
-include ChangeLog
-include AUTHORS
-include COPYING
-include FAQ
-include Gramps.py
-include INSTALL
-include MANIFEST.in
-include NEWS
-include RELEASE_NOTES
-include TODO
-include CONTRIBUTING
-include TestPlan.txt
-recursive-include bash *
-recursive-include data *
-recursive-include debian *
-recursive-include docs *
-recursive-include example *
-recursive-include gramps *
-recursive-include help *
-recursive-include images *
-recursive-include mac *
-recursive-include po *
-recursive-include test *
-recursive-include windows *
-
-# Remove files created in the build
-exclude data/tips.xml
-exclude data/holidays.xml
-exclude po/.intltool-merge-cache
-global-exclude *.pyc
-global-exclude *.pyo
-
-# Remove directories which should not be included in the distribution
--- a/Makefile.am
+++ b/Makefile.am
@@ -0,0 +1,35 @@
+# This is the top level Makefile for Gramps
+# $Id$
+
+SUBDIRS = m4 po src data example
+
+EXTRA_DIST = \
+	config.rpath autogen.sh \
+	FAQ COPYING \
+	intltool-extract.in intltool-merge.in intltool-update.in
+
+bin_SCRIPTS = gramps
+
+dist_pkgdata_DATA = COPYING
+
+distuninstallcheck_listfiles = find . -type -f -print | grep -E -v '/(globs|magic|XMLnamespaces)'
+
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
+	gnome-doc-utils.make
+
+gramps: gramps.sh
+	cp gramps.sh gramps
+
+.PHONY: pycheck trans
+
+pycheck:
+	(cd src; make pycheck) 
+trans:
+	(cd src; make trans) 
+
+distuninstallcheck:
+	@:
+
+CLEANFILES = gramps
+
+ACLOCAL_AMFLAGS = -I m4
--- a/2664
+++ b/2664
--- a/77
+++ b/77
@@ -0,0 +1,77 @@
+Please read the COPYING file first.
+If building from source, also read the INSTALL file (at least through the
+"SUPER-SHORT VERSION") before going further.
+
+Requirements
+--------------------------------
+The following packages *MUST* be installed in order for Gramps to work:
+   Python 2.5 or greater
+   PyGTK2 2.12 or greater
+   librsvg2 (svg icon view)
+   xdg-utils
+
+The following package is needed for full translation of the interface
+to your language:
+   language-pack-gnome-xx 
+                    Translation of GTK elements to your language, with             
+                    with xx your language code eg for Dutch you need
+                    language-pack-gnome-nl. The translation of the
+                    Gramps strings is included with the source code.
+
+
+The following packages are *STRONGLY RECOMMENDED* to be installed:
+   GraphViz         Enable creation of graphs using GraphViz engine
+                    http://www.graphviz.org
+
+The following packages are *STRONGLY RECOMMENDED* to be installed:
+   PyWebKitGtk or python-gtkmozembed: PACKAGERS, Test if on your distribution
+                    webkit and Gramps is stable. If you get crashes, patch 
+                    src/plugins/view/htmlrenderer.py and
+                    src/plugins/view/geoview.gpr.py, so as to remove:
+                       import webkit
+                    Then use the gecko package (python-gtkmozembed) instead.
+                    If WEBKIT ang GECKO are installed, webkit will be used as
+                    the javascript engine is faster (google maps).
+   * PyWebKitGtk    
+             Enable html rendering for Geographic view and Web view
+             Often called python-webkit package.
+             Be careful, webkit is always in a development phase.
+
+   * python-gtkmozembed 
+             Enable html rendering for Geographic view and Web view
+             The gecko (firefox) equivalent to webkit, at the moment 
+             of writing, more stable than webkit.
+             It can be in python-gnome2-extras or python-gtkhtml2
+             depending on distributions.
+
+The following packages are optional
+   python gtkspell & python enchant :  Enable spell checking in the notes,
+                    the first contains the libraries, the second is 
+                    needed to query the installed languages. Both must
+                    be present for spell check to activate
+   ttf-freefont     More font support in the reports
+
+No longer needed in 3.1:
+   yelp             Gnome help browser. At the moment no help is shipped
+No longer needed in 3.2:
+   python glade bindings
+
+Documentation
+---------------------------------
+The User Manual is now maintained on the gramps website,
+http://www.gramps-project.org/wiki/index.php?title=User_manual
+We might in the future distribute again a manual via gnome-doc-utils, this has not
+been decided yet though.
+
+
+Building on non-Linux systems: i18n support and GNU make
+--------------------------------------------------------
+If make fails, use gmake (the name FreeBSD gives to GNU make) instead.
+You might need a patch also. FreeBSD has in ports a patch (  /usr/ports/science/gramps/files)
+you need to apply to po/Makefile.in.in 
+
+
+--------------------------------
+Donald Allingham
+dallingham@users.sourceforge.net
+benny.malengier@gramps-project.org
--- a/README.md
+++ b/README.md
@@ -1,148 +0,0 @@
-The Gramps Project ( https://gramps-project.org ) [![Build Status](https://travis-ci.org/gramps-project/gramps.svg?branch=master)](https://travis-ci.org/gramps-project/gramps)[![codecov.io](https://codecov.io/github/gramps-project/gramps/coverage.svg?branch=master)](https://codecov.io/github/gramps-project/gramps?branch=master)
-===================
-We strive to produce a genealogy program that is both intuitive for hobbyists and feature-complete for professional genealogists.
-
-Please read the **COPYING** file first.
-
-Please read the **INSTALL** file if you intend to build from source.
-
-Requirements
-============
-The following packages **MUST** be installed in order for Gramps to work:
-
-* **Python** 3.2 or greater - The programming language used by Gramps. https://www.python.org/
-* **GTK** 3.10 or greater - A cross-platform widget toolkit for creating graphical user interfaces. http://www.gtk.org/
-* **pygobject** 3.12 or greater - Python Bindings for GLib/GObject/GIO/GTK+ https://wiki.gnome.org/Projects/PyGObject
-
-The following three packages with GObject Introspection bindings (the gi packages)
-
-* **cairo** 1.13.1 or greater - a 2D graphics library with support for multiple output devices. http://cairographics.org/
-* **Pycairo** 1.13.3 or greater - GObject Introspection bindings for cairo. https://github.com/pygobject/pycairo
-* **pango** - a library for laying out and rendering of text, with an emphasis on internationalization. http://www.pango.org/
-* **pangocairo** - Allows you to use Pango with Cairo http://www.pango.org/
-
-* **librsvg2** - (SVG icon view) a library to render SVG files using cairo. http://live.gnome.org/LibRsvg
-* **xdg-utils** - Desktop integration utilities from freedesktop.org
-* **bsddb3** - Python bindings for Oracle Berkeley DB https://pypi.python.org/pypi/bsddb3/
-* **sqlite3** - Python bindings for SQLite Database library
-
-The following package is needed for full translation of the interface
-to your language:
-
-*   **language-pack-gnome-xx**
-
- Translation of GTK elements to your language, with
- xx your language code; e.g. for Dutch you need
- language-pack-gnome-nl. The translation of the
- Gramps strings is included with the gramps source.
-
-
-The following packages are **STRONGLY RECOMMENDED** to be installed:
--------------------------------------------------------------------
-*  **osmgpsmap**
-
- Used to show maps in the geography view.
- It may be osmgpsmap, osm-gps-map, or python-osmgpsmap,
- but the Python bindings for this must also be present, so gir1.2-osmgpsmap-1.0.
- Without this the GeoView will not be active, see
- https://gramps-project.org/wiki/index.php?title=Gramps_5.0_Wiki_Manual_-_Categories#Geography_Category
-
-* **Graphviz**
-
-  Enable creation of graphs using Graphviz engine.
-  Without this, three reports cannot be run.
-  Obtain it from: http://www.graphviz.org or try graphviz and python3-pygraphviz from your packages.
-
-* **PyICU**
-
- Improves localised sorting in Gramps. In particular, this
- applies to sorting in the various views and in the
- Narrative Web output. It is particularly helpful for
- non-Latin characters, for non-English locales and on MS
- Windows and Mac OS X platforms. If it is not available,
- sorting is done through built-in libraries. PyICU is
- fairly widely available through the package managers of
- distributions. See http://pyicu.osafoundation.org/
- (These are Python bindings for the ICU package. 
- https://pypi.python.org/pypi/PyICU/)
-
-* **Ghostscript**
-
-  Used by Graphviz reports to help create PDF's
-
-The following packages are optional:
------------------------------------
-* **gtkspell** 
-
- Enable spell checking in the notes. Gtkspell depends on
- enchant. A version of gtkspell with gobject introspection
- is needed, so minimally version 3.0.0
-
-* **rcs**
-
- The GNU Revision Control System (RCS) can be used to manage
- multiple revisions of your family trees. See info at
- https://gramps-project.org/wiki/index.php?title=Gramps_5.0_Wiki_Manual_-_Manage_Family_Trees#Archiving_a_Family_Tree
- Only rcs is needed, NO python bindings are required
-
-* **PIL**
-
- Python Image Library (PILLOW) is needed to crop
- images and also to convert non-JPG images to
- JPG so as to include them in LaTeX output.
- (For Python3 a different source may be needed,
- python-imaging or python-pillow or python3-pillow)
-
-* **GExiv2**
-
- Enables Gramps to manage Exif metadata embedded in your
- media. Gramps needs version 0.5 or greater.
- See https://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion#GExiv2_for_Image_metadata
-
-* **ttf-freefont**
-
- More font support in the reports
-
-Optional packages required by Third-party Addons
------------------------------------------------
-
-**Third-party Addons are written by users and developers and unless stated are not officially part of Gramps.**
-For more information about Addons see:  https://gramps-project.org/wiki/index.php?title=Third-party_Plugins
-
-Prerequistes required for the following Addons to work:
-
-* **Family Sheet** - Requires: PIL (Python Imaging Library) or PILLOW.
-( https://gramps-project.org/wiki/index.php?title=Family_Sheet )
-
-* **Graph View** - Requires: PyGoocanvas and Goocanvas (python-pygoocanvas, gir1.2-goocanvas-2.0).
-( https://gramps-project.org/wiki/index.php?title=Graph_View )
-
-* **Network Chart** - Requires: networkx and pygraphviz
-( https://gramps-project.org/wiki/index.php?title=NetworkChart )
-
-* **PedigreeChart** - Can optionally use - numpy if installed
-( https://gramps-project.org/wiki/index.php?title=PedigreeChart )
-
-No longer needed:
-----------------
-* Since Gramps 4.2:
-   **gir-webkit**
-
-* Since Gramps 4.0:
-   **pygoocanvas, pygtk, pyexiv2**
-
-* Since Gramps 3.3:
-   **python-enchant Enchant**
-
-* Since Gramps 3.2:
-   **python glade bindings**
-
-* Since Gramps 3.1:
-   **yelp** -             Gnome help browser. No offline help is shipped see Gramps website for User manual
-
-Documentation
-------------
-The User Manual is maintained on the Gramps website:
-
-* https://www.gramps-project.org/wiki/index.php?title=User_manual
-
--- a/45
+++ b/45
@@ -1,35 +1,24 @@
+Gramps 3.2 Release Notes

-UNSTABLE Gramps 4.0.0 Beta2 release.
+General Improvements

-This is a technology preview to allow distribution packagers (and plugin
-writers) to update their scripts (and plugins). This release is not
-production ready, so only use it for testing!
+* New Plugin System
+In the Help Menu -> Menu Status, all available plugins are visible. All plugins can be hidden, saving resources and hiding options you do not need. Eg: You don't use the Pedigree View? Hide it in the Plugin Status, and it will not be present anymore. You don't use vcard export? Hide it in the Plugin Status, and it will not be offered anymore.

-It is recommended that Gramps 4.0.0 be used with python 2.7 since many
-dependent packages do not yet have python 3 versions.  A determined person
-can probably download their sources and build them, however.
+* Faster
+Many under the hood improvements have occurred that should improve perfamance enormously. Yes, new features are present to use all your processing power, but they are all implemented as plugins that can be hidden. Eg: Insert of a person in a 30000 people family tree took 4sec on 1.4Ghz PC in 3.1, Now it is done in milliseconds.

-The dependencies for Gramps 4.0.0 are _completely_ different than 3.4 due 
-to the switch to GObject introspection, and the removal of autotools. So 
-only install 4.0.0 if you are certain you can obtain the dependencies, 
-see README and INSTALL. 
-
-For linux, in Ubuntu 12.10 you can install 4.0.0, but you will need to 
-compile and install osmgpsmap manually to have the maps working (see 
-http://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion#OsmGpsMap_for_Geography ) 
+*New Views
+There are new views, and some views have been greatly improved
+  - People view can now be sorted on the columns
+  - A Place treeview is present, nicely grouping your places under country groups
+  - GeoView has left it's beta status behind and shows your data on an 
+    online map (Openstreetmap or google maps, fast internet connection required)
+  - Help Menu -> Extra Reports/Tools open a webpage with downloadable extra views


-Major enhancements in Gramps 4.0.0:
+Other Improvements

-* GEP 8: code reorganization: http://www.gramps-project.org/wiki/index.php?title=GEPS_008:_File_Organization
-
-* GEP 26: Replace make: http://www.gramps-project.org/wiki/index.php?title=GEPS_026:_Replace_%27make%27_for_Gramps_build
-
-* GEP 29: Gtk 3 :http://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion
-
-* GEP 31: Python 3 support: http://www.gramps-project.org/wiki/index.php?title=GEPS_031:_Python_3_support
-
-More info in the manual 
-http://www.gramps-project.org/wiki/index.php?title=Gramps_4.0_Wiki_Manual_-_What%27s_new%3F
-
-Everybody is invited to update the manual to make it current!
+* Styled Notes now in most output formats that support styles, eg in the web report
+* New languages
+* Select language in which report should be created (only present now in some reports)
--- a/77
+++ b/77
@@ -1 +1,76 @@
-http://gramps-project.org/wiki/index.php?title=Category:GEPS
+* Remove GCONF, provide up grade path - IN PROGRESS
+
+* Replace the LPRDoc interface (based on gnome-print) with a GTK based
+  print routine. This would remove one of the last gnome-specific 
+  libraries, and make portability better. Even more important, the 
+  gnome-print interface has been deprecated by the GNOME project, so it
+  will not be around forever. We need to adapt to the new GTK method. 
+  - IN PROGRESS
+
+* Add support for formatted notes. We have a start by ripping off code
+  from GPL code from grecipe-manager. - DONE
+
+* Allow for multiple notes. A tabbed interface would be really useful,
+  since there are no titles for notes. Not all objects would
+  necessarily need multiple notes. Determine which ones should and
+  shouldn't. - DONE
+
+* before release: fix command line options
+
+* remove critical bugs: 
+   - #1053 - DONE (testing of LDS privacy needed!!)
+   - #1318, wrong note backreferences - DONE
+   - #1208, relative path, see bug note for agreed solution
+
+* before release on multiple notes: 
+    --> in note: also public/private on GUI - DONE
+    --> on upgrade, the notetype should correspond to the object the note is made
+            from, so notetype SOURCE, SOURCEREF, ..., this gives information on 
+	    orphaned notes.(DONE for GRDB)
+	TODO: change notetype into note tags, so people can give notes multiple tags,
+	      Like this all source notes can have tag source, but also tag 'family history' (Discussion Alex/Benny)
+    --> in sourceref: 
+         * remove text tab. (DONE)
+         * On import of GEDCOM text tag, or upgrade of < 2.2 database, 
+           create a note with type TRANSCRIPT (DONE, type SOURCE_TEXT)
+         * On export, do not write the text tag in sourceref, write a
+           note instead (DONE)
+    --> A GrampsWidget for use in report dialogs to select which notetypes to include 
+        in a report (a filter?).
+    --> Support for multiple notes in all reports.
+    --> Empty text field on Saving Note should throw an error that Note is empty ! (?)
+    --> Undo in Note. Serious editing needs an undo function. Furthermore, the function
+        the Clear icon is unclear: tooltip? Other icon?
+
+* Remove import of global var in __init__.py, use functions or don't export. Eg.
+  PluginUtils/__init__.py export of plugin lists (tool_list, ...). E
+
+* Add forward/backward buttons (and active object) on all object views, not only person views.
+
+* Split views
+
+* Export to spreadsheet, print, CSV of views - DONE
+
+* Date calculator.  See
+  http://sourceforge.net/mailarchive/forum.php?thread_id=3252078&forum_id=1993
+
+* Add string substitutions for web page generation (name, report name,
+  date, etc).
+
+* Add support for sources of the parent/child relation
+
+* Add support for storing reliability (confidence) of the marriage
+  information; see
+  http://sourceforge.net/mailarchive/forum.php?thread_id=3066997&forum_id=1993
+  and
+  http://sourceforge.net/mailarchive/forum.php?thread_id=3134931&forum_id=1993
+  for the details.
+
+* Move LDS temple info out of const.py and into an XML file: DONE
+
+* Make the descendant graph adapt to the page size, not stuck with the
+  current 3 entries per page.
+
+* Add slideshow generation ability to web page generator
+
+* And a whole lot more....
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -0,0 +1,54 @@
+dnl AM_SHARED_MIME
+dnl Defines SHARED_MIME_DIR which is where mime type definitions should go.
+dnl
+
+AC_DEFUN([AM_SHARED_MIME],
+[
+  if test "x$SHARED_MIME_DIR" = "x"; then
+    SHARED_MIME_DIR='$(prefix)/share/mime'
+  fi
+
+  AC_ARG_WITH(mime-dir,
+  [  --with-mime-dir=dir	Shared mime directory.],SHARED_MIME_DIR="$withval",)
+
+  AC_SUBST(SHARED_MIME_DIR)
+  AC_MSG_RESULT([Using directory $SHARED_MIME_DIR for installation of mime type definitions])
+
+  AC_ARG_ENABLE(mime-install,
+     [  --disable-mime-install	Disable the mime types installation],
+     [case "${enableval}" in
+       yes) mime_install=true ;;
+       no)  mime_install=false ;;
+       *) AC_MSG_ERROR(bad value ${enableval} for --disable-mime-install) ;;
+     esac],[mime_install=true])
+  AM_CONDITIONAL(SHARED_MIME_INSTALL, test x$mime_install = xtrue)
+
+])
+
+
+dnl AM_PACKAGER
+dnl Defines conditional PACKAGER_MODE to define packager mode
+dnl
+
+AC_DEFUN([AM_PACKAGER],
+[
+  AC_ARG_ENABLE(packager_mode,
+     [  --enable-packager-mode          Enable packager mode],
+     [case "${enableval}" in
+       yes) packager_mode=true ;;
+       no)  packager_mode=false ;;
+       *) AC_MSG_ERROR(bad value ${enableval} for --enable-packager-mode) ;;
+     esac],[packager_mode=false])
+  AM_CONDITIONAL(PACKAGER_MODE, test x$packager_mode = xtrue)
+  if test "x$packager_mode" = "xtrue"; then
+     AC_MSG_RESULT([WARNING: 
+     	Packager mode enabled.
+        Shared mime types WILL NOT BE INSTALLED.
+	You will need to place the contents of the
+		SHARED_MIME_INSTALLATION
+	commands MANUALLY into the postinstall script of your package,
+	see data/Makefile.am file for details.
+	Otherwise you will end up with the unusable package.
+	YOU HAVE BEEN WARNED!])
+  fi
+])
--- a/autogen.sh
+++ b/autogen.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+# Run this to generate all the initial makefiles, etc.
+# $Id$
+
+PKG_NAME="gramps"
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+srcfile=$srcdir/src/gramps.py
+
+REQUIRED_AUTOMAKE_VERSION=1.9
+DIE=0
+
+# source helper functions
+if test ! -f gramps-autogen.sh;
+then
+  echo There is something wrong with your source tree.
+  echo You are missing gramps-autogen.sh
+  exit 1
+fi
+. ./gramps-autogen.sh
+
+CONFIGURE_DEF_OPT=
+
+autogen_options $@
+
+#echo -n "+ check for build tools"
+#if test ! -z "$NOCHECK"; then echo ": skipped version checks"; else  echo; fi
+
+#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13
+WANT_AUTOCONF_2_5=1
+export WANT_AUTOCONF_2_5
+version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \
+    "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" || DIE=1
+AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
+
+automake_progs="automake automake-1.10 automake-1.9"
+version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+    "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
+ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
+
+version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \
+    "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz" || DIE=1
+require_m4macro glib-gettext.m4
+
+version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \
+    "http://ftp.gnome.org/pub/GNOME/sources/intltool/" || DIE=1
+require_m4macro intltool.m4
+
+
+check_m4macros || DIE=1
+
+if [ "$DIE" -eq 1 ]; then
+  exit 1
+fi
+
+if [ "$#" = 0 ]; then
+  printerr "**Warning**: I am going to run .configure with no arguments."
+  printerr "If you wish to pass any to it, please specify them on the"
+  printerr "$0 command line."
+  printerr
+fi
+
+toplevel_check $srcfile
+
+# Note that the order these tools are called should match what
+# autoconf's "autoupdate" package does.  See bug 138584 for
+# details.
+
+# programs that might install new macros get run before aclocal
+
+printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages."
+echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1
+
+printbold "Running $INTLTOOLIZE..."
+$INTLTOOLIZE --force --copy --automake || exit 1
+
+# Now run aclocal to pull in any additional macros needed
+printbold "Running $ACLOCAL..."
+$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit 1
+
+# Now that all the macros are sorted, run autoconf and autoheader ...
+printbold "Running $AUTOCONF..."
+$AUTOCONF || exit 1
+
+# Finally, run automake to create the makefiles ...
+printbold "Running $AUTOMAKE..."
+cp -pf COPYING COPYING.autogen_bak
+cp -pf INSTALL INSTALL.autogen_bak
+$AUTOMAKE --gnu --add-missing --force --copy || exit 1
+cmp COPYING COPYING.autogen_bak || cp -pf COPYING.autogen_bak COPYING
+cmp INSTALL INSTALL.autogen_bak || cp -pf INSTALL.autogen_bak INSTALL
+rm -f COPYING.autogen_bak INSTALL.autogen_bak
+
+
+if test x$NOCONFIGURE = x; then
+    printbold Running ./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT ...
+    ./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT \
+        && echo Now type \`make\' to compile $PKG_NAME || exit 1
+else
+    echo Skipping configure process.
+fi
+
--- a/bash/command-completion
+++ b/bash/command-completion
@@ -1,23 +0,0 @@
-_gramps() 
-{
-    local cur prev opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-    opts="--action --config --create --databases --debug --export --format --help  --import --open --options --quiet --remove --show --usage --version --yes -?  -C -L  -O -a -b -c -d -e -f -i -l  -p -q -r -s -t  -u -v -y"
-    if [[ ${cur} == -* ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    elif [[ ${cur} == --open ]] ; then
-        local IFS=$'\n'
-        local names=($( gramps -l | grep \" | cut -d\  -f4- ))
-        COMPREPLY=( $(compgen --W "${names[*]}" -- ${cur}) )
-        return 0
-    else 
-        local IFS=$'\n'
-        local names=($( gramps -l | grep \" | cut -d\  -f4- ))
-        COMPREPLY=( $(compgen -W "${names[*]}" -- ${cur}) )
-        return 0
-    fi
-}
-complete -F _gramps gramps
--- a/config.rpath
+++ b/config.rpath
@@ -0,0 +1,571 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2005 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    darwin*)
+      case "$cc_basename" in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    mingw* | pw32* | os2*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    newsos6)
+      ;;
+    linux*)
+      case $cc_basename in
+        icc* | ecc*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+      esac
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    sco3.2v5*)
+      ;;
+    solaris*)
+      wl='-Wl,'
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  case "$host_os" in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we cannot use
+      # them.
+      ld_shlibs=no
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris* | sysv5*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = yes; then
+    # Unlike libtool, we use -rpath here, not --rpath, since the documented
+    # option of GNU ld is called -rpath, not --rpath.
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            hardcode_direct=yes
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case "$cc_basename" in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | kfreebsd*-gnu | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10* | hpux11*)
+      if test "$with_gnu_ld" = no; then
+        case "$host_cpu" in
+          hppa*64*)
+            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+            hardcode_libdir_separator=:
+            hardcode_direct=no
+            ;;
+          ia64*)
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_direct=no
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+          *)
+            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+            hardcode_libdir_separator=:
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    openbsd*)
+      hardcode_direct=yes
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+        case "$host_os" in
+          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+            hardcode_libdir_flag_spec='-R$libdir'
+            ;;
+          *)
+            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+            ;;
+        esac
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    sco3.2v5*)
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4.2uw2*)
+      hardcode_direct=yes
+      hardcode_minus_L=no
+      ;;
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+      ;;
+    sysv5*)
+      hardcode_libdir_flag_spec=
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    ;;
+  aix4* | aix5*)
+    ;;
+  amigaos*)
+    ;;
+  beos*)
+    ;;
+  bsdi[45]*)
+    ;;
+  cygwin* | mingw* | pw32*)
+    shrext=.dll
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    ;;
+  dgux*)
+    ;;
+  freebsd1*)
+    ;;
+  kfreebsd*-gnu)
+    ;;
+  freebsd*)
+    ;;
+  gnu*)
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case "$host_cpu" in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    ;;
+  irix5* | irix6* | nonstopux*)
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux*)
+    ;;
+  knetbsd*-gnu)
+    ;;
+  netbsd*)
+    ;;
+  newsos6)
+    ;;
+  nto-qnx*)
+    ;;
+  openbsd*)
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    ;;
+  osf3* | osf4* | osf5*)
+    ;;
+  sco3.2v5*)
+    ;;
+  solaris*)
+    ;;
+  sunos4*)
+    ;;
+  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    ;;
+  sysv4*MP*)
+    ;;
+  uts4*)
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
--- a/configure.in
+++ b/configure.in
@@ -0,0 +1,170 @@
+dnl $Id$
+
+dnl Process this file with autoconf to produce a configure script.
+dnl May need to run automake && aclocal first
+
+AC_PREREQ(2.57)
+dnl NOTE: arg to macro below becomes the "VERSION"
+AC_INIT(gramps, 3.3.0, [gramps-bugs@lists.sourceforge.net])
+AC_CONFIG_SRCDIR(configure.in)
+AM_INIT_AUTOMAKE([1.6.3 foreign])
+
+AC_CONFIG_MACRO_DIR([m4])
+
+RELEASE=0.SVN$(svnversion -n .)
+dnl RELEASE=0beta
+dnl RELEASE=0rc1
+dnl RELEASE=1
+
+VERSIONSTRING=$VERSION
+if test x"$RELEASE" != "x"
+then
+  VERSIONSTRING="$VERSION-$RELEASE"
+fi
+
+dnl put the ACLOCAL flags in the Makefile
+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
+AC_PROG_INTLTOOL
+
+AM_SHARED_MIME
+AM_PACKAGER
+AC_SUBST(RELEASE)
+AC_SUBST(VERSIONSTRING)
+
+dnl Add the languages which your application supports here.
+ALL_LINGUAS="hu zh_CN cs da de es fr it nb nl nn pl pt_BR ru sv fi lt sk bg hr sl ca sq he"
+GETTEXT_PACKAGE=gramps
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the Gettext package name.])
+AM_GLIB_GNU_GETTEXT
+
+dnl Checks for programs.  
+dnl We first only check for python >= 2.5
+
+AM_PATH_PYTHON(2.5)
+AC_PATH_PROG(BINSH, sh)
+
+pygtk_require="
+try:
+    import pygtk
+    pygtk.require('2.0')
+except ImportError:
+    pass
+
+def out(line):
+    f = open('conftest.out', 'w')
+    f.write(line)
+    f.close()
+"
+
+AC_MSG_CHECKING(Python bindings for gtk 2.10 (pygtk2>=2.10.0))
+cat > conftest.py <<EOF
+$pygtk_require
+try:
+    import gobject
+    version = gobject.pygtk_version
+    if version >= (2,10,0):
+        print_version = '.'.join([[str(i) for i in version]])
+        out(print_version)
+    else:
+        out("NO")
+except ImportError:
+    out("NO")
+except AttributeError:
+    out("NO")
+EOF
+$PYTHON conftest.py
+has_pygtk=`cat conftest.out`
+rm -f conftest.out conftest.py
+if test NO = "$has_pygtk"
+then
+   AC_MSG_ERROR([
+
+**** The python bindings for gtk 2.10 (pygtk2>=2.10.0) could not be found.])
+fi
+AC_MSG_RESULT($has_pygtk)
+
+AC_CONFIG_FILES([
+po/Makefile.in
+m4/Makefile
+Makefile
+gramps.sh
+src/const.py
+src/Makefile
+src/cli/Makefile
+src/cli/plug/Makefile
+src/gen/Makefile
+src/gen/db/Makefile
+src/gen/display/Makefile
+src/gen/lib/Makefile
+src/gen/mime/Makefile
+src/gen/plug/Makefile
+src/gen/plug/docbackend/Makefile
+src/gen/plug/docgen/Makefile
+src/gen/plug/menu/Makefile
+src/gen/plug/report/Makefile
+src/gen/proxy/Makefile
+src/gen/utils/Makefile
+src/gui/Makefile
+src/gui/editors/Makefile
+src/gui/editors/displaytabs/Makefile
+src/gui/plug/Makefile
+src/gui/plug/report/Makefile
+src/gui/selectors/Makefile
+src/gui/views/Makefile
+src/gui/views/treemodels/Makefile
+src/gui/widgets/Makefile
+src/GrampsLogger/Makefile
+src/Merge/Makefile
+src/docgen/Makefile
+src/Filters/Makefile
+src/Filters/Rules/Makefile
+src/Filters/Rules/Person/Makefile
+src/Filters/Rules/Family/Makefile
+src/Filters/Rules/Event/Makefile
+src/Filters/Rules/Source/Makefile
+src/Filters/Rules/Place/Makefile
+src/Filters/Rules/MediaObject/Makefile
+src/Filters/Rules/Repository/Makefile
+src/Filters/Rules/Note/Makefile
+src/Filters/SideBar/Makefile
+src/Simple/Makefile
+src/GrampsLocale/Makefile
+src/plugins/Makefile
+src/plugins/docgen/Makefile
+src/plugins/drawreport/Makefile
+src/plugins/export/Makefile
+src/plugins/gramplet/Makefile
+src/plugins/graph/Makefile
+src/plugins/import/Makefile
+src/plugins/lib/Makefile
+src/plugins/mapservices/Makefile
+src/plugins/quickview/Makefile
+src/plugins/rel/Makefile
+src/plugins/sidebar/Makefile
+src/plugins/textreport/Makefile
+src/plugins/tool/Makefile
+src/plugins/view/Makefile
+src/plugins/webreport/Makefile
+src/plugins/webstuff/Makefile
+src/DateHandler/Makefile
+src/data/Makefile
+src/glade/Makefile
+src/images/Makefile
+src/images/scalable/Makefile
+src/images/16x16/Makefile
+src/images/22x22/Makefile
+src/images/48x48/Makefile
+src/mapstraction/Makefile
+data/Makefile
+data/man/Makefile
+data/man/fr/Makefile
+data/man/nl/Makefile
+data/man/pl/Makefile
+data/man/sv/Makefile
+example/Makefile
+example/gramps/Makefile
+])
+
+AC_OUTPUT
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -0,0 +1,83 @@
+# This is the data level Makefile for gramps
+# $Id$
+
+SUBDIRS = man
+
+# Rules for files with translatable strings
+# These are taken care of by the intltool
+desktopdir = $(datadir)/applications
+desktop_in_files = gramps.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+
+keys_in_files = gramps.keys.in
+keys_files = $(keys_in_files:.keys.in=.keys)
+@INTLTOOL_KEYS_RULE@
+
+# Rules for files with translatable strings
+# These are taken care of by the intltool
+xml_in_files = gramps.xml.in
+xml_files = $(xml_in_files:.xml.in=.xml)
+@INTLTOOL_XML_RULE@
+
+applicationsdir = $(datadir)/application-registry
+applications_DATA = gramps.applications
+
+mimedir = $(datadir)/mime-info
+mime_DATA = $(keys_files) gramps.mime
+
+xmldir = $(SHARED_MIME_DIR)/packages
+xml_DATA = $(xml_files)
+
+pngdir = $(datadir)/icons/gnome/48x48/mimetypes
+png_DATA = \
+	gnome-mime-application-x-gramps.png \
+	gnome-mime-application-x-gedcom.png \
+	gnome-mime-application-x-gramps-package.png \
+	gnome-mime-application-x-gramps-xml.png \
+	gnome-mime-application-x-geneweb.png
+
+svgdir = $(datadir)/icons/gnome/scalable/mimetypes
+svg_DATA = \
+	gnome-mime-application-x-gramps.svg \
+	gnome-mime-application-x-gedcom.svg \
+	gnome-mime-application-x-gramps-package.svg \
+	gnome-mime-application-x-gramps-xml.svg \
+	gnome-mime-application-x-geneweb.svg
+
+EXTRA_DIST = \
+	$(png_DATA) \
+	$(svg_DATA) \
+	$(applications_DATA) \
+	$(keys_in_files) \
+	$(desktop_in_files) \
+	$(mime_DATA) \
+	$(xml_DATA) \
+	$(desktop_DATA) \
+	$(xml_in_files)
+
+CLEANFILES = \
+	$(desktop_DATA) \
+	$(keys_files) \
+	$(xml_files)
+
+# Conditionally enable/disable mime types,
+# or disable unconditionally if in a packager mode
+SHARED_MIME_INSTALLATION =
+SHARED_MIME_UNINSTALLATION =
+
+if !PACKAGER_MODE
+if SHARED_MIME_INSTALL
+SHARED_MIME_INSTALLATION += \
+	update-mime-database $(DESTDIR)$(SHARED_MIME_DIR)
+SHARED_MIME_UNINSTALLATION += \
+	update-mime-database $(DESTDIR)$(SHARED_MIME_DIR)
+endif
+endif
+
+
+install-data-hook:
+	$(SHARED_MIME_INSTALLATION)
+
+uninstall-hook:
+	$(SHARED_MIME_UNINSTALLATION)
--- a/data/authors.xml
+++ b/data/authors.xml
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<authors xmlns:html="http://www.w3.org/1999/xhtml">
- <author title="author">
-  Alex Roitman &lt;<html:a href="mailto:shura@gramps-project.org">shura@gramps-project.org</html:a>&gt;
- </author>
- <author title="contributor">
-  Arturas Sleinius &lt;<html:a href="mailto:asleinius@users.sourceforge.net">asleinius@users.sourceforge.net</html:a>&gt;
- </author>
- <author title="author">
-  Benny Malengier &lt;<html:a href="mailto:benny.malengier@gramps-project.org">benny.malengier@gramps-project.org</html:a>&gt;
- </author>
- <author title="contributor">
-  Boril Gourinov &lt;<html:a href="mailto:boril.gourinov@gmail.com">boril.gourinov@gmail.com</html:a>&gt;
- </author>
- <author title="author">
-  Brian Matherly &lt;<html:a href="mailto:brian@gramps-project.org">brian@gramps-project.org</html:a>&gt;
- </author>
- <author title="author">
-  Don Allingham &lt;<html:a href="mailto:don@gramps-project.org">don@gramps-project.org</html:a>&gt;
- </author>
- <author title="author">
-  Donald A. Peterson &lt;<html:a href="mailto:"></html:a>&gt;
- </author>
- <author title="author">
-  Doug Blank &lt;<html:a href="mailto:doug.blank@gmail.com">doug.blank@gmail.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Eero Tamminen &lt;<html:a href="mailto:eerot@users.sourceforge.net">eerot@users.sourceforge.net</html:a>&gt;
- </author>
- <author title="contributor">
-  Erik De Richter &lt;<html:a href="mailto:erikdrgm@users.sourceforge.net">erikdrgm@users.sourceforge.net</html:a>&gt;
- </author>
- <author title="contributor">
-  Espen Berg &lt;<html:a href="mailto:espenbe@gmail.com">espenbe@gmail.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Gary Burton &lt;<html:a href="mailto:gary.burton@zen.co.uk">gary.burton@zen.co.uk</html:a>&gt;
- </author>
- <author uid="gbritton" title="contributor">
-  Gerald Britton &lt;<html:a href="mailto:gerald.britton@gmail.com">gerald.britton@gmail.com</html:a>&gt;
- </author>
- <author title="contributor">
-  James G Sack &lt;<html:a href="mailto:jgsack@san.rr.com">jgsack@san.rr.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Janne Kovesjärvi &lt;<html:a href="mailto:janne.kovesjarvi@gmail.com">janne.kovesjarvi@gmail.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Jason Simanek &lt;<html:a href="mailto:jsimanek@gmail.com">jsimanek@gmail.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Jérôme Rapinat &lt;<html:a href="mailto:romjerome@yahoo.fr">romjerome@yahoo.fr</html:a>&gt;
- </author>
- <author title="contributor">
-  Joan Creus &lt;<html:a href="mailto:joan.creus@gmail.com">joan.creus@gmail.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Josip Pisoj &lt;<html:a href="mailto:josip@pisoj.com">josip@pisoj.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Julio Sánchez &lt;<html:a href="mailto:julio.sanchez@gmail.com">julio.sanchez@gmail.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Kees Bakker &lt;<html:a href="mailto:kees.bakker@xs4all.nl">kees.bakker@xs4all.nl</html:a>&gt;
- </author>
- <author title="contributor">
-  Konstantin Dorichev &lt;<html:a href="mailto:kdorichev@gmail.com">kdorichev@gmail.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Lubo Vasko &lt;<html:a href="mailto:pgval@inMail.sk">pgval@inMail.sk</html:a>&gt;
- </author>
- <author title="contributor">
-  Luigi Toscano &lt;<html:a href="mailto:luigi.toscano@tiscali.it">luigi.toscano@tiscali.it</html:a>&gt;
- </author>
- <author title="contributor">
-  Luiz Gonzaga dos Santos Filho &lt;<html:a href="mailto:lfilho@gmail.com">lfilho@gmail.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Łukasz Rymarczyk &lt;<html:a href="mailto:yenidai@poczta.onet.pl">yenidai@poczta.onet.pl</html:a>&gt;
- </author>
- <author title="contributor">
-  Michiel Nauta &lt;<html:a href="mailto:m.d.nauta@hetnet.nl">m.d.nauta@hetnet.nl</html:a>&gt;
- </author>
- <author title="contributor">
-  Mirko Leonhäuser &lt;<html:a href="mailto:mirko@leonhaeuser.de">mirko@leonhaeuser.de</html:a>&gt;
- </author>
- <author title="contributor">
-  Morten Bo Johansen &lt;<html:a href="mailto:mbj@spamcop.net">mbj@spamcop.net</html:a>&gt;
- </author>
- <author title="author">
-  Martin Hawlisch &lt;<html:a href="mailto:martin.hawlisch@gmx.de">martin.hawlisch@gmx.de</html:a>&gt;
- </author>
- <author title="contributor">
-  Nick Hall &lt;<html:a href="mailto:nick__hall@hotmail.com">nick__hall@hotmail.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Paul Culley &lt;<html:a href="mailto:paulr2787@gmail.com">paulr2787@gmail.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Peter Landgren &lt;<html:a href="mailto:peter.talken@telia.com">peter.talken@telia.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Raphael Ackermann &lt;<html:a href="mailto:raphael.ackermann@gmail.com">raphael.ackermann@gmail.com</html:a>&gt;
- </author>
- <author title="author">
-  Richard Taylor &lt;<html:a href="mailto:rjt-gramps@thegrindstone.me.uk">rjt-gramps@thegrindstone.me.uk</html:a>&gt;
- </author>
- <author title="contributor">
-  Serge Noiraud &lt;<html:a href="mailto:Serge.Noiraud@free.fr">Serge.Noiraud@free.fr</html:a>&gt;
- </author>
- <author title="contributor">
-  Sigmund Lorentsen &lt;<html:a href="mailto:sigmund.lorentsen@tele2.no">sigmund.lorentsen@tele2.no</html:a>&gt;
- </author>
- <author title="contributor">
-  Stefan Bjork &lt;<html:a href="mailto:betula@users.sourceforge.net">betula@users.sourceforge.net</html:a>&gt;
- </author>
- <author title="contributor">
-  Stéphane Charette &lt;<html:a href="mailto:stephanecharette@gmail.com">stephanecharette@gmail.com</html:a>&gt;
- </author>
- <author title="author">
-  Tim Waugh &lt;<html:a href="mailto:twaugh@redhat.com">twaugh@redhat.com</html:a>&gt;
- </author>
- <author title="contributor">
-  Vassilii Khachaturov &lt;<html:a href="mailto:vassilii@tarunz.org">vassilii@tarunz.org</html:a>&gt;
- </author>
- <author title="contributor">
-  Zdeněk Hataš &lt;<html:a href="mailto:zdenek.hatas@gmail.com">zdenek.hatas@gmail.com</html:a>&gt;
- </author>
-<author title="author">
-  Rob G. Healey &lt;<html:a href="mailto:robhealey1@gmail.com">robhealey1@gmail.com</html:a>&gt;
-</author>
- <author title="contributor">
-  Zsolt Foldvari &lt;<html:a href="mailto:zfoldvar@users.sourceforge.net">zfoldvar@users.sourceforge.net</html:a>&gt;
- </author>
- <author title="contributor">
-  Craig J. Anderson &lt;<html:a href="mailto:ander882@hotmail.com">ander882@hotmail.com</html:a>&gt;
- </author>
- <author title="author">
-  Tim G L Lyons &lt;<html:a href="mailto:tim.g.lyons@gmail.com">tim.g.lyons@gmail.com</html:a>&gt;
- </author>
- <author title="author">
-  John Ralls &lt;<html:a href="mailto:jralls@ceridwen.us">jralls@ceridwen.us</html:a>&gt;
- </author>
-</authors>
--- a/data/css/Web_Basic-Ash.css
+++ b/data/css/Web_Basic-Ash.css
@@ -1,668 +0,0 @@
-/*
-**************************************************************************************************
-Copyright Holder and License
-**************************************************************************************************
-GRAMPS Cascading Style Sheet
-Style Name: Basic-Ash Stylesheet
-Style Author: Jason M. Simanek (2008)
-Note: Adapted from GRAMPS original Modern Style stylesheet
-**************************************************************************************************
-This website was created with GRAMPS <http://www.gramps-project.org/>
--------------------------------------------------------------------------------------------------
-GRAMPS is a Free Software Project for Genealogy, offering a professional
-
-genealogy program, and a wiki open to all. It is a community project, created,
-developed and governed by genealogists.
-
-Go to <http://gramps-project.org/> to learn more!
-
--------------------------------------------------------------------------------------------------
-Copyright 2008 Jason M. Simanek
-Copyright 2009 Stephane Charette
-Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
-Copyright 2011 Michiel D. Nauta
-
-This file is part of the GRAMPS program.
-
-GRAMPS is free software: you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation, version 2 of the License.
-
-GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-GRAMPS. If not, see <http://www.gnu.org/licenses/>.
--------------------------------------------------------------------------------------------------
-
-Color Palette
--------------------------------------------------------------------------------------------------
-
-black                   #000
-gray dark               #555
-gray                    #999
-gray light              #CCC
-gray very light         #EEE
-white                   #FFF
--------------------------------------------------------------------------------------------------
-Characteristic of this style is that it uses the full width of the browser
-window and that horizontal highlighting bars extend over the full width of
-the page.
--------------------------------------------------------------------------------------------------
-
- NarrativeWeb Styles
------------------------------------------------------------------------------------------------ 
-
- General Elements
----------------------------------------------------- */
-
-body {
-    font-family: sans-serif;
-    font-size: 90%;
-    color: black;
-    margin: 0px;
-    background-color: #EEE;
-}
-body > div {
-    clear: both;
-}
-.content {
-    background-color: white;
-    border-top: solid 1px #999;
-}
-.content div.snapshot {
-    float: right;
-    margin: 2em;
-}
-.fullclear {
-    clear: both;
-}
-
-/* General Text
----------------------------------------------------- */
-h1 {
-    font-size: x-large;
-    font-weight: bold;
-    padding-left: 15px;
-}
-h2 {
-    display:block;
-    margin:0;
-    padding:0;
-    text-align: center;
-}
-h3 {
-    font-size: large;
-    padding-left: 15px;
-}
-h4 {
-    font-size: medium;
-    background-color: #CCC;
-    padding-left: 15px;
-    margin-bottom: 0px;
-    border-bottom: solid 1px #999;
-}
-p#description {
-    padding-left: 15px;
-}
-a {
-    color: black;
-    text-decoration: none;
-    word-wrap: break-word;
-}
-a[href]:hover, a[href]:active {
-    text-decoration: underline;
-}
-.grampsid {
-    font-family: monospace;
-    font-size: smaller;
-    color: #999;
-}
-
-/* Header
----------------------------------------------------- */
-#SiteTitle {
-    color: #555;
-}
-#user_header, #user_footer {
-    padding-left: 15px;
-}
-
-/* Navigation
----------------------------------------------------- */
-div#nav, #subnavigation {
-    border: solid 1px #EEE; /* needed by IE7 */
-}
-#subnavigation ul {
-    overflow: hidden;
-}
-div#nav ul, #subnavigation ul {
-    list-style: none;
-    margin: 0px;
-    padding-left: 15px;
-}
-#subnavigation ul {
-    border-bottom: solid 1px #999;
-}
-div#nav ul li, #subnavigation ul li {
-    float: left;
-}
-div#nav ul li a, #subnavigation ul li a {
-    display: block;
-    font-size: smaller;
-    font-weight: bold;
-    padding: 5px;
-    border-bottom: solid 1px #EEE;
-}
-div#nav ul li a:hover, #subnavigation ul li a:hover {
-    text-decoration: none;
-    background-color: #CCC;
-    border-bottom: solid 1px black;
-}
-div#nav ul li.CurrentSection a {
-    position: relative;
-    top: 1px;
-    border: solid 1px #999;
-    border-bottom-style: none;
-    background-color: white;
-}
-#subnavigation ul li.CurrentSection a {
-    background-color: white;
-}
-/* Alphabet Navigation
----------------------------------------------------- */
-div#alphanav {
-    background-color: #EEE;
-}
-div#alphanav ul {
-    list-style: none;
-    border-width: 2px 0px 4px 0px;
-    border-style: solid;
-    border-color: black;
-    margin: 0px;
-    padding-left: 15px;
-    /* float container stretch, see www.quirksmode.org/css/clearing.html */
-    overflow: hidden;
-}
-div#alphanav ul li {
-    float: left;
-    font-size: larger;
-    font-weight: bold;
-}
-div#alphanav ul li:after {
-    content: " |";
-}
-div#alphanav ul li a {
-    display: block;
-    padding: 4px 8px;
-    line-height: 100%;
-    float: left;
-}
-div#alphanav ul li a:hover {
-    text-decoration: none;
-    background-color: black;
-    color: white;
-}
-
-/* Main Table
----------------------------------------------------- */
-table {
-    border-collapse: collapse;
-    width: 100%;
-}
-div#summaryarea > table.infolist,
-div#parents > table.infolist,
-h3 + table.infolist {
-    width: auto;
-}
-table tr th {
-    text-align: left;
-    background-color: #EEE;
-    border-top: solid 1px #999;
-    border-bottom: solid 1px #999;
-}
-table tr th:first-child {
-    border-left: solid 1px #999;
-}
-table tr th:last-child {
-    border-right: solid 1px #999;
-}
-table.primobjlist tr th {
-    background-color: #CCC;
-}
-table td, table th {
-    vertical-align: top;
-    padding-left: 1ex;
-}
-table.primobjlist td {
-    vertical-align: middle;
-}
-table td:first-child, table th:first-child {
-    padding-left: 15px;
-}
-table.primobjlist tr a {
-    display: block; /* make whole td clickable */
-}
-table.primobjlist tr.BeginLetter td, table.primobjlist tr.BeginSurname td {
-    border-top: solid 1px #CCC;
-}
-td.ColumnLetter, td.ColumnRowLabel {
-    font-weight: bold;
-}
-td.ColumnBirth, td.ColumnDeath, td.ColumnPartner, td.ColumnParents {
-    font-size: 90%;
-}
-table.infolist tr td ol {
-    margin: 0px;
-}
-#summaryarea table.infolist td.ColumnAttribute,
-#parents table.infolist td.ColumnAttribute,
-#families table.infolist td.ColumnType,
-#families table.infolist td.ColumnAttribute {
-    color: #555;
-}
-/* div summaryarea is missing for events, sources and repos! */
-h3 + table.infolist td.ColumnAttribute {
-    color: #555;
-}
-table.primobjlist td.ColumnParents span.mother:before {
-    content: "+ ";
-}
-
-/* Surnames
----------------------------------------------------- */
-table#SortByName td.ColumnSurname, table#SortByName th.ColumnSurname,
-table#SortByCount td.ColumnQuantity, table#SortByCount th.ColumnQuantity {
-    background-color: #EEE;
-}
-table#SortByName thead th.ColumnSurname a:after,
-table#SortByCount thead th.ColumnQuantity a:after {
-    content: " \2193";
-}
-table.surname td.ColumnName {
-    background-color: #EEE;
-}
-
-/* Individuals
----------------------------------------------------- */
-table.IndividualList td.ColumnSurname {
-    background-color: #EEE;
-}
-
-/* Places
----------------------------------------------------- */
-#Places table.infolist td.ColumnName {
-    background-color: #EEE;
-}
-
-/* Events
----------------------------------------------------- */
-#EventList table.infolist tr.BeginType td {
-    border-top:dashed 1px #CCC;
-}
-#EventList table.infolist tr.BeginLetter td {
-    border-top:solid 1px #CCC;
-}
-#EventList table.infolist td.ColumnType {
-    background-color: #EEE;
-}
-#EventList td.ColumnPerson a {
-    display: inline;
-}
-#EventList td.ColumnPerson span.person:after,
-#EventList td.ColumnPerson span.father:after,
-#EventList td.ColumnPerson span.mother:after,
-#EventDetail td.ColumnPerson span.person:after,
-#EventDetail td.ColumnPerson span.father:after,
-#EventDetail td.ColumnPerson span.mother:after {
-    content: ", ";
-}
-#EventList td.ColumnPerson span.fatherNmother:after,
-#EventDetail td.ColumnPerson span.fatherNmother:after {
-    content: " + ";
-}
-#EventList td.ColumnPerson span.person:last-child:after,
-#EventList td.ColumnPerson span.father:last-child:after,
-#EventList td.ColumnPerson span.mother:last-child:after,
-#EventDetail td.ColumnPerson span.person:last-child:after,
-#EventDetail td.ColumnPerson span.father:last-child:after,
-#EventDetail td.ColumnPerson span.mother:last-child:after {
-    content: "";
-}
-
-table.eventlist tbody tr td.ColumnSources {
-    width: 5%;
-}
-
-/* Gallery
----------------------------------------------------- */
-#GalleryNav {
-    text-align: center;
-    margin: 2em 0px;
-}
-#GalleryNav a {
-    font-weight: bold;
-    background-color: #EEE;
-    border: solid 1px #999;
-    margin: 1em;
-}
-#GalleryNav a#Previous {
-    padding: .4em .7em .3em .7em;
-}
-#GalleryNav a#Next {
-    padding: .4em 1.9em .3em 1.9em;
-}
-#GalleryCurrent {
-    font-size: larger;
-}
-#GalleryTotal {
-    font-weight: normal;
-}
-#GalleryDisplay {
-    margin: 0px auto;
-    position: relative;
-}
-#GalleryDisplay img {
-    margin: 0px auto;
-    display: block;
-    border: solid 1px #999;
-}
-#GalleryDetail h3 {
-    text-align: center;
-}
-
-/*    Sources
------------------------------------------------------ */
-div#SourceDetail {
-    margin: 0 auto;
-}
-
-/* Contact
----------------------------------------------------- */
-#Contact {
-    overflow: hidden;
-}
-#Contact #summaryarea {
-    width: 50em;
-    margin: 2em auto;
-    padding: 3em;
-    background-color: #EEE;
-    border: solid 1px #999;
-}
-#Contact img {
-    float: right;
-    border: solid 1px #999;
-}
-#Contact #researcher, #Contact #researcher h3 {
-    font-size: larger;
-    padding-left: 0px;
-}
-#Contact #streetaddress, #Contact #locality, #Contact #email {
-    display: block;
-}
-#Contact #city:after {
-    content: ",";
-}
-
-/* Download
----------------------------------------------------- */
-#Download table.download a {
-    display: block;
-}
-
-/* Subsection
----------------------------------------------------- */
-#Home, #Introduction {
-    overflow: hidden;
-}
-#Home img, #Introduction img {
-    float: right;
-    margin: 1em;
-    max-width: 950px;
-}
-#Home p, #Introduction p {
-    padding-left: 15px;
-}
-.subsection {
-    clear: both;
-    overflow: visible;
-}
-.subsection p {
-    margin: 0px;
-}
-
-/* Subsection : Families
----------------------------------------------------- */
-div#families table.fixed_subtables table.eventlist {
-    table-layout: fixed;
-}
-div#families table.fixed_subtables table.eventlist th:first-child {
-    width: 9em;
-}
-div#families table.fixed_subtables table.eventlist th:last-child {
-    width: 5em;
-}
-div#families table.attrlist td.ColumnType {
-    color: black;
-}
-
-/* Subsection : Gallery
----------------------------------------------------- */
-#indivgallery .thumbnail {
-    float: left;
-    width: 130px;
-    font-size: smaller;
-    text-align: center;
-    margin: 0.8em 0.5em;
-}
-#indivgallery h4 + .thumbnail {
-    margin-left: 15px;
-    /* Problem: if there are more thumnails then fit on a single row, the
-     *          first thumnail on each next row should also have a margin-left
-     *          of 15 px. */
-}
-#indivgallery img {
-    border: solid 1px #999;
-}
-#indivgallery span {
-/* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
-    display: none; */
-}
-
-/* Subsection : Narrative
----------------------------------------------------- */
-h4 + div.grampsstylednote, a.familymap {
-    margin: 1em 15px;
-}
-i + div.grampsstylednote p {
-    margin: 0 0 0.3em 0;
-}
-div.grampsstylednote p {
-    margin-bottom: 0.5em;
-}
-
-/* Subsection : Family Map
----------------------------------------------------- */
-a.familymap {
-    display: block;
-}
-
-/* Subsection : Source References
----------------------------------------------------- */
-#sourcerefs ol li ol {
-    list-style-type: lower-alpha;
-}
-
-/* Subsection : Pedigree
----------------------------------------------------- */
-.pedigreegen {
-    list-style-type: none;
-    padding-left: 15px;
-}
-.pedigreegen li ol {
-    list-style-type: none;
-}
-.pedigreegen li ol li ol {
-    list-style-type: decimal;
-}
-.pedigreegen ol.spouselist {
-    list-style-type: none;
-}
-.pedigreegen ol.spouselist li.spouse ol {
-    list-style-type: decimal;
-}
-.spouse:before {
-    content: "+ ";
-}
-.thisperson {
-    font-weight: bold;
-}
-.thisperson > ol {
-    font-weight: normal;
-}
-
-/* Footer
----------------------------------------------------- */
-#footer {
-    clear: both;
-    padding-top: 1em;
-    background-color: #CCC;
-    border-top: solid 1px #555;
-}
-#footer > * {
-    background-color: #EEE;
-}
-#footer p#createdate {
-    float: left;
-    width: 50%;
-    text-align: left;
-    padding-left: 15px;
-    margin-top: 1em;
-}
-#footer p#copyright {
-    float: right;
-    width: 40%;
-    text-align: right;
-    padding-right: 15px;
-}
-
-/* Overwritten
----------------------------------------------------- */
-body#FamilyMap {
-    background-color: #EEE ! important;
-}
-
-/* Calendar Styles
-===================================================== */
-table.calendar {
-    table-layout: fixed;
-    empty-cells: show;
-}
-.calendar thead th {
-    text-align: center;
-    border-top-style: none;
-}
-.calendar thead th.monthName {
-    font-size: xx-large;
-    font-weight: normal;
-    background-color: white;
-    border-bottom-style: none;
-    padding-top: 1em;
-}
-.calendar thead th abbr {
-    border-bottom-style: none;
-}
-#CreatorInfo {
-    float: right;
-    margin: -1em 15px 0px 0px;
-    font-weight: bold;
-    color: #999;
-}
-.calendar tfoot tr td {
-    border-top: solid 4px #999;
-    vertical-align: middle;
-}
-
-/* Calendar : Date Numeral */
-.calendar div.date {
-    float: right;
-    width: 1.8em;
-    font-size: large;
-    text-align: center;
-    background-color: #CCC;
-    color: #555;
-}
-
-/* Calendar : Date Container */
-.calendar td {
-    padding: 0px 0px 0px 1ex;
-    border-width: 1px 0px 0px 1px;
-    border-style: solid;
-    border-color: #CCC;
-    background-color: #EEE;
-}
-.calendar td:first-child {
-    border-left-style: none;
-    padding: 0px 0px 0px 1ex;
-}
-.calendar tbody tr:first-child td {
-    border-top-style: none;
-}
-
-/* Calendar : Date Detail */
-.calendar td ul {
-    font-size: smaller;
-    list-style: none;
-    padding: 0px;
-}
-.calendar td ul li {
-    border-top: dashed 1px #CCC;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-.calendar td ul li:first-child {
-    border-style: none;
-}
-
-/* Calendar : Birthday, Anniversary, Highlight */
-.calendar td.highlight {
-    background-color: white;
-}
-.calendar td.highlight div.date {
-    color: black;
-    background-color: #CCC;
-}
-
-/* Calendar : Previous-Next Month */
-.calendar td.previous,
-.calendar td.next,
-.calendar td.previous div.date,
-.calendar td.next div.date {
-    color: #CCC;
-    background-color: #EEE;
-}
-
-/* Calendar : Full Year */
-body#fullyearlinked div.content {
-    overflow: hidden;
-}
-body#fullyearlinked table.calendar {
-    float: left;
-    width: 33.3%;
-    height: 18em;
-    border: solid 1px black;
-}
-body#fullyearlinked table.calendar thead th {
-    height: 2em;
-}
-body#fullyearlinked table.calendar thead th.monthName {
-    font-size: large;
-    padding: 2px 0px;
-}
-body#fullyearlinked table.calendar tbody td {
-    height: 3em;
-}
-body#OneDay div.content {
-    overflow: hidden;
-}
--- a/data/css/Web_Basic-Cypress.css
+++ b/data/css/Web_Basic-Cypress.css
@@ -1,726 +0,0 @@
-/*
-**************************************************************************************************
-Copyright Holder and License
-**************************************************************************************************
-GRAMPS Cascading Style Sheet
-Style Name: Basic - Cypress
-Style Author: Jason Simanek (2008)
-Note: Adapted from GRAMPS original Modern Style stylesheet with colors from the original 'Tranquil' stylesheet
-**************************************************************************************************
-This website was created with GRAMPS <http://www.gramps-project.org/>
--------------------------------------------------------------------------------------------------
-GRAMPS is a Free Software Project for Genealogy, offering a professional
-
-genealogy program, and a wiki open to all. It is a community project, created,
-developed and governed by genealogists.
-
-Go to <http://gramps-project.org/> to learn more!
-
--------------------------------------------------------------------------------------------------
-Copyright 2008 Jason M. Simanek
-Copyright 2009 Stephane Charette
-Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
-Copyright 2011 Michiel D. Nauta
-
-This file is part of the GRAMPS program.
-
-GRAMPS is free software: you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation, version 2 of the License.
-
-GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-GRAMPS. If not, see <http://www.gnu.org/licenses/>.
--------------------------------------------------------------------------------------------------
-
-Color Palette
--------------------------------------------------------------------------------------------------
-
-black                   #000
-slate dark              #454
-slate                   #7C8F7C
-slate light             #9DBF9D
-slate very light        #E0E6E0
-white                   #FFF
--------------------------------------------------------------------------------------------------
-Characteristic of this style is that it uses the full width of the browser
-window and that horizontal highlighting bars extend over the full width of
-the page.
--------------------------------------------------------------------------------------------------
-
- NarrativeWeb Styles
------------------------------------------------------------------------------------------------ 
-
- General Elements
----------------------------------------------------- */
-
-body {
-    font-family: sans-serif;
-    font-size: 90%;
-    color: black;
-    margin: 0px;
-    background-color: #454;
-}
-body > div {
-    clear: both;
-}
-.content {
-    background-color: white;
-    border-top: solid 1px #7C8F7C;
-}
-.content div.snapshot {
-    float: right;
-    margin: 2em;
-}
-.fullclear {
-    clear: both;
-}
-
-/* General Text
----------------------------------------------------- */
-h1 {
-    font-size: x-large;
-    font-weight: bold;
-    padding-left: 15px;
-}
-h2 {
-    display:block;
-    margin:0;
-    padding:0;
-    text-align: center;
-}
-h3 {
-    font-size: large;
-    padding-left: 15px;
-}
-h4 {
-    font-size: medium;
-    background-color: #9DBF9D;
-    padding-left: 15px;
-    margin-bottom: 0px;
-    border-bottom: solid 1px #7C8F7C;
-}
-p#description {
-    padding-left: 15px;
-}
-a {
-    color: black;
-    text-decoration: none;
-    word-wrap: break-word;
-}
-a[href]:hover, a[href]:active {
-    background-color: #9DBF9D;
-}
-.grampsid {
-    font-family: monospace;
-    font-size: smaller;
-    color: #7C8F7C;
-}
-
-/* Header
----------------------------------------------------- */
-#header {
-    color: #E0E6E0;
-}
-#user_header, #user_footer {
-    padding-left: 15px;
-}
-
-/* Navigation
----------------------------------------------------- */
-div#nav, #subnavigation {
-    border: solid 1px #454; /* needed by IE7 */
-}
-#subnavigation ul {
-    overflow: hidden;
-}
-div#nav ul, #subnavigation ul {
-    list-style: none;
-    margin: 0px;
-    padding-left: 15px;
-}
-#subnavigation ul {
-    border-bottom: solid 1px #7C8F7C;
-}
-div#nav ul li, #subnavigation ul li {
-    float: left;
-}
-div#nav ul li a, #subnavigation ul li a {
-    display: block;
-    font-size: smaller;
-    font-weight: bold;
-    color: #E0E6E0;
-    padding: 5px;
-    border-bottom: solid 1px #454;
-}
-div#nav ul li a:hover, #subnavigation ul li a:hover {
-    text-decoration: none;
-    background-color: #9DBF9D;
-    border-bottom: solid 1px black;
-}
-div#nav ul li.CurrentSection a {
-    position: relative;
-    top: 1px;
-    color: #454;
-    border: solid 1px #7C8F7C;
-    border-bottom-style: none;
-    background-color: white;
-}
-#subnavigation ul li.CurrentSection a {
-    color: #454;
-    background-color: white;
-}
-/* Alphabet Navigation
----------------------------------------------------- */
-div#alphanav {
-    background-color: #454
-}
-div#alphanav ul {
-    list-style: none;
-    border-width: 2px 0px 4px 0px;
-    border-style: solid;
-    border-color: black;
-    margin: 0px;
-    padding-left: 15px;
-    /* float container stretch, see www.quirksmode.org/css/clearing.html */
-    overflow: hidden;
-}
-div#alphanav ul li {
-    float: left;
-    font-size: larger;
-    font-weight: bold;
-}
-div#alphanav ul li:after {
-    content: " |";
-}
-div#alphanav ul li a {
-    display: block;
-    padding: 4px 8px;
-    line-height: 100%;
-    float: left;
-    color: white;
-}
-div#alphanav ul li a:hover {
-    text-decoration: none;
-    background-color: black;
-    color: white;
-}
-
-/* Main Table
----------------------------------------------------- */
-table {
-    border-collapse: collapse;
-    width: 100%;
-}
-div#summaryarea > table.infolist,
-div#parents > table.infolist,
-h3 + table.infolist {
-    width: auto;
-}
-table tr th {
-    text-align: left;
-    background-color: #E0E6E0;
-    border-top: solid 1px #7C8F7C;
-    border-bottom: solid 1px #7C8F7C;
-}
-table tr th:first-child {
-    border-left: solid 1px #7C8F7C;
-}
-table tr th:last-child {
-    border-right: solid 1px #7C8F7C;
-}
-table.primobjlist tr th {
-    background-color: #9DBF9D;
-}
-table td, table th {
-    vertical-align: top;
-    padding-left: 1ex;
-}
-table.primobjlist td {
-    vertical-align: middle;
-}
-table td:first-child, table th:first-child {
-    padding-left: 15px;
-}
-table.primobjlist tr a {
-    display: block; /* make whole td clickable */
-}
-table.primobjlist tr.BeginLetter td, table.primobjlist tr.BeginSurname td {
-    border-top: solid 1px #9DBF9D;
-}
-td.ColumnLetter, td.ColumnRowLabel {
-    font-weight: bold;
-}
-/* bug #8213 testing by Stephane, 2014-12-6 */
-td.ColumnEvent, td.ColumnDate {
-    white-space: nowrap;
-}
-td.ColumnPlace, td.ColumnDescription {
-    width: 20%
-}
-/* end of customizations by Stephane */
-td.ColumnBirth, td.ColumnDeath, td.ColumnPartner, td.ColumnParents {
-    font-size: 90%;
-}
-table.infolist tr td ol {
-    margin: 0px;
-}
-#summaryarea table.infolist td.ColumnAttribute,
-#parents table.infolist td.ColumnAttribute,
-#families table.infolist td.ColumnType,
-#families table.infolist td.ColumnAttribute {
-    color: #454;
-}
-/* div summaryarea is missing for events, sources and repos! */
-h3 + table.infolist td.ColumnAttribute {
-    color: #454;
-}
-table.primobjlist td.ColumnParents span.mother:before {
-    content: "+ ";
-}
-
-/* Surnames
----------------------------------------------------- */
-table#SortByName td.ColumnSurname, table#SortByName th.ColumnSurname,
-table#SortByCount td.ColumnQuantity, table#SortByCount th.ColumnQuantity {
-    background-color: #E0E6E0;
-}
-/* make the whole cell light up on hover not just the a. */
-table#SortByName td.ColumnSurname,
-table#SortByName th.ColumnSurname,
-table#SortByName th.ColumnQuantity {
-    padding-left: 0px;
-}
-table#SortByName td.ColumnSurname > a,
-table#SortByName th.ColumnSurname > a,
-table#SortByName th.ColumnQuantity > a {
-    padding-left: 1ex;
-}
-table#SortByName thead th.ColumnSurname a:after,
-table#SortByCount thead th.ColumnQuantity a:after {
-    content: " \2193";
-}
-table#SortByName th.ColumnSurname a:hover,
-table#SortByName th.ColumnQuantity a:hover,
-table#SortByCount th.ColumnSurname a:hover,
-table#SortByCount th.ColumnQuantity a:hover {
-    background-color: #E0E6E0;
-}
-table.surname td.ColumnName {
-    background-color: #E0E6E0;
-}
-/* make the whole cell light up on hover not just the a. */
-table.surname td.ColumnName {
-    padding-left: 0px;
-}
-table.surname td.ColumnName > a {
-    padding-left: 15px;
-}
-
-/* Individuals
----------------------------------------------------- */
-table.IndividualList td.ColumnSurname {
-    background-color: #E0E6E0;
-}
-
-/* Places
----------------------------------------------------- */
-#Places table.infolist td.ColumnName {
-    background-color: #E0E6E0;
-}
-/* make the whole cell light up on hover not just the a. */
-#Places table.infolist td.ColumnName {
-    padding-left: 0px;
-}
-#Places table.infolist td.ColumnName > a {
-    padding-left: 1ex;
-}
-
-/* Events
----------------------------------------------------- */
-#EventList table.infolist tr.BeginType td {
-    border-top:dashed 1px #9DBF9D;
-}
-#EventList table.infolist tr.BeginLetter td {
-    border-top:solid 1px #9DBF9D;
-}
-#EventList table.infolist td.ColumnType {
-    background-color: #E0E6E0;
-}
-#EventList td.ColumnPerson a {
-    display: inline;
-}
-#EventList td.ColumnPerson span.person:after,
-#EventList td.ColumnPerson span.father:after,
-#EventList td.ColumnPerson span.mother:after,
-#EventDetail td.ColumnPerson span.person:after,
-#EventDetail td.ColumnPerson span.father:after,
-#EventDetail td.ColumnPerson span.mother:after {
-    content: ", ";
-}
-#EventList td.ColumnPerson span.fatherNmother:after,
-#EventDetail td.ColumnPerson span.fatherNmother:after {
-    content: " + ";
-}
-#EventList td.ColumnPerson span.person:last-child:after,
-#EventList td.ColumnPerson span.father:last-child:after,
-#EventList td.ColumnPerson span.mother:last-child:after,
-#EventDetail td.ColumnPerson span.person:last-child:after,
-#EventDetail td.ColumnPerson span.father:last-child:after,
-#EventDetail td.ColumnPerson span.mother:last-child:after {
-    content: "";
-}
-
-table.eventlist tbody tr td.ColumnSources {
-    width: 5%;
-}
-
-/* Gallery
----------------------------------------------------- */
-#GalleryNav {
-    text-align: center;
-    margin: 2em 0px;
-}
-#GalleryNav a {
-    font-weight: bold;
-    background-color: #E0E6E0;
-    border: solid 1px #7C8F7C;
-    margin: 1em;
-}
-#GalleryNav a:hover {
-    background-color: #9DBF9D;
-}
-#GalleryNav a#Previous {
-    padding: .4em .7em .3em .7em;
-}
-#GalleryNav a#Next {
-    padding: .4em 1.9em .3em 1.9em;
-}
-#GalleryCurrent {
-    font-size: larger;
-}
-#GalleryTotal {
-    font-weight: normal;
-}
-#GalleryDisplay {
-    margin: 0px auto;
-    position: relative;
-}
-#GalleryDisplay img {
-    margin: 0px auto;
-    display: block;
-    border: solid 1px #7C8F7C;
-}
-#GalleryDetail h3 {
-    text-align: center;
-}
-
-/*    Sources
------------------------------------------------------ */
-div#SourceDetail {
-    margin: 0 auto;
-}
-
-/* Contact
----------------------------------------------------- */
-#Contact {
-    overflow: hidden;
-}
-#Contact #summaryarea {
-    width: 40em;
-    margin: 2em auto;
-    padding: 3em;
-    background-color: #E0E6E0;
-    border: solid 1px #7C8F7C;
-}
-#Contact img {
-    float: right;
-    border: solid 1px #7C8F7C;
-}
-#Contact #researcher, #Contact #researcher h3 {
-    font-size: larger;
-    padding-left: 0px;
-}
-#Contact #streetaddress, #Contact #locality, #Contact #email {
-    display: block;
-}
-#Contact #locality, #Contact #city, #Contact #state, #Contact #postalcode,
-#Contact #country {
-    white-space: nowrap;
-}
-#Contact #city:after {
-    content: ",";
-}
-
-/* Download
----------------------------------------------------- */
-#Download table.download a {
-    display: block;
-}
-
-/* Subsection
----------------------------------------------------- */
-#Home, #Introduction {
-    overflow: hidden;
-}
-#Home img, #Introduction img {
-    float: right;
-    margin: 1em;
-    max-width: 950px;
-}
-#Home p, #Introduction p {
-    padding-left: 15px;
-}
-.subsection {
-    clear: both;
-    overflow: visible;
-}
-.subsection p {
-    margin: 0px;
-}
-
-/* Subsection : Families
----------------------------------------------------- */
-div#families table.fixed_subtables table.eventlist {
-    table-layout: fixed;
-}
-div#families table.fixed_subtables table.eventlist th:first-child {
-    width: 9em;
-}
-div#families table.fixed_subtables table.eventlist th:last-child {
-    width: 5em;
-}
-div#families table.attrlist td.ColumnType {
-    color: black;
-}
-
-/* Subsection : Gallery
----------------------------------------------------- */
-#indivgallery .thumbnail {
-    float: left;
-    width: 130px;
-    font-size: smaller;
-    text-align: center;
-    margin: 0.8em 0.5em;
-}
-#indivgallery h4 + .thumbnail {
-    margin-left: 15px;
-    /* Problem: if there are more thumnails then fit on a single row, the
-     *          first thumnail on each next row should also have a margin-left
-     *          of 15 px. */
-}
-#indivgallery img {
-    border: solid 1px #7C8F7C;
-}
-#indivgallery span {
-/* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
-    display: none; */
-}
-
-/* Subsection : Narrative
----------------------------------------------------- */
-h4 + div.grampsstylednote, a.familymap {
-    margin: 1em 15px;
-}
-i + div.grampsstylednote p {
-    margin: 0 0 0.3em 0;
-}
-div.grampsstylednote p {
-    margin-bottom: 0.5em;
-}
-
-/* Subsection : Family Map
----------------------------------------------------- */
-a.familymap {
-    display: block;
-}
-
-/* Subsection : Source References
----------------------------------------------------- */
-#sourcerefs ol li ol {
-    list-style-type: lower-alpha;
-}
-
-/* Subsection : Pedigree
----------------------------------------------------- */
-.pedigreegen {
-    list-style-type: none;
-    padding-left: 15px;
-}
-.pedigreegen li ol {
-    list-style-type: none;
-}
-.pedigreegen li ol li ol {
-    list-style-type: decimal;
-}
-.pedigreegen ol.spouselist {
-    list-style-type: none;
-}
-.pedigreegen ol.spouselist li.spouse ol {
-    list-style-type: decimal;
-}
-.spouse:before {
-    content: "+ ";
-}
-.thisperson {
-    font-weight: bold;
-}
-.thisperson > ol {
-    font-weight: normal;
-}
-
-/* Footer
----------------------------------------------------- */
-#footer {
-    clear: both;
-    color: #E0E6E0;
-    padding-top: 1em;
-    background-color: #9DBF9D;
-    border-top: solid 1px #454;
-}
-#footer a {
-    color: #E0E6E0;
-}
-#footer > * {
-    background-color: #454;
-}
-#footer p#createdate {
-    float: left;
-    width: 50%;
-    text-align: left;
-    padding-left: 15px;
-    margin-top: 1em;
-}
-#footer p#copyright {
-    float: right;
-    width: 40%;
-    text-align: right;
-    padding-right: 15px;
-}
-
-/* Overwritten
----------------------------------------------------- */
-body#FamilyMap {
-    background-color: #E0E6E0 ! important;
-}
-
-/* Calendar Styles
-===================================================== */
-table.calendar {
-    table-layout: fixed;
-    empty-cells: show;
-}
-.calendar thead th {
-    text-align: center;
-    border-top-style: none;
-}
-.calendar thead th.monthName {
-    font-size: xx-large;
-    font-weight: normal;
-    background-color: white;
-    border-bottom-style: none;
-    padding-top: 1em;
-}
-.calendar thead th abbr {
-    border-bottom-style: none;
-}
-#CreatorInfo {
-    float: right;
-    margin: -1em 15px 0px 0px;
-    font-weight: bold;
-    color: #7C8F7C;
-}
-.calendar tfoot tr td {
-    border-top: solid 4px #7C8F7C;
-    vertical-align: middle;
-}
-
-/* Calendar : Date Numeral */
-.calendar div.date {
-    float: right;
-    width: 1.8em;
-    font-size: large;
-    text-align: center;
-    background-color: #9DBF9D;
-    color: #454;
-}
-
-/* Calendar : Date Container */
-.calendar td {
-    padding: 0px 0px 0px 1ex;
-    border-width: 1px 0px 0px 1px;
-    border-style: solid;
-    border-color: #9DBF9D;
-    background-color: white;
-}
-.calendar td:first-child {
-    border-left-style: none;
-    padding: 0px 0px 0px 1ex;
-}
-.calendar tbody tr:first-child td {
-    border-top-style: none;
-}
-
-/* Calendar : Date Detail */
-.calendar td ul {
-    font-size: smaller;
-    list-style: none;
-    padding: 0px;
-}
-.calendar td ul li {
-    border-top: dashed 1px #9DBF9D;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-.calendar td ul li:first-child {
-    border-style: none;
-}
-
-/* Calendar : Birthday, Anniversary, Highlight */
-.calendar td ul li em {
-    font-style: normal;
-    color: #7C8F7C;
-}
-.calendar td.highlight {
-    background-color: #E0E6E0;
-}
-.calendar td.highlight div.date {
-    color: black;
-    background-color: #9DBF9D;
-}
-
-/* Calendar : Previous-Next Month */
-.calendar td.previous,
-.calendar td.next,
-.calendar td.previous div.date,
-.calendar td.next div.date {
-    color: #9DBF9D;
-    background-color: white;
-}
-
-/* Calendar : Full Year */
-body#fullyearlinked div.content {
-    overflow: hidden;
-}
-body#fullyearlinked table.calendar {
-    float: left;
-    width: 33.3%;
-    height: 18em;
-    border: solid 1px black;
-}
-body#fullyearlinked table.calendar thead th {
-    height: 2em;
-}
-body#fullyearlinked table.calendar thead th.monthName {
-    font-size: large;
-    padding: 2px 0px;
-}
-body#fullyearlinked table.calendar tbody td {
-    height: 3em;
-}
-body#OneDay div.content {
-    overflow: hidden;
-}
--- a/data/css/Web_Basic-Lilac.css
+++ b/data/css/Web_Basic-Lilac.css
@@ -1,724 +0,0 @@
-/*
-**************************************************************************************************
-Copyright Holder and License
-**************************************************************************************************
-GRAMPS Cascading Style Sheet
-Style Name: Basic - Lilac
-Style Author: Jason M. Simanek (2008)
-Note: Adapted from GRAMPS original Modern Style stylesheet with colors from the original 'Business' stylesheet
-**************************************************************************************************
-This website was created with GRAMPS <http://www.gramps-project.org/>
--------------------------------------------------------------------------------------------------
-GRAMPS is a Free Software Project for Genealogy, offering a professional
-
-genealogy program, and a wiki open to all. It is a community project, created,
-developed and governed by genealogists.
-
-Go to <http://gramps-project.org/> to learn more!
-
--------------------------------------------------------------------------------------------------
-Copyright 2008 Jason M. Simanek
-Copyright 2009 Stephane Charette
-Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
-Copyright 2011 Michiel D. Nauta
-
-This file is part of the GRAMPS program.
-
-GRAMPS is free software: you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation, version 2 of the License.
-
-GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-GRAMPS. If not, see <http://www.gnu.org/licenses/>.
--------------------------------------------------------------------------------------------------
-
-Color Palette
--------------------------------------------------------------------------------------------------
-
-black                   #000
-lilac dark              #2E2E61
-lilac                   #669
-lilac light             #B4B4CB
-lilac very light        #E0E0E9
-white                   #FAFAFF
--------------------------------------------------------------------------------------------------
-Characteristic of this style is that it uses the full width of the browser
-window and that horizontal highlighting bars extend over the full width of
-the page.
--------------------------------------------------------------------------------------------------
-
- NarrativeWeb Styles
------------------------------------------------------------------------------------------------ 
-
- General Elements
----------------------------------------------------- */
-
-body {
-    font-family: sans-serif;
-    font-size: 90%;
-    color: black;
-    margin: 0px;
-    background-color: #E0E0E9;
-}
-body > div {
-    clear: both;
-}
-.content {
-    background-color: #FAFAFF;
-    border-top: solid 1px #669;
-}
-.content div.snapshot {
-    float: right;
-    margin: 2em;
-}
-.fullclear {
-    clear: both;
-}
-
-/* General Text
----------------------------------------------------- */
-h1 {
-    font-size: x-large;
-    font-weight: bold;
-    padding-left: 15px;
-}
-h2 {
-    display:block;
-    margin:0;
-    padding:0;
-    text-align: center;
-}
-h3 {
-    font-size: large;
-    padding-left: 15px;
-}
-h4 {
-    font-size: medium;
-    color: #2E2E61;
-    background-color: #B4B4CB;
-    padding-left: 15px;
-    margin-bottom: 0px;
-    border-bottom: solid 1px #669;
-}
-p#description {
-    padding-left: 15px;
-}
-a {
-    color: black;
-    text-decoration: none;
-    word-wrap: break-word;
-}
-a[href]:hover, a[href]:active {
-    background-color: #E0E0E9
-}
-.grampsid {
-    font-family: monospace;
-    font-size: smaller;
-    color: #669;
-}
-
-/* Header
----------------------------------------------------- */
-#SiteTitle {
-    color: #2E2E61;
-}
-#user_header, #user_footer {
-    padding-left: 15px;
-}
-
-/* Navigation
----------------------------------------------------- */
-div#nav, #subnavigation {
-    border: solid 1px #E0E0E9; /* needed by IE7 */
-}
-#subnavigation ul {
-    overflow: hidden;
-}
-div#nav ul, #subnavigation ul {
-    list-style: none;
-    margin: 0px;
-    padding-left: 15px;
-}
-#subnavigation ul {
-    border-bottom: solid 1px #669;
-}
-div#nav ul li, #subnavigation ul li {
-    float: left;
-}
-div#nav ul li a, #subnavigation ul li a {
-    display: block;
-    font-size: smaller;
-    font-weight: bold;
-    padding: 5px;
-    border-bottom: solid 1px #E0E0E9;
-}
-div#nav ul li a:hover, #subnavigation ul li a:hover {
-    text-decoration: none;
-    background-color: #B4B4CB;
-    border-bottom: solid 1px black;
-}
-div#nav ul li.CurrentSection a {
-    position: relative;
-    top: 1px;
-    border: solid 1px #669;
-    border-bottom-style: none;
-    background-color: #FAFAFF;
-}
-#subnavigation ul li.CurrentSection a {
-    background-color: #FAFAFF;
-}
-
-/* Alphabet Navigation
----------------------------------------------------- */
-div#alphanav {
-    background-color: #E0E0E9;
-}
-div#alphanav ul {
-    list-style: none;
-    border-width: 2px 0px 4px 0px;
-    border-style: solid;
-    border-color: black;
-    margin: 0px;
-    padding-left: 15px;
-    /* float container stretch, see www.quirksmode.org/css/clearing.html */
-    overflow: hidden;
-}
-div#alphanav ul li {
-    float: left;
-    font-size: larger;
-    font-weight: bold;
-}
-div#alphanav ul li:after {
-    content: " |";
-}
-div#alphanav ul li a {
-    display: block;
-    padding: 4px 8px;
-    line-height: 100%;
-    float: left;
-}
-div#alphanav ul li a:hover {
-    text-decoration: none;
-    background-color: black;
-    color: #FAFAFF;
-}
-
-/* Main Table
----------------------------------------------------- */
-table {
-    border-collapse: collapse;
-    width: 100%;
-}
-div#summaryarea > table.infolist,
-div#parents > table.infolist,
-h3 + table.infolist {
-    width: auto;
-}
-table tr th {
-    text-align: left;
-    background-color: #E0E0E9;
-    border-top: solid 1px #669;
-    border-bottom: solid 1px #669;
-}
-table tr th:first-child {
-    border-left: solid 1px #669;
-}
-table tr th:last-child {
-    border-right: solid 1px #669;
-}
-table.primobjlist tr th {
-    background-color: #B4B4CB;
-}
-table td, table th {
-    vertical-align: top;
-    padding-left: 1ex;
-}
-table.primobjlist td {
-    vertical-align: middle;
-}
-table td:first-child, table th:first-child {
-    padding-left: 15px;
-}
-table.primobjlist tr a {
-    display: block; /* make whole td clickable */
-}
-table.primobjlist tr.BeginLetter td, table.primobjlist tr.BeginSurname td {
-    border-top: solid 1px #B4B4CB;
-}
-td.ColumnLetter, td.ColumnRowLabel {
-    font-weight: bold;
-}
-td.ColumnBirth, td.ColumnDeath, td.ColumnPartner, td.ColumnParents {
-    font-size: 90%;
-}
-table.infolist tr td ol {
-    margin: 0px;
-}
-#summaryarea table.infolist td.ColumnAttribute,
-#parents table.infolist td.ColumnAttribute,
-#families table.infolist td.ColumnType,
-#families table.infolist td.ColumnAttribute {
-    color: #2E2E61;
-}
-/* div summaryarea is missing for events, sources and repos! */
-h3 + table.infolist td.ColumnAttribute {
-    color: #2E2E61;
-}
-table.primobjlist td.ColumnParents span.mother:before {
-    content: "+ ";
-}
-
-/* Surnames
----------------------------------------------------- */
-table#SortByName td.ColumnSurname, table#SortByName th.ColumnSurname,
-table#SortByCount td.ColumnQuantity, table#SortByCount th.ColumnQuantity {
-    background-color: #E0E0E9;
-}
-table#SortByName td.ColumnSurname a[href]:hover {
-    background-color: #B4B4CB;
-}
-/* make the whole cell light up on hover not just the a. */
-table#SortByName td.ColumnSurname,
-table#SortByName th.ColumnSurname,
-table#SortByName th.ColumnQuantity {
-    padding-left: 0px;
-}
-table#SortByName td.ColumnSurname > a,
-table#SortByName th.ColumnSurname > a,
-table#SortByName th.ColumnQuantity > a {
-    padding-left: 1ex;
-}
-table#SortByName thead th.ColumnSurname a:after,
-table#SortByCount thead th.ColumnQuantity a:after {
-    content: " \2193";
-}
-table.surname td.ColumnName {
-    background-color: #E0E0E9;
-}
-table.surname td.ColumnName a[href]:hover {
-    background-color: #B4B4CB;
-}
-/* make the whole cell light up on hover not just the a. */
-table.surname td.ColumnName {
-    padding-left: 0px;
-}
-table.surname td.ColumnName > a {
-    padding-left: 15px;
-}
-
-/* Individuals
----------------------------------------------------- */
-table.IndividualList td.ColumnSurname {
-    background-color: #E0E0E9;
-}
-
-/* Places
----------------------------------------------------- */
-#Places table.infolist td.ColumnName {
-    background-color: #E0E0E9;
-}
-#Places table.infolist td.ColumnName a[href]:hover {
-    background-color: #B4B4CB;
-}
-/* make the whole cell light up on hover not just the a. */
-#Places table.infolist td.ColumnName {
-    padding-left: 0px;
-}
-#Places table.infolist td.ColumnName > a {
-    padding-left: 1ex;
-}
-
-/* Events
----------------------------------------------------- */
-#EventList table.infolist tr.BeginType td {
-    border-top:dashed 1px #B4B4CB;
-}
-#EventList table.infolist tr.BeginLetter td {
-    border-top:solid 1px #B4B4CB;
-}
-#EventList table.infolist td.ColumnType {
-    background-color: #E0E0E9;
-}
-#EventList td.ColumnPerson a {
-    display: inline;
-}
-#EventList td.ColumnPerson span.person:after,
-#EventList td.ColumnPerson span.father:after,
-#EventList td.ColumnPerson span.mother:after,
-#EventDetail td.ColumnPerson span.person:after,
-#EventDetail td.ColumnPerson span.father:after,
-#EventDetail td.ColumnPerson span.mother:after {
-    content: ", ";
-}
-#EventList td.ColumnPerson span.fatherNmother:after,
-#EventDetail td.ColumnPerson span.fatherNmother:after {
-    content: " + ";
-}
-#EventList td.ColumnPerson span.person:last-child:after,
-#EventList td.ColumnPerson span.father:last-child:after,
-#EventList td.ColumnPerson span.mother:last-child:after,
-#EventDetail td.ColumnPerson span.person:last-child:after,
-#EventDetail td.ColumnPerson span.father:last-child:after,
-#EventDetail td.ColumnPerson span.mother:last-child:after {
-    content: "";
-}
-
-table.eventlist tbody tr td.ColumnSources {
-    width: 5%;
-}
-
-/* Gallery
----------------------------------------------------- */
-#GalleryNav {
-    text-align: center;
-    margin: 2em 0px;
-}
-#GalleryNav a {
-    font-weight: bold;
-    background-color: #E0E0E9;
-    border: solid 1px #669;
-    margin: 1em;
-}
-#GalleryNav a:hover {
-    background-color: #B4B4CB;
-}
-#GalleryNav a#Previous {
-    padding: .4em .7em .3em .7em;
-}
-#GalleryNav a#Next {
-    padding: .4em 1.9em .3em 1.9em;
-}
-#GalleryCurrent {
-    font-size: larger;
-}
-#GalleryTotal {
-    font-weight: normal;
-}
-#GalleryDisplay {
-    margin: 0px auto;
-    position: relative;
-}
-#GalleryDisplay img {
-    margin: 0px auto;
-    display: block;
-    border: solid 1px #669;
-}
-#GalleryDetail h3 {
-    text-align: center;
-}
-
-/*    Sources
------------------------------------------------------ */
-div#SourceDetail {
-    margin: 0 auto;
-}
-
-/* Contact
----------------------------------------------------- */
-#Contact {
-    overflow: hidden;
-}
-#Contact #summaryarea {
-    width: 40em;
-    margin: 2em auto;
-    padding: 3em;
-    background-color: #E0E0E9;
-    border: solid 1px #669;
-}
-#Contact img {
-    float: right;
-    border: solid 1px #669;
-}
-#Contact #researcher, #Contact #researcher h3 {
-    font-size: larger;
-    padding-left: 0px;
-}
-#Contact #streetaddress, #Contact #locality, #Contact #email {
-    display: block;
-}
-#Contact #locality, #Contact #city, #Contact #state, #Contact #postalcode,
-#Contact #country {
-    white-space: nowrap;
-}
-#Contact #city:after {
-    content: ",";
-}
-
-/* Download
----------------------------------------------------- */
-#Download table.download a {
-    display: block;
-}
-
-/* Subsection
----------------------------------------------------- */
-#Home, #Introduction {
-    overflow: hidden;
-}
-#Home img, #Introduction img {
-    float: right;
-    margin: 1em;
-    max-width: 950px;
-}
-#Home p, #Introduction p {
-    padding-left: 15px;
-}
-.subsection {
-    clear: both;
-    overflow: visible;
-}
-.subsection p {
-    margin: 0px;
-}
-
-/* Subsection : Families
----------------------------------------------------- */
-div#families table.fixed_subtables table.eventlist {
-    table-layout: fixed;
-}
-div#families table.fixed_subtables table.eventlist th:first-child {
-    width: 9em;
-}
-div#families table.fixed_subtables table.eventlist th:last-child {
-    width: 5em;
-}
-div#families table.attrlist td.ColumnType {
-    color: black;
-}
-
-/* Subsection : Gallery
----------------------------------------------------- */
-#indivgallery .thumbnail {
-    float: left;
-    width: 130px;
-    font-size: smaller;
-    text-align: center;
-    margin: 0.8em 0.5em;
-}
-#indivgallery h4 + .thumbnail {
-    margin-left: 15px;
-    /* Problem: if there are more thumnails then fit on a single row, the
-     *          first thumnail on each next row should also have a margin-left
-     *          of 15 px. */
-}
-#indivgallery img {
-    border: solid 1px #669;
-}
-#indivgallery span {
-/* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
-    display: none; */
-}
-
-/* Subsection : Narrative
----------------------------------------------------- */
-h4 + div.grampsstylednote, a.familymap {
-    margin: 1em 15px;
-}
-i + div.grampsstylednote p {
-    margin: 0 0 0.3em 0;
-}
-div.grampsstylednote p {
-    margin-bottom: 0.5em;
-}
-
-/* Subsection : Family Map
----------------------------------------------------- */
-a.familymap {
-    display: block;
-}
-
-/* Subsection : Source References
----------------------------------------------------- */
-#sourcerefs ol li ol {
-    list-style-type: lower-alpha;
-}
-
-/* Subsection : Pedigree
----------------------------------------------------- */
-.pedigreegen {
-    list-style-type: none;
-    padding-left: 15px;
-}
-.pedigreegen li ol {
-    list-style-type: none;
-}
-.pedigreegen li ol li ol {
-    list-style-type: decimal;
-}
-.pedigreegen ol.spouselist {
-    list-style-type: none;
-}
-.pedigreegen ol.spouselist li.spouse ol {
-    list-style-type: decimal;
-}
-.spouse:before {
-    content: "+ ";
-}
-.thisperson {
-    font-weight: bold;
-}
-.thisperson > ol {
-    font-weight: normal;
-}
-
-/* Footer
----------------------------------------------------- */
-#footer {
-    clear: both;
-    padding-top: 1em;
-    background-color: #B4B4CB;
-    border-top: solid 1px #2E2E61;
-}
-#footer > * {
-    background-color: #E0E0E9;
-}
-#footer p#createdate {
-    float: left;
-    width: 50%;
-    text-align: left;
-    padding-left: 15px;
-    margin-top: 1em;
-}
-#footer p#copyright {
-    float: right;
-    width: 40%;
-    text-align: right;
-    padding-right: 15px;
-}
-#footer a[href]:hover {
-    background-color: #B4B4CB;
-}
-
-/* Overwritten
----------------------------------------------------- */
-body#FamilyMap {
-    background-color: #E0E0E9 ! important;
-}
-
-/* Calendar Styles
-===================================================== */
-table.calendar {
-    table-layout: fixed;
-    empty-cells: show;
-}
-.calendar thead th {
-    text-align: center;
-    border-top-style: none;
-}
-.calendar thead th.monthName {
-    font-size: xx-large;
-    font-weight: normal;
-    background-color: #FAFAFF;
-    border-bottom-style: none;
-    padding-top: 1em;
-}
-.calendar thead th abbr {
-    border-bottom-style: none;
-}
-#CreatorInfo {
-    float: right;
-    margin: -1em 15px 0px 0px;
-    font-weight: bold;
-    color: #669;
-}
-#CreatorInfo a[href]:hover {
-    background-color: #B4B4CB;
-}
-.calendar tfoot tr td {
-    border-top: solid 4px #669;
-    vertical-align: middle;
-}
-
-/* Calendar : Date Numeral */
-.calendar div.date {
-    float: right;
-    width: 1.8em;
-    font-size: large;
-    text-align: center;
-    background-color: #B4B4CB;
-    color: #2E2E61;
-}
-
-/* Calendar : Date Container */
-.calendar td {
-    padding: 0px 0px 0px 1ex;
-    border-width: 1px 0px 0px 1px;
-    border-style: solid;
-    border-color: #B4B4CB;
-    background-color: #FAFAFF;
-}
-.calendar td:first-child {
-    border-left-style: none;
-    padding: 0px 0px 0px 1ex;
-}
-.calendar tbody tr:first-child td {
-    border-top-style: none;
-}
-
-/* Calendar : Date Detail */
-.calendar td ul {
-    font-size: smaller;
-    list-style: none;
-    padding: 0px;
-}
-.calendar td ul li {
-    border-top: dashed 1px #B4B4CB;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-.calendar td ul li:first-child {
-    border-style: none;
-}
-.calendar td ul a[href]:hover {
-    background-color: #B4B4CB;
-}
-
-/* Calendar : Birthday, Anniversary, Highlight */
-.calendar td ul li em {
-    font-style: normal;
-    color: #669;
-}
-.calendar td.highlight {
-    background-color: #E0E0E9;
-}
-.calendar td.highlight div.date {
-    color: black;
-    background-color: #B4B4CB;
-}
-
-/* Calendar : Previous-Next Month */
-.calendar td.previous,
-.calendar td.next,
-.calendar td.previous div.date,
-.calendar td.next div.date {
-    color: #B4B4CB;
-    background-color: #FAFAFF;
-}
-
-/* Calendar : Full Year */
-body#fullyearlinked div.content {
-    overflow: hidden;
-}
-body#fullyearlinked table.calendar {
-    float: left;
-    width: 33.3%;
-    height: 18em;
-    border: solid 1px black;
-}
-body#fullyearlinked table.calendar thead th {
-    height: 2em;
-}
-body#fullyearlinked table.calendar thead th.monthName {
-    font-size: large;
-    padding: 2px 0px;
-}
-body#fullyearlinked table.calendar tbody td {
-    height: 3em;
-}
-body#OneDay div.content {
-    overflow: hidden;
-}
--- a/data/css/Web_Basic-Peach.css
+++ b/data/css/Web_Basic-Peach.css
@@ -1,734 +0,0 @@
-/*
-**************************************************************************************************
-Copyright Holder and License
-**************************************************************************************************
-GRAMPS Cascading Style Sheet
-Style Name: Basic-Peach Stylesheet
-Style Author: Jason M. Simanek (2008)
-Note: Adapted from GRAMPS original Modern Style stylesheet with a new orange color scheme.
-**************************************************************************************************
-This website was created with GRAMPS <http://www.gramps-project.org/>
--------------------------------------------------------------------------------------------------
-GRAMPS is a Free Software Project for Genealogy, offering a professional
-
-genealogy program, and a wiki open to all. It is a community project, created,
-developed and governed by genealogists.
-
-Go to <http://gramps-project.org/> to learn more!
-
--------------------------------------------------------------------------------------------------
-Copyright 2008 Jason M. Simanek
-Copyright 2009 Stephane Charette
-Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
-Copyright 2011 Michiel D. Nauta
-
-This file is part of the GRAMPS program.
-
-GRAMPS is free software: you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation, version 2 of the License.
-
-GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-GRAMPS. If not, see <http://www.gnu.org/licenses/>.
--------------------------------------------------------------------------------------------------
-
-Color Palette
--------------------------------------------------------------------------------------------------
-
-black                   #36220B
-brown                   #8C581C
-orange dark             #EA8414
-orange                  #FFC35E
-orange light            #FFE09F
-yellow light            #FFFBE7
--------------------------------------------------------------------------------------------------
-Characteristic of this style is that it uses the full width of the browser
-window and that horizontal highlighting bars extend over the full width of
-the page.
--------------------------------------------------------------------------------------------------
-
- NarrativeWeb Styles
------------------------------------------------------------------------------------------------ 
-
- General Elements
----------------------------------------------------- */
-
-body {
-    font-family: sans-serif;
-    font-size: 90%;
-    color: #36220B;
-    margin: 0px;
-    background-color: #FFE09F;
-}
-body > div {
-    clear: both;
-}
-.content {
-    background-color: #FFFBE7;
-    border-top: solid 1px #8C581C;
-}
-.content div.snapshot {
-    float: right;
-    margin: 2em;
-}
-.fullclear {
-    clear: both;
-}
-
-/* General Text
----------------------------------------------------- */
-h1 {
-    font-size: x-large;
-    font-weight: bold;
-    padding-left: 15px;
-}
-h2 {
-    display:block;
-    margin:0;
-    padding:0;
-    text-align: center;
-}
-h3 {
-    font-size: large;
-    padding-left: 15px;
-}
-h4 {
-    font-size: medium;
-    color: #EA8414;
-    background-color: #FFC35E;
-    padding-left: 15px;
-    margin-bottom: 0px;
-    border-bottom: solid 1px #8C581C;
-}
-p#description {
-    padding-left: 15px;
-}
-a {
-    color: #36220B;
-    text-decoration: none;
-    word-wrap: break-word;
-}
-a[href]:hover, a[href]:active {
-    background-color: #FFE09F
-}
-.grampsid {
-    font-family: monospace;
-    font-size: smaller;
-    color: #8C581C;
-}
-
-/* Header
----------------------------------------------------- */
-#SiteTitle {
-    color: #EA8414;
-}
-#user_header, #user_footer {
-    padding-left: 15px;
-}
-
-/* Navigation
----------------------------------------------------- */
-div#nav, #subnavigation {
-    border: solid 1px #FFE09F; /* needed by IE7 */
-}
-#subnavigation ul {
-    overflow: hidden;
-}
-div#nav ul, #subnavigation ul {
-    list-style: none;
-    margin: 0px;
-    padding-left: 15px;
-}
-#subnavigation ul {
-    border-bottom: solid 1px #8C581C;
-}
-div#nav ul li, #subnavigation ul li {
-    float: left;
-}
-div#nav ul li a, #subnavigation ul li a {
-    display: block;
-    font-size: smaller;
-    font-weight: bold;
-    padding: 5px;
-    border-bottom: solid 1px #FFE09F;
-}
-div#nav ul li a:hover, #subnavigation ul li a:hover {
-    text-decoration: none;
-    background-color: #FFC35E;
-    border-bottom: solid 1px #36220B;
-}
-div#nav ul li.CurrentSection a {
-    position: relative;
-    top: 1px;
-    border: solid 1px #8C581C;
-    border-bottom-style: none;
-    background-color: #FFFBE7;
-}
-#subnavigation ul li.CurrentSection a {
-    background-color: #FFFBE7;
-}
-
-/* Alphabet Navigation
----------------------------------------------------- */
-div#alphanav {
-    background-color: #FFE09F;
-}
-div#alphanav ul {
-    list-style: none;
-    border-width: 2px 0px 4px 0px;
-    border-style: solid;
-    border-color: #36220B;
-    margin: 0px;
-    padding-left: 15px;
-    /* float container stretch, see www.quirksmode.org/css/clearing.html */
-    overflow: hidden;
-}
-div#alphanav ul li {
-    float: left;
-    font-size: larger;
-    font-weight: bold;
-}
-div#alphanav ul li:after {
-    content: " |";
-}
-div#alphanav ul li a {
-    display: block;
-    padding: 4px 8px;
-    line-height: 100%;
-    float: left;
-}
-div#alphanav ul li a:hover {
-    text-decoration: none;
-    background-color: #36220B;
-    color: #FFFBE7;
-}
-
-/* Main Table
----------------------------------------------------- */
-table {
-    border-collapse: collapse;
-    width: 100%;
-}
-div#summaryarea > table.infolist,
-div#parents > table.infolist,
-h3 + table.infolist {
-    width: auto;
-}
-table tr th {
-    text-align: left;
-    background-color: #FFE09F;
-    border-top: solid 1px #8C581C;
-    border-bottom: solid 1px #8C581C;
-}
-table tr th:first-child {
-    border-left: solid 1px #EA8414;
-}
-table tr th:last-child {
-    border-right: solid 1px #EA8414;
-}
-table.primobjlist tr th {
-    background-color: #FFC35E;
-}
-table td, table th {
-    vertical-align: top;
-    padding-left: 1ex;
-}
-table.primobjlist td {
-    vertical-align: middle;
-}
-table td:first-child, table th:first-child {
-    padding-left: 15px;
-}
-table.primobjlist tr a {
-    display: block; /* make whole td clickable */
-}
-table.primobjlist tr.BeginLetter td, table.primobjlist tr.BeginSurname td {
-    border-top: solid 1px #FFC35E;
-}
-td.ColumnLetter, td.ColumnRowLabel {
-    font-weight: bold;
-}
-td.ColumnBirth, td.ColumnDeath, td.ColumnPartner, td.ColumnParents {
-    font-size: 90%;
-}
-table.infolist tr td ol {
-    margin: 0px;
-}
-#summaryarea table.infolist td.ColumnAttribute,
-#parents table.infolist td.ColumnAttribute,
-#families table.infolist td.ColumnType,
-#families table.infolist td.ColumnAttribute {
-    color: #8C581C;
-}
-/* div summaryarea is missing for events, sources and repos! */
-h3 + table.infolist td.ColumnAttribute {
-    color: #8C581C;
-}
-table.primobjlist td.ColumnParents span.mother:before {
-    content: "+ ";
-}
-
-/* Surnames
----------------------------------------------------- */
-table#SortByName td.ColumnSurname, table#SortByName th.ColumnSurname,
-table#SortByCount td.ColumnQuantity, table#SortByCount th.ColumnQuantity {
-    background-color: #FFE09F;
-}
-table#SortByName td.ColumnSurname a[href]:hover {
-    background-color: #FFC35E;
-}
-/* make the whole cell light up on hover not just the a. */
-table#SortByName td.ColumnSurname,
-table#SortByName th.ColumnSurname,
-table#SortByName th.ColumnQuantity {
-    padding-left: 0px;
-}
-table#SortByName td.ColumnSurname > a,
-table#SortByName th.ColumnSurname > a,
-table#SortByName th.ColumnQuantity > a {
-    padding-left: 1ex;
-}
-table#SortByName thead th.ColumnSurname a:after,
-table#SortByCount thead th.ColumnQuantity a:after {
-    content: " \2193";
-}
-table.surname td.ColumnName {
-    background-color: #FFE09F;
-}
-table.surname td.ColumnName a[href]:hover {
-    background-color: #FFC35E;
-}
-/* make the whole cell light up on hover not just the a. */
-table.surname td.ColumnName {
-    padding-left: 0px;
-}
-table.surname td.ColumnName > a {
-    padding-left: 15px;
-}
-
-/* Individuals
----------------------------------------------------- */
-table.IndividualList td.ColumnSurname {
-    background-color: #FFE09F;
-}
-
-/* Places
----------------------------------------------------- */
-#Places table.infolist td.ColumnName {
-    background-color: #FFE09F;
-}
-#Places table.infolist td.ColumnName a[href]:hover {
-    background-color: #FFC35E;
-}
-/* make the whole cell light up on hover not just the a. */
-#Places table.infolist td.ColumnName {
-    padding-left: 0px;
-}
-#Places table.infolist td.ColumnName > a {
-    padding-left: 1ex;
-}
-
-/* Events
----------------------------------------------------- */
-#EventList table.infolist tr.BeginType td {
-    border-top:dashed 1px #FFC35E;
-}
-#EventList table.infolist tr.BeginLetter td {
-    border-top:solid 1px #FFC35E;
-}
-#EventList table.infolist td.ColumnType {
-    background-color: #FFE09F;
-}
-#EventList td.ColumnPerson a {
-    display: inline;
-}
-#EventList td.ColumnPerson span.person:after,
-#EventList td.ColumnPerson span.father:after,
-#EventList td.ColumnPerson span.mother:after,
-#EventDetail td.ColumnPerson span.person:after,
-#EventDetail td.ColumnPerson span.father:after,
-#EventDetail td.ColumnPerson span.mother:after {
-    content: ", ";
-}
-#EventList td.ColumnPerson span.fatherNmother:after,
-#EventDetail td.ColumnPerson span.fatherNmother:after {
-    content: " + ";
-}
-#EventList td.ColumnPerson span.person:last-child:after,
-#EventList td.ColumnPerson span.father:last-child:after,
-#EventList td.ColumnPerson span.mother:last-child:after,
-#EventDetail td.ColumnPerson span.person:last-child:after,
-#EventDetail td.ColumnPerson span.father:last-child:after,
-#EventDetail td.ColumnPerson span.mother:last-child:after {
-    content: "";
-}
-
-table.eventlist tbody tr td.ColumnSources {
-    width: 5%;
-}
-
-/* Gallery
----------------------------------------------------- */
-#GalleryNav {
-    text-align: center;
-    margin: 2em 0px;
-}
-#GalleryNav a {
-    font-weight: bold;
-    background-color: #FFE09F;
-    border: solid 1px #EA8414;
-    margin: 1em;
-}
-#GalleryNav a:hover {
-    background-color: #FFC35E;
-}
-#GalleryNav a#Previous {
-    padding: .4em .7em .3em .7em;
-}
-#GalleryNav a#Next {
-    padding: .4em 1.9em .3em 1.9em;
-}
-#GalleryCurrent {
-    font-size: larger;
-}
-#GalleryTotal {
-    font-weight: normal;
-}
-#GalleryDisplay {
-    margin: 0px auto;
-    position: relative;
-}
-#GalleryDisplay img {
-    margin: 0px auto;
-    display: block;
-    border: solid 1px #EA8414;
-}
-#GalleryDetail h3 {
-    text-align: center;
-}
-
-/*    Sources
------------------------------------------------------ */
-div#SourceDetail {
-    margin: 0 auto;
-}
-
-/* Contact
----------------------------------------------------- */
-#Contact {
-    overflow: hidden;
-}
-#Contact #summaryarea {
-    width: 40em;
-    margin: 2em auto;
-    padding: 3em;
-    background-color: #FFE09F;
-    border: solid 1px #EA8414;
-}
-#Contact img {
-    float: right;
-    border: solid 1px #EA8414;
-}
-#Contact #researcher, #Contact #researcher h3 {
-    font-size: larger;
-    padding-left: 0px;
-}
-#Contact #streetaddress, #Contact #locality, #Contact #email {
-    display: block;
-}
-#Contact #locality, #Contact #city, #Contact #state, #Contact #postalcode,
-#Contact #country {
-    white-space: nowrap;
-}
-#Contact #city:after {
-    content: ",";
-}
-
-/* Download
----------------------------------------------------- */
-#Download table.download a {
-    display: block;
-}
-
-/* Subsection
----------------------------------------------------- */
-#Home, #Introduction {
-    overflow: hidden;
-}
-#Home img, #Introduction img {
-    float: right;
-    margin: 1em;
-    max-width: 950px;
-}
-#Home p, #Introduction p {
-    padding-left: 15px;
-}
-.subsection {
-    clear: both;
-    overflow: visible;
-}
-.subsection p {
-    margin: 0px;
-}
-
-/* Subsection : Families
----------------------------------------------------- */
-div#families table.fixed_subtables table.eventlist {
-    table-layout: fixed;
-}
-div#families table.fixed_subtables table.eventlist th:first-child {
-    width: 9em;
-}
-div#families table.fixed_subtables table.eventlist th:last-child {
-    width: 5em;
-}
-div#families table.attrlist td.ColumnType {
-    color: #36220B;
-}
-
-/* Subsection : Gallery
----------------------------------------------------- */
-#indivgallery .thumbnail {
-    float: left;
-    width: 130px;
-    font-size: smaller;
-    text-align: center;
-    margin: 0.8em 0.5em;
-}
-#indivgallery h4 + .thumbnail {
-    margin-left: 15px;
-    /* Problem: if there are more thumnails then fit on a single row, the
-     *          first thumnail on each next row should also have a margin-left
-     *          of 15 px. */
-}
-#indivgallery img {
-    border: solid 1px #8C581C;
-}
-#indivgallery span {
-/* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
-    display: none; */
-}
-
-/* Subsection : Narrative
----------------------------------------------------- */
-h4 + div.grampsstylednote, a.familymap {
-    margin: 1em 15px;
-}
-i + div.grampsstylednote p {
-    margin: 0 0 0.3em 0;
-}
-div.grampsstylednote p {
-    margin-bottom: 0.5em;
-}
-
-/* Subsection : Family Map
----------------------------------------------------- */
-a.familymap {
-    display: block;
-}
-
-/* Subsection : Source References
----------------------------------------------------- */
-#sourcerefs ol li ol {
-    list-style-type: lower-alpha;
-}
-
-/* Subsection : Pedigree
----------------------------------------------------- */
-.pedigreegen {
-    list-style-type: none;
-    padding-left: 15px;
-}
-.pedigreegen li ol {
-    list-style-type: none;
-}
-.pedigreegen li ol li ol {
-    list-style-type: decimal;
-}
-.pedigreegen ol.spouselist {
-    list-style-type: none;
-}
-.pedigreegen ol.spouselist li.spouse ol {
-    list-style-type: decimal;
-}
-.spouse:before {
-    content: "+ ";
-}
-.thisperson {
-    font-weight: bold;
-}
-.thisperson > ol {
-    font-weight: normal;
-}
-
-/* Footer
----------------------------------------------------- */
-#footer {
-    clear: both;
-    padding-top: 1em;
-    background-color: #FFC35E;
-    border-top: solid 1px #EA8414;
-}
-#footer > * {
-    background-color: #FFE09F;
-}
-#footer p#createdate {
-    float: left;
-    width: 50%;
-    text-align: left;
-    padding-left: 15px;
-    margin-top: 1em;
-}
-#footer p#copyright {
-    float: right;
-    width: 40%;
-    text-align: right;
-    padding-right: 15px;
-}
-#footer a[href]:hover {
-    background-color: #FFC35E;
-}
-
-/* Overwritten
----------------------------------------------------- */
-button#drop {
-    background-color: #FFE09F;
-    border: solid 1px #EA8414 ! important;
-}
-button#drop:hover {
-    background-color: #FFC35E;
-}
-div#map_canvas {
-    border-color: #EA8414 ! important;
-}
-body#FamilyMap {
-    background-color: #FFE09F ! important;
-}
-
-/* Calendar Styles
-===================================================== */
-table.calendar {
-    table-layout: fixed;
-    empty-cells: show;
-}
-.calendar thead th {
-    text-align: center;
-    border-top-style: none;
-}
-.calendar thead th.monthName {
-    font-size: xx-large;
-    font-weight: normal;
-    background-color: #FFFBE7;
-    border-bottom-style: none;
-    padding-top: 1em;
-}
-.calendar thead th abbr {
-    border-bottom-style: none;
-}
-#CreatorInfo {
-    float: right;
-    margin: -1em 15px 0px 0px;
-    font-weight: bold;
-    color: #8C581C;
-}
-#CreatorInfo a[href]:hover {
-    background-color: #FFC35E;
-}
-.calendar tfoot tr td {
-    border-top: solid 4px #8C581C;
-    vertical-align: middle;
-}
-
-/* Calendar : Date Numeral */
-.calendar div.date {
-    float: right;
-    width: 1.8em;
-    font-size: large;
-    text-align: center;
-    background-color: #FFC35E;
-    color: #8C581C;
-}
-
-/* Calendar : Date Container */
-.calendar td {
-    padding: 0px 0px 0px 1ex;
-    border-width: 1px 0px 0px 1px;
-    border-style: solid;
-    border-color: #FFC35E;
-    background-color: #FFFBE7;
-}
-.calendar td:first-child {
-    border-left-style: none;
-    padding: 0px 0px 0px 1ex;
-}
-.calendar tbody tr:first-child td {
-    border-top-style: none;
-}
-
-/* Calendar : Date Detail */
-.calendar td ul {
-    font-size: smaller;
-    list-style: none;
-    padding: 0px;
-}
-.calendar td ul li {
-    border-top: dashed 1px #8C581C;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-.calendar td ul li:first-child {
-    border-style: none;
-}
-.calendar td ul a[href]:hover {
-    background-color: #FFC35E;
-}
-
-/* Calendar : Birthday, Anniversary, Highlight */
-.calendar td ul li em {
-    font-style: normal;
-    color: #EA8414;
-}
-.calendar td.highlight {
-    background-color: #FFE09F;
-}
-.calendar td.highlight div.date {
-    color: #36220B;
-    background-color: #FFC35E;
-}
-
-/* Calendar : Previous-Next Month */
-.calendar td.previous,
-.calendar td.next,
-.calendar td.previous div.date,
-.calendar td.next div.date {
-    color: #FFC35E;
-    background-color: #FFFBE7;
-}
-
-/* Calendar : Full Year */
-body#fullyearlinked div.content {
-    overflow: hidden;
-}
-body#fullyearlinked table.calendar {
-    float: left;
-    width: 33.3%;
-    height: 18em;
-    border: solid 1px #36220B;
-}
-body#fullyearlinked table.calendar thead th {
-    height: 2em;
-}
-body#fullyearlinked table.calendar thead th.monthName {
-    font-size: large;
-    padding: 2px 0px;
-}
-body#fullyearlinked table.calendar tbody td {
-    height: 3em;
-}
-body#OneDay div.content {
-    overflow: hidden;
-}
--- a/data/css/Web_Basic-Spruce.css
+++ b/data/css/Web_Basic-Spruce.css
@@ -1,724 +0,0 @@
-/*
-**************************************************************************************************
-Copyright Holder and License
-**************************************************************************************************
-GRAMPS Cascading Style Sheet
-Style Name: Basic-Spruce Stylesheet
-Style Author: Jason M. Simanek (2008)
-Note: Adapted from GRAMPS original Modern Style stylesheet with a new blue color scheme.
-**************************************************************************************************
-This website was created with GRAMPS <http://www.gramps-project.org/>
--------------------------------------------------------------------------------------------------
-GRAMPS is a Free Software Project for Genealogy, offering a professional
-
-genealogy program, and a wiki open to all. It is a community project, created,
-developed and governed by genealogists.
-
-Go to <http://gramps-project.org/> to learn more!
-
--------------------------------------------------------------------------------------------------
-Copyright 2008 Jason M. Simanek
-Copyright 2009 Stephane Charette
-Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
-Copyright 2011 Michiel D. Nauta
-
-This file is part of the GRAMPS program.
-
-GRAMPS is free software: you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation, version 2 of the License.
-
-GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-GRAMPS. If not, see <http://www.gnu.org/licenses/>.
--------------------------------------------------------------------------------------------------
-
-Color Palette
--------------------------------------------------------------------------------------------------
-
-black                   #000
-blue dark               #204D91
-blue                    #7CA3DD
-blue light              #BFD0EA
-blue very light         #EAEEF4
-white                   #FFF
--------------------------------------------------------------------------------------------------
-Characteristic of this style is that it uses the full width of the browser
-window and that horizontal highlighting bars extend over the full width of
-the page.
--------------------------------------------------------------------------------------------------
-
- NarrativeWeb Styles
------------------------------------------------------------------------------------------------ 
-
- General Elements
----------------------------------------------------- */
-
-body {
-    font-family: sans-serif;
-    font-size: 90%;
-    color: black;
-    margin: 0px;
-    background-color: #EAEEF4;
-}
-body > div {
-    clear: both;
-}
-.content {
-    background-color: #FFF;
-    border-top: solid 1px #7CA3DD;
-}
-.content div.snapshot {
-    float: right;
-    margin: 2em;
-}
-.fullclear {
-    clear: both;
-}
-
-/* General Text
----------------------------------------------------- */
-h1 {
-    font-size: x-large;
-    font-weight: bold;
-    padding-left: 15px;
-}
-h2 {
-    display:block;
-    margin:0;
-    padding:0;
-    text-align: center;
-}
-h3 {
-    font-size: large;
-    padding-left: 15px;
-}
-h4 {
-    font-size: medium;
-    color: #204D91;
-    background-color: #BFD0EA;
-    padding-left: 15px;
-    margin-bottom: 0px;
-    border-bottom: solid 1px #7CA3DD;
-}
-p#description {
-    padding-left: 15px;
-}
-a {
-    color: black;
-    text-decoration: none;
-    word-wrap: break-word;
-}
-a[href]:hover, a[href]:active {
-    background-color: #EAEEF4
-}
-.grampsid {
-    font-family: monospace;
-    font-size: smaller;
-    color: #7CA3DD;
-}
-
-/* Header
----------------------------------------------------- */
-#SiteTitle {
-    color: #204D91;
-}
-#user_header, #user_footer {
-    padding-left: 15px;
-}
-
-/* Navigation
----------------------------------------------------- */
-div#nav, #subnavigation {
-    border: solid 1px #EAEEF4; /* needed by IE7 */
-}
-#subnavigation ul {
-    overflow: hidden;
-}
-div#nav ul, #subnavigation ul {
-    list-style: none;
-    margin: 0px;
-    padding-left: 15px;
-}
-#subnavigation ul {
-    border-bottom: solid 1px #7CA3DD;
-}
-div#nav ul li, #subnavigation ul li {
-    float: left;
-}
-div#nav ul li a, #subnavigation ul li a {
-    display: block;
-    font-size: smaller;
-    font-weight: bold;
-    padding: 5px;
-    border-bottom: solid 1px #EAEEF4;
-}
-div#nav ul li a:hover, #subnavigation ul li a:hover {
-    text-decoration: none;
-    background-color: #BFD0EA;
-    border-bottom: solid 1px black;
-}
-div#nav ul li.CurrentSection a {
-    position: relative;
-    top: 1px;
-    border: solid 1px #7CA3DD;
-    border-bottom-style: none;
-    background-color: #FFF;
-}
-#subnavigation ul li.CurrentSection a {
-    background-color: #FFF;
-}
-
-/* Alphabet Navigation
----------------------------------------------------- */
-div#alphanav {
-    background-color: #EAEEF4;
-}
-div#alphanav ul {
-    list-style: none;
-    border-width: 2px 0px 4px 0px;
-    border-style: solid;
-    border-color: black;
-    margin: 0px;
-    padding-left: 15px;
-    /* float container stretch, see www.quirksmode.org/css/clearing.html */
-    overflow: hidden;
-}
-div#alphanav ul li {
-    float: left;
-    font-size: larger;
-    font-weight: bold;
-}
-div#alphanav ul li:after {
-    content: " |";
-}
-div#alphanav ul li a {
-    display: block;
-    padding: 4px 8px;
-    line-height: 100%;
-    float: left;
-}
-div#alphanav ul li a:hover {
-    text-decoration: none;
-    background-color: black;
-    color: #FFF;
-}
-
-/* Main Table
----------------------------------------------------- */
-table {
-    border-collapse: collapse;
-    width: 100%;
-}
-div#summaryarea > table.infolist,
-div#parents > table.infolist,
-h3 + table.infolist {
-    width: auto;
-}
-table tr th {
-    text-align: left;
-    background-color: #EAEEF4;
-    border-top: solid 1px #7CA3DD;
-    border-bottom: solid 1px #7CA3DD;
-}
-table tr th:first-child {
-    border-left: solid 1px #7CA3DD;
-}
-table tr th:last-child {
-    border-right: solid 1px #7CA3DD;
-}
-table.primobjlist tr th {
-    background-color: #BFD0EA;
-}
-table td, table th {
-    vertical-align: top;
-    padding-left: 1ex;
-}
-table.primobjlist td {
-    vertical-align: middle;
-}
-table td:first-child, table th:first-child {
-    padding-left: 15px;
-}
-table.primobjlist tr a {
-    display: block; /* make whole td clickable */
-}
-table.primobjlist tr.BeginLetter td, table.primobjlist tr.BeginSurname td {
-    border-top: solid 1px #BFD0EA;
-}
-td.ColumnLetter, td.ColumnRowLabel {
-    font-weight: bold;
-}
-td.ColumnBirth, td.ColumnDeath, td.ColumnPartner, td.ColumnParents {
-    font-size: 90%;
-}
-table.infolist tr td ol {
-    margin: 0px;
-}
-#summaryarea table.infolist td.ColumnAttribute,
-#parents table.infolist td.ColumnAttribute,
-#families table.infolist td.ColumnType,
-#families table.infolist td.ColumnAttribute {
-    color: #204D91;
-}
-/* div summaryarea is missing for events, sources and repos! */
-h3 + table.infolist td.ColumnAttribute {
-    color: #204D91;
-}
-table.primobjlist td.ColumnParents span.mother:before {
-    content: "+ ";
-}
-
-/* Surnames
----------------------------------------------------- */
-table#SortByName td.ColumnSurname, table#SortByName th.ColumnSurname,
-table#SortByCount td.ColumnQuantity, table#SortByCount th.ColumnQuantity {
-    background-color: #EAEEF4;
-}
-table#SortByName td.ColumnSurname a[href]:hover {
-    background-color: #BFD0EA;
-}
-/* make the whole cell light up on hover not just the a. */
-table#SortByName td.ColumnSurname,
-table#SortByName th.ColumnSurname,
-table#SortByName th.ColumnQuantity {
-    padding-left: 0px;
-}
-table#SortByName td.ColumnSurname > a,
-table#SortByName th.ColumnSurname > a,
-table#SortByName th.ColumnQuantity > a {
-    padding-left: 1ex;
-}
-table#SortByName thead th.ColumnSurname a:after,
-table#SortByCount thead th.ColumnQuantity a:after {
-    content: " \2193";
-}
-table.surname td.ColumnName {
-    background-color: #EAEEF4;
-}
-table.surname td.ColumnName a[href]:hover {
-    background-color: #BFD0EA;
-}
-/* make the whole cell light up on hover not just the a. */
-table.surname td.ColumnName {
-    padding-left: 0px;
-}
-table.surname td.ColumnName > a {
-    padding-left: 15px;
-}
-
-/* Individuals
----------------------------------------------------- */
-table.IndividualList td.ColumnSurname {
-    background-color: #EAEEF4;
-}
-
-/* Places
----------------------------------------------------- */
-#Places table.infolist td.ColumnName {
-    background-color: #EAEEF4;
-}
-#Places table.infolist td.ColumnName a[href]:hover {
-    background-color: #BFD0EA;
-}
-/* make the whole cell light up on hover not just the a. */
-#Places table.infolist td.ColumnName {
-    padding-left: 0px;
-}
-#Places table.infolist td.ColumnName > a {
-    padding-left: 1ex;
-}
-
-/* Events
----------------------------------------------------- */
-#EventList table.infolist tr.BeginType td {
-    border-top:dashed 1px #BFD0EA;
-}
-#EventList table.infolist tr.BeginLetter td {
-    border-top:solid 1px #BFD0EA;
-}
-#EventList table.infolist td.ColumnType {
-    background-color: #EAEEF4;
-}
-#EventList td.ColumnPerson a {
-    display: inline;
-}
-#EventList td.ColumnPerson span.person:after,
-#EventList td.ColumnPerson span.father:after,
-#EventList td.ColumnPerson span.mother:after,
-#EventDetail td.ColumnPerson span.person:after,
-#EventDetail td.ColumnPerson span.father:after,
-#EventDetail td.ColumnPerson span.mother:after {
-    content: ", ";
-}
-#EventList td.ColumnPerson span.fatherNmother:after,
-#EventDetail td.ColumnPerson span.fatherNmother:after {
-    content: " + ";
-}
-#EventList td.ColumnPerson span.person:last-child:after,
-#EventList td.ColumnPerson span.father:last-child:after,
-#EventList td.ColumnPerson span.mother:last-child:after,
-#EventDetail td.ColumnPerson span.person:last-child:after,
-#EventDetail td.ColumnPerson span.father:last-child:after,
-#EventDetail td.ColumnPerson span.mother:last-child:after {
-    content: "";
-}
-
-table.eventlist tbody tr td.ColumnSources {
-    width: 5%;
-}
-
-/* Gallery
----------------------------------------------------- */
-#GalleryNav {
-    text-align: center;
-    margin: 2em 0px;
-}
-#GalleryNav a {
-    font-weight: bold;
-    background-color: #EAEEF4;
-    border: solid 1px #7CA3DD;
-    margin: 1em;
-}
-#GalleryNav a:hover {
-    background-color: #BFD0EA;
-}
-#GalleryNav a#Previous {
-    padding: .4em .7em .3em .7em;
-}
-#GalleryNav a#Next {
-    padding: .4em 1.9em .3em 1.9em;
-}
-#GalleryCurrent {
-    font-size: larger;
-}
-#GalleryTotal {
-    font-weight: normal;
-}
-#GalleryDisplay {
-    margin: 0px auto;
-    position: relative;
-}
-#GalleryDisplay img {
-    margin: 0px auto;
-    display: block;
-    border: solid 1px #7CA3DD;
-}
-#GalleryDetail h3 {
-    text-align: center;
-}
-
-/*    Sources
------------------------------------------------------ */
-div#SourceDetail {
-    margin: 0 auto;
-}
-
-/* Contact
----------------------------------------------------- */
-#Contact {
-    overflow: hidden;
-}
-#Contact #summaryarea {
-    width: 40em;
-    margin: 2em auto;
-    padding: 3em;
-    background-color: #EAEEF4;
-    border: solid 1px #7CA3DD;
-}
-#Contact img {
-    float: right;
-    border: solid 1px #7CA3DD;
-}
-#Contact #researcher, #Contact #researcher h3 {
-    font-size: larger;
-    padding-left: 0px;
-}
-#Contact #streetaddress, #Contact #locality, #Contact #email {
-    display: block;
-}
-#Contact #locality, #Contact #city, #Contact #state, #Contact #postalcode,
-#Contact #country {
-    white-space: nowrap;
-}
-#Contact #city:after {
-    content: ",";
-}
-
-/* Download
----------------------------------------------------- */
-#Download table.download a {
-    display: block;
-}
-
-/* Subsection
----------------------------------------------------- */
-#Home, #Introduction {
-    overflow: hidden;
-}
-#Home img, #Introduction img {
-    float: right;
-    margin: 1em;
-    max-width: 950px;
-}
-#Home p, #Introduction p {
-    padding-left: 15px;
-}
-.subsection {
-    clear: both;
-    overflow: visible;
-}
-.subsection p {
-    margin: 0px;
-}
-
-/* Subsection : Families
----------------------------------------------------- */
-div#families table.fixed_subtables table.eventlist {
-    table-layout: fixed;
-}
-div#families table.fixed_subtables table.eventlist th:first-child {
-    width: 9em;
-}
-div#families table.fixed_subtables table.eventlist th:last-child {
-    width: 5em;
-}
-div#families table.attrlist td.ColumnType {
-    color: black;
-}
-
-/* Subsection : Gallery
----------------------------------------------------- */
-#indivgallery .thumbnail {
-    float: left;
-    width: 130px;
-    font-size: smaller;
-    text-align: center;
-    margin: 0.8em 0.5em;
-}
-#indivgallery h4 + .thumbnail {
-    margin-left: 15px;
-    /* Problem: if there are more thumnails then fit on a single row, the
-     *          first thumnail on each next row should also have a margin-left
-     *          of 15 px. */
-}
-#indivgallery img {
-    border: solid 1px #7CA3DD;
-}
-#indivgallery span {
-/* ## remove this line and the comment markers from the line below to hide description in Indivifual Gallery
-    display: none; */
-}
-
-/* Subsection : Narrative
----------------------------------------------------- */
-h4 + div.grampsstylednote, a.familymap {
-    margin: 1em 15px;
-}
-i + div.grampsstylednote p {
-    margin: 0 0 0.3em 0;
-}
-div.grampsstylednote p {
-    margin-bottom: 0.5em;
-}
-
-/* Subsection : Family Map
----------------------------------------------------- */
-a.familymap {
-    display: block;
-}
-
-/* Subsection : Source References
----------------------------------------------------- */
-#sourcerefs ol li ol {
-    list-style-type: lower-alpha;
-}
-
-/* Subsection : Pedigree
----------------------------------------------------- */
-.pedigreegen {
-    list-style-type: none;
-    padding-left: 15px;
-}
-.pedigreegen li ol {
-    list-style-type: none;
-}
-.pedigreegen li ol li ol {
-    list-style-type: decimal;
-}
-.pedigreegen ol.spouselist {
-    list-style-type: none;
-}
-.pedigreegen ol.spouselist li.spouse ol {
-    list-style-type: decimal;
-}
-.spouse:before {
-    content: "+ ";
-}
-.thisperson {
-    font-weight: bold;
-}
-.thisperson > ol {
-    font-weight: normal;
-}
-
-/* Footer
----------------------------------------------------- */
-#footer {
-    clear: both;
-    padding-top: 1em;
-    background-color: #BFD0EA;
-    border-top: solid 1px #204D91;
-}
-#footer > * {
-    background-color: #EAEEF4;
-}
-#footer p#createdate {
-    float: left;
-    width: 50%;
-    text-align: left;
-    padding-left: 15px;
-    margin-top: 1em;
-}
-#footer p#copyright {
-    float: right;
-    width: 40%;
-    text-align: right;
-    padding-right: 15px;
-}
-#footer a[href]:hover {
-    background-color: #BFD0EA;
-}
-
-/* Overwritten
----------------------------------------------------- */
-body#FamilyMap {
-    background-color: #EAEEF4 ! important;
-}
-
-/* Calendar Styles
-===================================================== */
-table.calendar {
-    table-layout: fixed;
-    empty-cells: show;
-}
-.calendar thead th {
-    text-align: center;
-    border-top-style: none;
-}
-.calendar thead th.monthName {
-    font-size: xx-large;
-    font-weight: normal;
-    background-color: #FFF;
-    border-bottom-style: none;
-    padding-top: 1em;
-}
-.calendar thead th abbr {
-    border-bottom-style: none;
-}
-#CreatorInfo {
-    float: right;
-    margin: -1em 15px 0px 0px;
-    font-weight: bold;
-    color: #7CA3DD;
-}
-#CreatorInfo a[href]:hover {
-    background-color: #BFD0EA;
-}
-.calendar tfoot tr td {
-    border-top: solid 4px #7CA3DD;
-    vertical-align: middle;
-}
-
-/* Calendar : Date Numeral */
-.calendar div.date {
-    float: right;
-    width: 1.8em;
-    font-size: large;
-    text-align: center;
-    background-color: #BFD0EA;
-    color: #204D91;
-}
-
-/* Calendar : Date Container */
-.calendar td {
-    padding: 0px 0px 0px 1ex;
-    border-width: 1px 0px 0px 1px;
-    border-style: solid;
-    border-color: #BFD0EA;
-    background-color: #FFF;
-}
-.calendar td:first-child {
-    border-left-style: none;
-    padding: 0px 0px 0px 1ex;
-}
-.calendar tbody tr:first-child td {
-    border-top-style: none;
-}
-
-/* Calendar : Date Detail */
-.calendar td ul {
-    font-size: smaller;
-    list-style: none;
-    padding: 0px;
-}
-.calendar td ul li {
-    border-top: dashed 1px #BFD0EA;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-.calendar td ul li:first-child {
-    border-style: none;
-}
-.calendar td ul a[href]:hover {
-    background-color: #BFD0EA;
-}
-
-/* Calendar : Birthday, Anniversary, Highlight */
-.calendar td ul li em {
-    font-style: normal;
-    color: #7CA3DD;
-}
-.calendar td.highlight {
-    background-color: #EAEEF4;
-}
-.calendar td.highlight div.date {
-    color: black;
-    background-color: #BFD0EA;
-}
-
-/* Calendar : Previous-Next Month */
-.calendar td.previous,
-.calendar td.next,
-.calendar td.previous div.date,
-.calendar td.next div.date {
-    color: #BFD0EA;
-    background-color: #FFF;
-}
-
-/* Calendar : Full Year */
-body#fullyearlinked div.content {
-    overflow: hidden;
-}
-body#fullyearlinked table.calendar {
-    float: left;
-    width: 33.3%;
-    height: 18em;
-    border: solid 1px black;
-}
-body#fullyearlinked table.calendar thead th {
-    height: 2em;
-}
-body#fullyearlinked table.calendar thead th.monthName {
-    font-size: large;
-    padding: 2px 0px;
-}
-body#fullyearlinked table.calendar tbody td {
-    height: 3em;
-}
-body#OneDay div.content {
-    overflow: hidden;
-}
--- a/data/css/Web_Citations-Animated.css
+++ b/data/css/Web_Citations-Animated.css
@@ -1,183 +0,0 @@
-/*    Main Element
------------------------------------------------------ */
-#menu, #menu ul {
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
-}
-
-/*    Main Level
------------------------------------------------------ */
-#menu {
-    width: 100%;
-    margin: 6px auto;
-    border: 1px solid #222;
-    background-color: #111;
-    background-image: -moz-linear-gradient(#444, #111);
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#444), to(#111));
-    background-image: -webkit-linear-gradient(#444, #111);
-    background-image: -o-linear-gradient(#444, #111);
-    background-image: -ms-linear-gradient(#444, #111);
-    background-image: linear-gradient(#444, #111);
-    -moz-border-radius: 6px;
-    -webkit-border-radius: 6px;
-    border-radius: 6px;
-    -moz-box-shadow: 0 1px 1px #777;
-    -webkit-box-shadow: 0 1px 1px #777;
-    box-shadow: 0 1px 1px #777;
-}
-
-/*    Clear Floats
------------------------------------------------------ */
-#menu:before,
-#menu:after {
-    content: "";
-    display: table;
-}
-#menu:after {
-    clear: both
-}
-#menu {
-    zoom: 1
-}
-
-/*    List Elements
------------------------------------------------------ */
-#menu li {
-    float: left;
-    border-right: 1px solid #222;
-    -moz-box-shadow: 1px 0 0 #444;
-    -webkit-box-shadow: 1px 0 0 #444;
-    box-shadow: 1px 0 0 #444;
-    position: relative;
-}
-#menu a {
-    float: left;
-    padding: 12px 30px;
-    color: #999;
-    text-transform: uppercase;
-    font: bold 12px Arial, Helvetica;
-    text-decoration: none;
-    text-shadow: 0 1px 0 #000;
-}
-#menu li:hover > a {
-    color: #fafafa
-}
-*html #menu li a:hover { /* IE6 only */
-    color: #fafafa
-}
-
-/*    sub-menu
------------------------------------------------------ */
-#menu ul {
-    margin: 20px 0 0 0;
-    _margin: 0; /*IE6 only*/
-    opacity: 0;
-    visibility: hidden;
-    position: absolute;
-    top: 38px;
-    left: 0;
-    z-index: 9999;
-    background: #444;
-    background: -moz-linear-gradient(#444, #111);
-    background: -webkit-gradient(linear,left bottom,left top,color-stop(0, #111),color-stop(1, #444));
-    background: -webkit-linear-gradient(#444, #111);
-    background: -o-linear-gradient(#444, #111);
-    background: -ms-linear-gradient(#444, #111);
-    background: linear-gradient(#444, #111);
-    -moz-box-shadow: 0 -1px rgba(255,255,255,.3);
-    -webkit-box-shadow: 0 -1px 0 rgba(255,255,255,.3);
-    box-shadow: 0 -1px 0 rgba(255,255,255,.3);
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    -webkit-transition: all .2s ease-in-out;
-    -moz-transition: all .2s ease-in-out;
-    -ms-transition: all .2s ease-in-out;
-    -o-transition: all .2s ease-in-out;
-    transition: all .2s ease-in-out;
-}
-#menu li:hover > ul {
-    opacity: 1;
-    visibility: visible;
-    margin: 0;
-}
-#menu ul ul {
-    top: 0;
-    left: 150px;
-    margin: 0 0 0 20px;
-    _margin: 0; /*IE6 only*/
-    -moz-box-shadow: -1px 0 0 rgba(255,255,255,.3);
-    -webkit-box-shadow: -1px 0 0 rgba(255,255,255,.3);
-    box-shadow: -1px 0 0 rgba(255,255,255,.3);
-}
-#menu ul li {
-    float: none;
-    display: block;
-    border: 0;
-    _line-height: 0; /*IE6 only*/
-    -moz-box-shadow: 0 1px 0 #111, 0 2px 0 #666;
-    -webkit-box-shadow: 0 1px 0 #111, 0 2px 0 #666;
-    box-shadow: 0 1px 0 #111, 0 2px 0 #666;
-}
-#menu ul li:last-child {
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-    box-shadow: none;
-}
-#menu ul a {
-    padding: 10px;
-    width: 130px;
-    _height: 10px; /*IE6 only*/
-    display: block;
-    white-space: nowrap;
-    float: none;
-    text-transform: none;
-}
-#menu ul a:hover {
-    background-color: #0186ba;
-    background-image: -moz-linear-gradient(#04acec,  #0186ba);
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#04acec), to(#0186ba));
-    background-image: -webkit-linear-gradient(#04acec, #0186ba);
-    background-image: -o-linear-gradient(#04acec, #0186ba);
-    background-image: -ms-linear-gradient(#04acec, #0186ba);
-    background-image: linear-gradient(#04acec, #0186ba);
-}
-
-/* first and Last child elements
------------------------------------------------------ */
-#menu ul li:first-child > a {
-    -moz-border-radius: 3px 3px 0 0;
-    -webkit-border-radius: 3px 3px 0 0;
-    border-radius: 3px 3px 0 0;
-}
-#menu ul li:first-child > a:after {
-    content: '';
-    position: absolute;
-    left: 40px;
-    top: -6px;
-    border-left: 6px solid transparent;
-    border-right: 6px solid transparent;
-    border-bottom: 6px solid #444;
-}
-#menu ul ul li:first-child a:after {
-    left: -6px;
-    top: 50%;
-    margin-top: -6px;
-    border-left: 0;
-    border-bottom: 6px solid transparent;
-    border-top: 6px solid transparent;
-    border-right: 6px solid #3b3b3b;
-}
-#menu ul li:first-child a:hover:after {
-    border-bottom-color: #04acec
-}
-#menu ul ul li:first-child a:hover:after {
-    border-right-color: #0299d3;
-    border-bottom-color: transparent;
-}
-#menu ul li:last-child > a {
-    -moz-border-radius: 0 0 3px 3px;
-    -webkit-border-radius: 0 0 3px 3px;
-    border-radius: 0 0 3px 3px;
-}
--- a/data/css/Web_Citations-Outline.css
+++ b/data/css/Web_Citations-Outline.css
@@ -1,45 +0,0 @@
-/*
-# encoding: utf-8
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2012 Rob G. Healey <robhealey1@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-******************************************************
-GRAMPS Cascading Style Sheet
-Style Name: Web_Citations-Outline.css
-******************************************************
-
-
-    Source Citations Outline styles
------------------------------------------------------ */
-div#SourceCitationReferents ul.Col1 {
-    list-style-type: decimal
-}
-div#SourceCitationReferents ul.Col2 {
-    list-style-type: upper-alpha
-}
-div#SourceCitationReferents ul.Col3 {
-    list-style-type: lower-alpha
-}
-div#SourceCitationReferents ul.Col4 {
-    list-style-type: upper-roman
-}
-div#SourceCitationReferents ul.Col5 {
-    list-style-type: disc
-}
--- a/data/css/Web_DropDown-Menus.css
+++ b/data/css/Web_DropDown-Menus.css
@@ -1,229 +0,0 @@
-/*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2012    Rob G. Healey <robhealey1@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-#
-*************************************************
-GRAMPS Cascading Style Sheet
-Style Name: Fade-Menus Style Sheet
-*************************************************
-
-    Body Element
------------------------------------------------------ */
-body {
-    background-color: #FFF;
-    color: #00029D;
-    width: 100%;
-}
-
-/*    Header
------------------------------------------------------ */
-div#header {
-    border-bottom: solid 8px #13A926;
-}
-
-/*     Drop Down Navigation Menu
------------------------------------------------------ */
-ul#dropmenu {
-    width: 100%;
-    margin: 0 auto;
-    padding: 10px 0 0 0;
-    list-style-type: none;
-    background: #00029D;
-    background: -moz-linear-gradient(#444, #00029D);
-    background: -webkit-gradient(linear,left bottom,left top,color-stop(0, #111),color-stop(1, #444));
-    background: -webkit-linear-gradient(#444, #111);
-    background: -o-linear-gradient(#444, #111);
-    background: -ms-linear-gradient(#444, #111);
-    background: linear-gradient(#444, #111);
-    -moz-border-radius: 50px;
-    border-radius: 50px;
-    -moz-box-shadow: 0 2px 1px #9c9c9c;
-    -webkit-box-shadow: 0 2px 1px #9c9c9c;
-    box-shadow: 0 2px 1px #9c9c9c;
-}
-ul#dropmenu li {
-    float: left;
-    padding: 0 0 10px 0;
-    position: relative;
-}
-ul#dropmenu a {
-    float: left;
-    height: 25px;
-    padding: 0 25px;
-    color: #999;
-    text-transform: uppercase;
-    font: bold 12px/25px Arial, Helvetica;
-    text-decoration: none;
-    text-shadow: 0 1px 0 #000;
-}
-ul#dropmenu li:hover > a {
-    color: #fafafa
-}
-
-*html ul#dropmenu li a:hover /* IE6 */
-{
-    color: #fafafa
-}
-ul#dropmenu li:hover > ul {
-    display: block
-}
-
-/*     Sub-menu
------------------------------------------------------ */
-ul#dropmenu ul {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    display: none;
-    position: absolute;
-    top: 35px;
-    left: 0;
-    z-index: 99999;
-    background: #444;
-    background: -moz-linear-gradient(#444, #111);
-    background: -webkit-gradient(linear,left bottom,left top,color-stop(0, #111),color-stop(1, #444));
-    background: -webkit-linear-gradient(#444, #111);
-    background: -o-linear-gradient(#444, #111);
-    background: -ms-linear-gradient(#444, #111);
-    background: linear-gradient(#444, #111);
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-}
-ul#dropmenu ul li {
-    float: none;
-    margin: 0;
-    padding: 0;
-    display: block;
-    -moz-box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
-    -webkit-box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
-    box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
-}
-ul#dropmenu ul li:last-child {
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-    box-shadow: none;
-}
-ul#dropmenu ul a {
-    padding: 10px;
-    height: auto;
-    line-height: 1;
-    display: block;
-    white-space: nowrap;
-    float: none;
-    text-transform: none;
-}
-*html ul#dropmenu ul a /* IE6 */
-{
-    height: 10px;
-    width: 150px;
-}
-*:first-child+html ul#dropmenu ul a /* IE7 */
-{
-    height: 10px;
-    width: 150px;
-}
-ul#dropmenu ul a:hover {
-    background: #0186ba;
-    background: -moz-linear-gradient(#04acec,  #0186ba);
-    background: -webkit-gradient(linear, left top, left bottom, from(#04acec), to(#0186ba));
-    background: -webkit-linear-gradient(#04acec,  #0186ba);
-    background: -o-linear-gradient(#04acec,  #0186ba);
-    background: -ms-linear-gradient(#04acec,  #0186ba);
-    background: linear-gradient(#04acec,  #0186ba);
-}
-ul#dropmenu ul li:first-child a {
-    -moz-border-radius: 5px 5px 0 0;
-    border-radius: 5px 5px 0 0;
-}
-ul#dropmenu ul li:first-child a:after {
-    content: '';
-    position: absolute;
-    left: 30px;
-    top: -8px;
-    width: 0;
-    height: 0;
-    border-left: 5px solid transparent;
-    border-right: 5px solid transparent;
-    border-bottom: 8px solid #444;
-}
-ul#dropmenu ul li:first-child a:hover:after {
-    border-bottom-color: #04acec
-}
-ul#dropmenu ul li:last-child a {
-    -moz-border-radius: 0 0 5px 5px;
-    border-radius: 0 0 5px 5px;
-}
-
-/*     Clear floated elements
------------------------------------------------------ */
-ul#dropmenu:after {
-    visibility: hidden;
-    display: block;
-    font-size: 0;
-    content: " ";
-    clear: both;
-    height: 0;
-}
-
-* html ul#dropmenu             { zoom: 1; } /* IE6 */
-*:first-child+html ul#dropmenu { zoom: 1; } /* IE7 */
-
-/*    Alphabet Navigation and Year Menu
------------------------------------------------------ */
-div#alphanav, div#subnavigation {
-    clear: both;
-    padding-top: 1px;
-    font: bold 1.2em/1.4 "sans, sans-serif";
-}
-div#alphanav ul, div#subnavigation ul {
-    float: left;
-    width: 100%;
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
-    background: #00029D;
-    border-top: 2px solid #13A926;
-    border-bottom: 2px solid #13A926;
-}
-div#alphanav ul li, div#subnavigation ul li {
-    display: inline;
-    margin: 0;
-    padding: 0;
-}
-div#alphanav ul li a, div#subnavigation ul li a {
-    display: block;
-    float: left;
-    padding: 6px 12px;
-    border-right: 1px solid #13A926;
-    border-left: 1px solid #13A926;
-    color: #FFF;
-    text-decoration: none;
-}
-div#alphanav ul li a:hover, div#alphanav ul li a:focus,
-div#subnavigation ul li a:hover, div#subnavigation ul li a:focus {
-    background: #FFF;
-    color: #000;
-}
-div#subnavigation ul li.CurrentSection a {
-    border-left: solid 1px #13A926;
-    border-right: solid 1px #13A926;
-    background-color: #FFF;
-    color: #00029D;
-}
--- a/data/css/Web_Fade-Menus.css
+++ b/data/css/Web_Fade-Menus.css
@@ -1,130 +0,0 @@
-/*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2012    Rob G. Healey <robhealey1@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-#
-*************************************************
-GRAMPS Cascading Style Sheet
-Style Name: Fade-Menus Style Sheet
-*************************************************
-
-    Body Element
------------------------------------------------------ */
-body {
-    background-color: #00029D;
-    color: #00029D;
-    width: 100%;
-}
-
-/*    Header
------------------------------------------------------ */
-div#header {
-    border-bottom: solid 8px #13A926;
-}
-
-/*    Fade Horizontal Navigation Menu
------------------------------------------------------ */
-div.wrapper {
-    width: 100%;
-    height: 50px;
-    background : #464646;
-    background : -webkit-gradient(linear, left top, left bottombottom, from(rgb(168,168,168)), to(rgb(69,69,69)));
-    background : -moz-linear-gradient(top, rgb(168,168,168), rgb(69,69,69));
-    border-top: 2px solid #939393;
-    position: relative;
-}
-ul {
-    margin: 0;
-    padding: 0;
-}
-ul.menu {
-    height: 80px;
-    border-left: 1px solid rgba(0,0,0,0.3);
-    border-right: 1px solid rgba(255,255,255,0.3);
-    float: left;
-}
-ul.menu li {
-    list-style-type: none;
-    float: left;
-    height: 45px;
-    text-align: center;
-    background: -webkit-gradient(radial, 50% 100%, 10, 50% 50%, 90, from(rgba(31,169,244,1)), to(rgba(0,28,78, 1)) );
-    background: -moz-radial-gradient(center 80px 45deg, circle cover, rgba(31,169,244,1) 0%, rgba(0,28,78, 1) 100%);
-}
-ul li a {
-    font: bold .9em "Helvetica, Courier, Arial, sans-serif, sans";
-    display: block;
-    padding: 0 6px;
-    border-left: 1px solid rgba(255,255,255,0.1);
-    border-right: 1px solid rgba(0,0,0,0.1);
-    text-align: center;
-    line-height: 45px;
-    background : -webkit-gradient(linear, left top, left bottombottom, from(rgb(168,168,168)), to(rgb(69,69,69)));
-    background : -moz-linear-gradient(top, rgb(168,168,168), rgb(69,69,69));
-    -webkit-transition-property: background;
-    -webkit-transition-duration: 700ms;
-    -moz-transition-property: background;
-    -moz-transition-duration: 700ms;
-    text-decoration: none;
-}
-ul li a:hover {
-    background: transparent none;
-    color: #FFF;
-}
-ul li.CurrentSection a {
-    background: -webkit-gradient(radial, 50% 100%, 10, 50% 50%, 90, from(rgba(31,169,244,1)), to(rgba(0,28,78, 1)) );
-    background: -moz-radial-gradient(center 80px 45deg, circle cover, rgba(31,169,244,1) 0%, rgba(0,28,78, 1) 100%);
-    Color: #FFF;
-}
-
-/*    Alphabet Navigation Menu
------------------------------------------------------ */
-div#alphanav {
-    clear: both;
-    padding-top: 1px;
-    font: bold 1.2em/1.4 "sans, sans-serif";
-}
-div#alphanav ul {
-    float: left;
-    width: 100%;
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
-    background: #00029D;
-    border-top: 2px solid #13A926;
-    border-bottom: 2px solid #13A926;
-}
-div#alphanav li {
-    display: inline;
-    margin: 0;
-    padding: 0;
-}
-div#alphanav a {
-    display: block;
-    float: left;
-    padding: 6px 12px;
-    border-right: 1px solid #13A926;
-    border-left: 1px solid #13A926;
-    color: #FFF;
-    text-decoration: none;
-}
-div#alphanav a:hover, div#alphanav a:focus {
-    background: #FFF;
-    color: #000;
-}
--- a/data/css/Web_Horizontal-Menus.css
+++ b/data/css/Web_Horizontal-Menus.css
@@ -1,123 +0,0 @@
-/*
-# encoding: utf-8
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2008-2010 Rob G. Healey <robhealey1@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-******************************************************
-GRAMPS Cascading Style Sheet
-Style Name: Web_Navigation-Horizontal.css
-******************************************************
-
-
-    Body Element
------------------------------------------------------ */
-body {
-    background-color: #00029D;
-    color: #00029D;
-    width: 100%;
-}
-
-/*   Navigation Menus
----------------------------------------------------- */
-div#nav {
-    clear: both;
-    padding-top: 1px;
-    font: 1.2em/1.4 "sans-serif, Helvetica, Arial";
-}
-div#nav ul {
-    float: left;
-    width: 100%;
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
-    background: #00029D;
-    border-bottom: 2px solid #13A926;
-}
-div#nav li {
-    display: inline;
-    margin: 0;
-    padding: 0;
-}
-div#nav a {
-    display: block;
-    float: left;
-    padding: 6px 12px;
-    border-right: 1px solid #13A926;
-    border-left: 1px solid #13A926;
-    color: #FFF;
-    text-decoration: none;
-}
-div#nav a:hover, div#nav a:focus {
-    background: #FFF;
-    color: #000;
-}
-div#nav .CurrentSection a {
-    font-weight: bold;
-    background: #BCEAF6;
-    color: #000;
-    border-bottom: none;
-}
-div#nav .CurrentSection a:hover, div#nav .CurrentSection a:focus {
-    background: #903;
-    color: #FFF;
-}
-
-/*    Alphabet Navigation and Year Menu
------------------------------------------------------ */
-div#alphanav, div#subnavigation {
-    clear: both;
-    padding-top: 1px;
-    font: bold 1.2em/1.4 "sans, sans-serif";
-}
-div#alphanav ul, div#subnavigation ul {
-    float: left;
-    width: 100%;
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
-    background: #00029D;
-    border-top: 2px solid #13A926;
-    border-bottom: 2px solid #13A926;
-}
-div#alphanav ul li, div#subnavigation ul li {
-    display: inline;
-    margin: 0;
-    padding: 0;
-}
-div#alphanav ul li a, div#subnavigation ul li a {
-    display: block;
-    float: left;
-    padding: 6px 12px;
-    border-right: 1px solid #13A926;
-    border-left: 1px solid #13A926;
-    color: #FFF;
-    text-decoration: none;
-}
-div#alphanav ul li a:hover, div#alphanav ul li a:focus,
-div#subnavigation ul li a:hover, div#subnavigation ul li a:focus {
-    background: #FFF;
-    color: #000;
-}
-div#subnavigation ul li.CurrentSection a {
-    border-left: solid 1px #13A926;
-    border-right: solid 1px #13A926;
-    background-color: #FFF;
-    color: #00029D;
-}
--- a/data/css/Web_Mainz.css
+++ b/data/css/Web_Mainz.css
@@ -1,642 +0,0 @@
-/*
----------------------------------------------------------------------------
-GRAMPS Cascading Style Sheet
-Style Name: Mainz
-Style Author: Jason Simanek (2008)
-
----------------------------------------------------------------------------
-This website was created with GRAMPS
----------------------------------------------------------------------------
-GRAMPS is a Free Software Project for Genealogy, offering a professional
-genealogy program, and a wiki open to all. It is a community project, created,
-developed and governed by genealogists.
-
-Go to <http://gramps-project.org/> to learn more!
-
-License
----------------------------------------------------------------------------
-Copyright 2008 Jason M. Simanek
-Copyright 2009 Stephane Charette
-Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
-Copyright 2011 Michiel D. Nauta
-
-This file is part of the GRAMPS program.
-
-GRAMPS is free software: you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation, version 2 of the License.
-
-GRAMPS is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-GRAMPS. If not, see <http://www.gnu.org/licenses/>.
----------------------------------------------------------------------------
-
-
-Color Palette
----------------------------------------------------------------------------
-black                           #000
-brown                           #7D5925
-brown light                     #D8C19F
-green                           #767D25
-yellow                          #FFF2C6
-yellow light                    #FFFFE7
----------------------------------------------------------------------------
-
-
-Style Images
----------------------------------------------------------------------------
-Body                    images/Web_Mainz_Bkgd.png
-Header                  images/Web_Mainz_Header.png
-Middle                  images/Web_Mainz_Mid.png
-Middle Light            images/Web_Mainz_MidLight.png
----------------------------------------------------------------------------
-
-
- NarrativeWeb Styles
-------------------------------------------------------------------------------------------- 
-
-General Elements
-----------------------------------------------------------------*/
-body {
-    font-family: Georgia, serif;
-    font-size: 90%;
-    color: #7D5925;
-    background: url(../images/Web_Mainz_Bkgd.png) black repeat;
-}
-body > div {
-    width: 85%;
-    margin: 0px auto;
-    background: url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
-    overflow: hidden;
-    padding: 0px 1.5em;
-}
-.content {
-    padding: 1.5em 1.5em;
-}
-div.snapshot div.thumbnail {
-    text-align: center;
-}
-div.snapshot a {
-    display: inline;
-}
-
-/* General Text
-----------------------------------------------------------------*/
-h1 {
-    font-weight: normal;
-    font-style: italic;
-    margin-left: 2em;
-}
-h2 {
-    display:block;
-    margin:0;
-    padding:0;
-    text-align: center;
-}
-h3 {
-    font-size: xx-large;
-    font-weight: normal;
-    font-style: italic;
-    color: #767D25;
-    text-align: center;
-    border-bottom: double 4px #7D5925;
-    padding-bottom: 1ex;
-    margin: 0.5em 0px 0.5em 0px;
-}
-h4 {
-    font-size: x-large;
-    font-weight: normal;
-    font-style: italic;
-    color: black;
-    text-align: center;
-    border-bottom: dashed 1px #7D5925;
-    padding-bottom: 0.5ex;
-    margin: 0.5em 0px 0.5em 0px;
-}
-a {
-    color: #7D5925;
-    text-decoration: none;
-    word-wrap: break-word;
-}
-a[href]:hover, a[href]:active {
-    background-color: #FFFFE7;
-}
-.grampsid {
-    font-family: monospace;
-    font-size: smaller;
-}
-
-/* Header
-----------------------------------------------------------------*/
-#header {
-    padding-top: 5em;
-    background: url(../images/Web_Mainz_Header.png) repeat-x top left;
-}
-
-/* Navigation
-----------------------------------------------------------------*/
-div#nav, #subnavigation {
-    background: url(../images/Web_Mainz_MidLight.png) #FFF2C6 repeat;
-}
-div#nav ul, #subnavigation ul {
-    list-style-type: none;
-    margin: 0px;
-    padding-left: 0px;
-}
-div#nav ul li, #subnavigation ul li {
-    float: left;
-}
-div#nav ul li a, #subnavigation ul li a {
-    display: run-in;
-    padding: 0.4em 0.8em 0.3em 0.8em;
-    font-size: smaller;
-    font-family: sans-serif;
-}
-div#nav ul li a:hover, #subnavigation ul li a:hover {
-    text-decoration: none;
-    background-color: #FFFFE7;
-}
-div#nav ul li.CurrentSection a, #subnavigation ul li.CurrentSection a {
-    font-weight: bold;
-    font-style: italic;
-    background-image: url(../images/Web_Mainz_Mid.png);
-    border-style: dashed;
-    border-width: 1px 1px 0px 1px;
-    border-color: #7D5925;
-}
-#subnavigation ul li.CurrentSection a {
-    border-width: 0px 1px 1px 1px;
-}
-
-/* Alphabet Navigation
-----------------------------------------------------------------*/
-div#alphanav ul {
-    list-style: none;
-    border-width: 2px 0px 4px 0px;
-    border-style: solid;
-    border-color: black;
-    padding-left: 2em;
-    /* float container stretch, see www.quirksmode.org/css/clearing.html */
-    overflow: hidden;
-}
-div#alphanav ul li {
-    float: left;
-    font-size: larger;
-    font-family: sans-serif;
-    font-weight: bold;
-}
-div#alphanav ul li:after {
-    content: " |";
-}
-div#alphanav ul li a {
-    display: block;
-    padding: 4px 8px;
-    line-height: 100%;
-    float: left;
-    color: black;
-}
-div#alphanav ul li a:hover {
-    text-decoration: none;
-    background-color: black;
-    color: white;
-}
-
-/* Main Table
-----------------------------------------------------------------*/
-table {
-    border-collapse: collapse;
-    width: 100%;
-}
-div#summaryarea > table.infolist,
-div#parents > table.infolist,
-h3 + table.infolist {
-    width: auto;
-}
-table th {
-    text-align: left;
-    margin: 0px;
-    border-bottom: double 4px #7D5925;
-    padding: .1em 10px;
-}
-table td {
-    vertical-align: top;
-    padding: .1em 10px;
-}
-table.primobjlist td {
-    vertical-align: middle;
-}
-table.primobjlist tr a {
-    display: block; /* make whole td clickable */
-}
-table.primobjlist tr.BeginLetter td, table.primobjlist tr.BeginSurname td {
-    border-top: dashed 1px #D8C19F;
-}
-td.ColumnLetter, td.ColumnRowLabel {
-    font-weight: bold;
-}
-td.ColumnBirth, td.ColumnDeath, td.ColumnPartner, td.ColumnParents {
-    font-size: 90%;
-}
-table.relationships td.ColumnPartner {
-    font-size: 100%;
-}
-table.infolist tr td ol {
-    margin: 0px;
-}
-#summaryarea table.infolist td.ColumnAttribute,
-#parents table.infolist td.ColumnAttribute,
-#families table.infolist td.ColumnType,
-#families table.infolist td.ColumnAttribute {
-    color: #767D25;
-}
-/* div summaryarea is missing for events, sources and repos! */
-h3 + table.infolist td.ColumnAttribute {
-    color: #767D25;
-}
-
-table.primobjlist td.ColumnParents span.father, table.primobjlist td.ColumnParents span.mother {
-    display: block;
-}
-table.primobjlist td.ColumnParents span.mother:before, table.primobjlist td.ColumnPerson span.mother:before {
-    content: "+ ";
-}
-
-/* Surnames
-----------------------------------------------------------------*/
-table#SortByName thead th.ColumnSurname a:after,
-table#SortByCount thead th.ColumnQuantity a:after {
-    content: " \2193";
-}
-#SurnameDetail h3 {
-    border-bottom-width: 0px;
-    padding-bottom: 0px;
-    margin: 0px;
-}
-
-/* Events
-----------------------------------------------------------------*/
-#EventList tr.BeginType td {
-    border-top: dashed 1px #D8C19F;
-}
-#EventList tr.BeginLetter td {
-    border-top: solid 1px #D8C19F;
-}
-/* Events with multiple participants should have a comma seperated list of
-   names*/
-#EventList td.ColumnPerson a {
-    display: inline;
-}
-/* Family events, put mother on next line */
-#EventList td.ColumnPerson span.father,
-#EventList td.ColumnPerson span.mother,
-#EventDetail td.ColumnPerson span.father,
-#EventDetail td.ColumnPerson span.mother {
-    display: block;
-}
-#EventList td.ColumnPerson span.person:after,
-#EventList td.ColumnPerson span.father:after,
-#EventList td.ColumnPerson span.mother:after,
-#EventDetail td.ColumnPerson span.person:after,
-#EventDetail td.ColumnPerson span.father:after,
-#EventDetail td.ColumnPerson span.mother:after {
-    content: ", ";
-}
-#EventList td.ColumnPerson span.person:last-child:after,
-#EventList td.ColumnPerson span.father:last-child:after,
-#EventList td.ColumnPerson span.mother:last-child:after,
-#EventDetail td.ColumnPerson span.person:last-child:after,
-#EventDetail td.ColumnPerson span.father:last-child:after,
-#EventDetail td.ColumnPerson span.mother:last-child:after {
-    content: "";
-}
-
-table.eventlist tbody tr td.ColumnSources {
-    width: 5%;
-}
-
-/* Gallery
-----------------------------------------------------------------*/
-#GalleryNav {
-    text-align: center;
-    margin: 1.4em 0px;
-}
-#GalleryNav a {
-    font-weight: bold;
-    font-style: italic;
-    color: #FFF2C6;
-    background: url(../images/Web_Mainz_Bkgd.png) #7D5925 repeat;
-    border: outset 3px black;
-}
-#GalleryNav a:hover {
-    border-color: #7D5925;
-}
-#GalleryNav a:active {
-    border-style: solid;
-}
-#GalleryNav a#Previous {
-    padding: .4em .7em .3em .7em;
-}
-#GalleryNav a#Next {
-    padding: .4em 1.9em .3em 1.9em;
-}
-#GalleryPages {
-    margin: 0 1em;
-}
-#GalleryCurrent {
-    font-size: x-large;
-    font-weight: normal;
-    font-style: italic;
-}
-#GalleryTotal {
-    font-weight: normal;
-}
-#GalleryDisplay {
-    margin: 0px auto;
-    position: relative;
-}
-#GalleryDisplay img {
-    margin: 0px auto;
-    display:block;
-    border: solid 1px #7D5925;
-}
-
-/*    Sources
------------------------------------------------------ */
-div#SourceDetail {
-    margin: 0 auto;
-}
-
-/* Contact
-----------------------------------------------------------------*/
-#Contact h3 {
-    border-bottom-width: 0px;
-    padding-bottom: 0px;
-    margin: 0px;
-}
-#Contact img {
-    display: block;
-    margin: 0px auto 1em auto;
-    border: solid 1px #7D5925;
-}
-#Contact #researcher {
-    text-align: center;
-}
-#Contact #researcher span {
-    font-size: larger;
-}
-#Contact #streetaddress, #Contact #locality, #Contact #email {
-    display: block;
-}
-#Contact #city:after {
-    content: ",";
-}
-
-/* Download
-----------------------------------------------------------------*/
-#Download table.download a {
-    display: block;
-}
-
-/* SubSection
-----------------------------------------------------------------*/
-#Home img, #Introduction img {
-    display: block;
-    margin: 1em auto;
-    max-width: 950px;
-}
-#Home a, #Introduction a, #Contact a {
-    color: black;
-}
-.subsection {
-    clear: both;
-}
-.subsection p {
-    margin: 0px;
-}
-
-/* SubSection : Families
-----------------------------------------------------------------*/
-div#families table.fixed_subtables table.eventlist {
-    table-layout: fixed;
-}
-div#families table.fixed_subtables table.eventlist th:first-child {
-    width: 9em;
-}
-div#families table.fixed_subtables table.eventlist th:last-child {
-    width: 5em;
-}
-
-/* SubSection : Gallery
-----------------------------------------------------------------*/
-#indivgallery {
-    /* float container stretch, see www.quirksmode.org/css/clearing.html */
-    overflow: hidden;
-}
-#indivgallery .thumbnail {
-    float: left;
-    width: 130px;
-    font-size: smaller;
-    text-align: center;
-    margin: 0.5em;
-}
-#indivgallery img {
-    border: solid 1px #7D5925;
-}
-#indivgallery span {
-/* ## remove this line and the comment markers from the line below to hide the description in Individual Gallery
-    display: none; */
-}
-
-/* SubSection : Narrative
-----------------------------------------------------------------*/
-h4 + div.grampsstylednote, a.familymap {
-    margin-left: 10px;
-    margin-right: 10px;
-}
-i + div.grampsstylednote p {
-    margin: 0 0 0.3em 0;
-}
-div.grampsstylednote p {
-    margin-bottom: 0.5em;
-}
-
-/* SubSection : Source References
-----------------------------------------------------------------*/
-#sourcerefs ol li ol {
-    list-style-type: lower-alpha;
-}
-
-/* SubSection : Pedigree
-----------------------------------------------------------------*/
-.pedigreegen {
-    list-style-type: none;
-    padding-left: 10px;
-}
-.pedigreegen li ol {
-    list-style-type: none;
-}
-.pedigreegen li ol li ol {
-    list-style-type: decimal;
-}
-.pedigreegen ol.spouselist {
-    list-style-type: none;
-}
-.pedigreegen ol.spouselist li.spouse ol {
-    list-style-type: decimal;
-}
-.spouse:before {
-    content: "+ ";
-}
-.thisperson {
-    font-weight: bold;
-}
-.thisperson > ol {
-    font-weight: normal;
-}
-
-/* Footer
-----------------------------------------------------------------*/
-#footer {
-    clear: both;
-    background: url(../images/Web_Mainz_MidLight.png) #FFF2C6;
-    border-top: dashed 1px #7D5925;
-    font-family: sans-serif;
-}
-#footer p#createdate {
-    float: left;
-    width: 50%;
-    text-align: left;
-}
-#footer p#copyright {
-    float: right;
-    width: 40%;
-    text-align: right;
-}
-
-/* Overwritten
-----------------------------------------------------------------*/
-button#drop {
-    font-style: italic;
-    color: #FFF2C6;
-    background: url(../images/Web_Mainz_Bkgd.png) #7D5925 repeat;
-    border: outset 3px black ! important;
-}
-div#map_canvas {
-    border-color: #7D5925 ! important;
-}
-
-/* Calendar Styles
-=================================================================*/
-table.calendar {
-    table-layout: fixed;
-    empty-cells: show;
-    margin: 0px auto;
-    background: url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
-}
-.calendar thead th {
-    font-size: large;
-    font-weight: normal;
-    font-style: italic;
-    text-align: center;
-}
-.calendar thead th.monthName {
-    font-size: xx-large;
-    color: #767D25;
-    border-bottom-color: #7D5925;
-}
-.calendar thead th abbr {
-    border-bottom-style: none;
-}
-#CreatorInfo {
-    float: right;
-    margin: -1em 0px 0px 0px;
-    font-weight: bold;
-    font-style: italic;
-}
-.calendar tfoot td {
-    border-top: double 4px #7D5925;
-}
-
-/* Calendar : Date Numeral */
-.calendar div.date {
-    float: right;
-    width: 1.8em;
-    font-size: large;
-    font-style: italic;
-    text-align: center;
-    background: url(../images/Web_Mainz_MidLight.png) #FFF2C6 repeat;
-}
-
-/* Calendar : Date Container */
-.calendar td {
-    padding: 0px;
-    border-width: 1px 0px 0px 1px;
-    border-style: dashed;
-    border-color: #7D5925;
-}
-.calendar td.weekday {
-    background: url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat;
-}
-.calendar td.weekend {
-    background: url(../images/Web_Mainz_MidLight.png) #FFF2C6 repeat;
-}
-.calendar td:first-child {
-    border-left-style: none;
-}
-.calendar tbody tr:first-child td {
-    border-top-style: none;
-}
-
-/* Calendar : Date Detail */
-.calendar td ul {
-    font-size: smaller;
-    list-style: none;
-    padding: 0px;
-}
-.calendar td ul li {
-    margin: 0 4%;
-    border-top: dashed 1px #D8C19F;
-}
-.calendar td ul li:first-child {
-    border-style: none;
-}
-
-/* Calendar : Birthday, Anniversary, Highlight */
-.calendar td ul li em {
-    font-style: normal;
-    color: #767D25;
-}
-.calendar td ul li span.yearsmarried em {
-    color: black;
-}
-.calendar td.highlight div.date {
-    color: #767D25;
-    background-image: none;
-    background-color: #FFFFE7;
-}
-
-/* Calendar : Previous-Next Month */
-.calendar td.previous, .calendar td.next {
-    color: #D8C19F;
-    background: url(../images/Web_Mainz_MidLight.png) #FFF2C6 repeat;
-}
-
-/* Calendar : Full Year */
-body#fullyearlinked table.calendar {
-    float: left;
-    width: 315px;
-    height: 18em;
-    border: solid 1px #7D5925;
-}
-body#fullyearlinked table.calendar thead th {
-    height: 2em;
-}
-body#fullyearlinked table.calendar thead th.monthName {
-    font-size: large;
-}
-body#fullyearlinked table.calendar tbody td {
-    height: 3em;
-}
--- a/data/css/Web_Vertical-Menus.css
+++ b/data/css/Web_Vertical-Menus.css
@@ -1,157 +0,0 @@
-/*
-# encoding: utf-8
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright 2008-2010 Rob G. Healey <robhealey1@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-**************************************************************************************************
-GRAMPS Cascading Style Sheet
-Style Name: Web_Navigation-Vertical.css Stylesheet
-***************************************************************************************************
-
-# $Id: Web_Navigation-Vertical.css 15241 2010-04-19 11:07:00Z robhealey1 $
-
- Body Element
----------------------------------------------------- */
-body { background: -webkit-gradient
-           (linear, left top, left bottom, from(#ccc), to(#fff));
-    color: #000;
-    padding: 60px 0px 0px 146px;
-}
-
-/*    Header
----------------------------------------------------- */
-#header  {
-    position: fixed;
-    top: 0px;
-    left: 0px;
-    overflow: auto;
-    width: 100%;
-    height: 65px;
-}
-
-/* Navigation
----------------------------------------------------- */
-div#nav {
-    padding: 0px;
-    margin: 0 auto;
-    overflow: auto;
-}
-div#nav ul {
-    list-style-type: none;
-    display: block;
-    width: 330px;
-    position: fixed;
-    top: 53px;
-    left: 0px;
-    padding: 0px;
-    background: url(shad2.png) no-repeat;
-    -webkit-background-size: 50% 100%;
-}
-div#nav ul li a {
-    -webkit-transition: all 0.3s ease-out;
-    background: #cbcbcb url(border.png) no-repeat;
-    color: #174867;
-    padding: 7px 15px 7px 15px;
-    -webkit-border-top-right-radius: 10px;
-    -webkit-border-bottom-right-radius: 10px;
-    width: 120px;
-    display: block;
-    text-decoration: none;
-    -webkit-box-shadow: 2px 2px 4px #888;
-}
-div#nav ul li a:hover {
-    background: #ebebeb url(border.png) no-repeat;
-    color: #67a5cd;
-    padding: 7px 0px 7px 30px;
-}
-div#nav ul li.CurrentSection a {
-    background-color: #000;
-    color: #FFF;
-}
-
-/* SubNavigation
----------------------------------------------------- */
-div#subnavigation {
-    width: 100%;
-    margin: 0;
-    padding: 0;
-    border: solid 2px #000;
-}
-div#subnavigation ul {
-    list-style:none;
-    min-width: 900px;
-    height: 40px;
-    margin:0;
-    padding: 0px 0px 0px 16px;
-    border-bottom: solid 2px #5D835F;
-}
-div#subnavigation ul li {
-    float:left;
-}
-div#subnavigation ul li:after {
-    content: "| ";
-}
-div#subnavigation ul li a {
-    display: block;
-    padding: 12px 16px 14px 1px;
-    float:left;
-    font: .8em bold italic small-caps verdana, serif;
-    color: #000;
-    text-decoration:none;
-    margin:0;
-}
-div#subnavigation ul li a:hover {
-    background-color: #C1B398;
-}
-
-/* Alphabet Navigation
----------------------------------------------------- */
-div#alphanav {
-    width: 100%;
-    margin: 0;
-    padding: 0;
-    border: solid 2px #000;
-}
-div#alphanav ul {
-    list-style:none;
-    min-width: 900px;
-    height: 24px;
-    margin:0;
-    padding: 0px 0px 0px 9px;
-    border-bottom: solid 2px #000;
-}
-div#alphanav ul li {
-    float: left;
-}
-div#alphanav ul li:first-child {
-    margin-left: 10px;
-}
-div#alphanav ul li:after {
-    content: "| ";
-}
-div#alphanav ul li a {
-    display: block;
-    padding: 4px 8px 4px 8px;
-    float: left;
-    font: .8em bold italic small-caps verdana, serif;
-    color: #000;
-    text-decoration:none;
-    margin:0;
-}
--- a/data/css/jquery.flexbox.css
+++ b/data/css/jquery.flexbox.css
@@ -1,83 +0,0 @@
-/* Input textbox - do not specify a width here, it will be overwritten */
-.ffb-input 
-{
-	float:left;
-	color:#000; /* must specify along with watermark color */
-	height:16px; /* required for webkit browsers (Safari, Chrome) */
-}
-/* Color of watermark, if present */
-.ffb-input.watermark { /* added and removed dynamically */
-	color:#888; /* must specify along with input color */
-}
-/* Drop-down arrow, with sprited image */
-.ffb-arrow 
-{
-	float:left;
-	width:17px;
-	height:22px;
-	background-image:url(../img/sel_win7.gif);
-}
-.ffb-arrow.out { /* css sprite technique */
-	background-position:0;
-}
-.ffb-arrow.over { /* css sprite technique */
-	background-position:-17px 0;
-}
-.ffb-arrow.active { /* css sprite technique */
-	background-position:-34px 0;
-}
-.ffb-no-results 
-{
-	padding:2px;
-	color:#888;
-	font-style:italic;
-	border-bottom:1px solid #828790;
-}
-/* Container for dropdown contents */
-.ffb {
-	position:absolute; /* this guy's parent div is hard-coded to position:relative */
-	overflow:hidden;
-	border-left:1px solid #828790; /* #7B9EBD for Vista */
-	border-right:1px solid #828790;
-	background-color:#fff; /* Give it a background-color, so it's not transparent */
-}
-/* Inner div for dropdown */
-.ffb .content {
-	overflow:auto;
-}
-.ffb .content .row {
-	border-bottom:1px solid #828790;
-	color:#000;
-	height:20px;
-	clear:both;
-}
-.ffb-sel {
-	cursor:pointer;
-	cursor:hand;
-	color:#fff !important;
-	background-color:#39f;
-}
-.ffb-match {
-	font-weight:bold;
-	color:#000;
-}
-
-/* Paging */
-.ffb .paging {
-	vertical-align:middle;
-	border-bottom:1px solid #828790;
-}
-.ffb .page, .ffb a.page {
-	font-size:85%;
-	padding:2px;
-	border:solid 1px #339;
-	background-color:#eef;
-	margin:2px;
-}
-.ffb .box {
-	width:22px;
-	margin:2px;
-}
-.ffb .summary {
-	font-size:85%;
-}
--- a/data/css/narrative-maps.css
+++ b/data/css/narrative-maps.css
@@ -1,68 +0,0 @@
-/*
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2011 Rob G. Healey <robhealey1@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-#
-###################################################### */
-body#FamilyMap {
-    background-color: #000;
-    padding: 0 14px;
-}
-
-/*    Family Maps
------------------------------------------------------ */
-#map_canvas {
-    margin-left: 10px;
-    margin-right: 10px;
-    border: solid 4px #000;
-    margin: 0px auto;
-    width: 800px;
-    height: 400px;
-    max-width: 90%;
-    max-height: 90%;
-}
-
-/*    Place Maps
------------------------------------------------------ */
-div#place_canvas {
-    margin-left: 210px;
-    border: solid 4px #000;
-    width: 500px;
-    height: 400px;
-    max-width: 90%;
-    max-height: 90%;
-}
-button#drop {
-    background-color: purple;
-    color: #FFF;
-    font: bold .8em sans-serif;
-    padding: 10px;
-    margin-top: 10px;
-    margin-left: 10px;
-    border: solid 4px #00029D;
-}
-
-/*    Subsection: References
------------------------------------------------------ */
-div#FamilyMapDetail div#references table.infolist {
-    width: 100%;
-}
-div#FamilyMapDetail div#references table.infolist tbody tr td.ColumnPlace {
-    width: 40%;
-}
--- a/data/gramps.appdata.xml.in
+++ b/data/gramps.appdata.xml.in
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>gramps.desktop</id>
-  <metadata_license>CC0</metadata_license>
-  <name>Gramps</name>
-  <summary>Genealogical research program</summary>
-
-  <description>
-    <_p>Gramps is a genealogy program that is both intuitive for hobbyists and feature-complete for professional genealogists.</_p>
-    <_p>It gives you the ability to record the many details of the life of an individual as well as the complex relationships between various people, places and events.</_p>
-    <_p>All of your research is kept organized, searchable and as precise as you need it to be.</_p>
-  </description>
-
-  <url type="homepage">https://gramps-project.org/</url>
-  <url type="bugtracker">https://gramps-project.org/bugs/</url>
-  <url type="help">https://gramps-project.org/wiki/index.php?title=Main_page</url>
-  <project_license>GPL-2.0+</project_license>
-  <developer_name>Gramps Development Team</developer_name>
-
-  <screenshots>
-    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/5/5f/AppData1.png</screenshot>
-    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/6/68/AppData2.png</screenshot>
-    <screenshot type="default" width="1226" height="740">http://www.gramps-project.org/wiki/images/e/e9/AppData3.png</screenshot>
-    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/6/68/AppData4.png</screenshot>
-    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/5/50/AppData5.png</screenshot>
-  </screenshots>
-
-  <provides>
-    <binary>gramps</binary>
-  </provides>
-
-</component>
--- a/data/gramps.desktop.in
+++ b/data/gramps.desktop.in
@@ -1,13 +1,11 @@
 [Desktop Entry]
-_Name=Gramps
-_GenericName=Genealogy System
-_X-GNOME-FullName=Gramps Genealogy System
+_Name=Gramps Genealogy System
 _Comment=Manage genealogical information, perform genealogical research and analysis
 Icon=gramps
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Office;
-_Keywords=Genealogy;Family History;Research;Family Tree;GEDCOM;
+X-GNOME-DocPath=gramps/gramps-manual.xml
 MimeType=application/x-gramps;application/x-gedcom;application/x-gramps-package;application/x-gramps-xml;
 Exec=gramps %F
--- a/data/gramps.xml.in
+++ b/data/gramps.xml.in
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!-- $Id$ -->

 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
  <mime-type type="application/x-gramps">
--- a/data/gramps_canonicalize.xsl
+++ b/data/gramps_canonicalize.xsl
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Gramps - a GTK+/GNOME based genealogy program
-
- Copyright (C) 2011       Michiel D. Nauta
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-->
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:g="http://gramps-project.org/xml/1.4.0/">
-
-<!--
-    Transform a Gramps XML file into "canonical form", that is strip the
-    timestamps in the change attributes, and order all elements for which
-    the id attribute is used. The idea is that "canonical Gramps XML" files
-    can be compared with eachother with the help of ordinary diff tools.
-->
-
-<xsl:output method="xml"/>
-
-<xsl:param name="replace_handles"/>
-<xsl:key name="primary_obj" match="g:person|g:family|g:event|g:placeobj|g:source|g:repository|g:object|g:note|g:tag" use="@handle"/>
-
-<xsl:template match="*|@*|text()">
-    <xsl:copy>
-        <xsl:apply-templates select="*|@*|text()"/>
-    </xsl:copy>
-</xsl:template>
-
-<xsl:template match="@change">
-</xsl:template>
-
-<xsl:template match="g:researcher">
-    <xsl:copy/>
-</xsl:template>
-
-<xsl:template match="g:people|g:families|g:events|g:places|g:sources|g:repositories|g:objects|g:notes|g:tags">
-    <xsl:copy>
-        <xsl:apply-templates select="*">
-            <xsl:sort select="@id"/>
-        </xsl:apply-templates>
-    </xsl:copy>
-</xsl:template>
-
-<xsl:template match="@handle">
-    <xsl:choose>
-        <xsl:when test="$replace_handles='ID'">
-            <xsl:attribute name="handle">
-                <xsl:value-of select="../@id"/>
-            </xsl:attribute>
-        </xsl:when>
-        <xsl:when test="$replace_handles='strip'">
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:copy/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template match="@hlink">
-    <xsl:choose>
-        <xsl:when test="$replace_handles='ID'">
-            <xsl:attribute name="hlink">
-                <xsl:value-of select="key('primary_obj',.)/@id"/>
-            </xsl:attribute>
-        </xsl:when>
-        <xsl:when test="$replace_handles='strip'">
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:copy/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -3,9 +3,8 @@
 <!-- 
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2001       Graham J. Williams
+# Copyright (C) 2001 Graham J. Williams
 # Copyright (C) 2000-2007  Donald N. Allingham
-# Copyright (C) 2010-2014  Nick Hall
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,57 +18,51 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+# $Id$
 -->

 <!--
-    This is the Document Type Definition file for v1.7.1
+    This is the Document Type Definition file for v1.3.0
    of the GRAMPS XML genealogy data format.
    Please use the following formal public identifier to identify it:

-    "-//GRAMPS//DTD GRAMPS XML V1.7.1//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.3.0//EN"

    For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.7.1//EN"
-                "http://gramps-project.org/xml/1.7.1/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.3.0//EN"
+                "http://gramps-project.org/xml/1.3.0/grampsxml.dtd"
                [...]>
 -->


 <!--
 DATABASE
-    Defines an XML document which is a <database> consisting of a
+	Defines an XML document which is a <database> consisting of a

-    header     Information about the "owner" of the database
-    name-formats
-    people
-    families
-    events
-    places
-    citations
-    sources
-    objects
-    repositories
-    notes
-    tags
-    bookmarks
-    namemaps
-    tags
+	header	   Information about the "owner" of the database
+	people
+	families
+	sources
+	places
+	objects
+	repositories
+	notes
+	bookmarks
 -->

-<!ELEMENT database (header, name-formats?, tags?, events?, people?, families?,
-                    citations?, sources?, places?, objects?, repositories?,
-                    notes?, bookmarks?, namemaps?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.7.1/">
+<!ELEMENT database (header, name-formats?, events?, people?, families?,
+                    sources?, places?, objects?, repositories?, notes?,
+                    bookmarks?,namemaps?)>
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.4.0/">

-
-<!--    ************************************************************
+<!--	************************************************************
 HEADER

-    A <header> consists of <created> (information about this
-    genealogical database) and <researcher> (information about the
-    person who created this genealogical database)
+	A <header> consists of <created> (information about this
+	genealogical database) and <researcher> (information about the
+	person who created this genealogical database)
 -->

 <!ELEMENT header (created, researcher?, mediapath?)>
@@ -80,21 +73,20 @@ HEADER
        version  CDATA #REQUIRED
 >

-<!ELEMENT researcher (resname?, resaddr?, reslocality?, rescity?, resstate?,
+<!ELEMENT researcher (resname, resaddr?, rescity?, resstate?,
                      rescountry?, respostal?, resphone?, resemail?)>
-<!ELEMENT resname        (#PCDATA)>
-<!ELEMENT resaddr        (#PCDATA)>
-<!ELEMENT reslocality    (#PCDATA)>
-<!ELEMENT rescity        (#PCDATA)>
-<!ELEMENT resstate       (#PCDATA)>
-<!ELEMENT rescountry     (#PCDATA)>
-<!ELEMENT respostal      (#PCDATA)>
-<!ELEMENT resphone       (#PCDATA)>
-<!ELEMENT resemail       (#PCDATA)>
+<!ELEMENT resname    (#PCDATA)>
+<!ELEMENT resaddr    (#PCDATA)>
+<!ELEMENT rescity    (#PCDATA)>
+<!ELEMENT resstate   (#PCDATA)>
+<!ELEMENT rescountry (#PCDATA)>
+<!ELEMENT respostal  (#PCDATA)>
+<!ELEMENT resphone   (#PCDATA)>
+<!ELEMENT resemail   (#PCDATA)>

 <!ELEMENT mediapath  (#PCDATA)>

-<!--    ************************************************************
+<!--	************************************************************
 PEOPLE
 -->

@@ -106,11 +98,12 @@ PEOPLE

 <!ELEMENT person (gender, name*, eventref*, lds_ord*,
                  objref*, address*, attribute*, url*, childof*,
-                  parentin*, personref*, noteref*, citationref*, tagref*)>
+                  parentin*, personref*, noteref*, sourceref*)>
 <!ATTLIST person
-        id        CDATA #IMPLIED
+        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
+	marker    CDATA #IMPLIED
        change    CDATA #REQUIRED
 >

@@ -119,9 +112,8 @@ GENDER has values of M, F, or U.
 -->
 <!ELEMENT gender  (#PCDATA)>

-<!ELEMENT name    (first?, call?, surname*, suffix?, title?, nick?, familynick?, group?,
-                  (daterange|datespan|dateval|datestr)?, noteref*, citationref*)>
-<!-- (Unknown|Also Know As|Birth Name|Married Name|Other Name) -->
+<!ELEMENT name    (first?,call?,surname*,nick?,familynick?,suffix?,title?,group?
+                  (daterange|datespan|dateval|datestr)?,noteref*,sourceref*)>
 <!ATTLIST name    
        alt       (0|1) #IMPLIED
        type      CDATA #IMPLIED
@@ -137,12 +129,11 @@ GENDER has values of M, F, or U.
 <!ELEMENT nick       (#PCDATA)>
 <!ELEMENT familynick (#PCDATA)>
 <!ELEMENT group      (#PCDATA)>
+
 <!ELEMENT surname    (#PCDATA)>
-<!-- (Unknown|Inherited|Given|Taken|Patronymic|Matronymic|Feudal|
-Pseudonym|Patrilineal|Matrilineal|Occupation|Location) -->
 <!ATTLIST surname
        prefix      CDATA #IMPLIED
-        prim        (1|0) #IMPLIED
+        primary     (1|0) #IMPLIED
        derivation  CDATA #IMPLIED
        connector   CDATA #IMPLIED
 >
@@ -154,41 +145,40 @@ Pseudonym|Patrilineal|Matrilineal|Occupation|Location) -->
 <!ELEMENT parentin EMPTY>
 <!ATTLIST parentin hlink IDREF #REQUIRED>

-<!ELEMENT personref (citationref*, noteref*)>
+<!ELEMENT personref (sourceref*,noteref*)>
 <!ATTLIST personref 
-        hlink IDREF #REQUIRED
-        priv  (0|1) #IMPLIED
-        rel   CDATA #REQUIRED
+  hlink IDREF #REQUIRED
+  priv  (0|1) #IMPLIED
+  rel   CDATA #REQUIRED
 >

-<!ELEMENT address ((daterange|datespan|dateval|datestr)?, street?, 
-				   locality?, city?, county?, state?, country?, postal?, 
-				   phone?, noteref*,citationref*)>
+<!ELEMENT address ((daterange|datespan|dateval|datestr)?,street?,city?,
+                   county?,state?,country?,postal?,phone?,noteref*,sourceref*)>
 <!ATTLIST address priv (0|1) #IMPLIED>

-<!ELEMENT street   (#PCDATA)>
-<!ELEMENT locality (#PCDATA)>
-<!ELEMENT city     (#PCDATA)>
-<!ELEMENT county   (#PCDATA)>
-<!ELEMENT state    (#PCDATA)>
-<!ELEMENT country  (#PCDATA)>
-<!ELEMENT postal   (#PCDATA)>
-<!ELEMENT phone    (#PCDATA)>
+<!ELEMENT street  (#PCDATA)>
+<!ELEMENT city    (#PCDATA)>
+<!ELEMENT county  (#PCDATA)>
+<!ELEMENT country (#PCDATA)>
+<!ELEMENT postal  (#PCDATA)>
+<!ELEMENT state   (#PCDATA)>
+<!ELEMENT phone   (#PCDATA)>


-<!--    ************************************************************
+<!--	************************************************************
 FAMILY
-    An element to record information about a family.
+	An element to record information about a family.
 -->

 <!ELEMENT families (family)*>

-<!ELEMENT family (rel?, father?, mother?, eventref*, lds_ord*, objref*,
-                  childref*, attribute*, noteref*, citationref*, tagref*)>
+<!ELEMENT family (rel?,father?,mother?,eventref*,lds_ord*,
+                  objref*,childref*,attribute*,noteref*,sourceref*)>
 <!ATTLIST family
-        id        CDATA #IMPLIED
+        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
+	marker    CDATA #IMPLIED
        change    CDATA #REQUIRED
 >

@@ -198,13 +188,12 @@ FAMILY
 <!ELEMENT mother EMPTY>
 <!ATTLIST mother hlink IDREF #REQUIRED>

-<!-- (None|Birth|Adopted|Stepchild|Sponsored|Foster|Other|Unknown) -->
-<!ELEMENT childref (citationref*,noteref*)>
+<!ELEMENT childref (sourceref*,noteref*)>
 <!ATTLIST childref
-        hlink IDREF #REQUIRED
-        priv  (0|1) #IMPLIED
-        mrel  CDATA #IMPLIED
-        frel  CDATA #IMPLIED
+  hlink IDREF #REQUIRED
+  priv  (0|1) #IMPLIED
+  mrel  (None|Birth|Adopted|Stepchild|Sponsored|Foster|Other|Unknown) #IMPLIED
+  frel  (None|Birth|Adopted|Stepchild|Sponsored|Foster|Other|Unknown) #IMPLIED
 >

 <!ELEMENT type (#PCDATA)>
@@ -212,32 +201,33 @@ FAMILY
 <!ELEMENT rel EMPTY>
 <!ATTLIST rel type CDATA #REQUIRED>

-<!--    ************************************************************
+<!--	************************************************************
 EVENT
 -->
 <!ELEMENT events (event)*>

-<!ELEMENT event (type?, (daterange|datespan|dateval|datestr)?, place?, cause?,
-                 description?, attribute*, noteref*, citationref*, objref*,
-                 tagref*)>
+<!ELEMENT event (type?,(daterange|datespan|dateval|datestr)?,place?,cause?,
+                 description?,attribute*,noteref*,sourceref*,objref*)>
 <!ATTLIST event 
-        id        CDATA #IMPLIED
+        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
+	marker    CDATA #IMPLIED
        change    CDATA #REQUIRED
 >

-<!--    ************************************************************
+<!--	************************************************************
 SOURCES
 -->

 <!ELEMENT sources (source)*>
-<!ELEMENT source (stitle?, sauthor?, spubinfo?, sabbrev?,
-                  noteref*, objref*, srcattribute*, reporef*, tagref*)>
+<!ELEMENT source (stitle?,sauthor?,spubinfo?,sabbrev?,
+                  noteref*,objref*,data_item*,reporef*)>
 <!ATTLIST source
-        id        CDATA #IMPLIED
+        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
+	marker    CDATA #IMPLIED
        change    CDATA #REQUIRED
 >
 <!ELEMENT stitle   (#PCDATA)>
@@ -245,31 +235,22 @@ SOURCES
 <!ELEMENT spubinfo (#PCDATA)>
 <!ELEMENT sabbrev  (#PCDATA)>

-<!--    ************************************************************
+<!--	************************************************************
 PLACES
 -->

 <!ELEMENT places (placeobj)*>

-<!ELEMENT placeobj (ptitle?, pname+, code?, coord?, placeref*, location*,
-                    objref*, url*, noteref*, citationref*, tagref*)>
+<!ELEMENT placeobj (ptitle?,coord?,location*,objref*,url*,noteref*,sourceref*)>
 <!ATTLIST placeobj
-        id        CDATA #IMPLIED
+        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
+	marker    CDATA #IMPLIED
        change    CDATA #REQUIRED
-        type      CDATA #REQUIRED
 >

-<!ELEMENT pname (daterange|datespan|dateval|datestr)?>
-
-<!ATTLIST pname
-        lang CDATA #IMPLIED
-        value CDATA #REQUIRED
->
-
-<!ELEMENT ptitle (#PCDATA)>
-<!ELEMENT code (#PCDATA)>
+<!ELEMENT ptitle   (#PCDATA)>

 <!ELEMENT coord EMPTY>
 <!ATTLIST coord
@@ -279,29 +260,29 @@ PLACES

 <!ELEMENT location EMPTY>
 <!ATTLIST location
-        street   CDATA #IMPLIED
-        locality CDATA #IMPLIED
-        city     CDATA #IMPLIED
-        parish   CDATA #IMPLIED
-        county   CDATA #IMPLIED
-        state    CDATA #IMPLIED
-        country  CDATA #IMPLIED
-        postal   CDATA #IMPLIED
-        phone    CDATA #IMPLIED
+    street  CDATA #IMPLIED
+    city    CDATA #IMPLIED
+    parish  CDATA #IMPLIED
+    county  CDATA #IMPLIED
+    state   CDATA #IMPLIED
+    country CDATA #IMPLIED
+    postal  CDATA #IMPLIED
+    phone   CDATA #IMPLIED
 >

-<!--    ************************************************************
+<!--	************************************************************
 OBJECTS
 -->

 <!ELEMENT objects (object)*>

-<!ELEMENT object (file, attribute*, noteref*,
-                 (daterange|datespan|dateval|datestr)?, citationref*, tagref*)>
+<!ELEMENT object (file,attribute*,noteref*,
+                 (daterange|datespan|dateval|datestr)?,sourceref*)>
 <!ATTLIST object
-        id        CDATA #IMPLIED
+        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
+	marker    CDATA #IMPLIED
        change    CDATA #REQUIRED
 >

@@ -309,100 +290,70 @@ OBJECTS
 <!ATTLIST file
        src         CDATA #REQUIRED
        mime        CDATA #REQUIRED
-        checksum    CDATA #IMPLIED
        description CDATA #REQUIRED
 >

-<!--    ************************************************************
+<!--	************************************************************
 REPOSITORIES
 -->

 <!ELEMENT repositories (repository)*>

-<!ELEMENT repository (rname, type, address*, url*, noteref*, tagref*)>
+<!ELEMENT repository (rname,type,address*,url*,noteref*)>
 <!ATTLIST repository
-        id        CDATA #IMPLIED
+        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
+	marker    CDATA #IMPLIED
        change    CDATA #REQUIRED
 >

 <!ELEMENT rname   (#PCDATA)>

-<!--    ************************************************************
+<!--	************************************************************
 NOTES
 -->

 <!ELEMENT notes (note)*>

-<!ELEMENT note (text, style*, tagref*)>
+<!ELEMENT note (text,tag*)>
 <!ATTLIST note
-        id        CDATA #IMPLIED
+        id        CDATA #REQUIRED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
-        change    CDATA #REQUIRED
-        format    (0|1) #IMPLIED
-        type      CDATA #REQUIRED
+	marker    CDATA #IMPLIED
+	change    CDATA #REQUIRED
+	format    (0|1) #IMPLIED
+	type      CDATA #REQUIRED
 >

 <!ELEMENT text (#PCDATA)>

-<!ELEMENT style (range+)>
-<!ATTLIST style
-        name    (bold|italic|underline|fontface|fontsize|
-                fontcolor|highlight|superscript|link) #REQUIRED
-        value   CDATA #IMPLIED
+<!ELEMENT tag (range+)>
+<!ATTLIST tag
+	name	(bold|italic|underline|fontface|fontsize|
+		fontcolor|highlight|superscript) #REQUIRED
+	value	CDATA #IMPLIED
 >

 <!ELEMENT range EMPTY>
 <!ATTLIST range
-        start   CDATA #REQUIRED
-        end     CDATA #REQUIRED
+	start	CDATA #REQUIRED
+	end	CDATA #REQUIRED
 >

-<!--    ************************************************************
-TAGS
-->
-
-<!ELEMENT tags (tag)*>
-
-<!ELEMENT tag EMPTY>
-<!ATTLIST tag
-        handle    ID    #REQUIRED
-        name      CDATA #REQUIRED
-        color     CDATA #REQUIRED
-        priority  CDATA #REQUIRED
-        change    CDATA #REQUIRED
->
-
-<!--    ************************************************************
-CITATIONS
-->
-
-<!ELEMENT citations (citation)*>
-
-<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence,
-                    noteref*, objref*, srcattribute*, sourceref, tagref*)>
-<!ATTLIST citation
-        id        CDATA #IMPLIED
-        handle    ID    #REQUIRED
-        priv      (0|1) #IMPLIED
-        change    CDATA #REQUIRED
->
-
-<!--    ************************************************************
+<!--	************************************************************
 BOOKMARKS
 -->

 <!ELEMENT bookmarks (bookmark)*>
 <!ELEMENT bookmark EMPTY>
 <!ATTLIST bookmark 
-        target (person|family|event|source|citation|place|media|repository|
-                note) #REQUIRED
+        target (person|family|event|source|place|media|repository) #REQUIRED
        hlink  IDREF #REQUIRED
 >

-<!--    ************************************************************
+<!--	************************************************************
 NAME MAPS
 -->
 <!ELEMENT namemaps (map)*>
@@ -413,7 +364,7 @@ NAME MAPS
        value CDATA #REQUIRED
 >

-<!--    ************************************************************
+<!--	************************************************************
 NAME FORMATS
 -->

@@ -426,10 +377,10 @@ NAME FORMATS
        active  (0|1) #IMPLIED
 >

-<!--    ************************************************************
+<!--	************************************************************
 SHARED ELEMENTS
 -->
-<!ELEMENT daterange EMPTY>
+<!ELEMENT daterange    EMPTY>
 <!ATTLIST daterange
        start     CDATA                  #REQUIRED
        stop      CDATA                  #REQUIRED
@@ -439,17 +390,17 @@ SHARED ELEMENTS
        newyear   CDATA                  #IMPLIED 
 >

-<!ELEMENT datespan EMPTY>
+<!ELEMENT datespan    EMPTY>
 <!ATTLIST datespan
-        start     CDATA                  #REQUIRED
-        stop      CDATA                  #REQUIRED
-        quality   (estimated|calculated) #IMPLIED
-        cformat   CDATA                  #IMPLIED
+        start   CDATA                    #REQUIRED
+        stop    CDATA                    #REQUIRED
+        quality (estimated|calculated)   #IMPLIED
+        cformat CDATA                    #IMPLIED
        dualdated (0|1)                  #IMPLIED
        newyear   CDATA                  #IMPLIED 
 >

-<!ELEMENT dateval EMPTY>
+<!ELEMENT dateval    EMPTY>
 <!ATTLIST dateval
        val       CDATA                  #REQUIRED
        type      (before|after|about)   #IMPLIED
@@ -459,20 +410,17 @@ SHARED ELEMENTS
        newyear   CDATA                  #IMPLIED 
 >

-<!ELEMENT datestr EMPTY>
+<!ELEMENT datestr    EMPTY>
 <!ATTLIST datestr val CDATA #REQUIRED>

-<!ELEMENT citationref EMPTY>
-<!ATTLIST citationref
-        hlink IDREF #REQUIRED
->
-
-<!ELEMENT sourceref EMPTY>
+<!ELEMENT sourceref (spage?,noteref*,(daterange|datespan|dateval|datestr)?)>
 <!ATTLIST sourceref
        hlink IDREF #REQUIRED
+        priv  (0|1) #IMPLIED
+        conf  CDATA #IMPLIED
 >

-<!ELEMENT eventref (attribute*, noteref*)>
+<!ELEMENT eventref (attribute*,noteref*)>
 <!ATTLIST eventref
        hlink IDREF #REQUIRED
        priv  (0|1) #IMPLIED
@@ -492,26 +440,13 @@ SHARED ELEMENTS
        hlink IDREF #REQUIRED
 >

-<!ELEMENT tagref EMPTY>
-<!ATTLIST tagref
-        hlink IDREF #REQUIRED
->
+<!ELEMENT spage     (#PCDATA)>

-<!ELEMENT page (#PCDATA)>
-<!ELEMENT confidence (#PCDATA)>
-
-<!ELEMENT attribute (citationref*, noteref*)>
+<!ELEMENT attribute  (sourceref*,noteref*)>
 <!ATTLIST attribute
-        priv    (0|1)   #IMPLIED
-        type    CDATA   #REQUIRED
-        value   CDATA   #REQUIRED
->
-
-<!ELEMENT srcattribute EMPTY>
-<!ATTLIST srcattribute
-        priv    (0|1)   #IMPLIED
-        type    CDATA   #REQUIRED
-        value   CDATA   #REQUIRED
+        priv 	(0|1) 	#IMPLIED
+        type	CDATA	#REQUIRED
+        value	CDATA	#REQUIRED
 >

 <!ELEMENT place EMPTY>
@@ -522,23 +457,18 @@ SHARED ELEMENTS

 <!ELEMENT url EMPTY>
 <!ATTLIST url
-        priv        (0|1) #IMPLIED
-        type        CDATA #IMPLIED
-        href        CDATA #REQUIRED
+        priv (0|1) #IMPLIED
+        type CDATA #IMPLIED
+        href CDATA #REQUIRED
        description CDATA #IMPLIED
 >

-<!ELEMENT objref (region?, attribute*, citationref*, noteref*)>
+<!ELEMENT objref (region?,attribute*,sourceref*,noteref*)>
 <!ATTLIST objref 
        hlink IDREF #REQUIRED
        priv (0|1)  #IMPLIED
 >

-<!ELEMENT placeref ((daterange|datespan|dateval|datestr)?)>
-<!ATTLIST placeref
-        hlink IDREF #REQUIRED
->
-
 <!ELEMENT region EMPTY>
 <!ATTLIST region
        corner1_x  CDATA #REQUIRED
@@ -553,10 +483,10 @@ SHARED ELEMENTS
        value CDATA #REQUIRED
 >

-<!ELEMENT lds_ord ((daterange|datespan|dateval|datestr)?, temple?, place?,
-                   status?, sealed_to?, noteref*, citationref*)>
+<!ELEMENT lds_ord ((daterange|datespan|dateval|datestr)?,temple?,place?,
+                   status?,sealed_to?,noteref*,sourceref*)>
 <!ATTLIST lds_ord
-        priv   (0|1) #IMPLIED
+        priv  (0|1) #IMPLIED
        type   CDATA #REQUIRED
 >

--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -4,7 +4,6 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2005-2007  Donald N. Allingham
-# Copyright (C) 2010-2014  Nick Hall
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,10 +17,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 # Written by Alex Roitman

+# $Id$
 -->

 <!--
@@ -31,7 +31,7 @@

 <grammar
  datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/xml/1.7.1/"
+  ns="http://gramps-project.org/xml/1.4.0/"
  xmlns="http://relaxng.org/ns/structure/1.0">

  <start><element name="database">
@@ -41,15 +41,10 @@
            <attribute name="date"><data type="date"/></attribute>
            <attribute name="version"><text/></attribute>
        </element>
-        <element name="researcher">
-            <optional>
+        <optional><element name="researcher">
            <ref name="researcher-content"/>
-            </optional>
-        </element>
-        <optional>
-           <element name="mediapath"><text/>
-           </element>
-        </optional>
+        </element></optional>
+        <optional><element name="mediapath"><text/></element></optional>
      </element>

      <optional><element name="name-formats">
@@ -58,12 +53,6 @@
          </element></zeroOrMore>
      </element></optional>

-      <optional><element name="tags">
-          <zeroOrMore><element name="tag">
-              <ref name="tag-content"/>
-          </element></zeroOrMore>
-      </element></optional>
-
      <optional><element name="events">
          <zeroOrMore><element name="event">
              <ref name="event-content"/>
@@ -86,12 +75,6 @@
          </element></zeroOrMore>
      </element></optional>

-      <optional><element name="citations">
-          <zeroOrMore><element name="citation">
-              <ref name="citation-content"/>
-          </element></zeroOrMore>
-      </element></optional>
-
      <optional><element name="sources">
          <zeroOrMore><element name="source">
              <ref name="source-content"/>
@@ -138,7 +121,6 @@
  <define name="researcher-content">
      <element name="resname"><text/></element>
      <optional><element name="resaddr"><text/></element></optional>
-      <optional><element name="reslocality"><text/></element></optional>
      <optional><element name="rescity"><text/></element></optional>
      <optional><element name="resstate"><text/></element></optional>
      <optional><element name="rescountry"><text/></element></optional>
@@ -147,18 +129,15 @@
      <optional><element name="resemail"><text/></element></optional>
  </define>

-  <define name="table-object">
-    <attribute name="handle"><data type="ID"/></attribute>
-    <attribute name="change"><text/></attribute>
-  </define>
-
  <define name="primary-object">
-    <ref name="table-object"/>
-    <optional><attribute name="id"><text/></attribute></optional>
+    <attribute name="id"><text/></attribute>
+    <attribute name="handle"><data type="ID"/></attribute>
    <optional><attribute name="priv"><choice>
        <value>0</value>
        <value>1</value>
    </choice></attribute></optional>
+    <optional><attribute name="marker"><text/></attribute></optional>
+    <attribute name="change"><text/></attribute>
  </define>

  <define name="person-content">
@@ -196,21 +175,31 @@
        <attribute name="hlink"><data type="IDREF"/></attribute>
    </element></zeroOrMore>
    <zeroOrMore><element name="personref">
-        <ref name="personref-content"/>
+        <attribute name="hlink"><data type="IDREF"/></attribute>
+        <optional><attribute name="priv">
+            <ref name="priv-content"/>
+        </attribute></optional>
+        <attribute name="rel"><text/></attribute>
    </element></zeroOrMore>
    <zeroOrMore><element name="noteref">
        <ref name="noteref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="citationref">
-        <ref name="citationref-content"/>
-    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
+    <zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
    </element></zeroOrMore>
  </define>

  <define name="child-rel">
-    <text/>
+    <choice>
+      <value>Birth</value>
+      <value>Adopted</value>
+      <value>Stepchild</value>
+      <value>Sponsored</value>
+      <value>Foster</value>
+      <value>None</value>
+      <value>Other</value>
+      <value>Unknown</value>
+    </choice>
  </define>

  <define name="name-content">
@@ -221,37 +210,49 @@
    <optional><attribute name="priv">
        <ref name="priv-content"/>
    </attribute></optional>
-    <optional><attribute name="type"><text/></attribute></optional>
+    <optional><attribute name="type"><choice>
+        <value>Also Known As</value>
+        <value>Birth Name</value>
+        <value>Married Name</value>
+        <value>Other Name</value>
+    </choice></attribute></optional>
    <optional><attribute name="sort"><text/></attribute></optional>
    <optional><attribute name="display"><text/></attribute></optional>
    <optional><element name="first"><text/></element></optional>
    <optional><element name="call"><text/></element></optional>
+    <optional><element name="nick"><text/></element></optional>
+    <optional><element name="familynick"><text/></element></optional>
+    <optional><element name="group"><text/></element></optional>
    <zeroOrMore><element name="surname">
        <ref name="surname-content"/>
    </element></zeroOrMore>
    <optional><element name="suffix"><text/></element></optional>
    <optional><element name="title"><text/></element></optional>
-    <optional><element name="nick"><text/></element></optional>
-    <optional><element name="familynick"><text/></element></optional>
-    <optional><element name="group"><text/></element></optional>
    <optional><ref name="date-content"/></optional>
    <zeroOrMore><element name="noteref">
        <ref name="noteref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="citationref">
-        <ref name="citationref-content"/>
+    <zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
    </element></zeroOrMore>
  </define>

  <define name="surname-content">
-    <text/>
-    <optional><attribute name="prefix"><text/></attribute></optional>
-    <optional><attribute name="prim"><choice>
-    <value>1</value>
-    <value>0</value>
-    </choice></attribute></optional>
-    <optional><attribute name="derivation"><text/></attribute></optional>
-    <optional><attribute name="connector"><text/></attribute></optional>
+    <element name="surname">
+        <text/>
+        <optional><attribute name="prefix"><text/></attribute></optional>
+        <optional><attribute name="primary"><choice>
+        <value>1</value>
+        <value>0</value>
+        </choice></attribute></optional>
+        <optional><attribute name="derivation"><choice>
+        <value>inherited</value>
+        <value>patronymic</value>
+        <value>matronymic</value>
+        <value>other</value>
+        </choice></attribute></optional>
+        <optional><attribute name="connector"><text/></attribute></optional>
+    </element>
  </define>

  <define name="address-content">
@@ -260,7 +261,6 @@
    </attribute></optional>
    <optional><ref name="date-content"/></optional>
    <optional><element name="street"><text/></element></optional>
-    <optional><element name="locality"><text/></element></optional>
    <optional><element name="city"><text/></element></optional>
    <optional><element name="county"><text/></element></optional>
    <optional><element name="state"><text/></element></optional>
@@ -270,8 +270,8 @@
    <zeroOrMore><element name="noteref">
        <ref name="noteref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="citationref">
-        <ref name="citationref-content"/>
+    <zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
    </element></zeroOrMore>
  </define>

@@ -285,10 +285,10 @@
                <value>calculated</value>
            </choice></attribute></optional>
            <optional><attribute name="cformat"><text/></attribute></optional>
-        <optional><attribute name="dualdated">
+	    <optional><attribute name="dualdated">
                <choice><value>0</value><value>1</value></choice>
-        </attribute></optional>
-        <optional><attribute name="newyear"><text/></attribute></optional>
+	    </attribute></optional>
+	    <optional><attribute name="newyear"><text/></attribute></optional>
        </element>
        <element name="datespan">
            <attribute name="start"><text/></attribute>
@@ -298,10 +298,10 @@
                <value>calculated</value>
            </choice></attribute></optional>
            <optional><attribute name="cformat"><text/></attribute></optional>
-        <optional><attribute name="dualdated">
+	    <optional><attribute name="dualdated">
                <choice><value>0</value><value>1</value></choice>
-        </attribute></optional>
-        <optional><attribute name="newyear"><text/></attribute></optional>
+	    </attribute></optional>
+	    <optional><attribute name="newyear"><text/></attribute></optional>
        </element>
        <element name="dateval">
            <attribute name="val"><text/></attribute>
@@ -315,10 +315,10 @@
                <value>estimated</value>
                <value>calculated</value>
            </choice></attribute></optional>
-        <optional><attribute name="dualdated">
+	    <optional><attribute name="dualdated">
                <choice><value>0</value><value>1</value></choice>
-        </attribute></optional>
-        <optional><attribute name="newyear"><text/></attribute></optional>
+	    </attribute></optional>
+	    <optional><attribute name="newyear"><text/></attribute></optional>
        </element>
        <element name="datestr">
            <attribute name="val"><text/></attribute>
@@ -357,12 +357,6 @@
        <optional><attribute name="frel">
            <ref name="child-rel"/>
        </attribute></optional>
-        <zeroOrMore><element name="citationref">
-            <ref name="citationref-content"/>
-        </element></zeroOrMore>
-        <zeroOrMore><element name="noteref">
-            <ref name="noteref-content"/>
-        </element></zeroOrMore>
    </element></zeroOrMore>
    <zeroOrMore><element name="attribute">
        <ref name="attribute-content"/>
@@ -371,11 +365,8 @@
        <ref name="noteref-content"/>
    </element></zeroOrMore>
    <optional><ref name="date-content"/></optional>
-    <zeroOrMore><element name="citationref">
-        <ref name="citationref-content"/>
-    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
+    <zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
    </element></zeroOrMore>
  </define>

@@ -393,36 +384,11 @@
    <zeroOrMore><element name="noteref">
        <ref name="noteref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="citationref">
-        <ref name="citationref-content"/>
-    </element></zeroOrMore>
-    <zeroOrMore><element name="objref">
-        <ref name="objref-content"/>
-    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
-  </define>
-
-  <define name="citation-content">
-    <ref name="primary-object"/>
-    <optional><ref name="date-content"/></optional>
-    <optional><element name="page"><text/></element></optional>
-    <element name="confidence"><text/></element>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
-    <zeroOrMore><element name="objref">
-        <ref name="objref-content"/>
-    </element></zeroOrMore>
-    <zeroOrMore><element name="srcattribute">
-        <ref name="srcattribute-content"/>
-    </element></zeroOrMore>
-    <element name="sourceref">
+    <zeroOrMore><element name="sourceref">
        <ref name="sourceref-content"/>
-    </element>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
+    </element></zeroOrMore>
+    <zeroOrMore><element name="objref">
+        <ref name="objref-content"/>
    </element></zeroOrMore>
  </define>

@@ -438,35 +404,24 @@
    <zeroOrMore><element name="objref">
        <ref name="objref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="srcattribute">
-        <ref name="srcattribute-content"/>
+    <zeroOrMore><element name="data_item">
+        <attribute name="key"><text/></attribute>
+        <attribute name="value"><text/></attribute>
    </element></zeroOrMore>
    <zeroOrMore><element name="reporef">
        <ref name="reporef-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
  </define>

  <define name="place-content">
    <ref name="primary-object"/>
-    <attribute name="type"><text/></attribute>
    <optional><element name="ptitle"><text/></element></optional>
-    <oneOrMore><element name="pname">
-        <ref name="placename-content"/>
-    </element></oneOrMore>
-    <optional><element name="code"><text/></element></optional>
    <optional><element name="coord">
-        <attribute name="long"><text/></attribute>
-        <attribute name="lat"><text/></attribute>
+        <attribute name="long"><data type="float"/></attribute>
+        <attribute name="lat"><data type="float"/></attribute>
    </element></optional>
-    <zeroOrMore><element name="placeref">
-        <ref name="placeref-content"/>
-    </element></zeroOrMore>
    <zeroOrMore><element name="location">
        <optional><attribute name="street"><text/></attribute></optional>
-        <optional><attribute name="locality"><text/></attribute></optional>
        <optional><attribute name="city"><text/></attribute></optional>
        <optional><attribute name="parish"><text/></attribute></optional>
        <optional><attribute name="county"><text/></attribute></optional>
@@ -484,11 +439,8 @@
    <zeroOrMore><element name="noteref">
        <ref name="noteref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="citationref">
-        <ref name="citationref-content"/>
-    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
+    <zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
    </element></zeroOrMore>
  </define>

@@ -497,8 +449,7 @@
    <element name="file">
        <attribute name="src"><text/></attribute>
        <attribute name="mime"><text/></attribute>
-        <optional><attribute name="checksum"><text/></attribute></optional>
-        <optional><attribute name="description"><text/></attribute></optional>
+        <attribute name="description"><text/></attribute>
    </element>
    <zeroOrMore><element name="attribute">
        <ref name="attribute-content"/>
@@ -507,11 +458,8 @@
        <ref name="noteref-content"/>
    </element></zeroOrMore>
    <optional><ref name="date-content"/></optional>
-    <zeroOrMore><element name="citationref">
-        <ref name="citationref-content"/>
-    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
+    <zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
    </element></zeroOrMore>
  </define>

@@ -528,9 +476,6 @@
    <zeroOrMore><element name="noteref">
        <ref name="noteref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
  </define>

  <define name="bookmark-content">
@@ -539,11 +484,9 @@
        <value>family</value>
        <value>event</value>
        <value>source</value>
-        <value>citation</value>
        <value>place</value>
        <value>media</value>
        <value>repository</value>
-        <value>note</value>
    </choice></attribute>
    <attribute name="hlink"><data type="IDREF"/></attribute>
  </define>
@@ -574,14 +517,11 @@
    </choice></attribute></optional>
    <attribute name="type"><text/></attribute>
    <ref name="styledtext"/>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
  </define>

  <define name="styledtext">
    <element name="text"><text/></element>
-    <zeroOrMore><element name="style">
+    <zeroOrMore><element name="tag">
      <attribute name="name"><choice>
          <value>bold</value>
          <value>italic</value>
@@ -591,7 +531,6 @@
          <value>fontcolor</value>
          <value>highlight</value>
          <value>superscript</value>
-          <value>link</value>
      </choice></attribute>
      <optional><attribute name="value"><text/></attribute></optional>
      <oneOrMore><element name="range">
@@ -601,28 +540,19 @@
    </element></zeroOrMore>
  </define>

-  <define name="citationref-content">
-    <attribute name="hlink"><data type="IDREF"/></attribute>
-  </define>
-  
-  <define name="personref-content">
-    <attribute name="hlink"><data type="IDREF"/></attribute>
-        <optional><attribute name="priv">
-            <ref name="priv-content"/>
-        </attribute></optional>
-        <attribute name="rel"><text/></attribute>
-    <optional><zeroOrMore><element name="citationref">
-        <ref name="citationref-content"/>
-    </element></zeroOrMore></optional>
-    <optional><zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore></optional>
-  </define>
-    
  <define name="sourceref-content">
    <attribute name="hlink"><data type="IDREF"/></attribute>
+    <optional><attribute name="priv">
+        <ref name="priv-content"/>
+    </attribute></optional>
+    <optional><attribute name="conf"><text/></attribute></optional>
+    <optional><element name="spage"><text/></element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
+    <optional><ref name="date-content"/></optional>
  </define>
-    
+
  <define name="eventref-content">
    <attribute name="hlink"><data type="IDREF"/></attribute>
    <optional><attribute name="priv">
@@ -666,21 +596,13 @@
    </attribute></optional>
    <attribute name="type"><text/></attribute>
    <attribute name="value"><text/></attribute>
-    <zeroOrMore><element name="citationref">
-        <ref name="citationref-content"/>
+    <zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
    </element></zeroOrMore>
    <zeroOrMore><element name="noteref">
        <ref name="noteref-content"/>
    </element></zeroOrMore>
  </define>
-  
-  <define name="srcattribute-content">
-    <optional><attribute name="priv">
-        <ref name="priv-content"/>
-    </attribute></optional>
-    <attribute name="type"><text/></attribute>
-    <attribute name="value"><text/></attribute>
-  </define>

  <define name="url-content">
      <optional><attribute name="priv">
@@ -702,8 +624,8 @@
    <zeroOrMore><element name="attribute">
        <ref name="attribute-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="citationref">
-        <ref name="citationref-content"/>
+    <zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
    </element></zeroOrMore>
    <zeroOrMore><element name="noteref">
        <ref name="noteref-content"/>
@@ -732,8 +654,8 @@
        <ref name="noteref-content"/>
    </element></zeroOrMore>
    <optional><ref name="date-content"/></optional>
-    <zeroOrMore><element name="citationref">
-        <ref name="citationref-content"/>
+    <zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
    </element></zeroOrMore>
  </define>

@@ -745,26 +667,4 @@
    <text/>
  </define>

-  <define name="placename-content">
-    <attribute name="value"><text/></attribute>
-    <optional><attribute name="lang"><text/></attribute></optional>
-    <optional><ref name="date-content"/></optional>
-  </define>
-
-  <define name="placeref-content">
-    <attribute name="hlink"><data type="IDREF"/></attribute>
-    <optional><ref name="date-content"/></optional>
-  </define>
-
-  <define name="tagref-content">
-    <attribute name="hlink"><data type="IDREF"/></attribute>
-  </define>
-
-  <define name="tag-content">
-    <ref name="table-object"/>
-      <attribute name="name"><text/></attribute>
-      <attribute name="color"><text/></attribute>
-      <attribute name="priority"><data type="integer"/></attribute>
-  </define>
-
 </grammar>
--- a/data/holidays.xml.in
+++ b/data/holidays.xml.in
@@ -1,538 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<calendar>
-  <country _name="Bulgaria">
-    <date name="Нова Година" value="*/1/1" type="national" />
-    <date name="Освобождение на България от Османско иго" value="*/3/3" type="national" />
-    <date name="Ден на труда" value="*/5/1" type="national" />
-    <date name="Ден на храбростта и Българската армия" value="*/5/6" type="national" />
-    <date name="Гергьовден" value="*/5/6" type="religious" />
-    <date name="Ден на българската просвета и култура и на славянската писменост" value="*/5/24" type="national" />
-    <date name="Ден на Съединението на България" value="*/9/6" type="national" />
-    <date name="Ден на Независимостта на България" value="*/9/22" type="national" />
-    <date name="Ден на народните будители" value="*/10/1" type="national" />
-    <date name="Бъдни вечер" value="*/12/24" type="national" />
-    <date name="Рождество Христово, Коледа" value="*/12/25" type="national" />
-    <date name="Рождество Христово, Коледа" value="*/12/26" type="national" />
-    <date name="Васильовден" value="*/1/1" type="religious" />
-    <date name="Св. Йоан Кръстител (Ивановден)" value="*/1/6" type="religious" />
-    <date name="Богоявление (Йордановден)" value="*/1/7" type="religious" />
-    <date name="Антоновден" value="*/1/17" type="religious" />
-    <date name="Атанасовден" value="*/1/18" type="religious" />
-    <date name="Трифон Зарезан (стар ст.)" value="*/2/1" type="religious" />
-    <date name="Сретение Господне" value="*/2/2" type="religious" />
-    <date name="Св. Симеон" value="*/2/3" type="religious" />
-    <date name="Св. Валентин" value="*/2/14" type="religious" />
-    <date name="Трифон Зарезан" value="*/2/14" type="religious" />
-    <date name="Благовещение" value="*/3/25" type="religious" />
-    <date name="Св. цар Борис" value="*/5/2" type="religious" />
-    <date name="Св. Св.Кирил и Методий" value="*/5/11" type="religious" />
-    <date name="Св.Богородица" value="*/6/11" type="religious" />
-    <date name="Еньовден" value="*/6/24" type="religious" />
-    <date name="Петровден" value="*/6/29" type="religious" />
-    <date name="Св. Седмочисленици" value="*/7/27" type="religious" />
-    <date name="Илинден" value="*/7/20" type="religious" />
-    <date name="Рождество Богородично (Малка Богородица)" value="*/9/8" type="religious" />
-    <date name="Кръстовден" value="*/9/14" type="religious" />
-    <date name="Петковден" value="*/10/14" type="religious" />
-    <date name="Димитровден" value="*/10/26" type="religious" />
-    <date name="Архангеловден" value="*/11/8" type="religious" />
-    <date name="Въведение Богородично" value="*/11/21" type="religious" />
-    <date name="Андреевден" value="*/11/30" type="religious" />
-    <date name="Св. Варвара" value="*/12/4" type="religious" />
-    <date name="Св. Сава" value="*/12/5" type="religious" />
-    <date name="Никулден" value="*/12/6" type="religious" />
-    <date name="Игнажден" value="*/12/20" type="religious" />
-    <date name="Стефановден" value="*/12/27" type="religious" />
-    <date name="Великден" value="> julian_easter(y)" type="religious" />
-    <date name="Цветница" value="> julian_easter(y)" offset="-7" type="religious" />
-    <date name="Възнесение господне" value="2010/5/13" type="religious" />
-    <date name="Възнесение господне" value="2011/6/2" type="religious" />
-    <date name="Възнесение господне" value="2012/5/24" type="religious" />
-  </country>
-  <country _name="Canada">
-    <date name="New Year's Day" value="*/1/1" type="national" />
-    <date name="Groundhog Day" value="*/2/2" type="secular" />
-    <date name="Valentine's Day" value="*/2/14" type="secular" />
-    <date name="Flag Day" value="*/2/15" type="secular" />
-    <date name="St. Patrick's Day" value="*/3/17" type="secular" />
-    <date name="April Fool's Day" value="*/4/1" type="secular" />
-    <date name="Daylight Savings begins" value="*/1/sun/apr" type="informational" />
-    <date name="Ash Wednesday" value="> easter(y)" type="religious" offset="-46" />
-    <date name="Easter" type="religious" value="> easter(y)"  />
-    <date name="Passover" type="religious" value="> passover(y)" />
-    <date name="Earth Day" value="*/4/22" type="secular" />
-    <date name="Mother's Day" value="*/2/sun/may" type="secular" />
-    <date name="Victoria Day" value="*/5/24" offset="-mon" type="national" />
-    <date name="Father's Day" value="*/3/sun/jun" type="secular" />
-    <date name="St-Jean Baptiste (QC)" value="*/6/24" type="national" />
-    <date name="Canada Day" value="*/7/1" type="national" />
-    <date name="Civic Holiday" value="*/1/mon/aug" type="national" />
-    <date name="Labour Day" value="*/1/mon/sep" type="national" />
-    <date name="Grandparent's Day" value="*/2/sun/sep" offset="6" type="secular" />
-    <date name="Thanksgiving" value="*/2/mon/oct" type="national" />
-    <date name="Daylight Savings ends" value="*/-1/sun/oct" type="informational" />
-    <date name="Yom Kippur" type="religious" value="> passover(y)" offset="172" />
-    <date name="Ramadan begins" value="2006/9/24" type="religious" />
-    <date name="Ramadan begins" value="2007/9/13" type="religious" />
-    <date name="Ramadan begins" value="2008/9/2" type="religious" />
-    <date name="Halloween" value="*/10/31" type="secular" />
-    <date name="Rememberance Day" value="*/11/11" type="national" />
-    <date name="Hanukkah begins" type="religious" value="> hanuka(y)" />
-    <date name="Christmas" value="*/12/25" type="national" />
-    <date name="Boxing Day" value="*/12/26" type="national" />
-  </country>
-  <country _name="Czech Republic">
-    <date name="Nový rok" value="*/1/1" type="national" />
-    <date name="Den obnovy samostatného českého státu" value="*/1/1" type="national" />
-    <date name="Velikonoce" type="religious" value="> easter(y)"  />
-    <date name="Svátek práce" value="*/5/1" type="national" />
-    <date name="Den osvobození od fašismu" value="*/5/8" type="national" />
-    <date name="Den slovanských věrozvěstů Cyrila a Metoděje" value="*/7/5" type="national" />
-    <date name="Den upálení mistra Jana Husa" value="*/7/6" type="national" />
-    <date name="Den české státnosti" value="*/9/28" type="national" />
-    <date name="Den vzniku samostatného československého státu" value="*/10/28" type="national" />
-    <date name="Den boje za svobodu a demokracii" value="*/11/17" type="national" />
-    <date name="Štědrý den" value="*/12/24" type="religious" />
-    <date name="1. svátek vánoční" value="*/12/25" type="national" />
-    <date name="2. svátek vánoční" value="*/12/26" type="national" />
-  </country>
-  <country _name="Chile">
-    <date name="Año nuevo" value="*/1/1" type="national" />
-    <date name="Viernes Santo" value="2007/4/6" type="religious" />
-    <date name="Viernes Santo" value="2008/3/21" type="religious" />
-    <date name="Viernes Santo" value="2009/4/10" type="religious" />
-    <date name="Viernes Santo" value="2010/4/2" type="religious" />
-    <date name="Viernes Santo" value="2011/4/22" type="religious" />
-    <date name="Viernes Santo" value="2012/4/6" type="religious" />
-    <date name="Viernes Santo" value="2013/3/29" type="religious" />
-    <date name="Viernes Santo" value="2014/4/18" type="religious" />
-    <date name="Viernes Santo" value="2015/4/3" type="religious" />
-    <date name="Día del Trabajador" value="*/5/1" type="national" />
-    <date name="Día de las Glorias Navales" value="*/5/21" type="national" />
-    <date name="San Pedro y San Pablo" value="*/6/29" type="religious" />
-    <date name="Día de la Virgen del Carmen" value="*/7/16" type="religious" />
-    <date name="Asunción de la Virgen" value="*/8/15" type="religious" />
-    <date name="Fiestas Patrias" value="*/9/18" type="national" />
-    <date name="Glorias del Ejército" value="*/9/19" type="national" />
-    <date name="Día de la Raza" value="*/10/12" type="national" />
-    <date name="Todos los Santos" value="*/11/1" type="religious" />
-    <date name="Inmaculada Concepción" value="*/12/8" type="religious" />
-    <date name="Navidad" value="*/12/25" type="national" />
-  </country>
-  <country _name="China">
-    <date name="Chinese New Year" value="2006/1/29" type="national" />
-  </country>
-  <country _name="Croatia">
-    <date name="Nova godina" value="*/1/1" type="national" />
-    <date name="Sveta tri kralja" value="*/1/6" type="national" />
-    <date name="Uskrs" value="> easter(y)" type="national" />
-    <date name="Uskršnji ponedjeljak" value="> easter(y)" offset="1" type="national" />
-    <date name="Dan rada" value="*/5/1" type="national" />
-    <date name="Tijelovo" value="> easter(y)" offset="60" type="national" />
-    <date name="Dan antifašističke borbe" value="*/6/22" type="national" />
-    <date name="Dan državnosti" value="*/6/25" type="national" />
-    <date name="Dan domovinske zahvalnosti" value="*/8/5" type="national" />
-    <date name="Velika Gospa" value="*/8/15" type="national" />
-    <date name="Dan neovisnosti" value="*/10/8" type="national" />
-    <date name="Svi sveti" value="*/11/1" type="national" />
-    <date name="Božić" value="*/12/25" type="national" />
-    <date name="Sveti Stjepan" value="*/12/26" type="national" />
-  </country>
-  <country _name="England">
-    <date name="New Year's Day" value="*/1/1" type="national" />
-    <date name="Bank Holiday" value="*/1/1" offset="+1" if="dow(y, m, d) == 7" type="national" />
-    <date name="Bank Holiday" value="*/1/1" offset="+2" if="dow(y, m, d) == 6" type="national" />
-    <date name="Good Friday" value="> easter(y)" offset="-2" type="national" />
-    <date name="Easter Monday" value="> easter(y)" offset="+1" type="national" />
-    <date name="May Bank Holiday" value="*/1/mon/may" type="national" />
-    <date name="Spring Bank Holiday" value="*/-1/mon/may" if="y != 2012" type="national" />
-    <date name="Spring Bank Holiday" value="2012/6/4" type="national" />
-    <date name="Diamond Jubilee" value="2012/6/5" type="national" />
-    <date name="Summer Bank Holiday" value="*/-1/mon/aug" type="national" />
-    <date name="Christmas Day" value="*/dec/25" type="national" />
-    <date name="Boxing Day" value="*/dec/26" type="national" />
-    <date name="Bank Holiday" value="*/dec/25" offset="+2" if="dow(y, m, d) > 5" type="national" />
-    <date name="Bank Holiday" value="*/dec/26" offset="+2" if="dow(y, m, d) > 5" type="national" />
-    <date name="BST starts" value="*/-1/sun/mar" type="informational" />
-    <date name="BST ends" value="*/-1/sun/oct" type="informational" />
-    <date name="Valentine's Day" value="*/2/14" type="secular" />
-    <date name="Shrove Tuesday" value="> easter(y)" offset="-47" type="religious" />
-    <date name="Ash Wednesday" value="> easter(y)" offset="-46" type="religious" />
-    <date name="Easter Sunday" value="> easter(y)" type="religious" />
-    <date name="April Fool's Day" value="*/4/1" type="secular" />
-    <date name="St. George's Day" value="*/4/23" type="secular" />
-    <date name="Mothering Sunday" value="> easter(y)" offset="-21" type="secular" />
-    <date name="Fathers' Day" value="*/3/sun/jun" type="secular" />
-    <date name="Halloween" value="*/10/31" type="secular" />
-    <date name="Guy Fawkes Night" value="*/11/5" type="secular" />
-    <date name="Armistice Day" value="*/11/11" type="secular" />
-    <date name="Remembrance Sunday" value="*/2/sun/nov" type="secular" />
-  </country>
-  <country _name="Finland">
-    <date name="Loppiainen" value="*/1/6" type="religious" if="not(y>=1973)" />
-    <date name="Loppiainen" value="*/1/6" offset="sat" type="religious" if="(y>=1973) and not(y>=1992)" />
-    <date name="Loppiainen" value="*/1/6" type="religious" if="(y>=1992)" />
-    <date name="Knud" value="*/1/7" type="religious" if="not(y>=1708)" />
-    <date name="Knud" value="*/1/13" type="religious" if="(y>=1708) and not(y>=1885)" />
-    <date name="Nuutti" value="*/1/13" type="religious" if="(y>=1885)" />
-    <date name="Pyhän Henrikin muistopäivä" value="*/1/20" type="religious" if="not(y>=1699)" />
-    <date name="Pyhän Henrikin muistopäivä" value="*/1/19" type="religious" if="(y>=1699)" />
-    <date name="Laskiaissunnuntai" type="religious" value="> easter(y)" offset="-49"/>
-    <date name="Laskiaistiistai" type="religious" value="> easter(y)" offset="-47"/>
-    <date name="Tuhkakeskiviikko" type="religious" value="> easter(y)" offset="-46" />
-<!--
-# Candlemas Day was February 2, before the year 1774.
-# From 1774 Candlemas Day was February 2, if it is Sunday, otherwise the next Sunday.
-# If this day is Shrove Sunday, Candlemas Day is the week before.
-->
-    <date name="Kynttilänpäivä" value="*/2/2" type="religious" if="not(y>=1774)" />
-<!--
-# Before the year 1955, Annunciation day was 25 March.
-# If the day is a week before Passover, the holy day was Palm Sunday preceding Saturday.
-# If it occurred on Easter Sunday, Annunciation day was Easter the following Tuesday.
-#
-# From 1955 has been the Annunciation on Sunday, no earlier than March 22 and no later than March 28,
-# if this Sunday is Palm Sunday or Easter, Annunciation day is the Sunday before Palm Sunday.
-->
-    <date name="Palmusunnuntai" type="religious" value="> easter(y)" offset="-7" />
-    <date name="Kiirastorstai" type="religious" value="> easter(y)" offset="-3" />
-    <date name="Pitkäperjantai" type="religious" value="> easter(y)" offset="-2" />
-    <date name="Lankalauantai" type="religious" value="> easter(y)" offset="-1" />
-    <date name="Pääsiäispäivä" type="religious" value="> easter(y)" />
-    <date name="2. Pääsiäispäivä" type="religious" value="> easter(y)" offset="1" />
-    <date name="Helatorstai" type="religious" value="> easter(y)" offset="39" if="not(y>=1973)" />
-    <date name="Kristuksen taivaaseenastumisen päivä" type="religious" value="> easter(y)" offset="34" if="(y>=1973) and not(y>=1992)" />
-    <date name="Helatorstai" type="religious" value="> easter(y)" offset="39" if="(y>=1992)" />
-    <date name="Helluntaipäivä" value="easter(y)" offset="49" type="religious" />
-    <date name="Pyhän Kolminaisuuden päivä" value="easter(y)" offset="56" type="religious" />
-    <date name="Apostolienpäivä" value="easter(y)" offset="91" type="religious" />
-    <date name="Kirkastussunnuntai" value="easter(y)" offset="105" type="religious" />
-    <date name="Juhannusaatto" value="*/jun/19" offset="fri" type="religious" if="(y>=1955)" />
-    <date name="Juhannusaatto" value="*/jun/23" type="religious" if="not(y>=1955)"  />
-    <date name="Juhannuspäivä" value="*/jun/20" offset="sat" type="religious" if="(y>=1955)" />
-    <date name="Juhannuspäivä" value="*/jun/24" type="religious" if="not(y>=1955)"  />
-    <date name="Pyhäinmiestenpäivä" value="*/nov/1" type="religious" if="not(y>=1774)" />
-    <date name="Pyhäinmiestenpäivä" value="*/nov/1" offset="sun" type="religious" if="(y>=1774) and not(y>=1955)" />
-    <date name="Pyhäinpäivä" value="*/oct/31" offset="sat" type="religious" if="(y>=1955)" />
-    <date name="1. Adventti" value="*/nov/27" offset="sun" type="religious" />
-    <date name="2. Adventti" value="*/dec/4" offset="sun" type="religious" />
-    <date name="3. Adventti" value="*/dec/11" offset="sun" type="religious" />
-    <date name="4. Adventti" value="*/dec/18" offset="sun" type="religious" />
-    <date name="Lucian päivä" value="*/12/13" type="religious" />
-    <date name="Tuomaan päivä" value="*/12/21" type="religious" />
-    <date name="Jouluaatto" value="*/12/24" type="religious" />
-    <date name="Joulupäivä" value="*/12/25" type="religious" />
-    <date name="Tapaninpäivä" value="*/12/26" type="religious" />
-    <date name="Johannes Evankelistan päivä" value="*/dec/27" type="religious" if="not(y>=1774)" />
-    <date name="Apostoli Johanneksen päivä" value="*/dec/27" type="religious" if="dow(y, m, d) == 7 and (y>=2000)" />
-    <date name="Viattomien lasten päivä" value="*/12/28" type="religious" />
-    <date name="Uudenvuodenpäivä" value="*/1/1" type="national" />
-    <date name="Vainojen uhrien muistopäivä" value="*/1/27" type="national" if="(y>=2002)" />
-    <date name="J.L. Runebergin päivä" value="*/2/5" type="national" if="(y>=1854)" />
-    <date name="Saamelaisten kansallispäivä" value="*/2/6" type="religious" if="(y>=2004)" />
-    <date name="Ystävänpäivä" value="*/2/14" type="national" if="(y>=1987)" />
-    <date name="Kalevalan päivä" value="*/2/28" type="national" if="(y>=1978)" />
-    <date name="Naistenpäivä" value="*/3/8" type="national" if="(y>=1975)" />
-    <date name="Minna Canthin päivä" value="*/3/19" type="national" if="(y>=2003)" />
-    <date name="Kesäaika alkaa" value="*/-1/sun/mar" type="informational" if="(y>=1981)" />
-    <date name="Romanien kansallispäivä" value="*/4/8" type="national" if="(y>=2014)" />
-    <date name="Mikael Agricolan päivä" value="*/4/9" type="national" if="(y>=1960)" />
-    <date name="Veteraanipäivä" value="*/4/27" type="national" if="(y>=1987)" />
-    <date name="Vappuaatto" value="*/4/30" type="national" />
-    <date name="Vappu" value="*/5/1" type="national" />
-    <date name="Eurooppa-päivä" value="*/5/9" type="national" if="(y>=1950)" />
-    <date name="J.V. Snelmannin päivä" value="*/5/12" type="national" if="(y>=1952)" />
-    <date name="Äitienpäivä" value="*/2/sun/may" type="national" if="(y>=1927)" />
-    <date name="Kaatuneiden muistopäivä" value="*/3/sun/may" type="national" if="(y>=1947)" />
-    <date name="Puolustusvoimien lippujuhla" value="*/6/4" type="national" if="(y>=1951)" />
-    <date name="Eino Leinon päivä" value="*/7/6" type="national" if="(y>=1998)" />
-    <date name="Unikeonpäivä" value="*/6/27" type="national" if="not(y>=1720)" />
-    <date name="Unikeonpäivä" value="*/7/27" type="national" if="(y>=1720)" />
-    <date name="Yrittäjänpäivä" value="*/9/5" type="national" if="(y>=2010)" />
-    <date name="Mikkelinpäivä" value="*/9/29" type="national" if="not(y>=1774)" />
-    <date name="Mikkelinpäivä" value="*/9/29" offset="sun" type="national" if="(y>=1774)" />
-    <date name="Aleksis Kiven päivä" value="*/10/10" type="national" if="(y>=1950)" />
-    <date name="YK:n päivä" value="*/10/24" type="national" if="(y>=1968)" />
-    <date name="Halloween" value="*/10/31" type="secular" if="(y>=1950)" />
-    <date name="Talviaika alkaa" value="*/-1/sun/oct" type="informational" if="(y>=1981)" />
-    <date name="Ruotsalaisuuden päivä" value="*/11/6" type="national" if="(y>=1979)" />
-    <date name="Isänpäivä" value="*/2/sun/nov" type="national" if="(y>=1987)" />
-    <date name="Lapsen oikeukeuksien päivä" value="*/11/20" type="national" if="(y>=2002)" />
-    <date name="Itsenäisyyspäivä" value="*/12/6" type="national" if="(y>=1917)" />
-    <date name="Jean Sibeliuksen päivä" value="*/12/8" type="national" if="(y>=2011)" />
-    <date name="Uudenvuodenaatto" value="*/12/31" type="national" if="(y>=1846)" />
-  </country>
-  <country _name="France">
-    <date name="Jour de l'an" value="*/1/1" type="national" />
-    <date name="Fête du travail" value="*/5/1" type="national" />
-    <date name="Victoire 1945" value="*/5/8" type="national" />
-    <date name="Fête nationale" value="*/7/14" type="national" />
-    <date name="Armistice 1918" value="*/11/11" type="national" />
-    <date name="Abolition de l’esclavage (Martinique)" value="*/05/22" type="local" />
-    <date name="Abolition de l’esclavage (Guadeloupe)" value="*/05/27" type="local" />
-    <date name="Abolition de l’esclavage (Guyane)" value="*/06/10" type="local" />
-    <date name="Abolition de l’esclavage (Réunion)" value="*/10/20" type="local" />
-    <date name="Vendredi Saint (Alsace/Moselle)" type="religious" value="> easter(y)" offset="-2" />
-    <date name="Pâques" type="religious" value="> easter(y)"  />
-    <date name="Lundi de pâques" type="religious" value="> easter(y)" offset="1" />
-    <date name="Ascension" type="religious" value="> easter(y)" offset="39" />
-    <date name="Pentecôte" type="religious" value="> easter(y)" offset="49" />
-    <date name="Lundi de pentecôte" type="religious" value="> easter(y)" offset="50" />
-    <date name="Assomption" value="*/8/15" type="religious" />
-    <date name="Toussaint" value="*/11/1" type="religious" />
-    <date name="Jour des morts (Antilles)" value="*/11/2" type="religious" />
-    <date name="Noël" value="*/12/25" type="religious" />
-    <date name="Pâque juive" type="religious" value="> passover(y)" />
-    <date name="Yom Kippour" type="religious" value="> passover(y)" offset="172" />
-    <date name="Hanoucca" type="religious" value="> hanuka(y)" />
-    <date name="début Ramadan" value="2006/09/24" type="religious" />
-    <date name="début Ramadan" value="2007/09/13" type="religious" />
-    <date name="début Ramadan" value="2008/09/02" type="religious" />
-    <date name="début Ramadan" value="2009/08/22" type="religious" />
-    <date name="début Ramadan" value="2010/08/12" type="religious" />
-    <date name="début Ramadan" value="2011/08/02" type="religious" />
-    <date name="début Ramadan" value="2012/07/21" type="religious" />
-    <date name="début Ramadan" value="2013/07/09" type="religious" />
-    <date name="début Ramadan" value="2014/06/29" type="religious" />
-    <date name="début Ramadan" value="2015/06/19" type="religious" />
-    <date name="début Ramadan" value="2016/06/08" type="religious" />
-    <date name="Saint Étienne (Alsace/Moselle)" value="*/12/26" type="religious" />
-  </country>
-  <country _name="Germany">
-    <date name="Neujahr" type="national" value="*/1/1" />
-    <date name="Hl. Drei Könige BW,BY,ST" type="religious" value="*/1/6" />
-    <date name="Karfreitag" type="religious" value="> easter(y)" offset="-2" />
-    <date name="Ostermontag" type="religious" value="> easter(y)" offset="+1" />
-    <date name="Maifeiertag" type="national" value="*/5/1" />
-    <date name="Christi Himmelfahrt" type="religious" value="> easter(y)" offset="+39" />
-    <date name="Pfingstmontag" type="religious" value="> easter(y)" offset="+50" />
-    <date name="Fronleichnam BW, BY, HE, NW, RP, SL" type="religious" value="> easter(y)" offset="+60" />
-    <date name="Mariä Himmelfahrt SL" type="religious" value="*/8/15" />
-    <date name="Tag der Deutschen Einheit" type="national" value="*/10/3" />
-    <date name="Reformationstag BB, MV, SN, ST, TH" type="religious" value="*/10/31" />
-    <date name="Allerheiligen BW, BY, NW, RP, SL" type="religious" value="*/11/1" />
-    <date name="Buß- u. Bettag SN" type="religious" value="*/11/23"  offset="-wed"/>
-    <date name="1. Weihnachtsfeiertag" type="religious" value="*/12/25" />
-    <date name="2. Weihnachtsfeiertag" type="religious" value="*/12/26" />
-  </country>
-  <country _name="Japan">
-    <date name="元日" value="*/1/1" />
-    <date name="成人の日" value="*/2/mon/jan" />
-    <date name="建国記念の日" value="*/2/11" />
-    <date name="春分の日" value="*/3/20" />
-    <date name="春分の日" value="*/3/21" />
-    <date name="昭和の日" value="*/4/29" />
-    <date name="憲法記念日" value="*/5/3" />
-    <date name="みどりの日" value="*/5/4" />
-    <date name="こどもの日" value="*/5/5" />
-    <date name="海の日" value="*/3/mon/jul" />
-    <date name="敬老の日" value="*/3/mon/sep" />
-    <date name="秋分の日" value="*/9/22" />
-    <date name="秋分の日" value="*/9/23" />
-    <date name="体育の日" value="*/2/mon/oct" />
-    <date name="文化の日" value="*/11/3" />
-    <date name="勤労感謝の日" value="*/11/23" />
-    <date name="天皇誕生日" value="*/12/23" />
-    <date name="皇太子明仁親王の結婚" value="1959/4/10" />
-    <date name="昭和天皇の大喪の礼" value="1989/2/24" />
-    <date name="天皇(明仁)即位記念" value="1990/11/12" />
-    <date name="皇太子徳仁親王の結婚" value="1993/6/9" />
-  </country>
-  <country _name="Slovakia">
-    <date name="Deň vzniku Slovenskej republiky" value="*/1/1" type="national" />
-    <date name="Zjavenie Pána (Traja králi)" value="*/1/6" type="religious" />
-    <date name="Veľký piatok" value="> easter(y)" offset="-2" type="religious" />
-    <date name="Veľkonočný pondelok" value="> easter(y)" offset="+1" type="religious" />
-    <date name="Sviatok práce" value="*/5/1" type="national" />
-    <date name="Deň víťazstva nad fašizmom" value="*/5/8" type="national" />
-    <date name="Sviatok svätého Cyrila a Metoda" value="*/7/5" type="national" />
-    <date name="Výročie SNP" value="*/8/29" type="national" />
-    <date name="Deň Ústavy Slovenskej republiky" value="*/9/1" type="national" />
-    <date name="Sedembolestná Panna Mária" value="*/9/15" type="religious" />
-    <date name="Sviatok všetkých svätých" value="*/11/1" type="religious" />
-    <date name="Deň boja za slobodu a demokraciu" value="*/11/17" type="national" />
-    <date name="Štedrý deň" value="*/12/24" type="religious" />
-    <date name="Prvý sviatok vianočný" value="*/12/25" type="national" />
-    <date name="Druhý sviatok vianočný" value="*/12/26" type="national" />
-  </country>
-  <country _name="Sweden">
-    <date name="Nyårsafton" value="*/12/31" type="national" />
-    <date name="Trettondedag jul" value="*/1/6" type="religious" />
-    <date name="Alla helgons dag" value="*/oct/31" offset="sat" type="religious" if="(y>=1953)" />
-    <date name="Lucia" value="*/12/13" type="religious" />
-    <date name="Julafton" value="*/12/24" type="religious" />
-    <date name="Juldagen" value="*/12/25" type="religious" />
-    <date name="Annandag Jul" value="*/12/26" type="religious" />
-    <date name="Skärtorsdagen" type="religious" value="> easter(y)" offset="-3" />
-    <date name="Långfredagen" type="religious" value="> easter(y)" offset="-2" />
-    <date name="Påsk" type="religious" value="> easter(y)"  />
-    <date name="Annandag Påsk" type="religious" value="> easter(y)" offset="1" />
-    <date name="Kristi Himmelsfärdsdag" type="religious" value="> easter(y)" offset="39" />
-    <date name="Pingstdagen" value="easter(y)" offset="49" type="secular" />
-    <date name="Annandag pingst" value="easter(y)" offset="50" type="secular" />
-    <date name="Nyårsdagen" value="*/1/1" type="national" />
-    <date name="Alla hjärtans dag" value="*/2/14" type="national" />
-    <date name="1. april" value="*/4/1" type="national" />
-    <date name="Första Maj" value="*/5/1" type="national" />
-    <date name="Nationaldagen" value="*/6/6" type="national" />
-    <date name="Mors dag" value="*/may/25" offset="sun" type="religious" />
-    <date name="Midsommarafton" value="*/jun/19" offset="fri" type="religious" if="(y>=1953)" />
-    <date name="Midsommarafton" value="*/jun/23" type="religious" if="not(y>=1953)"  />
-    <date name="Midsommardagen" value="*/jun/20" offset="sat" type="religious" if="(y>=1953)" />
-    <date name="Midsommardagen" value="*/jun/24" type="religious" if="not(y>=1953)"  />
-    <date name="Fars dag" value="*/2/sun/nov" type="national" />
-  </country>
-  <country _name="United States of America">
-    <date name="New Year's Eve" value="*/12/31" type="national" />
-    <date name="New Year's Day" value="*/1/1" type="national" />
-    <date name="ML Kings's Birthday" value="*/3/mon/jan" type="secular" />
-    <date name="Groundhog Day" value="*/2/2" type="secular" />
-    <date name="Lincoln's Birthday" value="*/2/12" type="secular" />
-    <date name="Super Bowl" value="*/1/sun/feb" type="secular" />
-    <date name="Valentine's Day" value="*/2/14" type="secular" />
-    <date name="Presidents' Day" value="*/3/mon/feb" type="secular" />
-    <date name="Washington's Birthday" value="*/3/mon/feb" type="secular" />
-    <date name="St. Patrick's Day" value="*/3/17" type="secular" />
-    <date name="April Fool's Day" value="*/4/1" type="secular" />
-    <date name="Arbor Day" value="*/-1/fri/apr" type="secular" />
-    <date name="Earth Day" value="*/4/22" type="secular" />
-    <date name="Easter" value="> easter(y)" type="religious" />
-    <date name="Ash Wednesday" value="> easter(y)" type="religious" offset="-46" />
-    <date name="Mardi Gras" value="> easter(y)" type="religious" offset="-47" />
-    <date name="Daylight Saving begins" value="> dst(y)[0]" type="informational" />
-    <date name="Income Taxes due" value="*/4/15" type="national" if="cmp(date.weekday(),4)-1"/>
-    <date name="Income Taxes due" value="*/4/16" type="national" if="date.weekday() == 0" />
-    <date name="Income Taxes due" value="*/4/17" type="national" if="date.weekday() == 0" />
-    <date name="Daylight Saving ends" value="> dst(y)[1]" type="informational" />
-    <date name="Inauguration Day" value="*/1/20" type="national" if="(y - 1980) % 4 == 1" />
-    <date name="Passover" value="> passover(y)" type="religious" />
-    <date name="Assistants' Day" value="*/-1/sat/apr" offset="-3" type="secular" />
-    <date name="Cinco de Mayo" value="*/5/5" type="secular" />
-    <date name="Armed Forces Day" value="*/3/sat/may" type="secular" />
-    <date name="Mothers' Day" value="*/2/sun/may" type="secular" />
-    <date name="Memorial Day" value="*/-1/mon/may" type="secular" />
-    <date name="Flag Day" value="*/6/14" type="secular" />
-    <date name="Fathers' Day" value="*/3/sun/jun" type="secular" />
-    <date name="Independence Day" value="*/7/4" type="national" />
-    <date name="Parents' Day" value="*/4/sun/jul" type="secular" />
-    <date name="Labor Day" value="*/1/mon/sep" type="national" />
-    <date name="Grandparents' Day" value="*/1/mon/sep" type="secular" offset="6" />
-    <date name="Columbus Day" value="*/2/mon/oct" type="secular" />
-    <date name="Ramadan begins" value="2006/09/24" type="religious" />
-    <date name="Ramadan begins" value="2007/09/13" type="religious" />
-    <date name="Ramadan begins" value="2008/09/2" type="religious" />
-    <date name="Ramadan begins" value="2009/08/22" type="religious" />
-    <date name="Yom Kippur" value="> passover(y)" type="religious" offset="172" />
-    <date name="United Nations Day" value="*/10/24" type="secular" />
-    <date name="Halloween" value="*/10/31" type="secular" />
-    <date name="Election Day" value="*/11/2" type="secular" offset="tue" />
-    <date name="Veterans Day" value="*/11/11" type="national" />
-    <date name="Thanksgiving" value="*/4/thu/nov" type="national" />
-    <date name="Hanukkah begins" value="> hanuka(y)" type="religious" />
-    <date name="Christmas" value="*/12/25" type="religious" />
-    <date name="Kwanzaa begins" value="*/12/26" type="religious" />
-  </country>
-  <country _name="Jewish Holidays">
-    <date _name="Purim" value="> passover(y)" offset="-30"/>
-    <date _name="Passover" value="> passover(y)" offset="0"/>
-    <date _name="2 of Passover" value="> passover(y)" offset="1"/>
-    <date _name="3 of Passover" value="> passover(y)" offset="2"/>
-    <date _name="4 of Passover" value="> passover(y)" offset="3"/>
-    <date _name="5 of Passover" value="> passover(y)" offset="4"/>
-    <date _name="6 of Passover" value="> passover(y)" offset="5"/>
-    <date _name="7 of Passover" value="> passover(y)" offset="6"/>
-    <date _name="Shavuot" value="> passover(y)" offset="50"/>
-    <date _name="Rosh Ha'Shana" value="> passover(y)" offset="163"/>
-    <date _name="Rosh Ha'Shana 2" value="> passover(y)" offset="164"/>
-    <date _name="Yom Kippur" value="> passover(y)" offset="172"/>
-    <date _name="Sukot" value="> passover(y)" offset="177"/>
-    <date _name="2 of Sukot" value="> passover(y)" offset="178"/>
-    <date _name="3 of Sukot" value="> passover(y)" offset="179"/>
-    <date _name="4 of Sukot" value="> passover(y)" offset="180"/>
-    <date _name="5 of Sukot" value="> passover(y)" offset="181"/>
-    <date _name="6 of Sukot" value="> passover(y)" offset="182"/>
-    <date _name="7 of Sukot" value="> passover(y)" offset="183"/>
-    <date _name="Simhat Tora" value="> passover(y)" offset="184"/>
-    <date _name="Hanuka" value="> hanuka(y)" offset="0"/>
-    <date _name="2 of Hanuka" value="> hanuka(y)" offset="1"/>
-    <date _name="3 of Hanuka" value="> hanuka(y)" offset="2"/>
-    <date _name="4 of Hanuka" value="> hanuka(y)" offset="3"/>
-    <date _name="5 of Hanuka" value="> hanuka(y)" offset="4"/>
-    <date _name="6 of Hanuka" value="> hanuka(y)" offset="5"/>
-    <date _name="7 of Hanuka" value="> hanuka(y)" offset="6"/>
-    <date _name="8 of Hanuka" value="> hanuka(y)" offset="7"/>
-  </country>
-  <country _name="New Zealand">
-    <date value="*/1/1" type="national" name="New Year's Day"/>
-    <date value="*/1/2" type="national" name="Day After New Year's Day"/>
-    <date value="*/1/1" type="national" offset="+1" name="New Years Day Holiday" if="dow(y, m, d) == 7"/>
-    <date value="*/1/1" type="national" offset="+2" name="Day After New Years Day Holiday" if="dow(y, m, d) == 6"/>
-    <date value="*/feb/6" type="national" name="Waitangi Day"/>
-    <date value="> easter(y)" type="national" offset="-2" name="Good Friday"/>
-    <date value="> easter(y)" type="national" offset="+1" name="Easter Monday"/>
-    <date value="*/apr/25" type="national" name="ANZAC Day"/>
-    <date value="*/-1/mon/jun" type="national" name="Queen's Birthday Holiday"/>
-    <date value="*/-4/mon/oct" type="national" name="Labour Day"/>
-    <date value="*/dec/25" type="national" name="Christmas Day"/>
-    <date value="*/dec/26" type="national" name="Boxing Day"/>
-    <date value="*/dec/25" type="national" offset="+2" name="Christmas Day Holiday" if="dow(y, m, d) > 5"/>
-    <date value="*/dec/26" type="national" offset="+2" name="Boxing Day Holiday" if="dow(y, m, d) > 5"/>
-  </country>
-  <country _name="Ukraine">
-    <date value="*/1/1" type="national" name="Новий Рік"/>
-    <date value="*/1/6" type="religious" name="Святий Вечір"/>
-    <date value="*/1/7" type="religious" name="Різдво"/>
-    <date value="*/1/13" type="religious" name="Маланка"/>
-    <date value="*/1/14" type="religious" name="Старий Новий рік, Щедрий вечір"/>
-    <date value="*/1/19" type="religious" name="Водохреща"/>
-    <date value="*/1/22" type="national" name="День Соборності України"/>
-    <date value="*/2/14" type="secular" name="День закоханих"/>
-    <date value="*/2/15" type="religious" name="Стрітення"/>
-    <date value="*/3/8" type="secular" name="Міжнародний жіночий день"/>
-    <date value="*/3/20" type="secular" name="Весняне Рівнодення"/>
-    <date value="*/4/1" type="secular" name="День сміху"/>
-    <date value="*/4/7" type="religious" name="Благовіщення"/>
-    <date value="> julian_easter(y)" type="religious" name="Великдень"/>
-    <date value="*/5/1" type="national" name="День Праці"/>
-    <date value="*/6/21" type="secular" name="Весняне Сонцестояння"/>
-    <date value="*/6/28" type="national" name="День Конституції України"/>
-    <date value="*/7/7" type="religious" name="Івана Купала"/>
-    <date value="*/8/19" type="religious" name="Спаса"/>
-    <date value="*/8/24" type="national" name="День Незалежності України"/>
-    <date value="*/9/22" type="secular" name="Осіннє Рівнодення"/>
-    <date value="*/10/14" type="religious" name="Покрова, День Українського козацтва"/>
-    <date value="*/12/13" type="religious" name="Андрія"/>
-    <date value="*/12/19" type="religious" name="Миколая"/>
-    <date value="*/12/21" type="secular" name="Осіннє Сонцестояння"/>
-  </country>
-  <country _name="Serbia">
-    <date value="*/1/1" type="national" name="Нова Година" />
-    <date value="*/1/7" type="religious" name="Божић" />
-    <date value="*/2/15" type="national" name="Дан државности Србије" />
-    <date value="> julian_easter(y)" type="religious" offset="-2" name="Велики петак" />
-    <date value="> julian_easter(y)" type="religious" name="Васкрс" />
-    <date value="> julian_easter(y)" type="religious" offset="1" name="Васкрсни понедељак" />
-    <date value="*/5/1" type="national" name="Празник рада" />
-    <date value="*/11/11" type="national" name="Дан примирја" />
-    <date value="*/1/27" type="religious" name="Свети Сава" />
-    <date value="*/4/22" type="national" name="Дан сећања на жртве холокауста" />
-    <date value="*/5/9" type="national" name="Дан победе" />
-    <date value="*/6/28" type="religious" name="Видовдан" />
-    <date value="*/10/21" type="national" name="Дан сећања на српске жртве у Другом светском рату" />
-  </country>
-  <country _name="Serbia (Latin)">
-    <date value="*/1/1" type="national" name="Nova godina" />
-    <date value="*/1/7" type="religious" name="Božić" />
-    <date value="*/2/15" type="national" name="Dan državnosti Srbije" />
-    <date value="> julian_easter(y)" type="religious" offset="-2" name="Veliki petak" />
-    <date value="> julian_easter(y)" type="religious" name="Vaskrs" />
-    <date value="> julian_easter(y)" type="religious" offset="1" name="Vaskrsni ponedeljak" />
-    <date value="*/5/1" type="national" name="Praznik rada" />
-    <date value="*/11/11" type="national" name="Dan primirja" />
-    <date value="*/1/27" type="religious" name="Sveti Sava" />
-    <date value="*/4/22" type="national" name="Dan sećanja na žrtve holokausta" />
-    <date value="*/5/9" type="national" name="Dan pobede" />
-    <date value="*/6/28" type="religious" name="Vidovdan" />
-    <date value="*/10/21" type="national" name="Dan sećanja na srpske žrtve u Drugom svetskom ratu" />
-  </country>
-</calendar>
--- a/data/images/Web_Mainz_Header.png
+++ b/data/images/Web_Mainz_Header.png
--- a/data/images/somerights20.gif
+++ b/data/images/somerights20.gif
--- a/data/man/Makefile.am
+++ b/data/man/Makefile.am
@@ -0,0 +1,14 @@
+# This is the data/man level Makefile for Gramps
+# $Id$
+
+SUBDIRS = fr sv nl pl
+
+man_IN_FILES = gramps.1.in
+man_MANS = $(man_IN_FILES:.1.in=.1)
+
+EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
+
+gramps.1: $(top_builddir)/config.status gramps.1.in
+	cd $(top_builddir) && CONFIG_FILES=data/man/$@ $(SHELL) ./config.status
+
+CLEANFILES=$(man_MANS)
--- a/data/man/conf.py
+++ b/data/man/conf.py
@@ -1,243 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Gramps documentation build configuration file, created by
-# sphinx-quickstart on Sat Dec  1 14:38:29 2012.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'Gramps'
-copyright = u'2015, Gramps project'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '4.2'
-# The full version, including alpha/beta/rc tags.
-release = '4.2.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#locale_dirs = './locale'
-#gettext_compact = True
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'Grampsdoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'Gramps.tex', u'Gramps Documentation',
-   u'.', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('en', 'gramps', u'Gramps Documentation',
-     ['Gramps project'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'Gramps', u'Gramps Documentation',
-   u'.', 'Gramps', 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
--- a/data/man/cs/conf.py
+++ b/data/man/cs/conf.py
@@ -1,243 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Gramps documentation build configuration file, created by
-# sphinx-quickstart on Sat Dec  1 14:38:29 2012.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'cs'
-
-# General information about the project.
-project = u'Gramps'
-copyright = u'2015, Gramps project'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '4.2'
-# The full version, including alpha/beta/rc tags.
-release = '4.2.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-locale_dirs = './locale'
-gettext_compact = True
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'Grampsdoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'Gramps.tex', u'Gramps Documentation',
-   u'.', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('cs', 'gramps', u'Gramps Documentation',
-     [u'.'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'Gramps', u'Gramps Documentation',
-   u'.', 'Gramps', 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
--- a/data/man/cs/cs.rst
+++ b/data/man/cs/cs.rst
@@ -1,282 +0,0 @@
-Czech
-======
-
-gramps(1)			     3.4.0			     gramps(1)
-
-
-
-**JMÉNO**
-       gramps - programový systém pro správu genealogického výzkumu a analýzy.
-
-
-**POUŽITÍ**
-       gramps	[-?|--help]  [--usage]	[--version]  [-l]  [-u|--force-unlock]
-       [-O|--open=  DATABÁZE  [-f|--format=  FORMÁT]]	[-i|--import=	SOUBOR
-       [-f|--format=   FORMÁT]]   [-i|--import=   ...]	 [-e|--export=	SOUBOR
-       [-f|--format= FORMÁT]] [-a|--action= AKCE] [-p|--options= PARAMETRY]] [
-       SOUBOR ] [--version]
-
-
-**POPIS**
-       Gramps  je  zdarma šířený Open Source genealogický program. Je napsán v
-       jazyce Python s využitím rozhraní  GTK+/GNOME.	Gramps	bude  povědomý
-       komukoli,  kdo už pracoval s jinými genealogickými programy jako Family
-       Tree Maker (TM),  Personal Ancestral  Files  (TM),  nebo  GNU  Geneweb.
-       Podporuje import dat z populárního formátu GEDCOM, který je celosvětově
-       rozšířen a je využíván téměř všemi ostatními genealogickými programy.
-
-
-**MOŽNOSTI**
-       **gramps** *SOUBOR*
-	      Pokud je zadán SOUBOR (bez dalších parametrů) jako název	rodok‐
-	      menu  nebo jako adresář databáze rodokmenu, je gramps otevřeno v
-	      interaktivním  módu.  Pokud  je  SOUBOR  formátem   podporovaným
-	      Gramps, je vytvořen rodokmen s názvem založeným na názvu souboru
-	      a data ze vstupu jsou do něho  naimportována.  Zbytek  parametrů
-	      příkazové  řádky je ignorován.  Tento způsob spouštění je vhodný
-	      pro gramps použitý jako prohlížeč genealogických dat  např.  pro
-	      webové  prohlížeče.   Spuštění  tímto způsobem zpracuje jakákoli
-	      data ve formátu podporovaném gramps, viz dále.
-
-
-       **-f** , **--format=** *FORMÁT*
-	      Explicitně definuje formát  SOUBORu  předchozího	parametru  -i,
-	      nebo  -e.  Pokud	není parametr -f pro SOUBOR specifikován, bude
-	      automaticky použit formát  odpovídající  koncovce  souboru  nebo
-	      MIME-typu.
-
-	      Formáty dostupné pro export jsou	gramps-xml (automaticky použit
-	      pokud má SOUBOR koncovku .gramps),  gedcom  (automaticky	použit
-	      pokud  má SOUBOR koncovku .ged), případně jiný další formát dos‐
-	      tupný prostřednictvím zásuvných modulů Gramps.
-
-	      Formáty dostupné	pro  import  jsou  grdb,  gramps-xml,  gedcom,
-	      gramps-pkg  (automaticky použit pokud má SOUBOR koncovku .gpkg),
-	      nebo geneweb (automaticky použit pokud má SOUBOR koncovku .gw).
-
-	      Formáty dostupné pro export jsou gramps-xml, gedcom, gramps-pkg,
-	      wft (automaticky použit pokud má SOUBOR koncovku .wft), geneweb,
-	      a iso (nikdy není použit automaticky, vždy musí být specifikován
-	      parametrem -f).
-
-
-       **-l**     
-          Vypíše seznam známých rodokmenů.
-
-
-       **-u** , **--force-unlock**
-	      Odemkne zamčenou databázi.
-
-
-       **-O** , **--open=** *DATABÁZE*
-	      Otevření *DATABÁZE* . Hodnota  musí  být  existujícím databázovým
-	      adresářem,  nebo	názvem	existujícího  rodokmenu.    Pokud   na
-	      příkazové  řádce nejsou žádné parametry importu nebo exportu, je
-	      nad danou databází spuštěna interaktivní relace.
-
-
-       **-i** , **--import=** *SOUBOR*
-	      Importuje data ze SOUBORu. Pokud není specifikována databáze, je
-	      použita dočasná. Ta je po ukončení gramps smazána.
-
-	      Pokud  je  předáván  více  než jeden vstup, musí každému souboru
-	      předcházet parametr -i.  Soubory jsou zpracovávány v  pořadí,  v
-	      jakém  byly zadány na příkazové řádce.  Např. -i SOUBOR1 -i SOU‐
-	      BOR2 a -i SOUBOR2 -i SOUBOR1 mohou vytvořit ve výsledné databázi
-	      různá gramps ID.
-
-
-       **-a** , **--action=** *AKCE*
-	      Provedení  AKCE  nad importovanými daty. Akce jsou spuštěny poté
-	      co jsou všechny importy dat úspěšně ukončeny. V tuto chvíli jsou
-	      podporovány    následující    akce:    summary	(stejné   jako
-	      Zprávy->Pohled->Souhrn), check (stejné  jako  Nástroje->Database
-	      Processing->Kontrola  a oprava), report (vytvoří zprávu), a tool
-	      (spustí nástroj zásuvného modulu).  Akce report a tool potřebují
-	      v PARAMETRY zadat parametr -p .
-
-	      PARAMETRY by měly splňovat následující kritéria:
-	      Nesmí  obsahovat žádné mezery.  Pokud některý argument potřebuje
-	      mezeru, musí být řetězec uzavřen v uvozovkách (držet se  syntaxe
-	      příkazové  řádky).   Řetězec  možností je seznam párů název=hod‐
-	      nota.  Jednotlivé páry musí být odděleny čárkami.
-
-	      Většina  možností  nástrojů  a  zpráv  jsou   specifickými   pro
-	      konkrétní  nástroj  nebo	zprávu.   Existují ale i takové, které
-	      jsou společné.
-
-	      **name=name**
-	      Povinná  předvolba  určující  který  nástroj  nebo  zpráva  bude
-	      spuštěna.    Pokud   zadané   name   neodpovídá  žádné  dostupné
-	      funkčnosti, vypíše se chybové hlášení následované seznamem  dos‐
-	      tupných nástrojů a zpráv (záleží na AKCE).
-
-	      **show=all**
-	      Vytvoří seznam názvů všech předvoleb dostupných pro danou zprávu
-	      nebo nástroj.
-
-	      **show=optionname**
-	      Vypíše popis všech  funkcionalit	poskytnutých  optionname,  ale
-	      také všechny přijatelné typy a hodnoty pro tuto volbu.
-
-	      Použijte	výše  popsané  volby  pro zjištění všech možností dané
-	      zprávy.
-
-
-       Pokud je zadána jedna nebo více výstupních akcí, každá musí být uvozena
-       předvolbou -a. Akce jsou prováděny jedna za druhou v zadaném pořadí.
-
-
-       **-d** , **--debug=** *LOGGER_NAME*
-	      Zapne  ladicí  výstup  pro vývoj a testování. Detaily najdete ve
-	      zdrojovém kódu.
-
-       **--version**
-	      Vytiskne číslo verze gramps a skončí
-
-
-
-
-**Chování**
-       Pokud první parametr  příkazové	řádky  nezačíná  pomlčkou,  pokusí  se
-       gramps  otevřít	soubor	s  názvem daným prvním argumentem na příkazové
-       řádce a spustit interaktivní  relaci.  Zbytek  argumentů  na  příkazové
-       řádce je v tomto případě ignorován.
-
-
-       Pokud  je  zadán  parametr  -O,	pak  se  gramps  snaží otevřít zadanou
-       databázi a pracovat s jejími daty  podle  instrukcí  dalších  parametrů
-       příkazové řádky.
-
-
-       S  nebo	bez  použití  parametru  -O  může  být provedeno více importů,
-       exportů, případně akcí daných argumenty příkazové řádky (-i, -e a -a).
-
-
-       Na pořadí parametrů -i, -e, nebo -a nezáleží.   Aktuální  pořadí  zpra‐
-       cování  je  vždy:  všechny  importy (pokud jsou nějaké) -> všechny akce
-       (pokud jsou nějaké) -> všechny exporty (pokud jsou  nějaké).   Parametr
-       otevření musí být ale vždy první!
-
-
-       Pokud  nejsou zadány -O nebo -i, gramps otevře své hlavní okno a spustí
-       se v obvyklém interaktivním módu s prázdnou databází.
-
-
-       Pokud nejsou zadány -e nebo -a, gramps otevře své hlavní okno a	spustí
-       se  v  ovbyklém interaktnivním módu s databází vzniklou výsledkem všech
-       importů.  Tato databáze je umístěna v souboru import_db.grdb v adresáři
-       ~/.gramps/import.
-
-
-       Chyba  vzniklá  při  importu,  exportu nebo akci bude vypsána na stdout
-       (pokud se jedná o vyjímku  ošetřenou  gramps)  nebo  na	stderr	(pokud
-       problém	není  ošetřen).  Pro  uložení zpráv a chyb do souboru použijte
-       obvyklá přesměrování výstupů stdout a stderr příkazové řádky.
-
-
-**PŘÍKLADY**
-       Otevření existujícího rodokmenu a import xml souboru do něho  může  být
-       proveden takto:
-       
-	      gramps -O 'Můj rodokmen' -i ~/db3.gramps
-
-       To  samé,  jen  s importem do dočasné databáze a otevřením interaktivní
-       relace:
-       
-	      gramps -i 'My Family Tree' -i ~/db3.gramps
-
-       Import čtyř databází (jejichž formáty jsou stanoveny podle  názvů  sou‐
-       borů)  a  následná  kontrola  bezchybnosti  výsledné  databáze může být
-       provedena takto:
-       
-	      gramps -i file1.ged -i file2.tgz -i ~/db3.gramps -i file4.wft -a
-	      check
-
-       Explicitní  specifikace	formátu databází předchozího příkladu přidáním
-       příslušného parametru -f za název souboru:
-       
-	      gramps -i file1.ged -f gedcom  -i  file2.tgz  -f	gramps-pkg  -i
-	      ~/db3.gramps -f gramps-xml -i file4.wft -f wft  -a check
-
-       Zapsání	výsledné  databáze vytvořené ze všech importů zajistí parametr
-       -e (použijte -f pokud nelze uhodnout formát z názvu souboru):
-       
-	      gramps -i file1.ged -i file2.tgz -e ~/nový-balíček -f gramps-pkg
-
-       Import tří databází a start interaktivní gramps relace nad výsledkem:
-       
-	      gramps -i file1.ged -i file2.tgz -i ~/db3.gramps
-
-       Spuštění nástroje kontroly z příkazové řádky s výstupem na stdout:
-       
-	      gramps -O 'Můj rodokmen' -a tool -p name=verify
-
-       A konečně spuštění normální interaktivní relace aplikace:
-       
-	      gramps
-
-
-**PROMĚNNÉ PROSTŘEDÍ**
-       Program kontroluje, zda jsou nastaveny následující proměnné:
-
-       **LANG** - popisuje, který jazyk bude použit: Příklad: pro češtinu musí mít
-       proměnná hodnotu cs_CZ.utf8.
-
-       **GRAMPSHOME**  -  pokud  je  nastavena,  Gramps  použije její hodnotu jako
-       adresář v němž jsou uložena nastavení a databáze.  Ve  výchozím	stavu,
-       kdy  proměnná není nastavena gramps předpokládá že adresář s databázemi
-       a nastavením bude vytvořen v adresáři s	uživatelským  profile  (popsán
-       proměnnou prostředí HOME v Linuxu nebo USERPROFILE ve Windows 2000/XP).
-
-
-**KONCEPTY**
-       gramps  podporuje  systém  zásuvných modulů založených na jazyku python
-       jehož prostřednictvím umožňuje přidání	import/export  modulů,	modulů
-       pro  vytváření  zpráv,  nástrojů  a  zobrazovacích  filtrů bez nutnosti
-       zásahu do hlavního programu.
-
-       Dále, krom možnosti přímého tisku,  dovoluje  směřovat  výstup  také  k
-       ostatním systémům a aplikacím jako např. OpenOffice.org, AbiWord, HTML,
-       nebo LaTeX. Tím dává možnost přizpůsobit formát požadavku uživatelů.
-
-
-**ZNÁMÉ CHYBY A OMEZENÍ**
-       nejsou
-
-
-**SOUBORY**
-
-       *${PREFIX}/bin/gramps*
-       
-       *${PREFIX}/lib/python/dist-packages/gramps/*
-       
-       *${PREFIX}/share/*
-       
-       *${HOME}/.gramps*
-
-
-**AUTOŘI**
-       Donald Allingham <don@gramps-project.org>
-       http://gramps-project.org/
-
-       Originální manuálovou stránku vytvořil:
-       Brandon L. Griffith <brandon@debian.org>
-       pro zařazení do systému Debian GNU/Linux.
-
-       Tuto manuálovou stránku přeložil a v současné době spravuje:
-       Zdeněk Hataš <zdenek.hatas@gmail.com>
-
-
-**DOKUMENTACE**
-       Uživatelská dokumentace je  k  dispozici  prostřednictvím  standardního
-       prohlížeče  nápovědy  GNOME  ve formě příručky Gramps. Příručka je také
-       dostupná ve formátu XML jako gramps-manual.xml v  adresáři  doc/gramps-
-       manual/$LANG v oficiální distribuci zdrojového kódu.
-
-       Dokumentace  pro  vývojáře  je  k  dispozici  na  webu
-       http://www.gramps-project.org/wiki/index.php?title=Portal:Developers
-
-
-
-Leden 2012			     3.4.0			     gramps(1)
--- a/data/man/cs/gramps.1.in
+++ b/data/man/cs/gramps.1.in
@@ -1,323 +0,0 @@
-.TH gramps 1 "@VERSION@" "Leden 2011" "@VERSION@"
-.SH JMÉNO 
-gramps \- programový systém pro správu genealogického výzkumu a analýzy.
-
-.SH POUŽITÍ
-.B gramps
-.RB [ \-?|\-\^\-help ]
-.RB [ \-\^\-usage ]
-.RB [ \-\^\-version ]
-.RB [ \-l ]
-.RB [ \-u|\-\^\-force-unlock ]
-.RB [ \-O|\-\^\-open=
-.IR DATABÁZE 
-.RB [ \-f|\-\^\-format= 
-.IR FORMÁT ]] 
-.RB [ \-i|\-\^\-import=
-.IR SOUBOR 
-.RB [ \-f|\-\^\-format= 
-.IR FORMÁT ]] 
-.RB [ \-i|\-\^\-import= 
-.IR ... ] 
-.RB [ \-e|\-\^\-export= 
-.IR SOUBOR
-.RB [ \-f|\-\^\-format= 
-.IR FORMÁT ]] 
-.RB [ \-a|\-\^\-action= 
-.IR AKCE ]
-.RB [ \-p|\-\^\-options= 
-.IR PARAMETRY ]]
-.RB [
-.IR SOUBOR
-.RB ]
-.if 0 .RB [ bonobo\ options ]
-.if 0 .RB [ sound\ options ]
-.RB [ \-\-version ]
-
-.SH POPIS
-.PP 
-\fIGramps\fP je zdarma šířený Open Source genealogický program. Je napsán
-v jazyce Python s využitím rozhraní GTK+/GNOME.
-Gramps bude povědomý komukoli, kdo už pracoval s jinými genealogickými programy
-jako \fIFamily Tree Maker (TM)\fR,  \fIPersonal Ancestral
-Files (TM)\fR, nebo GNU Geneweb.
-Podporuje import dat z populárního formátu GEDCOM, který je celosvětově rozšířen
-a je využíván téměř všemi ostatními genealogickými programy.
-
-.SH MOŽNOSTI
-.TP 
-.BI gramps " SOUBOR" 
-Pokud je zadán \fISOUBOR\fR (bez dalších parametrů) jako název rodokmenu
-nebo jako adresář databáze rodokmenu, je gramps otevřeno v interaktivním 
-módu. Pokud je \fISOUBOR\fR formátem podporovaným Gramps, je vytvořen rodokmen
-s názvem založeným na názvu souboru a data ze vstupu jsou do něho 
-naimportována. Zbytek parametrů příkazové řádky je ignorován.
-Tento způsob spouštění je vhodný pro gramps použitý jako prohlížeč
-genealogických dat např. pro webové prohlížeče.
-Spuštění tímto způsobem zpracuje jakákoli data ve formátu podporovaném
-gramps, viz dále.
-.br
-
-.TP 
-.BI \-f,\-\^\-format= " FORMÁT"
-Explicitně definuje formát \fISOUBOR\fRu předchozího parametru
-.ig
-\fB\-O\fR,
-..
-\fB\-i\fR, nebo 
-\fB\-e\fR. Pokud není parametr \fB\-f\fR pro \fISOUBOR\fR specifikován, 
-bude automaticky použit formát odpovídající koncovce souboru nebo MIME-typu. 
-.br
-
-Formáty
-dostupné pro export jsou  \fBgramps\-xml\fR (automaticky použit pokud má
-\fISOUBOR\fR koncovku \fB.gramps\fR), \fBgedcom\fR (automaticky použit 
-pokud má \fISOUBOR\fR koncovku \fB.ged\fR), případně jiný další formát dostupný
-prostřednictvím zásuvných modulů Gramps.
-.br
-
-Formáty
-dostupné pro import jsou \fBgrdb\fR, \fBgramps\-xml\fR, \fBgedcom\fR,  
-\fBgramps\-pkg\fR (automaticky použit pokud má \fISOUBOR\fR koncovku \fB.gpkg\fR),
-nebo \fBgeneweb\fR (automaticky použit pokud má \fISOUBOR\fR koncovku \fB.gw\fR). 
-.br
-
-Formáty dostupné pro export jsou
-.ig
-\fBgrdb\fR,
-..
-\fBgramps\-xml\fR, \fBgedcom\fR,
-\fBgramps\-pkg\fR, \fBwft\fR (automaticky použit pokud má \fISOUBOR\fR koncovku \fB.wft\fR),
-\fBgeneweb\fR, a \fBiso\fR (nikdy není použit automaticky, vždy musí být specifikován 
-parametrem \fB\-f\fR).
-
-.TP 
-.BI \-l
-Vypíše seznam známých rodokmenů.
-
-.TP
-.BI \-u,\-\^\-force-unlock
-Odemkne zamčenou databázi.
-
-.TP 
-.BI \-O,\-\^\-open= " DATABÁZE"
-Otevření \fIDATABÁZE\fR. Hodnota musí být existujícím databázovým adresářem, nebo názvem existujícího rodokmenu.
-Pokud na příkazové řádce nejsou žádné parametry importu nebo exportu, je nad danou databází spuštěna interaktivní relace.
-
-.TP 
-.BI \-i,\-\^\-import= " SOUBOR"
-Importuje data ze \fISOUBOR\fRu. Pokud není specifikována databáze, je použita dočasná. Ta je po ukončení gramps smazána.
-.br
-
-Pokud je předáván více než jeden vstup, musí každému souboru předcházet parametr \fB\-i\fR. 
-Soubory jsou zpracovávány v pořadí, v jakém byly zadány na příkazové řádce.
-Např. \fB\-i\fR \fISOUBOR1\fR \fB\-i\fR \fISOUBOR2\fR
-a \fB\-i\fR \fISOUBOR2\fR \fB\-i\fR \fISOUBOR1\fR mohou vytvořit ve výsledné databázi
-různá gramps ID.
-
-.TP 
-.BI \-a,\-\^\-action= " AKCE"
-Provedení \fIAKCE\fR nad importovanými daty. Akce jsou spuštěny poté co jsou všechny importy dat
-úspěšně ukončeny. V tuto chvíli jsou podporovány následující akce: 
-\fBsummary\fR (stejné jako Zprávy->Pohled->Souhrn), 
-\fBcheck\fR (stejné jako Nástroje->Database Processing->Kontrola a oprava), 
-\fBreport\fR (vytvoří zprávu), a
-\fBtool\fR (spustí nástroj zásuvného modulu).
-Akce \fBreport\fR a \fBtool\fR potřebují v \fIPARAMETRY\fR zadat parametr
-\fB\-p\fR . 
-.br
-
-\fIPARAMETRY\fR by měly splňovat následující kritéria:
-.br
-Nesmí obsahovat žádné mezery. 
-Pokud některý argument potřebuje mezeru, musí být řetězec uzavřen
-v uvozovkách (držet se syntaxe příkazové řádky).
-Řetězec možností je seznam párů název=hodnota.
-Jednotlivé páry musí být odděleny čárkami.  
-.br
-
-Většina možností nástrojů a zpráv jsou specifickými pro konkrétní nástroj nebo zprávu. 
-Existují ale i takové, které jsou společné.
-
-.BI "name=name"
-.br
-Povinná předvolba určující který nástroj nebo zpráva bude spuštěna.
-Pokud zadané \fIname\fR neodpovídá žádné dostupné funkčnosti, vypíše se chybové hlášení 
-následované seznamem dostupných nástrojů a zpráv (záleží na \fIAKCE\fR).
-
-.BI "show=all"
-.br
-Vytvoří seznam názvů všech předvoleb dostupných pro danou zprávu nebo nástroj.
-
-.BI "show="optionname
-.br
-Vypíše popis všech funkcionalit poskytnutých \fIoptionname\fR, 
-ale také všechny přijatelné typy a hodnoty pro tuto volbu.
-
-.br
-Použijte výše popsané volby pro zjištění všech možností
-dané zprávy.
-
-.LP
-Pokud je zadána jedna nebo více výstupních akcí, každá musí být uvozena
-předvolbou \fB\-a\fR. Akce jsou prováděny jedna za druhou v zadaném pořadí.
-
-.TP 
-.BI \-d,\-\^\-debug= " LOGGER_NAME"
-Zapne ladicí výstup pro vývoj a testování. Detaily najdete ve zdrojovém kódu.
-.TP
-.BI \-\^\-version
-Vytiskne číslo verze gramps a skončí
-\" change 0 to 1 to enable output of OAF options
-.if 0 \{
-.PP
-Následující možnosti slouží pro aktivaci Bonobo.
-.TP 
-.BI \-\^\-oaf-ior-fd= "FD"
-Popisovač souboru pro zápis OAF IOR
-.TP 
-.BI \-\^\-oaf-activate-iid= " IID"
-OAF IID k aktivaci
-.TP 
-.BI \-\^\-oaf-private
-Znemožní registraci serveru s OAF
-\}
-\" change 0 to 1 to enable output of Gnome sound options
-.if 0 \{
-.PP
-Následující možnosti slouží pro řízení zvuku prostřednictívm knihovny Gnome.
-.TP
-.BI \-\^\-disable-sound
-Zablokuje využití zvukového serveru
-.TP
-.BI \-\^\-enable-sound
-Umožní využití zvukového serveru
-.TP
-.BI \-\^\-espeaker= " HOSTNAME:PORT"
-Host:port na které běží zvukový server který bude použit
-\}
-
-.SH "Chování"
-.br
-Pokud první parametr příkazové řádky nezačíná pomlčkou, pokusí se gramps
-otevřít soubor s názvem daným prvním argumentem na příkazové řádce
-a spustit interaktivní relaci. Zbytek argumentů na příkazové řádce je
-v tomto případě ignorován.
-
-.LP
-Pokud je zadán parametr \fB\-O\fR, pak se gramps snaží otevřít zadanou
-databázi a pracovat s jejími daty podle instrukcí dalších parametrů 
-příkazové řádky.
-
-.LP
-S nebo bez použití parametru \fB\-O\fR může být provedeno více importů,
-exportů, případně akcí daných argumenty příkazové řádky (\fB\-i\fR,
-\fB\-e\fR a \fB\-a\fR).  
-
-.LP
-Na pořadí parametrů \fB\-i\fR, \fB\-e\fR, nebo \fB\-a\fR nezáleží. 
-Aktuální pořadí zpracování je vždy: všechny importy (pokud jsou nějaké)
-> všechny akce (pokud jsou nějaké) -> všechny exporty (pokud jsou nějaké).
-Parametr otevření musí být ale vždy první!
-
-.LP
-Pokud nejsou zadány \fB\-O\fR nebo \fB\-i\fR, gramps otevře své hlavní okno
-a spustí se v obvyklém interaktivním módu s prázdnou databází.
-
-.LP
-Pokud nejsou zadány \fB\-e\fR nebo \fB\-a\fR, gramps otevře své hlavní okno 
-a spustí se v ovbyklém interaktnivním módu s databází vzniklou výsledkem 
-všech importů.
-Tato databáze je umístěna v souboru \fBimport_db.grdb\fR v adresáři
-\fB~/.gramps/import\fR.
-
-.LP
-Chyba vzniklá při importu, exportu nebo akci bude vypsána na \fIstdout\fR
-(pokud se jedná o vyjímku ošetřenou gramps) nebo na \fIstderr\fR 
-(pokud problém není ošetřen). Pro uložení zpráv a chyb do souboru použijte
-obvyklá přesměrování výstupů \fIstdout\fR a \fIstderr\fR příkazové řádky. 
-
-.SH PŘÍKLADY
-.TP 
-Otevření existujícího rodokmenu a import xml souboru do něho může být proveden takto: 
-\fBgramps\fR \fB\-O\fR \fI'Můj rodokmen'\fR \fB\-i\fR \fI~/db3.gramps\fR
-.TP 
-To samé, jen s importem do dočasné databáze a otevřením interaktivní relace: 
-\fBgramps\fR \fB\-i\fR \fI'My Family Tree'\fR \fB\-i\fR \fI~/db3.gramps\fR
-.TP 
-Import čtyř databází (jejichž formáty jsou stanoveny podle názvů souborů) a následná kontrola bezchybnosti výsledné databáze může být provedena takto: 
-\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-i\fR \fIfile4.wft\fR \fB\-a\fR \fIcheck\fR 
-.TP 
-Explicitní specifikace formátu databází předchozího příkladu přidáním příslušného parametru \fB\-f\fR za název souboru: 
-\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-f\fR \fIgedcom\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-f\fR \fIgramps-pkg\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-f\fR \fIgramps-xml\fR \fB\-i\fR \fIfile4.wft\fR \fB\-f\fR \fIwft\fR  \fB\-a\fR \fIcheck\fR 
-.TP 
-Zapsání výsledné databáze vytvořené ze všech importů zajistí parametr \fB\-e\fR (použijte \fB\-f\fR pokud nelze uhodnout formát z názvu souboru):
-\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-e\fR \fI~/nový-balíček\fR \fB\-f\fR \fIgramps-pkg\fR 
-.TP 
-Import tří databází a start interaktivní gramps relace nad výsledkem: 
-\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR 
-.TP 
-Spuštění nástroje kontroly z příkazové řádky s výstupem na stdout: 
-\fBgramps\fR \fB\-O\fR \fI'Můj rodokmen'\fR \fB-a\fR \fItool\fR \fB-p\fR \fBname\fR=\fIverify\fR
-.TP 
-A konečně spuštění normální interaktivní relace aplikace: 
-\fBgramps\fR 
-
-.SH PROMĚNNÉ PROSTŘEDÍ
-Program kontroluje, zda jsou nastaveny následující proměnné:
-
-\fBLANG\fR - popisuje, který jazyk bude použit:
-Příklad: pro češtinu musí mít proměnná hodnotu cs_CZ.utf8.
-
-\fBGRAMPSHOME\fR - pokud je nastavena, Gramps použije její hodnotu jako adresář
-v němž jsou uložena nastavení a databáze. Ve výchozím stavu, kdy proměnná není nastavena 
-gramps předpokládá že adresář s databázemi a nastavením bude vytvořen
-v adresáři s uživatelským profile (popsán proměnnou prostředí HOME v Linuxu nebo
-USERPROFILE ve Windows 2000/XP).
-
-.SH KONCEPTY
-\fBgramps\fR podporuje systém zásuvných modulů založených na jazyku python jehož prostřednictvím
-umožňuje přidání  import/export modulů, modulů pro vytváření zpráv, 
-nástrojů a zobrazovacích filtrů bez nutnosti zásahu do hlavního programu. 
-.LP 
-Dále, krom možnosti přímého tisku, dovoluje směřovat výstup také k ostatním
-systémům a aplikacím jako např. \fIOpenOffice.org\fR, \fIAbiWord\fR, HTML, 
-nebo LaTeX. Tím dává možnost přizpůsobit formát požadavku uživatelů. 
-
-.SH ZNÁMÉ CHYBY A OMEZENÍ
-.br
-nejsou
-
-.SH SOUBORY
-.LP 
-\fI${PREFIX}/bin/gramps\fP 
-.br 
-\fI${PREFIX}/share/gramps\fP
-.br 
-\fI${HOME}/.gramps\fP 
-
-.SH AUTOŘI
-Donald Allingham \fI<don@gramps-project.org>\fR
-.br 
-\fIhttp://gramps.sourceforge.net\fR
-.LP 
-Originální manuálovou stránku vytvořil:
-.br 
-Brandon L. Griffith \fI<brandon@debian.org>\fR
-.br
-pro zařazení do systému Debian GNU/Linux.
-.LP 
-Tuto manuálovou stránku přeložil a v současné době spravuje:
-.br 
-Zdeněk Hataš \fI<zdenek.hatas@gmail.com>\fR
-.br 
-
-.SH DOKUMENTACE
-Uživatelská dokumentace je k dispozici prostřednictvím standardního
-prohlížeče nápovědy GNOME ve formě příručky Gramps. Příručka je také
-dostupná ve formátu XML jako \fBgramps-manual.xml\fR 
-v adresáři \fIdoc/gramps-manual/$LANG\fR v oficiální distribuci 
-zdrojového kódu.
-.LP 
-Dokumentace pro vývojáře je k dispozici na webu
-\fIhttp://developers.gramps-project.org\fR. 
--- a/data/man/en.rst
+++ b/data/man/en.rst
@@ -1,299 +0,0 @@
-English
-=======
-
-gramps(1)                @VERSION@               gramps(1)
-
-
-
-**NAME**
-       gramps - Genealogical Research and Analysis Management Programming Sys‐
-       tem.
-
-
-**SYNOPSIS**
-       **gramps** [**-?** | **--help**] [**--usage**] [**--version**]
-       [**-l**] [**-L**] [**-u** | **--force-unlock**] [**-O** | **--open=** *DATABASE*
-       [**-f** | **--format=** *FORMAT*] [**-i** | **--import=** *FILE*
-       [**-f** | **--format=** *FORMAT*]] [**--remove=** *FAMILY_TREE_PATTERN*]
-       [**-e** | **--export=** *FILE* [**-f** | **--format=** *FORMAT*]]
-       [**-a** | **--action=** *ACTION*] [*-p* | **--options=** *OPTION‐
-       STRING*]] [*FILE*] [**--version**]
-
-
-**DESCRIPTION**
-       Gramps is a Free/OpenSource genealogy program. It is written in Python,
-       using  the GTK+/GNOME interface.  Gramps should seem familiar to anyone
-       who has used other genealogy programs before such as Family Tree  Maker
-       (TM),   Personal Ancestral Files (TM), or the GNU Geneweb.  It supports
-       importing of the ever popular GEDCOM format which is used world wide by
-       almost all other genealogy software.
-
-
-**OPTIONS**
-       **gramps** *FILE*
-          When *FILE* is given (without any flags) as a family tree name or
-          as a family tree database directory, then it is opened and an
-          interactive  session is started. If *FILE* is a file format under‐
-          stood by Gramps, an empty family tree is created  whose name is
-          based  on  the *FILE* name and the data is imported into it. The
-          rest of the options is ignored. This way of launching is suit‐
-          able for using gramps as a handler for genealogical data in e.g.
-          web browsers. This invocation can accept any data format  native
-          to gramps, see below.
-
-
-       **-f** , **--format=** *FORMAT*
-          Explicitly specify format of *FILE* given by preceding **-i** ,
-          or **-e** option. If the **-f** option is not given for any
-          *FILE* , the format of that file is guessed according to its extension
-          or MIME-type.
-
-          Formats  available for export are **gramps-xml** (guessed if *FILE*
-          ends with **.gramps** ), **gedcom** (guessed if *FILE* ends with
-          **.ged** ), or any file export available through the Gramps plugin
-          system.
-
-          Formats available for import are **gramps-xml** , **gedcom** ,
-          **gramps-pkg** (guessed if *FILE* ends with **.gpkg** ),
-          and **geneweb** (guessed if *FILE* ends with **.gw** ).
-
-          Formats available for export are **gramps-xml** , **gedcom** ,
-          **gramps-pkg** , **wft** (guessed if *FILE* ends with **.wft** ),
-          **geneweb**.
-
-
-       **-l**
-          Print a list of known family trees.
-
-
-       **-L**
-          Print a detailed list of known family trees.
-
-
-       **-u** , **--force-unlock**
-          Unlock a locked database.
-
-
-       **-O** , **--open=** *DATABASE*
-          Open *DATABASE* which  must be an existing database directory or
-          existing family tree name. If no action, import or export
-          options are given on the command line then an interactive ses‐
-          sion is started using that database.
-
-
-       **-i** , **--import=** *FILE*
-          Import data from *FILE* . If you haven't specified a database, then
-          an empty database is created for you called Family Tree x
-          (where x is an incrementing number).
-
-          When more than one input file is given, each has to be preceded
-          by **-i** flag. The files are imported in the specified order, i.e.
-          **-i** *FILE1* **-i** *FILE2* and **-i** *FILE2* **-i** *FILE1*
-          might produce different gramps IDs in the resulting database.
-
-
-       **-e** , **--export=** *FILE*
-          Export data into *FILE* . For **gramps-xml** , **gedcom**
-          , **wft** , **gramps-pkg** , and **geneweb** , the *FILE* is the
-          name of the resulting file.
-
-          When more than one output file is given, each has to be preceded
-          by **-e** flag. The files are written one by one, in the specified order.
-
-
-       **-a** , **--action=** *ACTION*
-          Perform *ACTION* on the imported data. This is done after all
-          imports are successfully completed. Currently available  actions
-          are **summary** (same  as  Reports->View->Summary), **check** (same as
-          Tools->Database Processing->Check and Repair), **report** (generates
-          report),  and  tool  (runs a plugin tool).  Both **report** and **tool**
-          need the *OPTIONSTRING* supplied by the **-p** flag).
-
-          The *OPTIONSTRING* should satisfy the following conditions:
-          It must not contain any  spaces. If some arguments need to
-          include spaces, the string should be enclosed with quotation
-          marks, i.e., follow the shell syntax. Option string is a list
-          of  pairs  with name and value (separated by the equality sign).
-          The name and value pairs must be separated by commas.
-
-          Most of the report or tools options are specific for each report
-          or tool. However, there are some common options.
-
-          **name=name**
-          This mandatory option determines which report or tool will be
-          run. If the supplied name does not correspond to any  available
-          report or tool, an error message will be printed followed by the
-          list of available reports or tools (depending on the *ACTION* ).
-
-          **show=all**
-          This will produce the list of names for all options available
-          for a given report or tool.
-
-          **show=optionname**
-          This will print the description of the functionality supplied by
-          *optionname*, as well as what are the acceptable types and  values
-          for this option.
-
-          Use the above options to find out everything about a given
-          report.
-
-
-       When more than one output action is given, each has to be preceded  by
-       **-a** flag. The actions are performed one by one, in the specified order.
-
-
-       **-d** , **--debug=** *LOGGER_NAME*
-          Enables debug logs for development and testing. Look at the
-          source code for details
-
-       **--version**
-          Prints the version number of gramps and then exits
-
-
-
-
-**Operation**
-       If the first argument on the command line does not start with dash
-       (i.e. no flag), gramps will attempt to open the file with the name
-       given by the first argument and start interactive session, ignoring the
-       rest of the command line arguments.
-
-
-       If the  **-O** flag is given, then gramps will try opening the supplied
-       database and then work with that data, as instructed by the further
-       command line parameters.
-
-
-       With or without the **-O** flag, there could be multiple imports, exports,
-       and actions specified further on the command line by using **-i** ,
-       **-e** , and **-a** flags.
-
-
-       The order of **-i** , **-e** , or **-a** options does not matter. The actual order
-       always is: all imports (if any) -> all actions (if any) -> all  exports
-       (if any). But opening must always be first!
-
-
-       If no **-O** or **-i** option is given, gramps will launch its main window and
-       start the usual interactive session with the empty database, since
-       there is no data to process, anyway.
-
-
-       If no **-e**  or **-a** options are given, gramps will launch its main window
-       and start the usual interactive session with the database resulted from
-       all imports. This database resides in the **import_db.grdb** under
-       **~/.gramps/import** directory.
-
-
-       The error encountered during import, export, or action, will be  either
-       dumped to stdout (if  these  are exceptions handled by gramps) or to
-       *stderr* (if these are not handled). Use usual shell redirections of
-       *stdout* and *stderr* to save messages and errors in files.
-
-
-**EXAMPLES**
-       To open an existing family tree and import an xml file into it, one
-       may type:
-
-          **gramps -O** *'My Family Tree'* **-i** *~/db3.gramps*
-
-       The above changes the opened family tree, to do the  same, but import
-       both in a temporary family tree and start an interactive session, one
-       may type:
-
-          **gramps -i** *'My Family Tree'* **-i** *~/db3.gramps*
-
-       To import four databases (whose formats can be  determined from their
-       names) and then check the resulting database for errors, one may type:
-
-          **gramps -i** *file1.ged* **-i** *file2.tgz* **-i** *~/db3.gramps*
-          **-i** *file4.wft* **-a** *check*
-
-       To explicitly specify the formats in the above  example,  append  file‐
-       names with appropriate **-f** options:
-
-          **gramps -i** *file1.ged* **-f** *gedcom* **-i** *file2.tgz* **-f**
-          *gramps-pkg* **-i** *~/db3.gramps* **-f** *gramps-xml* **-i** *file4.wft*
-          **-f** *wft* **-a** *check*
-
-       To record the database resulting from all imports, supply **-e** flag  (use
-       **-f** if the filename does not allow gramps to guess the format):
-
-          **gramps -i** *file1.ged* **-i** *file2.tgz* **-e** *~/new-package*
-          **-f** *gramps-pkg*
-
-       To import three databases and start interactive gramps session with the
-       result:
-
-          **gramps -i** *file1.ged* **-i** *file2.tgz* **-i** *~/db3.gramps*
-
-       To run the Verify tool from the commandline and output the result to
-       stdout:
-
-          **gramps -O** *'My Family Tree'* **-a** *tool* **-p name=** *verify*
-
-       Finally, to start normal interactive session type:
-
-          **gramps**
-
-
-**ENVIRONMENT VARIABLES**
-       The program checks whether these environment variables are set:
-
-       **LANG**  -  describe, which language to use: Ex.: for polish language this
-       variable has to be set to pl_PL.UTF-8.
-
-       **GRAMPSHOME** - if set, force Gramps to use  the  specified  directory  to
-       keep program settings and databases there. By default, this variable is
-       not set and gramps assumes that the folder with all databases and  pro‐
-       file  settings  should  be  created  within  the  user  profile  folder
-       (described by environment variable HOME for Linux  or  USERPROFILE  for
-       Windows 2000/XP).
-
-
-**CONCEPTS**
-       Supports a python-based plugin system, allowing import and export writ‐
-       ers, report generators, tools, and display filters to be added  without
-       modification of the main program.
-
-       In addition to generating direct printer output, report generators also
-       target other systems, such as *LibreOffice.org* , *AbiWord* , *HTML*,
-       or *LaTeX* to allow the users to modify the format to suit their needs.
-
-
-**KNOWN BUGS AND LIMITATIONS**
-
-**FILES**
-
-       *${PREFIX}/bin/gramps*
-
-       *${PREFIX}/lib/python3/dist-packages/gramps/*
-
-       *${PREFIX}/share/*
-
-       *${HOME}/.gramps*
-
-
-**AUTHORS**
-       Donald Allingham <don@gramps-project.org>
-       http://gramps-project.org/
-
-       This man page was originally written by:
-       Brandon L. Griffith <brandon@debian.org>
-       for inclusion in the Debian GNU/Linux system.
-
-       This man page is currently maintained by:
-       Gramps project <xxx@gramps-project.org>
-
-
-**DOCUMENTATION**
-       The user documentation is available through standard web browser
-       in the form of Gramps Manual.
-
-       The developer documentation can be found on the
-       http://www.gramps-project.org/wiki/index.php?title=Portal:Developers
-       portal.
-
-
-
-gramps(1)                 @VERSION@               gramps(1)
--- a/data/man/fr/Makefile.am
+++ b/data/man/fr/Makefile.am
@@ -0,0 +1,14 @@
+# This is the data/man/fr level Makefile for Gramps
+# $Id$
+
+man_IN_FILES = gramps.1.in
+man_MANS = $(man_IN_FILES:.1.in=.1)
+
+mandir = @mandir@/fr
+
+EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
+
+gramps.1: $(top_builddir)/config.status gramps.1.in
+	cd $(top_builddir) && CONFIG_FILES=data/man/fr/$@ $(SHELL) ./config.status
+
+CLEANFILES=$(man_MANS)
--- a/data/man/fr/conf.py
+++ b/data/man/fr/conf.py
@@ -1,243 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Gramps documentation build configuration file, created by
-# sphinx-quickstart on Sat Dec  1 14:38:29 2012.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'fr'
-
-# General information about the project.
-project = u'Gramps'
-copyright = u'2015, Gramps project'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '4.2'
-# The full version, including alpha/beta/rc tags.
-release = '4.2.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-locale_dirs = './locale'
-gettext_compact = True
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-today_fmt = '%d %B %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'Grampsdoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'Gramps.tex', u'Gramps Documentation',
-   u'.', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('fr', 'gramps', u'Gramps Documentation',
-     ['Jerome Rapinat'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'Gramps', u'Gramps Documentation',
-   u'.', 'Gramps', 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
--- a/data/man/fr/fr.rst
+++ b/data/man/fr/fr.rst
@@ -1,299 +0,0 @@
-French
-=======
-
-gramps(1)                @VERSION@               gramps(1)
-
-
-**NOM**
-       gramps - Gramps est une application de généalogie. Gramps est
-       l'acronyme de Genealogical Research and Analysis Management Programming
-       System (Systeme de Programmation pour Recherche, Analyse et Gestion de
-       données généalogiques)
-
-
-**SYNOPSIS**
-       **gramps** [**-?** | **--help**] [**--usage**] [**--version**]
-       [**-l**] [**-L**] [**-u** | **--force-unlock**] [**-O** | **--open=** *BASE_DE_DONNEES*]
-       [**-f** | **--format=** *FORMAT*] [**-i** | **--import=** *FICHIER*]
-       [**-e** | **--export=** *FICHIER*] [**--remove=** *FAMILY_TREE_PATTERN*]
-       [**-a** | **--action=** *ACTION* [*-p* | **--options=** *CHAÎNE‐
-       OPTION*]] [*FICHIER*] [**--version**]
-
-
-**DESCRIPTION**
-       Gramps est un programme Libre/OpenSource de généalogie. Il est écrit en
-       python, et utilise une interface GTK+/GNOME. Gramps est semblable à
-       d'autres programmes de généalogie tel  que  Family Tree Maker (FTM),
-       Personal Ancestral Files, ou le programme GNU Geneweb. Il peut
-       importer/exporter le format le plus utilisé par les autres logiciels de
-       généalogie : GEDCOM.
-
-
-**OPTIONS**
-       **gramps** *FICHIER*
-          Si *FICHIER* est désigné (sans autres commandes) comme arbre
-          familial ou comme répertoire d'arbre familial, alors une session
-          interactive est ouverte. Si *FICHIER* est un format de fichier
-          supporté par Gramps, une base vide est créée  dont le nom est
-          celui du *FICHIER* et les données y seront importées. Les autres
-          options sont ignorées. Ce type de lancement permet d'utiliser
-          gramps  pour manipuler des données comme dans un navigateur web.
-          Les formats natifs de gramps sont acceptés, voir ci-dessous.
-
-
-       **-f** , **--format=** *FORMAT*
-          Le format spécifique du *FICHIER* est précédé par les arguments
-          **-i** , ou **-e** . Si l'option **-f** n'est pas donnée pour le *FICHIER* ,
-          alors le format sera celui de l'extension ou du type-MIME.
-
-          Les formats de sortie disponibles sont **gramps-xml** (deviné si
-          *FICHIER* se termine par **.gramps** ), et **gedcom** (deviné si *FICHIER* se
-          termine  par **.ged** ), ou tout autre fichier d'exportation
-          disponible dans le système de plugin Gramps.
-
-          Les formats disponibles pour l'importation sont  **grdb** ,
-          **gramps-xml** , **gedcom** , **gramps-pkg** (deviné si *FICHIER* se termine par
-          **.gpkg** ), et **geneweb** (deviné si *FICHIER* se termine par **.gw** ).
-
-          Les formats disponibles pour l'exportation sont **gramps-xml** , **ged‐
-          com** , **gramps-pkg** , **wft** (deviné si *FICHIER* se termine par **.wft** ),
-          **geneweb** .
-
-
-       **-l**
-          Imprime une liste des arbres familiaux disponibles.
-
-
-       **-u** , **--force-unlock**
-          Débloquer une base de données verrouillée.
-
-
-       **-O** , **--open=** *BASE_DE_DONNEES*
-          Ouvrir une *BASE_DE_DONNEES* qui doit être une base présente dans
-          le répertoire des bases ou le nom d'un arbre familial existant.
-          Si aucune action n'est définie, les options d'import ou d'export
-          sont données par la ligne de commande puis une session interactive
-          est ouverte, utilisant cette base de données.
-
-          Seulement une base peut être ouverte. Si vous utilisez plusieurs
-          sources, vous devez utiliser l'option d'import.
-
-
-       **-i** , **--import=** *FICHIER*
-          Importer des données depuis un *FICHIER* . Si vous n'avez pas
-          spécifié de base de données, alors une base de données vide
-          est utilisée.
-
-          Quand plus d'un fichier doit être importé, chacun doit être
-          précédé par la commande **-i** . Ces fichiers sont importés dans le
-          même ordre,  **-i** *FICHIER1* **-i** *FICHIER2* et **-i** *FICHIER2* **-i**
-          *FICHIER1* vont tous les deux produire différents IDs gramps.
-
-
-       **-e** , **--export=** *FICHIER*
-          Exporter des données dans un *FICHIER* . Pour les fichiers **gramps-xml**
-          , **gedcom** , **wft** , **gramps-pkg** , et **geneweb** , le
-          *FICHIER* est le nom du fichier de sortie.
-
-          Quand plus d'un fichier doit être exporté, chacun doit être
-          précédé par la commande **-e** . Ces fichiers sont importés dans le
-          même ordre.
-
-
-       **-a** , **--action=** *ACTION*
-          Accomplir une *ACTION* sur les données importées. C'est effectué à
-          la fin de l'importation. Les actions possibles sont **summary**
-          (comme le rapport -> Afficher -> Statistiques sur la base),
-          **check** (comme l'outil -> Réparation de la base -> Vérifier et
-          réparer), **report** (produit un rapport) et **tool** (utilise un
-          outil), ces derniers ont besoin de *OPTION* précédé par la commande -p.
-
-          L' *OPTION* doit satisfaire ces conditions:
-          Il ne doit pas y avoir d'espace. Si certains arguments doivent
-          utiliser des espaces, la chaîne doit être encadrée par des
-          guillemets. Les options vont par paire nom et valeur. Une
-          paire est séparée par un signe égal. Différentes paires sont
-          séparées par une virgule.
-
-          La plupart des options sont spécifiques à chaque rapport. Même
-          s'il existe des options communes.
-
-          **name=name**
-          Cette option est obligatoire, elle détermine quel rapport ou
-          outil sera utilisé. Si le name saisi ne correspond à aucun
-          module disponible, un message d'erreur sera ajouté.
-
-          **show=all**
-          Cette option produit une liste avec les noms des options
-          disponibles pour un rapport donné.
-
-          **show=optionname**
-          Cette option affiche une description de toutes les fonctionnalités
-          proposées par optionname, aussi bien les types que les valeurs pour une option.
-
-          Utiliser les options ci-dessus pour trouver tout sur un rapport
-          choisi.
-
-
-       Quand plus d'une action doit être effectuée, chacune doit être précédée
-       par la commande **-a** . Les actions seront réalisées une à une, dans
-       l'ordre spécifié.
-
-
-       **-d** , **--debug=** *NOM_LOGGER*
-          Permet les logs de debug pour le développement et les tests.
-          Regarder le code source pour les détails.
-
-       **--version**
-          Imprime le numéro de version pour gramps puis quitte.
-
-
-
-
-**Opération**
-       Si le premie argument de la ligne de commande ne commence pas par un
-       tiret (i.e. pas d'instruction), gramps va essayer d'ouvrir la base de
-       données avec le nom donné par le premier argument et démarrer une ses‐
-       sion interactive, en ignorant le reste de la ligne de commande.
-
-
-       Si la commande **-O** est notée, alors gramps va essayer le fichier défini
-       et va travailler avec ses données, comme pour les autres paramètres de
-       la ligne de commande.
-
-
-       Avec ou sans la commande **-O** , il peut y avoir plusieurs imports,
-       exports, et actions dans la ligne de commande **-i** , **-e** , et **-a** .
-
-
-       L'ordre des options **-i** , **-e** , ou **-a** n'a pas de sens. L'ordre actuel est
-       toujours : imports -> actions -> exports. Mais l'ouverture doit toujours
-       être la première !
-
-
-       Si aucune option **-O** ou **-i** n'est donnée, gramps lancera sa propre
-       fenêtre et demarrera avec une base vide, puisqu'il n'y a pas données.
-
-
-       Si aucune option **-e** ou **-a** n'est donnée, gramps lancera sa propre
-       fenêtre et démarrera avec la base de données issue de tout les imports.
-       Cette base sera **import_db.grdb** dans le répertoire **~/.gramps/import**.
-
-
-       Les erreurs  rencontrées lors d'importation, d'exportation, ou d'action, seront
-       mémorisées en *stdout* (si elles sont le fait de la manipulation par
-       gramps) ou en *stderr* (si elles ne sont pas le fait d'une manipulation).
-       Utilisez les shell de redirection de *stdout* et *stderr* pour sauver
-       les messages et les erreurs dans les fichiers.
-
-
-**EXEMPLES**
-       Pour ouvrir un arbre familial et y importer un fichier XML, on peut
-       saisir:
-
-          **gramps -O** *'Mon Arbre Familial'* **-i** *~/db3.gramps*
-
-       Ceci ouvre un arbre familial, pour faire la même chose, mais importer
-       dans un arbre familial temporaire et démarrer une session interactive,
-       on peut saisir :
-
-          **gramps -i** *'Mon Arbre Familial'* **-i** *~/db3.gramps*
-
-       Lecture de quatre bases de données dont les formats peuvent être
-       devinés d'après les noms, puis vérification des données:
-
-          **gramps -i** *file1.ged* **-i** *file2.tgz* **-i** *~/db3.gramps*
-          **-i** *file4.wft* **-a** *check*
-
-       Si vous voulez préciser lesformats de fichiers dans l'exemple ci-
-       dessus, complétez les noms de fichiers par les options -f appropriées:
-
-          **gramps -i** *file1.ged* **-f** *gedcom* **-i** *file2.tgz* **-f**
-          *gramps-pkg* **-i** *~/db3.gramps* **-f** *gramps-xml* **-i** *file4.wft*
-          **-f** *wft* **-a** *check*
-
-       Pour enregistrer le résultat des lectures, donnez l'option **-e**
-       (utiliser -f si le nom de fichier ne permet pas à gramps de deviner le
-       format):
-
-          **gramps -i** *file1.ged* **-i** *file2.tgz* **-e** *~/new-package*
-          **-f** *gramps-pkg*
-
-       Pour lire trois ensembles de données puis lancer une session
-       interactive de gramps sur le tout :
-
-          **gramps -i** *file1.ged* **-i** *file2.tgz* **-i** *~/db3.gramps*
-
-       Pour lancer l'outil de vérification de la base de données depuis la
-       ligne de commande et obtenir le résultat :
-
-          **gramps -O** *'My Family Tree'* **-a** *tool* **-p name=** *verify*
-
-       Enfin, pour lancer une session interactive normale, entrer :
-
-          **gramps**
-
-
-**VARIABLES D'ENVIRONMENT**
-       Le programme vérifie si ces variables d'environnement sont déclarées:
-
-       **LANG** - décrit, quelle langue est utilisée: Ex.: pour le français on
-       peut définir fr_FR.UTF-8.
-
-       **GRAMPSHOME**  - si  défini, force Gramps à utiliser un répertoire
-       spécifique pour y conserver ses préférences et bases de données. Par
-       défaut, cette variable n'est pas active et Gramps sait que les options
-       et bases de données doivent être créées dans le répertoire par défaut
-       de l'utilisateur (la variable d'environnement HOME pour Linux ou USER‐
-       PROFILE pour Windows 2000/XP).
-
-
-**CONCEPTS**
-       Gramps est un système basé sur le support de plugin-python, permettant
-       d'importer et d'exporter, la saisie, générer des rapports, des outils,
-       et afficher des filtres pouvant être ajoutés sans modifier le programme.
-
-       Par ailleurs, gramps permet la génération directe : impression, rap‐
-       ports avec sortie vers d'autres formats, comme *LibreOffice.org* ,
-       *HTML* , ou *LaTeX* pour permettre à l'utilisateur de choisir selon ses
-       besoins
-
-
-**BUGS CONNUS ET LIMITATIONS**
-
-**FICHIERS**
-
-       *${PREFIX}/bin/gramps*
-
-       *${PREFIX}/lib/python3/dist-packages/gramps/*
-
-       *${PREFIX}/share/*
-
-       *${HOME}/.gramps*
-
-
-**AUTEURS**
-       Donald Allingham <don@gramps-project.org>
-       http://gramps-project.org/
-
-       Cette page man a d'abord été écrite par :
-       Brandon L. Griffith <brandon@debian.org>
-       pour Debian GNU/Linux système.
-
-       Cette page man est maintenue par :
-       Gramps project <xxx@gramps-project.org>
-
-       La traduction française :
-       Jérôme Rapinat <romjerome@yahoo.fr>
-
-
-**DOCUMENTATION**
-       La documentation-utilisateur est disponible par un navigateur
-       standard sous la forme du manuel Gramps.
-
-       La documentation pour développeur est disponible sur le site
-       http://www.gramps-project.org/wiki/index.php?title=Portal:Developers .
-
-
-
-gramps(1)                 @VERSION@               gramps(1)
--- a/data/man/fr/gramps.1.in
+++ b/data/man/fr/gramps.1.in
@@ -1,337 +1,290 @@
-.\" Man page generated from reStructuredText.
-.
-.TH FRENCH  "" "" ""
-.SH NAME
-French \- 
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
-
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
+.TH gramps 1 "@VERSION@" "Mars 2009" "@VERSION@"
+.SH NOM
+gramps \- Gramps est une application de généalogie. Gramps est l'acronyme de Genealogical Research and Analysis Management Programming System (Systeme de Programmation pour Recherche, Analyse et Gestion de données généalogiques)
+
+.SH SYNOPSIS
+.B gramps
+.RB [ \-?|\-\^\-help ]
+.RB [ \-\^\-usage ]
+.RB [ \-\^\-version ]
+.RB [ \-l]
+.RB [ \-u|\-\^\-force-unlock ]
+.RB [ \-O|\-\^\-open=
+.IR BASE_DE_DONNEES 
+.RB [ \-f|\-\^\-format= 
+.IR FORMAT ]] 
+.RB [ \-i|\-\^\-import=
+.IR FICHIER 
+.RB [ \-f|\-\^\-format= 
+.IR FORMAT ]] 
+.RB [ \-i|\-\^\-import= 
+.IR ... ] 
+.RB [ \-e|\-\^\-export= 
+.IR FICHIER
+.RB [ \-f|\-\^\-format= 
+.IR FORMAT ]] 
+.RB [ \-a|\-\^\-action= 
+.IR ACTION ]
+.RB [ \-p|\-\^\-options= 
+.IR OPTION ]] 
+.RB [
+.IR FICHIER
+.RB ]
+.if 0 .RB [ bonobo\ options ]
+.if 0 .RB [ sound\ options ]
+.RB [ \-\-version ]
+
+.SH DESCRIPTION
+.PP 
+\fIGramps\fP est un programme Libre/OpenSource de généalogie. Il est écrit en python, 
+et utilise une interface GTK+/GNOME.
+Gramps est semblable à d'autres programmes de généalogie tel que \fIFamily Tree Maker (FTM)\fR,  \fIPersonal Ancestral
+Files\fR, ou le programme GNU Geneweb.
+Il peut importer/exporter le format le plus utilisé par les autres logiciels de généalogie : GEDCOM.
+
+.SH OPTIONS
+.TP 
+.BI gramps " FICHIER" 
+Si \fIFICHIER\fR est désigné (sans autres commandes) comme arbre familial ou comme répertoire d'arbre familial, alors une session interactive est ouverte. Si FICHIER est un format de fichier supporté par Gramps, une base vide est créée dont le nom est celui du \fIFICHIER\fP et les données y seront importées. Les autres options sont ignorées. Ce type de lancement permet d'utiliser gramps pour manipuler des données comme dans un navigateur web. Les formats natifs de gramps sont acceptés, voir ci-dessous.
+.br
+
+.TP 
+.BI \-f,\-\^\-format= " FORMAT"
+Le format spécifique du \fIFICHIER\fR est précédé par les arguments
+.ig
+\fB\-O\fR,
 ..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
+\fB\-i\fR, ou
+\fB\-e\fR. Si l'option \fB\-f\fR n'est pas donnée pour le \fIFICHIER\fR, alors le format sera celui de l'extension ou du type-MIME.
+.br
+
+Les formats de sortie disponibles sont \fBgramps\-xml\fR (deviné si \fIFICHIER\fR se termine par
+\fB.gramps\fR), et \fBgedcom\fR (deviné si \fIFICHIER\fR se termine par \fB.ged\fR), ou
+tout autre fichier d'exportation disponible dans le système de plugin Gramps.
+.br
+
+Les formats disponibles pour l'importation sont \fBgrdb\fR, \fBgramps\-xml\fR, \fBgedcom\fR,  
+\fBgramps\-pkg\fR (deviné si \fIFICHIER\fR se termine par \fB.gpkg\fR), et
+\fBgeneweb\fR (deviné si \fIFICHIER\fR se termine par \fB.gw\fR). 
+.br
+
+Les formats disponibles pour l'exportation sont  
+.ig
+\fBgrdb\fR,
 ..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-.sp
-gramps(1)                @VERSION@               gramps(1)
-.INDENT 0.0
-.TP
-.B \fBNOM\fP
-gramps \- Gramps est une application de généalogie. Gramps est
-l\(aqacronyme de Genealogical Research and Analysis Management Programming
-System (Systeme de Programmation pour Recherche, Analyse et Gestion de
-données généalogiques)
-.TP
-.B \fBSYNOPSIS\fP
-\fBgramps\fP [\fB\-?\fP | \fB\-\-help\fP] [\fB\-\-usage\fP] [\fB\-\-version\fP]
-[\fB\-l\fP] [\fB\-L\fP] [\fB\-u\fP | \fB\-\-force\-unlock\fP] [\fB\-O\fP | \fB\-\-open=\fP \fIBASE_DE_DONNEES\fP]
-[\fB\-f\fP | \fB\-\-format=\fP \fIFORMAT\fP] [\fB\-i\fP | \fB\-\-import=\fP \fIFICHIER\fP]
-[\fB\-e\fP | \fB\-\-export=\fP \fIFICHIER\fP] [\fB\-\-remove=\fP \fIFAMILY_TREE_PATTERN\fP]
-[\fB\-a\fP | \fB\-\-action=\fP \fIACTION\fP [\fI\-p\fP | \fB\-\-options=\fP \fICHAÎNE‐
-OPTION\fP]] [\fIFICHIER\fP] [\fB\-\-version\fP]
-.TP
-.B \fBDESCRIPTION\fP
-Gramps est un programme Libre/OpenSource de généalogie. Il est écrit en
-python, et utilise une interface GTK+/GNOME. Gramps est semblable à
-d\(aqautres programmes de généalogie tel  que  Family Tree Maker (FTM),
-Personal Ancestral Files, ou le programme GNU Geneweb. Il peut
-importer/exporter le format le plus utilisé par les autres logiciels de
-généalogie : GEDCOM.
-.TP
-.B \fBOPTIONS\fP
-.INDENT 7.0
-.TP
-.B \fBgramps\fP \fIFICHIER\fP
-Si \fIFICHIER\fP est désigné (sans autres commandes) comme arbre
-familial ou comme répertoire d\(aqarbre familial, alors une session
-interactive est ouverte. Si \fIFICHIER\fP est un format de fichier
-supporté par Gramps, une base vide est créée  dont le nom est
-celui du \fIFICHIER\fP et les données y seront importées. Les autres
-options sont ignorées. Ce type de lancement permet d\(aqutiliser
-gramps  pour manipuler des données comme dans un navigateur web.
-Les formats natifs de gramps sont acceptés, voir ci\-dessous.
-.TP
-.B \fB\-f\fP , \fB\-\-format=\fP \fIFORMAT\fP
-Le format spécifique du \fIFICHIER\fP est précédé par les arguments
-\fB\-i\fP , ou \fB\-e\fP . Si l\(aqoption \fB\-f\fP n\(aqest pas donnée pour le \fIFICHIER\fP ,
-alors le format sera celui de l\(aqextension ou du type\-MIME.
-.sp
-Les formats de sortie disponibles sont \fBgramps\-xml\fP (deviné si
-\fIFICHIER\fP se termine par \fB\&.gramps\fP ), et \fBgedcom\fP (deviné si \fIFICHIER\fP se
-termine  par \fB\&.ged\fP ), ou tout autre fichier d\(aqexportation
-disponible dans le système de plugin Gramps.
-.sp
-Les formats disponibles pour l\(aqimportation sont  \fBgrdb\fP ,
-\fBgramps\-xml\fP , \fBgedcom\fP , \fBgramps\-pkg\fP (deviné si \fIFICHIER\fP se termine par
-\fB\&.gpkg\fP ), et \fBgeneweb\fP (deviné si \fIFICHIER\fP se termine par \fB\&.gw\fP ).
-.sp
-Les formats disponibles pour l\(aqexportation sont \fBgramps\-xml\fP , \fBged‐
-com\fP , \fBgramps\-pkg\fP , \fBwft\fP (deviné si \fIFICHIER\fP se termine par \fB\&.wft\fP ),
-\fBgeneweb\fP .
-.TP
-.B \fB\-l\fP
+\fBgramps\-xml\fR, \fBgedcom\fR,
+\fBgramps\-pkg\fR, \fBwft\fR (deviné si \fIFICHIER\fR se termine par \fB.wft\fR),
+\fBgeneweb\fR, et \fBiso\fR (jamais deviné, toujours spécifié avec l'option
+\fB\-f\fR).
+
+.TP 
+.BI \-l
 Imprime une liste des arbres familiaux disponibles.
+
 .TP
-.B \fB\-u\fP , \fB\-\-force\-unlock\fP
+.BI \-u,\-\^\-force-unlock
 Débloquer une base de données verrouillée.
+
+.TP 
+.BI \-O,\-\^\-open= " BASE_DE_DONNEES"
+Ouvrir une \fIBASE_DE_DONNEES\fR qui doit être une base présente dans le répertoire des bases ou le nom d'un arbre familial existant.
+Si aucune action n'est définie, les options d'import ou d'export sont données par la ligne de commande puis une session interactive est ouverte, utilisant cette base de données.
+.br
+
+Seulement une base peut être ouverte. Si vous utilisez plusieurs sources, vous devez utiliser l'option d'import.
+
+.TP 
+.BI \-i,\-\^\-import= " FICHIER"
+Importer des données depuis un \fIFICHIER\fR. Si vous n'avez pas spécifié de base de données alors une base de données temporaire est utilisée; elle sera effacée quand vous quitterez gramps.
+.br
+
+Quand plus d'un fichier doit être importé, chacun doit être précédé par la commande \fB\-i\fR. Ces fichiers sont importés dans le même ordre, 
+i.e. \fB\-i\fR \fIFICHIER1\fR \fB\-i\fR \fIFICHIER2\fR  
+et \fB\-i\fR \fIFICHIER2\fR \fB\-i\fR \fIFICHIER1\fR vont tous les deux produire différents IDs gramps.
+
+.TP 
+.BI \-e,\-\^\-export= " FICHIER"
+Exporter des données dans un \fIFICHIER\fR. Pour le format \fBiso\fR, le \fIFICHIER\fR est le nom du répertoire dans lequel la base de données gramps est écrite.
+Pour 
+.ig
+\fBgrdb\fR,
+..
+\fBgramps\-xml\fR, \fBgedcom\fR, \fBwft\fR, \fBgramps\-pkg\fR, 
+et \fBgeneweb\fR, le \fIFICHIER\fR est le nom du fichier de sortie 
+.br
+
+Quand plus d'un fichier doit être exporté, chacun doit être précédé par la commande \fB\-e\fR. Ces fichiers sont importés dans le même ordre.
+
+.TP 
+.BI \-a,\-\^\-action= " ACTION"
+Accomplir une \fIACTION\fR sur les données importées. C'est effectué à la fin de l'importation. Les actions possibles sont \fBsummary\fR 
+(comme le rapport -> Afficher -> Statistiques sur la base), \fBcheck\fR (comme l'outil -> Réparation de la base -> Vérifier et réparer), \fBreport\fR (produit un rapport) et
+\fBtool\fR (utilise un outil), ces derniers ont besoin
+de \fIOPTION\fR précédé par la commande \fB\-p\fR.
+.br
+
+L'\fIOPTION\fR doit satisfaire ces conditions:
+.br
+Il ne doit pas y avoir d'espace. 
+Si certains arguments doivent utiliser des espaces, la chaîne doit être encadrée par des guillemets.
+Les options vont par paire nom et valeur.
+Une paire est séparée par un signe égal.
+Différentes paires sont séparées par une virgule.
+.br
+
+La plupart des options sont spécifiques à chaque rapport. Même s'il existe des options communes.
+
+.BI "name=name"
+.br
+Cette option est obligatoire, elle détermine quel rapport ou outil sera utilisé. Si le \fIname\fR saisi ne correspond à aucun module disponible, un message d'erreur sera ajouté.
+
+.BI "show=all"
+.br
+Cette option produit une liste avec les noms des options disponibles pour un rapport donné.
+
+.BI "show="optionname
+.br
+Cette option affiche une description de toutes les fonctionnalités proposées par \fIoptionname\fR, aussi bien les types que les valeurs pour une option.
+
+.br
+Utiliser les options ci-dessus pour trouver tout sur un rapport choisi.
+
+.LP
+Quand plus d'une action doit être effectuée, chacune doit être précédée par la commande \fB\-a\fR. Les actions seront réalisées une à une, dans l'ordre spécifié.
+
+.TP 
+.BI \-d,\-\^\-debug= " NOM_LOGGER"
+Permet les logs de debug pour le développement et les tests. Regarder le code source pour les détails.
 .TP
-.B \fB\-O\fP , \fB\-\-open=\fP \fIBASE_DE_DONNEES\fP
-Ouvrir une \fIBASE_DE_DONNEES\fP qui doit être une base présente dans
-le répertoire des bases ou le nom d\(aqun arbre familial existant.
-Si aucune action n\(aqest définie, les options d\(aqimport ou d\(aqexport
-sont données par la ligne de commande puis une session interactive
-est ouverte, utilisant cette base de données.
-.sp
-Seulement une base peut être ouverte. Si vous utilisez plusieurs
-sources, vous devez utiliser l\(aqoption d\(aqimport.
-.TP
-.B \fB\-i\fP , \fB\-\-import=\fP \fIFICHIER\fP
-Importer des données depuis un \fIFICHIER\fP . Si vous n\(aqavez pas
-spécifié de base de données, alors une base de données vide
-est utilisée.
-.sp
-Quand plus d\(aqun fichier doit être importé, chacun doit être
-précédé par la commande \fB\-i\fP . Ces fichiers sont importés dans le
-même ordre,  \fB\-i\fP \fIFICHIER1\fP \fB\-i\fP \fIFICHIER2\fP et \fB\-i\fP \fIFICHIER2\fP \fB\-i\fP
-\fIFICHIER1\fP vont tous les deux produire différents IDs gramps.
-.TP
-.B \fB\-e\fP , \fB\-\-export=\fP \fIFICHIER\fP
-Exporter des données dans un \fIFICHIER\fP . Pour les fichiers \fBgramps\-xml\fP
-, \fBgedcom\fP , \fBwft\fP , \fBgramps\-pkg\fP , et \fBgeneweb\fP , le
-\fIFICHIER\fP est le nom du fichier de sortie.
-.sp
-Quand plus d\(aqun fichier doit être exporté, chacun doit être
-précédé par la commande \fB\-e\fP . Ces fichiers sont importés dans le
-même ordre.
-.TP
-.B \fB\-a\fP , \fB\-\-action=\fP \fIACTION\fP
-Accomplir une \fIACTION\fP sur les données importées. C\(aqest effectué à
-la fin de l\(aqimportation. Les actions possibles sont \fBsummary\fP
-(comme le rapport \-> Afficher \-> Statistiques sur la base),
-\fBcheck\fP (comme l\(aqoutil \-> Réparation de la base \-> Vérifier et
-réparer), \fBreport\fP (produit un rapport) et \fBtool\fP (utilise un
-outil), ces derniers ont besoin de \fIOPTION\fP précédé par la commande \-p.
-.sp
-L\(aq \fIOPTION\fP doit satisfaire ces conditions:
-Il ne doit pas y avoir d\(aqespace. Si certains arguments doivent
-utiliser des espaces, la chaîne doit être encadrée par des
-guillemets. Les options vont par paire nom et valeur. Une
-paire est séparée par un signe égal. Différentes paires sont
-séparées par une virgule.
-.sp
-La plupart des options sont spécifiques à chaque rapport. Même
-s\(aqil existe des options communes.
-.sp
-\fBname=name\fP
-Cette option est obligatoire, elle détermine quel rapport ou
-outil sera utilisé. Si le name saisi ne correspond à aucun
-module disponible, un message d\(aqerreur sera ajouté.
-.sp
-\fBshow=all\fP
-Cette option produit une liste avec les noms des options
-disponibles pour un rapport donné.
-.sp
-\fBshow=optionname\fP
-Cette option affiche une description de toutes les fonctionnalités
-proposées par optionname, aussi bien les types que les valeurs pour une option.
-.sp
-Utiliser les options ci\-dessus pour trouver tout sur un rapport
-choisi.
-.UNINDENT
-.sp
-Quand plus d\(aqune action doit être effectuée, chacune doit être précédée
-par la commande \fB\-a\fP . Les actions seront réalisées une à une, dans
-l\(aqordre spécifié.
-.INDENT 7.0
-.TP
-.B \fB\-d\fP , \fB\-\-debug=\fP \fINOM_LOGGER\fP
-Permet les logs de debug pour le développement et les tests.
-Regarder le code source pour les détails.
-.TP
-.B \fB\-\-version\fP
+.BI \-\^\-version
 Imprime le numéro de version pour gramps puis quitte.
-.UNINDENT
+\" changer 0 par 1 pour permettre la sortie des options OAF
+.if 0 \{
+.PP
+Les options suivantes seront utilisées pour l'activation Bonobo.
+.TP 
+.BI \-\^\-oaf-ior-fd= "FD"
+Le descripteur de fichier pour imprimer OAF IOR
+.TP 
+.BI \-\^\-oaf-activate-iid= " IID"
+OAF IID à activer
+.TP 
+.BI \-\^\-oaf-private
+Prévenir de l'enregistrement du serveur avec OAF
+\}
+\" changer 0 par 1 pour permettre la sortie des options son de GNOME
+.if 0 \{
+.PP
+Les options suivantes seront utilisées pour contrôler le son avec les librairies GNOME.
 .TP
-.B \fBOpération\fP
-Si le premie argument de la ligne de commande ne commence pas par un
-tiret (i.e. pas d\(aqinstruction), gramps va essayer d\(aqouvrir la base de
-données avec le nom donné par le premier argument et démarrer une ses‐
-sion interactive, en ignorant le reste de la ligne de commande.
-.sp
-Si la commande \fB\-O\fP est notée, alors gramps va essayer le fichier défini
-et va travailler avec ses données, comme pour les autres paramètres de
-la ligne de commande.
-.sp
-Avec ou sans la commande \fB\-O\fP , il peut y avoir plusieurs imports,
-exports, et actions dans la ligne de commande \fB\-i\fP , \fB\-e\fP , et \fB\-a\fP .
-.sp
-L\(aqordre des options \fB\-i\fP , \fB\-e\fP , ou \fB\-a\fP n\(aqa pas de sens. L\(aqordre actuel est
-toujours : imports \-> actions \-> exports. Mais l\(aqouverture doit toujours
-être la première !
-.sp
-Si aucune option \fB\-O\fP ou \fB\-i\fP n\(aqest donnée, gramps lancera sa propre
-fenêtre et demarrera avec une base vide, puisqu\(aqil n\(aqy a pas données.
-.sp
-Si aucune option \fB\-e\fP ou \fB\-a\fP n\(aqest donnée, gramps lancera sa propre
-fenêtre et démarrera avec la base de données issue de tout les imports.
-Cette base sera \fBimport_db.grdb\fP dans le répertoire \fB~/.gramps/import\fP\&.
-.sp
-Les erreurs  rencontrées lors d\(aqimportation, d\(aqexportation, ou d\(aqaction, seront
-mémorisées en \fIstdout\fP (si elles sont le fait de la manipulation par
-gramps) ou en \fIstderr\fP (si elles ne sont pas le fait d\(aqune manipulation).
-Utilisez les shell de redirection de \fIstdout\fP et \fIstderr\fP pour sauver
-les messages et les erreurs dans les fichiers.
+.BI \-\^\-disable-sound
+Désactive l'utilisation du server son
 .TP
-.B \fBEXEMPLES\fP
-Pour ouvrir un arbre familial et y importer un fichier XML, on peut
-saisir:
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-O\fP \fI\(aqMon Arbre Familial\(aq\fP \fB\-i\fP \fI~/db3.gramps\fP
-.UNINDENT
-.UNINDENT
-.sp
-Ceci ouvre un arbre familial, pour faire la même chose, mais importer
-dans un arbre familial temporaire et démarrer une session interactive,
-on peut saisir :
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-i\fP \fI\(aqMon Arbre Familial\(aq\fP \fB\-i\fP \fI~/db3.gramps\fP
-.UNINDENT
-.UNINDENT
-.sp
-Lecture de quatre bases de données dont les formats peuvent être
-devinés d\(aqaprès les noms, puis vérification des données:
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-i\fP \fIfile1.ged\fP \fB\-i\fP \fIfile2.tgz\fP \fB\-i\fP \fI~/db3.gramps\fP
-\fB\-i\fP \fIfile4.wft\fP \fB\-a\fP \fIcheck\fP
-.UNINDENT
-.UNINDENT
-.sp
-Si vous voulez préciser lesformats de fichiers dans l\(aqexemple ci\-
-dessus, complétez les noms de fichiers par les options \-f appropriées:
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-i\fP \fIfile1.ged\fP \fB\-f\fP \fIgedcom\fP \fB\-i\fP \fIfile2.tgz\fP \fB\-f\fP
-\fIgramps\-pkg\fP \fB\-i\fP \fI~/db3.gramps\fP \fB\-f\fP \fIgramps\-xml\fP \fB\-i\fP \fIfile4.wft\fP
-\fB\-f\fP \fIwft\fP \fB\-a\fP \fIcheck\fP
-.UNINDENT
-.UNINDENT
-.sp
-Pour enregistrer le résultat des lectures, donnez l\(aqoption \fB\-e\fP
-(utiliser \-f si le nom de fichier ne permet pas à gramps de deviner le
-format):
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-i\fP \fIfile1.ged\fP \fB\-i\fP \fIfile2.tgz\fP \fB\-e\fP \fI~/new\-package\fP
-\fB\-f\fP \fIgramps\-pkg\fP
-.UNINDENT
-.UNINDENT
-.sp
-Pour lire trois ensembles de données puis lancer une session
-interactive de gramps sur le tout :
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-i\fP \fIfile1.ged\fP \fB\-i\fP \fIfile2.tgz\fP \fB\-i\fP \fI~/db3.gramps\fP
-.UNINDENT
-.UNINDENT
-.sp
-Pour lancer l\(aqoutil de vérification de la base de données depuis la
-ligne de commande et obtenir le résultat :
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-O\fP \fI\(aqMy Family Tree\(aq\fP \fB\-a\fP \fItool\fP \fB\-p name=\fP \fIverify\fP
-.UNINDENT
-.UNINDENT
-.sp
-Enfin, pour lancer une session interactive normale, entrer :
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps\fP
-.UNINDENT
-.UNINDENT
+.BI \-\^\-enable-sound
+Active l'utilisation du server son
 .TP
-.B \fBVARIABLES D\(aqENVIRONMENT\fP
-Le programme vérifie si ces variables d\(aqenvironnement sont déclarées:
-.sp
-\fBLANG\fP \- décrit, quelle langue est utilisée: Ex.: pour le français on
-peut définir fr_FR.UTF\-8.
-.sp
-\fBGRAMPSHOME\fP  \- si  défini, force Gramps à utiliser un répertoire
-spécifique pour y conserver ses préférences et bases de données. Par
-défaut, cette variable n\(aqest pas active et Gramps sait que les options
-et bases de données doivent être créées dans le répertoire par défaut
-de l\(aqutilisateur (la variable d\(aqenvironnement HOME pour Linux ou USER‐
-PROFILE pour Windows 2000/XP).
+.BI \-\^\-espeaker= " HOSTNAME:PORT"
+Host:port sur lequel le serveur son sera utilisé
+\}
+
+.SH "Operation"
+.br
+Si le premier argument de la ligne de commande ne commence pas par un tiret (i.e. pas
+d'instruction), gramps va essayer d'ouvrir la base de données avec le nom donné par le premier argument et démarrer une session interactive, en ignorant le reste de la ligne de commande.
+
+.LP
+Si la commande \fB\-O\fR est notée, alors gramps va essayer le fichier défini et va travailler avec ses données, comme pour les autres paramètres de la ligne de commande.
+
+.LP
+Avec ou sans la commande \fB\-O\fR, il peut y avoir plusieurs imports, exports, et actions dans la ligne de commande \fB\-i\fR,
+\fB\-e\fR, et \fB\-a\fR.
+
+.LP
+L'ordre des options \fB\-i\fR, \fB\-e\fR, ou \fB\-a\fR n'a pas de sens. L'ordre actuel est toujours : imports -> actions -> exports. Mais l'ouverture doit toujours être la première!
+
+.LP
+Si aucune option \fB\-O\fR ou \fB\-i\fR n'est donnée, gramps lancera sa propre fenêtre et demarrera avec une base vide, puisqu'il n'y a pas données.
+
+.LP
+Si aucune option \fB\-e\fR ou \fB\-a\fR n'est donnée, gramps lancera sa propre fenêtre et démarrera avec la base de données issue de tout les imports. Cette base sera \fBimport_db.grdb\fR sous le répertoire \fB~/.gramps/import\fR.
+
+.LP
+Les erreurs rencontrées lors d'import, export, ou action, seront mémorisées en \fIstdout\fR (si elles sont le fait de la manipulation par gramps) ou
+en \fIstderr\fR (si elles ne sont pas le fait d'une manipulation). Utilisez les shell de redirection de
+ \fIstdout\fR et \fIstderr\fR pour sauver les messages et les erreurs dans les fichiers.
+
+.SH EXEMPLES
 .TP
-.B \fBCONCEPTS\fP
-Gramps est un système basé sur le support de plugin\-python, permettant
-d\(aqimporter et d\(aqexporter, la saisie, générer des rapports, des outils,
-et afficher des filtres pouvant être ajoutés sans modifier le programme.
-.sp
-Par ailleurs, gramps permet la génération directe : impression, rap‐
-ports avec sortie vers d\(aqautres formats, comme \fILibreOffice.org\fP ,
-\fIHTML\fP , ou \fILaTeX\fP pour permettre à l\(aqutilisateur de choisir selon ses
-besoins
-.UNINDENT
-.sp
-\fBBUGS CONNUS ET LIMITATIONS\fP
-.sp
-\fBFICHIERS\fP
-.INDENT 0.0
-.INDENT 3.5
-\fI${PREFIX}/bin/gramps\fP
-.sp
-\fI${PREFIX}/lib/python3/dist\-packages/gramps/\fP
-.sp
-\fI${PREFIX}/share/\fP
-.sp
-\fI${HOME}/.gramps\fP
-.UNINDENT
-.UNINDENT
-.INDENT 0.0
+Pour ouvrir un arbre familial et y importer un fichier XML, on peut saisir: 
+\fBgramps\fR \fB\-O\fR \fI'Mon Arbre Familal'\fR \fB\-i\fR \fI~/db3.gramps\fR
+.TP 
+Ceci ouvre un arbre familal, pour faire la même chose, mais importer dans un arbre familial temporaire et démarrer une session interactive, on peut saisir: 
+\fBgramps\fR \fB\-i\fR \fI'Mon Arbre Familal'\fR \fB\-i\fR \fI~/db3.gramps\fR
+.TP  
+Lecture de quatre bases de données dont les formats peuvent être devinés d'après les noms, puis vérification des données: 
+\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-i\fR \fIfile4.wft\fR \fB\-a\fR \fIcheck\fR 
+.TP 
+Si vous voulez préciser les formats de fichiers dans l'exemple ci-dessus, complétez les noms de fichiers par les options \fB\-f\fR appropriées: 
+\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-f\fR \fIgedcom\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-f\fR \fIgramps-pkg\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-f\fR \fIgramps-xml\fR \fB\-i\fR \fIfile4.wft\fR \fB\-f\fR \fIwft\fR  \fB\-a\fR \fIcheck\fR 
+.TP 
+Pour enregistrer le résultat des lectures, donnez l'option  \fB\-e\fR (utiliser \fB\-f\fR si le nom de fichier ne permet pas à gramps de deviner le format):
+\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-e\fR \fI~/new-package\fR \fB\-f\fR \fIgramps-pkg\fR 
+.TP 
+Pour lire trois ensembles de données puis lancer une session interactive de gramps sur le tout : 
+\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR 
+.TP 
+Pour lancer l'outil de vérification de la base de données depuis la ligne de commande et obtenir le résultat: 
+\fBgramps\fR \fB\-O\fR \fIfile.grdb\fR \fB-a\fR \fItool\fR \fB-p\fR \fBname\fR=\fIverify\fR
 .TP
-.B \fBAUTEURS\fP
-Donald Allingham <\fI\%don@gramps\-project.org\fP>
-\fI\%http://gramps\-project.org/\fP
-.sp
-Cette page man a d\(aqabord été écrite par :
-Brandon L. Griffith <\fI\%brandon@debian.org\fP>
+Enfin, pour lancer une session interactive normale, entrer : \fBgramps\fR
+
+.SH VARIABLES D'ENVIRONMENT 
+Le programme vérifie si ces variables d'environnement sont déclarées:
+
+\fBLANG\fR - décrit, quelle langue est utilisée:
+Ex.: pour le français on peut définir fr_FR.UTF-8.
+
+\fBGRAMPSHOME\fR - si défini, force Gramps à utiliser un répertoire spécifique pour y conserver ses préférences et bases de données. Par défaut, cette variable n'est pas active et Gramps sait que les options et bases de données doivent être créées
+dans le répertoire par défaut de l'utilisateur (la variable d'environnement HOME pour Linux ou USERPROFILE pour Windows 2000/XP).
+
+.SH CONCEPTS
+Gramps est un système basé sur le support de plugin-python, permettant d'importer et d'exporter, la saisie, 
+générer des rapports, des outils, et afficher des filtres pouvant être ajoutés sans modifier le programme.
+.LP 
+Par ailleurs, gramps permet la génération directe : impression, rapports avec sortie vers d'autres formats, comme \fIOpenOffice.org\fR, \fIAbiWord\fR, HTML, 
+ou LaTeX pour permettre à l'utilisateur de choisir selon ses besoins 
+
+.SH BUGS CONNUS ET LIMITATIONS
+
+.SH FICHIERS
+.LP 
+\fI${PREFIX}/bin/gramps\fP 
+.br 
+\fI${PREFIX}/share/gramps\fP
+.br 
+\fI${HOME}/.gramps\fP 
+
+.SH AUTEURS
+Donald Allingham \fI<don@gramps-project.org>\fR
+.br 
+\fIhttp://gramps.sourceforge.net\fR
+.LP 
+Cette page man a d'abord été écrite par:
+.br 
+Brandon L. Griffith \fI<brandon@debian.org>\fR
+.br
 pour Debian GNU/Linux système.
-.sp
-Cette page man est maintenue par :
-Gramps project <\fI\%xxx@gramps\-project.org\fP>
-.sp
-La traduction française :
-Jérôme Rapinat <\fI\%romjerome@yahoo.fr\fP>
-.TP
-.B \fBDOCUMENTATION\fP
-La documentation\-utilisateur est disponible par un navigateur
-standard sous la forme du manuel Gramps.
-.sp
-La documentation pour développeur est disponible sur le site
-\fI\%http://www.gramps\-project.org/wiki/index.php?title=Portal:Developers\fP .
-.UNINDENT
-.sp
-gramps(1)                 @VERSION@               gramps(1)
-.\" Generated by docutils manpage writer.
-.
+.LP 
+Cette page man est maintenue par:
+.br 
+Gramps project \fI<xxx@gramps-project.org>\fR
+.LP 
+La traduction française:
+.br 
+Jérôme Rapinat \fI<romjerome@yahoo.fr>\fR
+.br 
+
+.SH DOCUMENTATION
+La documentation-utilisateur est disponible par le navigateur d'aide de GNOME sous la forme du manuel Gramps. Ce manuel est également disponible sous format XML comme \fBgramps-manual.xml\fR sous \fIdoc/gramps-manual/$LANG\fR dans les sources officielles.
+.LP 
+La documentation pour développeur est disponible sur le site \fIhttp://developers.gramps-project.org\fR.
--- a/data/man/gramps.1.in
+++ b/data/man/gramps.1.in
@@ -1,335 +1,320 @@
-.\" Man page generated from reStructuredText.
-.
-.TH ENGLISH  "" "" ""
+.TH gramps 1 "@VERSION@" "January 2008" "@VERSION@"
 .SH NAME
-English \- 
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
-
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
+gramps \- Genealogical Research and Analysis Management Programming System.
+
+.SH SYNOPSIS
+.B gramps
+.RB [ \-?|\-\^\-help ]
+.RB [ \-\^\-usage ]
+.RB [ \-\^\-version ]
+.RB [ \-l ]
+.RB [ \-u|\-\^\-force-unlock ]
+.RB [ \-O|\-\^\-open=
+.IR DATABASE 
+.RB [ \-f|\-\^\-format= 
+.IR FORMAT ]] 
+.RB [ \-i|\-\^\-import=
+.IR FILE 
+.RB [ \-f|\-\^\-format= 
+.IR FORMAT ]] 
+.RB [ \-i|\-\^\-import= 
+.IR ... ] 
+.RB [ \-e|\-\^\-export= 
+.IR FILE
+.RB [ \-f|\-\^\-format= 
+.IR FORMAT ]] 
+.RB [ \-a|\-\^\-action= 
+.IR ACTION ]
+.RB [ \-p|\-\^\-options= 
+.IR OPTIONSTRING ]]
+.RB [
+.IR FILE
+.RB ]
+.if 0 .RB [ bonobo\ options ]
+.if 0 .RB [ sound\ options ]
+.RB [ \-\-version ]
+
+.SH DESCRIPTION
+.PP 
+\fIGramps\fP is a Free/OpenSource genealogy program. It is written in Python, 
+using the GTK+/GNOME interface.
+Gramps should seem familiar to anyone who has used other genealogy programs 
+before such as \fIFamily Tree Maker (TM)\fR,  \fIPersonal Ancestral
+Files (TM)\fR, or the GNU Geneweb.
+It supports importing of the ever popular GEDCOM format which is used world 
+wide by almost all other genealogy software.
+
+.SH OPTIONS
+.TP 
+.BI gramps " FILE" 
+When \fIFILE\fR is given (without any flags) as a family tree name or as
+a family tree database directory, then it is opened and an interactive 
+session is started. If FILE is a file format understood by Gramps, an empty
+family tree is created  whose name is based on the \fIFILE\fP name
+and the data is imported into it. The rest of the
+options is ignored. This way of launching is suitable for using gramps
+as a handler for genealogical data in e.g. web browsers. This invocation
+can accept any data format native to gramps, see below.
+.br
+
+.TP 
+.BI \-f,\-\^\-format= " FORMAT"
+Explicitly specify format of \fIFILE\fR given by preceding
+.ig
+\fB\-O\fR,
 ..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
+\fB\-i\fR, or 
+\fB\-e\fR option. If the \fB\-f\fR option is not given for any \fIFILE\fR, 
+the format of that file is guessed according to its extension or MIME-type. 
+.br
+
+Formats 
+available for export are \fBgramps\-xml\fR (guessed if \fIFILE\fR ends with
+\fB.gramps\fR), \fBgedcom\fR (guessed if \fIFILE\fR ends with \fB.ged\fR), or
+any file export available through the Gramps plugin system.
+.br
+
+Formats 
+available for import are \fBgrdb\fR, \fBgramps\-xml\fR, \fBgedcom\fR,  
+\fBgramps\-pkg\fR (guessed if \fIFILE\fR ends with \fB.gpkg\fR), and
+\fBgeneweb\fR (guessed if \fIFILE\fR ends with \fB.gw\fR). 
+.br
+
+Formats available for export are
+.ig
+\fBgrdb\fR,
 ..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-.sp
-gramps(1)                @VERSION@               gramps(1)
-.INDENT 0.0
-.TP
-.B \fBNAME\fP
-gramps \- Genealogical Research and Analysis Management Programming Sys‐
-tem.
-.TP
-.B \fBSYNOPSIS\fP
-\fBgramps\fP [\fB\-?\fP | \fB\-\-help\fP] [\fB\-\-usage\fP] [\fB\-\-version\fP]
-[\fB\-l\fP] [\fB\-L\fP] [\fB\-u\fP | \fB\-\-force\-unlock\fP] [\fB\-O\fP | \fB\-\-open=\fP \fIDATABASE\fP
-[\fB\-f\fP | \fB\-\-format=\fP \fIFORMAT\fP] [\fB\-i\fP | \fB\-\-import=\fP \fIFILE\fP
-[\fB\-f\fP | \fB\-\-format=\fP \fIFORMAT\fP]] [\fB\-\-remove=\fP \fIFAMILY_TREE_PATTERN\fP]
-[\fB\-e\fP | \fB\-\-export=\fP \fIFILE\fP [\fB\-f\fP | \fB\-\-format=\fP \fIFORMAT\fP]]
-[\fB\-a\fP | \fB\-\-action=\fP \fIACTION\fP] [\fI\-p\fP | \fB\-\-options=\fP \fIOPTION‐
-STRING\fP]] [\fIFILE\fP] [\fB\-\-version\fP]
-.TP
-.B \fBDESCRIPTION\fP
-Gramps is a Free/OpenSource genealogy program. It is written in Python,
-using  the GTK+/GNOME interface.  Gramps should seem familiar to anyone
-who has used other genealogy programs before such as Family Tree  Maker
-(TM),   Personal Ancestral Files (TM), or the GNU Geneweb.  It supports
-importing of the ever popular GEDCOM format which is used world wide by
-almost all other genealogy software.
-.TP
-.B \fBOPTIONS\fP
-.INDENT 7.0
-.TP
-.B \fBgramps\fP \fIFILE\fP
-When \fIFILE\fP is given (without any flags) as a family tree name or
-as a family tree database directory, then it is opened and an
-interactive  session is started. If \fIFILE\fP is a file format under‐
-stood by Gramps, an empty family tree is created  whose name is
-based  on  the \fIFILE\fP name and the data is imported into it. The
-rest of the options is ignored. This way of launching is suit‐
-able for using gramps as a handler for genealogical data in e.g.
-web browsers. This invocation can accept any data format  native
-to gramps, see below.
-.TP
-.B \fB\-f\fP , \fB\-\-format=\fP \fIFORMAT\fP
-Explicitly specify format of \fIFILE\fP given by preceding \fB\-i\fP ,
-or \fB\-e\fP option. If the \fB\-f\fP option is not given for any
-\fIFILE\fP , the format of that file is guessed according to its extension
-or MIME\-type.
-.sp
-Formats  available for export are \fBgramps\-xml\fP (guessed if \fIFILE\fP
-ends with \fB\&.gramps\fP ), \fBgedcom\fP (guessed if \fIFILE\fP ends with
-\fB\&.ged\fP ), or any file export available through the Gramps plugin
-system.
-.sp
-Formats available for import are \fBgramps\-xml\fP , \fBgedcom\fP ,
-\fBgramps\-pkg\fP (guessed if \fIFILE\fP ends with \fB\&.gpkg\fP ),
-and \fBgeneweb\fP (guessed if \fIFILE\fP ends with \fB\&.gw\fP ).
-.sp
-Formats available for export are \fBgramps\-xml\fP , \fBgedcom\fP ,
-\fBgramps\-pkg\fP , \fBwft\fP (guessed if \fIFILE\fP ends with \fB\&.wft\fP ),
-\fBgeneweb\fP\&.
-.TP
-.B \fB\-l\fP
+\fBgramps\-xml\fR, \fBgedcom\fR,
+\fBgramps\-pkg\fR, \fBwft\fR (guessed if \fIFILE\fR ends with \fB.wft\fR),
+\fBgeneweb\fR, and \fBiso\fR (never guessed, always specify with
+\fB\-f\fR option).
+
+.TP 
+.BI \-l
 Print a list of known family trees.
+
 .TP
-.B \fB\-L\fP
-Print a detailed list of known family trees.
-.TP
-.B \fB\-u\fP , \fB\-\-force\-unlock\fP
+.BI \-u,\-\^\-force-unlock
 Unlock a locked database.
+
+.TP 
+.BI \-O,\-\^\-open= " DATABASE"
+Open \fIDATABASE\fR which must be an existing database directory or existing family tree name.
+If no action, import or export options are given on the command line then an interactive session is started using that database.
+
+.TP 
+.BI \-i,\-\^\-import= " FILE"
+Import data from \fIFILE\fR. If you haven't specified a database then a temporary database is used; this is deleted when you exit gramps.
+.br
+
+When more than one input file is given, each has to be preceded by \fB\-i\fR 
+flag. The files are imported in the specified order, 
+i.e. \fB\-i\fR \fIFILE1\fR \fB\-i\fR \fIFILE2\fR  
+and \fB\-i\fR \fIFILE2\fR \fB\-i\fR \fIFILE1\fR might produce different 
+gramps IDs in the resulting database. 
+
+.TP 
+.BI \-a,\-\^\-action= " ACTION"
+Perform \fIACTION\fR on the imported data. This is done after all imports
+are successfully completed. Currently available actions are 
+\fBsummary\fR (same as Reports->View->Summary), 
+\fBcheck\fR (same as Tools->Database Processing->Check and Repair), 
+\fBreport\fR (generates report), and
+\fBtool\fR (runs a plugin tool).
+Both \fBreport\fR and \fBtool\fR need the \fIOPTIONSTRING\fR supplied by the 
+\fB\-p\fR flag). 
+.br
+
+The \fIOPTIONSTRING\fR should satisfy the following conditions:
+.br
+It must not contain any spaces. 
+If some arguments need to include spaces, the string should
+be enclosed with quotation marks, i.e., follow the shell syntax.
+Option string is a list of pairs with name and value (separated by the 
+equality sign). The name and value pairs must be separated by commas.  
+.br
+
+Most of the report or tools options are specific for each report or tool. 
+However, there are some common options.
+
+.BI "name=name"
+.br
+This mandatory option determines which report or tool will be run.
+If the supplied \fIname\fR does not correspond to any available report or 
+tool, an error message will be printed followed by the list of
+available reports or tools (depending on the \fIACTION\fR).
+
+.BI "show=all"
+.br
+This will produce the list of names for all options available for a given 
+report or tool.
+
+.BI "show="optionname
+.br
+This will print the description of
+the functionality supplied by \fIoptionname\fR, as well as what are the
+acceptable types and values for this option.
+
+.br
+Use the above options to find out
+everything about a given report.  
+
+.LP
+When more than one output action is given, each has to be preceded 
+by \fB\-a\fR flag. The actions are performed one by one, in the specified order.
+
+.TP 
+.BI \-d,\-\^\-debug= " LOGGER_NAME"
+Enables debug logs for development and testing. Look at the source code for details
 .TP
-.B \fB\-O\fP , \fB\-\-open=\fP \fIDATABASE\fP
-Open \fIDATABASE\fP which  must be an existing database directory or
-existing family tree name. If no action, import or export
-options are given on the command line then an interactive ses‐
-sion is started using that database.
-.TP
-.B \fB\-i\fP , \fB\-\-import=\fP \fIFILE\fP
-Import data from \fIFILE\fP . If you haven\(aqt specified a database, then
-an empty database is created for you called Family Tree x
-(where x is an incrementing number).
-.sp
-When more than one input file is given, each has to be preceded
-by \fB\-i\fP flag. The files are imported in the specified order, i.e.
-\fB\-i\fP \fIFILE1\fP \fB\-i\fP \fIFILE2\fP and \fB\-i\fP \fIFILE2\fP \fB\-i\fP \fIFILE1\fP
-might produce different gramps IDs in the resulting database.
-.TP
-.B \fB\-e\fP , \fB\-\-export=\fP \fIFILE\fP
-Export data into \fIFILE\fP . For \fBgramps\-xml\fP , \fBgedcom\fP
-, \fBwft\fP , \fBgramps\-pkg\fP , and \fBgeneweb\fP , the \fIFILE\fP is the
-name of the resulting file.
-.sp
-When more than one output file is given, each has to be preceded
-by \fB\-e\fP flag. The files are written one by one, in the specified order.
-.TP
-.B \fB\-a\fP , \fB\-\-action=\fP \fIACTION\fP
-Perform \fIACTION\fP on the imported data. This is done after all
-imports are successfully completed. Currently available  actions
-are \fBsummary\fP (same  as  Reports\->View\->Summary), \fBcheck\fP (same as
-Tools\->Database Processing\->Check and Repair), \fBreport\fP (generates
-report),  and  tool  (runs a plugin tool).  Both \fBreport\fP and \fBtool\fP
-need the \fIOPTIONSTRING\fP supplied by the \fB\-p\fP flag).
-.sp
-The \fIOPTIONSTRING\fP should satisfy the following conditions:
-It must not contain any  spaces. If some arguments need to
-include spaces, the string should be enclosed with quotation
-marks, i.e., follow the shell syntax. Option string is a list
-of  pairs  with name and value (separated by the equality sign).
-The name and value pairs must be separated by commas.
-.sp
-Most of the report or tools options are specific for each report
-or tool. However, there are some common options.
-.sp
-\fBname=name\fP
-This mandatory option determines which report or tool will be
-run. If the supplied name does not correspond to any  available
-report or tool, an error message will be printed followed by the
-list of available reports or tools (depending on the \fIACTION\fP ).
-.sp
-\fBshow=all\fP
-This will produce the list of names for all options available
-for a given report or tool.
-.sp
-\fBshow=optionname\fP
-This will print the description of the functionality supplied by
-\fIoptionname\fP, as well as what are the acceptable types and  values
-for this option.
-.sp
-Use the above options to find out everything about a given
-report.
-.UNINDENT
-.sp
-When more than one output action is given, each has to be preceded  by
-\fB\-a\fP flag. The actions are performed one by one, in the specified order.
-.INDENT 7.0
-.TP
-.B \fB\-d\fP , \fB\-\-debug=\fP \fILOGGER_NAME\fP
-Enables debug logs for development and testing. Look at the
-source code for details
-.TP
-.B \fB\-\-version\fP
+.BI \-\^\-version
 Prints the version number of gramps and then exits
-.UNINDENT
+\" change 0 to 1 to enable output of OAF options
+.if 0 \{
+.PP
+The following options are used for Bonobo activation.
+.TP 
+.BI \-\^\-oaf-ior-fd= "FD"
+File descriptor to print the OAF IOR on
+.TP 
+.BI \-\^\-oaf-activate-iid= " IID"
+OAF IID to activate
+.TP 
+.BI \-\^\-oaf-private
+Prevent registering of server with OAF
+\}
+\" change 0 to 1 to enable output of Gnome sound options
+.if 0 \{
+.PP
+The following options are used for controlling sound using the Gnome Library.
 .TP
-.B \fBOperation\fP
-If the first argument on the command line does not start with dash
-(i.e. no flag), gramps will attempt to open the file with the name
-given by the first argument and start interactive session, ignoring the
-rest of the command line arguments.
-.sp
-If the  \fB\-O\fP flag is given, then gramps will try opening the supplied
-database and then work with that data, as instructed by the further
-command line parameters.
-.sp
-With or without the \fB\-O\fP flag, there could be multiple imports, exports,
-and actions specified further on the command line by using \fB\-i\fP ,
-\fB\-e\fP , and \fB\-a\fP flags.
-.sp
-The order of \fB\-i\fP , \fB\-e\fP , or \fB\-a\fP options does not matter. The actual order
-always is: all imports (if any) \-> all actions (if any) \-> all  exports
-(if any). But opening must always be first!
-.sp
-If no \fB\-O\fP or \fB\-i\fP option is given, gramps will launch its main window and
-start the usual interactive session with the empty database, since
-there is no data to process, anyway.
-.sp
-If no \fB\-e\fP  or \fB\-a\fP options are given, gramps will launch its main window
-and start the usual interactive session with the database resulted from
-all imports. This database resides in the \fBimport_db.grdb\fP under
-\fB~/.gramps/import\fP directory.
-.sp
-The error encountered during import, export, or action, will be  either
-dumped to stdout (if  these  are exceptions handled by gramps) or to
-\fIstderr\fP (if these are not handled). Use usual shell redirections of
-\fIstdout\fP and \fIstderr\fP to save messages and errors in files.
+.BI \-\^\-disable-sound
+Disable sound server usage
 .TP
-.B \fBEXAMPLES\fP
-To open an existing family tree and import an xml file into it, one
-may type:
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-O\fP \fI\(aqMy Family Tree\(aq\fP \fB\-i\fP \fI~/db3.gramps\fP
-.UNINDENT
-.UNINDENT
-.sp
-The above changes the opened family tree, to do the  same, but import
-both in a temporary family tree and start an interactive session, one
-may type:
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-i\fP \fI\(aqMy Family Tree\(aq\fP \fB\-i\fP \fI~/db3.gramps\fP
-.UNINDENT
-.UNINDENT
-.sp
-To import four databases (whose formats can be  determined from their
-names) and then check the resulting database for errors, one may type:
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-i\fP \fIfile1.ged\fP \fB\-i\fP \fIfile2.tgz\fP \fB\-i\fP \fI~/db3.gramps\fP
-\fB\-i\fP \fIfile4.wft\fP \fB\-a\fP \fIcheck\fP
-.UNINDENT
-.UNINDENT
-.sp
-To explicitly specify the formats in the above  example,  append  file‐
-names with appropriate \fB\-f\fP options:
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-i\fP \fIfile1.ged\fP \fB\-f\fP \fIgedcom\fP \fB\-i\fP \fIfile2.tgz\fP \fB\-f\fP
-\fIgramps\-pkg\fP \fB\-i\fP \fI~/db3.gramps\fP \fB\-f\fP \fIgramps\-xml\fP \fB\-i\fP \fIfile4.wft\fP
-\fB\-f\fP \fIwft\fP \fB\-a\fP \fIcheck\fP
-.UNINDENT
-.UNINDENT
-.sp
-To record the database resulting from all imports, supply \fB\-e\fP flag  (use
-\fB\-f\fP if the filename does not allow gramps to guess the format):
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-i\fP \fIfile1.ged\fP \fB\-i\fP \fIfile2.tgz\fP \fB\-e\fP \fI~/new\-package\fP
-\fB\-f\fP \fIgramps\-pkg\fP
-.UNINDENT
-.UNINDENT
-.sp
-To import three databases and start interactive gramps session with the
-result:
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-i\fP \fIfile1.ged\fP \fB\-i\fP \fIfile2.tgz\fP \fB\-i\fP \fI~/db3.gramps\fP
-.UNINDENT
-.UNINDENT
-.sp
-To run the Verify tool from the commandline and output the result to
-stdout:
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps \-O\fP \fI\(aqMy Family Tree\(aq\fP \fB\-a\fP \fItool\fP \fB\-p name=\fP \fIverify\fP
-.UNINDENT
-.UNINDENT
-.sp
-Finally, to start normal interactive session type:
-.INDENT 7.0
-.INDENT 3.5
-\fBgramps\fP
-.UNINDENT
-.UNINDENT
+.BI \-\^\-enable-sound
+Enable sound server usage
 .TP
-.B \fBENVIRONMENT VARIABLES\fP
+.BI \-\^\-espeaker= " HOSTNAME:PORT"
+Host:port on which the sound server to use is running
+\}
+
+.SH "Operation"
+.br
+If the first argument on the command line does not start with dash (i.e. no
+flag), gramps will attempt to open the file with the name given by the first
+argument and start interactive session, ignoring the rest of the command line
+arguments.
+
+.LP
+If the \fB\-O\fR flag is given, then gramps will try opening
+the supplied database and then work with that data, as instructed by the
+further command line parameters.
+
+.LP
+With or without the \fB\-O\fR flag, there could be multiple imports,
+exports, and actions specified further on the command line by using \fB\-i\fR,
+\fB\-e\fR, and \fB\-a\fR flags.  
+
+.LP
+The order of \fB\-i\fR, \fB\-e\fR, or \fB\-a\fR options does not matter. The
+actual order always is: all imports (if any) -> all actions (if any)
+-> all exports (if any). But opening must always be first!
+
+.LP
+If no \fB\-O\fR or \fB\-i\fR option is given, gramps will launch its main 
+window and start the usual interactive session with the empty database,
+since there is no data to process, anyway.
+
+.LP
+If no \fB\-e\fR or \fB\-a\fR options are given, gramps will launch its main 
+window and start the usual interactive session with the database resulted 
+from all imports. This database resides in the \fBimport_db.grdb\fR
+under \fB~/.gramps/import\fR directory.
+
+.LP
+The error encountered during import, export, or action, will be either 
+dumped to \fIstdout\fR (if these are exceptions handled by gramps) or 
+to \fIstderr\fR (if these are not handled). Use usual shell redirections 
+of \fIstdout\fR and \fIstderr\fR to save messages and errors in files. 
+
+.SH EXAMPLES
+.TP 
+To open an existing family tree and import an xml file  into it, one may type: 
+\fBgramps\fR \fB\-O\fR \fI'My Family Tree'\fR \fB\-i\fR \fI~/db3.gramps\fR
+.TP 
+The above changes the opened family tree, to do the same, but import both in a temporary family tree and start an interactive session, one may type: 
+\fBgramps\fR \fB\-i\fR \fI'My Family Tree'\fR \fB\-i\fR \fI~/db3.gramps\fR
+.TP 
+To import four databases (whose formats can be determined from their names) and then check the resulting database for errors, one may type: 
+\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-i\fR \fIfile4.wft\fR \fB\-a\fR \fIcheck\fR 
+.TP 
+To explicitly specify the formats in the above example, append filenames with appropriate \fB\-f\fR options: 
+\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-f\fR \fIgedcom\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-f\fR \fIgramps-pkg\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-f\fR \fIgramps-xml\fR \fB\-i\fR \fIfile4.wft\fR \fB\-f\fR \fIwft\fR  \fB\-a\fR \fIcheck\fR 
+.TP 
+To record the database resulting from all imports, supply \fB\-e\fR flag (use \fB\-f\fR if the filename does not allow gramps to guess the format):
+\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-e\fR \fI~/new-package\fR \fB\-f\fR \fIgramps-pkg\fR 
+.TP 
+To import three databases and start interactive gramps session with the result: 
+\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR 
+.TP 
+To run the Verify tool from the commandline and output the result to stdout: 
+\fBgramps\fR \fB\-O\fR \fI'My Family Tree'\fR \fB-a\fR \fItool\fR \fB-p\fR \fBname\fR=\fIverify\fR
+.TP 
+Finally, to start normal interactive session type: 
+\fBgramps\fR 
+
+.SH ENVIRONMENT VARIABLES
 The program checks whether these environment variables are set:
-.sp
-\fBLANG\fP  \-  describe, which language to use: Ex.: for polish language this
-variable has to be set to pl_PL.UTF\-8.
-.sp
-\fBGRAMPSHOME\fP \- if set, force Gramps to use  the  specified  directory  to
-keep program settings and databases there. By default, this variable is
-not set and gramps assumes that the folder with all databases and  pro‐
-file  settings  should  be  created  within  the  user  profile  folder
-(described by environment variable HOME for Linux  or  USERPROFILE  for
-Windows 2000/XP).
-.TP
-.B \fBCONCEPTS\fP
-Supports a python\-based plugin system, allowing import and export writ‐
-ers, report generators, tools, and display filters to be added  without
-modification of the main program.
-.sp
-In addition to generating direct printer output, report generators also
-target other systems, such as \fILibreOffice.org\fP , \fIAbiWord\fP , \fIHTML\fP,
-or \fILaTeX\fP to allow the users to modify the format to suit their needs.
-.UNINDENT
-.sp
-\fBKNOWN BUGS AND LIMITATIONS\fP
-.sp
-\fBFILES\fP
-.INDENT 0.0
-.INDENT 3.5
-\fI${PREFIX}/bin/gramps\fP
-.sp
-\fI${PREFIX}/lib/python3/dist\-packages/gramps/\fP
-.sp
-\fI${PREFIX}/share/\fP
-.sp
-\fI${HOME}/.gramps\fP
-.UNINDENT
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \fBAUTHORS\fP
-Donald Allingham <\fI\%don@gramps\-project.org\fP>
-\fI\%http://gramps\-project.org/\fP
-.sp
+
+\fBLANG\fR - describe, which language to use:
+Ex.: for polish language this variable has to be set to pl_PL.UTF-8.
+
+\fBGRAMPSHOME\fR - if set, force Gramps to use the specified directory to keep 
+program settings and databases there. By default, this variable is not set and 
+gramps assumes that the folder with all databases and profile settings 
+should be created within the user profile folder (described by environment 
+variable HOME for Linux or USERPROFILE for Windows 2000/XP).
+
+.SH CONCEPTS
+Supports a python\-based plugin system, allowing import and export writers, 
+report generators, tools, and display filters to be added without modification 
+of the main program.
+.LP 
+In addition to generating direct printer output, report generators also 
+target other systems, such as \fIOpenOffice.org\fR, \fIAbiWord\fR, HTML, 
+or LaTeX to allow the users to modify the format to suit their needs. 
+
+.SH KNOWN BUGS AND LIMITATIONS
+
+.SH FILES
+.LP 
+\fI${PREFIX}/bin/gramps\fP 
+.br 
+\fI${PREFIX}/share/gramps\fP
+.br 
+\fI${HOME}/.gramps\fP 
+
+.SH AUTHORS
+Donald Allingham \fI<don@gramps-project.org>\fR
+.br 
+\fIhttp://gramps.sourceforge.net\fR
+.LP 
 This man page was originally written by:
-Brandon L. Griffith <\fI\%brandon@debian.org\fP>
+.br 
+Brandon L. Griffith \fI<brandon@debian.org>\fR
+.br
 for inclusion in the Debian GNU/Linux system.
-.sp
+.LP 
 This man page is currently maintained by:
-Gramps project <\fI\%xxx@gramps\-project.org\fP>
-.TP
-.B \fBDOCUMENTATION\fP
-The user documentation is available through standard web browser
-in the form of Gramps Manual.
-.sp
+.br 
+Gramps project \fI<xxx@gramps-project.org>\fR
+.br 
+
+.SH DOCUMENTATION
+The user documentation is available through standard GNOME Help browser 
+in the form of Gramps Manual. The manual is also available in XML format
+as \fBgramps-manual.xml\fR under \fIdoc/gramps-manual/$LANG\fR in the official
+source distribution.
+.LP 
 The developer documentation can be found on the
-\fI\%http://www.gramps\-project.org/wiki/index.php?title=Portal:Developers\fP
-portal.
-.UNINDENT
-.sp
-gramps(1)                 @VERSION@               gramps(1)
-.\" Generated by docutils manpage writer.
-.
+\fIhttp://developers.gramps-project.org\fR site. 
--- a/data/man/index.rst
+++ b/data/man/index.rst
@@ -1,22 +0,0 @@
-.. Gramps documentation master file, created by
-   sphinx-quickstart on Sat Dec 1 00:07:37 2012.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Welcome to Gramps' command line documentation!
-==============================================
-
-Contents:
-
-.. toctree::
-   :maxdepth: 2
-
-   en
-   cs/cs
-   fr/fr
-   nl/nl
-   pl/pl
-   pt_BR/pt_BR
-   sv/sv
-
-
--- a/data/man/nl/Makefile.am
+++ b/data/man/nl/Makefile.am
@@ -0,0 +1,15 @@
+# This is the data/man/nl level Makefile for Gramps
+# $Id: Makefile.am 9819 2008-01-15 15:42:10Z bmcage $
+
+mandir = @mandir@/nl
+
+man_IN_FILES = gramps.1.in
+man_MANS = $(man_IN_FILES:.1.in=.1)
+
+EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
+
+gramps.1: $(top_builddir)/config.status gramps.1.in
+	cd $(top_builddir) && CONFIG_FILES=data/man/nl/$@ $(SHELL) ./config.status
+
+CLEANFILES=$(man_MANS)
+
--- a/data/man/nl/conf.py
+++ b/data/man/nl/conf.py
@@ -1,243 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Gramps documentation build configuration file, created by
-# sphinx-quickstart on Sat Dec  1 14:38:29 2012.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'nl'
-
-# General information about the project.
-project = u'Gramps'
-copyright = u'2015, Gramps project'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '4.2'
-# The full version, including alpha/beta/rc tags.
-release = '4.2.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-locale_dirs = './locale'
-gettext_compact = True
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'Grampsdoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'Gramps.tex', u'Gramps Documentation',
-   u'.', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('nl', 'gramps', u'Gramps Documentation',
-     [u'.'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'Gramps', u'Gramps Documentation',
-   u'.', 'Gramps', 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
--- a/data/man/nl/nl.rst
+++ b/data/man/nl/nl.rst
@@ -1,266 +0,0 @@
-Dutch
-======
-
-gramps(1)			     3.4.0			     gramps(1)
-
-
-
-**NAAM**
-       gramps - Genealogisch Onderzoek en Analyse Beheersysteem.
-
-
-**SAMENVATTING**
-       gramps  [-?|--help]  [--usage]  [--version] [-O|--open= GEGEVENSBESTAND
-       [-f|--format= FORMAAT]] [-i|--import= BESTAND  [-f|--format=  FORMAAT]]
-       [-i|--import=   ...]   [-e|--export=  BESTAND  [-f|--format=  FORMAAT]]
-       [-a|--action= ACTIE] [-p|--options= OPTIESTRING]] [ BESTAND  ]  [--ver‐
-       sion]
-
-
-**BESCHRIJVING**
-       Gramps  is  een	Free/OpenSource  genealogisch programma dat in Python,
-       geschreven is en gebruik maakt van de GTK+/GNOME interface.  Gramps zal
-       voor iedereen die al gewerkt heeft met andere genealogische programma's
-       zoals Family Tree Maker (TM),  Personal Ancestral  Files  (TM)  of  GNU
-       Geneweb.   Importeren vanuit het gekende GEDCOM-formaat wordt onderste‐
-       und. Dit formaat wordt wereldwijd gebruikt door bijna alle  genealogis‐
-       che software.
-
-
-**OPTIES**
-       **gramps** *BESTAND*
-	      Wanneer *BESTAND* opgegeven wordt (zonder vlaggen) als een famili‐
-	      estamboom of als een familistamboommap, dan  wordt  dit  bestand
-	      geopend en een interactieve sessie wordt gestart. Indien BESTAND
-	      een bestandsformaat dat door Gramps herkent wordt, zal een  lege
-	      familiestamboom	aangemaakt   worden.   De  bestandsnaam  wordt
-	      gebaseerd op de *BESTAND*  naam  en  de  gegevens  worden  in  dit
-	      bestand  geïmporteerd. Met resterende opties wordt geen rekening
-	      gehouden. Deze wijze van opstarten is zeer bruikbaar  om	Gramps
-	      te  gebruiken  voor  genealogische  gegevens via een webbrowser.
-	      Deze opstartmethode kan gelijk welk  gegevensformaat  eigen  aan
-	      Gramps behandelen, zie onder.
-
-
-       **-f** , **--format=** *FORMAAT*
-	      Expliciet  een formaat opgeven voor BESTAND door de optie -i, of
-	      -e mee te geven. Indien de -f optie niet	opgegeven  wordt  voor
-	      BESTAND,	wordt  het formaat gebaseerd op de bestandsextensie of
-	      het MIME-type.
-
-	      Formaten beschikbaar voor uitvoer zijn  gramps-xml  (guessed  if
-	      FILE  ends  with	.gramps),  gedcom  (guessed  if FILE ends with
-	      .ged), or any file export available through  the	Gramps	plugin
-	      system.
-
-	      Formats  available  for  import  are  grdb,  gramps-xml, gedcom,
-	      gramps-pkg (guessed  if  FILE  ends  with  .gpkg),  and  geneweb
-	      (guessed if FILE ends with .gw).
-
-	      Formats available for export are gramps-xml, gedcom, gramps-pkg,
-	      wft (guessed if FILE ends with .wft), geneweb,  and  iso	(never
-	      guessed, always specify with -f option).
-
-
-       **-O** , **--open=** *DATABASE*
-          Open *DATABASE* which  must be an existing database directory or
-          existing family tree name. If no action, import or export
-          options are given on the command line then an interactive ses‐
-          sion is started using that database.
-
-
-       **-i** , **--import=** *FILE*
-          Import data from *FILE* . If you haven't specified a database then
-          a  temporary database is used; this is deleted when you exit
-          gramps.
-
-          When more than one input file is given, each has to be preceded
-          by **-i** flag. The files are imported in the specified order, i.e.
-          **-i** *FILE1* **-i** *FILE2* and **-i** *FILE2* **-i** *FILE1* 
-          might produce different gramps IDs in the resulting database.
-
-
-       **-a** , **--action=** *ACTION*
-          Perform *ACTION* on the imported data. This is done after all
-          imports are successfully completed. Currently available  actions
-          are **summary** (same  as  Reports->View->Summary), **check** (same as
-          Tools->Database Processing->Check and Repair), **report** (generates
-          report),  and  tool  (runs a plugin tool).  Both **report** and **tool**
-          need the *OPTIONSTRING* supplied by the **-p** flag).
-
-          The *OPTIONSTRING* should satisfy the following conditions:
-          It must not contain any  spaces. If some arguments need to
-          include spaces, the string should be enclosed with quotation
-          marks, i.e., follow the shell syntax. Option string is a list
-          of  pairs  with name and value (separated by the equality sign).
-          The name and value pairs must be separated by commas.
-
-          Most of the report or tools options are specific for each report
-          or tool. However, there are some common options.
-
-          **name=name**
-          This mandatory option determines which report or tool will be
-          run. If the supplied name does not correspond to any  available
-          report or tool, an error message will be printed followed by the
-          list of available reports or tools (depending on the *ACTION* ).
-
-          **show=all**
-          This will produce the list of names for all options available
-          for a given report or tool.
-
-          **show=optionname**
-          This will print the description of the functionality supplied by
-          *optionname*, as well as what are the acceptable types and  values
-          for this option.
-
-          Use the above options to find out everything about a given
-          report.
-
-
-       When more than one output action is given, each has to be preceded  by
-       **-a** flag. The actions are performed one by one, in the specified order.
-
-
-       **-d** , **--debug=** *LOGGER_NAME*
-          Enables debug logs for development and testing. Look at the
-          source code for details
-
-       **--version**
-          Prints the version number of gramps and then exits
-
-
-
-
-**werking**
-       Indien het eerste argument in de opdrachtregel niet start met dash (dus
-       geen vlag) dan zal Gramps trachten om het bestand  te  openen  met  een
-       naam  die  in  het eerste argument werd opgegeven. Vervolgens wordt een
-       interactieve  sessie  gestart  en  de   overige	 argumenten   van   de
-       opdrachtregel worden genegeerd.
-
-       If the  **-O** flag is given, then gramps will try opening the supplied
-       database and then work with that data, as instructed by the further
-       command line parameters.
-
-
-       With or without the **-O** flag, there could be multiple imports, exports,
-       and actions specified further on the command line by using **-i** , 
-       **-e** , and **-a** flags.
-
-
-       The order of **-i** , **-e** , or **-a** options does not matter. The actual order
-       always is: all imports (if any) -> all actions (if any) -> all  exports
-       (if any). But opening must always be first!
-
-
-       If no **-O** or **-i** option is given, gramps will launch its main window and
-       start the usual interactive session with the empty database, since
-       there is no data to process, anyway.
-
-
-       If no **-e**  or **-a** options are given, gramps will launch its main window
-       and start the usual interactive session with the database resulted from
-       all imports. This database resides in the **import_db.grdb** under
-       **~/.gramps/import** directory.
-
-
-       The error encountered during import, export, or action, will be  either
-       dumped to stdout (if  these  are exceptions handled by gramps) or to
-       *stderr* (if these are not handled). Use usual shell redirections of
-       *stdout* and *stderr* to save messages and errors in files.
-
-
-**EXAMPLES**
-       To open an existing family tree and import an xml file into it, one
-       may type:
-          
-          **gramps -O** *'My Family Tree'* **-i** *~/db3.gramps*
-
-       The above changes the opened family tree, to do the  same, but import
-       both in a temporary family tree and start an interactive session, one
-       may type:
-       
-          **gramps -i** *'My Family Tree'* **-i** *~/db3.gramps*
-
-       To import four databases (whose formats can be  determined from their
-       names) and then check the resulting database for errors, one may type:
-       
-          **gramps -i** *file1.ged* **-i** *file2.tgz* **-i** *~/db3.gramps* 
-          **-i** *file4.wft* **-a** *check*
-
-       To explicitly specify the formats in the above  example,  append  file‐
-       names with appropriate **-f** options:
-          
-          **gramps -i** *file1.ged* **-f** *gedcom* **-i** *file2.tgz* **-f** 
-          *gramps-pkg* **-i** *~/db3.gramps* **-f** *gramps-xml* **-i** *file4.wft*
-          **-f** *wft* **-a** *check*
-
-       To record the database resulting from all imports, supply **-e** flag  (use
-       **-f** if the filename does not allow gramps to guess the format):
-       
-          **gramps -i** *file1.ged* **-i** *file2.tgz* **-e** *~/new-package*
-          **-f** *gramps-pkg*
-
-       To import three databases and start interactive gramps session with the
-       result:
-          
-          **gramps -i** *file1.ged* **-i** *file2.tgz* **-i** *~/db3.gramps*
-
-       To run the Verify tool from the commandline and output the result to
-       stdout:
-       
-          **gramps -O** *'My Family Tree'* **-a** *tool* **-p name=** *verify*
-
-       Finally, to start normal interactive session type:
-       
-          **gramps**
-
-
-**CONCEPTEN**
-       Ondersteuning van een op python-gebaseerd plugin systeem. Dit laat  toe
-       om verslagen, hulpgereedschappen en vensterfilters toe te voegen zonder
-       dat het hoofdprogramma dient aangepast.
-
-       De klassieke uitdrukken zijn mogelijk, maar daar  bovenover  kunnen  de
-       meeste  verslagen  ook gebruik maken van OpenOffice.org, AbiWord, HTML,
-       of LaTeX. Zo kunnen gebruikers het formaat wijzigen naar eigen wens.
-
-
-**GEKENDE BUGS EN BEPERKINGEN**
-
-**BESTANDEN**
-
-       *${PREFIX}/bin/gramps*
-       
-       *${PREFIX}/lib/python/dist-packages/gramps/*
-       
-       *${PREFIX}/share/*
-       
-       *${HOME}/.gramps*
-
-
-**AUTEURS**
-       Donald Allingham <don@gramps-project.org>
-       http://gramps-project.org/
-
-       Deze man pagina werd oorspronkelijk geschreven door:
-       Brandon L. Griffith <brandon@debian.org>
-       voor het Debian GNU/Linux systeem.
-
-       Deze man pagina wordt momenteel onderhouden door:
-       Alex Roitman <shura@gramps-project.org>
-
-       Deze nederlandstalige man pagina wordt momenteel onderhouden door:
-       Erik De Richter <frederik.de.richter@pandora.be>
-
-
-**DOCUMENTATIE**
-       De gebruikersdocumentatie is beschikbaar via browser in de webstek.
-
-       De  ontwikkelingsdocumentatie kan gevonden worden op de 
-       http://www.gramps-project.org/wiki/index.php?title=Portal:Developers 
-       webstek.
-
-
-
-August 2005			     4.0.0			     gramps(1)
--- a/data/man/pl/Makefile.am
+++ b/data/man/pl/Makefile.am
@@ -0,0 +1,14 @@
+# This is the data/man/sv level Makefile for Gramps
+# $Id: Makefile.am 6189 2006-03-21 19:05:46Z rshura $
+
+man_IN_FILES = gramps.1.in
+man_MANS = $(man_IN_FILES:.1.in=.1)
+
+mandir = @mandir@/pl
+
+EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
+
+gramps.1: $(top_builddir)/config.status gramps.1.in
+	cd $(top_builddir) && CONFIG_FILES=data/man/pl/$@ $(SHELL) ./config.status
+
+CLEANFILES=$(man_MANS)
--- a/data/man/pl/conf.py
+++ b/data/man/pl/conf.py
@@ -1,243 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Gramps documentation build configuration file, created by
-# sphinx-quickstart on Sat Dec  1 14:38:29 2012.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'pl'
-
-# General information about the project.
-project = u'Gramps'
-copyright = u'2015, Gramps project'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '4.2'
-# The full version, including alpha/beta/rc tags.
-release = '4.2.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-locale_dirs = './locale'
-gettext_compact = True
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'Grampsdoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'Gramps.tex', u'Gramps Documentation',
-   u'.', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('pl', 'gramps', u'Gramps Documentation',
-     [u'.'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'Gramps', u'Gramps Documentation',
-   u'.', 'Gramps', 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
--- a/data/man/pl/pl.rst
+++ b/data/man/pl/pl.rst
@@ -1,308 +0,0 @@
-Polish
-=======
-
-gramps(1)			     3.4.0			     gramps(1)
-
-
-
-**NAME**
-       gramps - Genealogical Research and Analysis Management Programming Sys‐
-       tem.
-       (w wolnym tłumaczeniu: System Wspomagania Badań Genealogicznych i  Pro‐
-       gramowego Zarządzania Tą Informacją)
-
-
-**SYNOPSIS**
-       gramps	[-?|--help]  [--usage]	[--version]  [-l]  [-u|--force-unlock]
-       [-O|--open=  BAZA_DANYCH  [-f|--format=	FORMAT]]  [-i|--import=   PLIK
-       [-f|--format=   FORMAT]]   [-i|--import=   ...]	  [-e|--export=   PLIK
-       [-f|--format= FORMAT]] [-a|--action= AKCJA] [-p|--options= CIĄG_OPCJI]]
-       [ PLIK ] [--version]
-
-
-**OPIS**
-       Gramps  jest wolnym, darmowym programem genealogicznym OpenSource. Jest
-       napisany w Python, przy użyciu interfejsu GTK+/GNOME.  Dla każdego, kto
-       wcześniej  używał  innego  programu  genealogicznego  (np.  Family Tree
-       Maker (TM),  Personal Ancestral Files (TM), lub	GNU  Geneweb),	zapoz‐
-       nanie  się  z  interfejsem  Gramps'a  będzie  natychmiastowe.   Program
-       obsługuje także import i eksport w popularnym  formacie	GEDCOM,  który
-       jest używany przez większość programów genealogicznych na świecie.
-
-
-**OPCJE**
-       **gramps** *PLIK*
-	      Kiedy *PLIK* jest  podany  (bez  żadnych flag) jako nazwa drzewa
-	      rodzinnego albo nazwa katalogu z drzewem, to wybrane drzewo jest
-	      otwierane  i  rozpoczynana  jest	sesja interaktywna. Jeśli PLIK
-	      jest formatem rozpoznawanym przez Gramps, to tworzone jest puste
-	      drzewo,  którego nazwa bazuje na nazwie PLIKU i dane są do niego
-	      importowane. Pozostałe  opcje  są  wtedy	ignorowane.   Jest  to
-	      sposób  na  używanie  programu  jako  uchwytu obsługującego dane
-	      genealogiczne, np. w przeglądarce internetowej. Takie  wywołanie
-	      akceptuje każdy format natywny dla grampsa, zobacz poniżej.
-
-
-       **-f** , **--format=** *FORMAT*
-	      Jawne  określenie formatu PLIKU przez poprzedzenie opcji -i, lub
-	      -e.  Jeśli opcja -f nie jest podana dla żadnego PLIKU, to format
-	      pliku jest określany na podstawie rozszerzenia albo typu MIME.
-
-	      Dostępne formaty wyjściowe to:
-	      gramps-xml (używany jeśli PLIK kończy się na .gramps),
-	      gedcom (przyjmowany jeśli PLIK kończy się na .ged),
-	      lub  dowolny  plik  eksportu  obsługiwany  przez	system wtyczek
-	      Gramps.
-
-	      Formaty dostępne dla importu to: grdb, gramps-xml, gedcom,
-	      gramps-pkg (przyjmowany jeśli PLIK kończy się na .gpkg),
-	      oraz geneweb (przyjmowany jeśli PLIK ma rozszerzenie .gw).
-
-	      Formats  dostępne   dla	eksportu   to:	 gramps-xml,   gedcom,
-	      gramps-pkg,  wft	(jeśli rozszerzenie PLIKU to .wft), geneweb, i
-	      iso (używany tylko, jeśli jawnie określony przez parametr -f ).
-
-
-       **-l**     
-          Wyświetla listę dosŧępnych drzew genealogicznych.
-
-
-       **-u** , **--force-unlock**
-	      Wymusza odblokowanie bazy danych.
-
-
-       **-O** , **--open=** *BAZA_DANYCH*
-	      Otwiera *BAZĘ_DANYCH* , która musi istnieć w katalogu baz  lub  być
-	      nazwą istniejącego drzewa rodzinnego. Jeśli nie podano akcji, to
-	      opcje eksportu albo importu  są  wykonywane,  a  następnie  jest
-	      uruchamiana sesja interaktywna z otwarciem wybranej bazy.
-
-
-       **-i** , **--import=** *PLIK*
-	      Importuje  dane  z *PLIKU* . Jeśli  nie określono bazy danych, to
-	      tworzona jest tymczasowa baza kasowana po zamknięciu programu.
-
-	      Kiedy podany jest więcej niż jeden plik do importu, to  każdy  z
-	      nich musi być poprzedzony flagą -i. Pliki są importowane w kole‐
-	      jności podanej w linii poleceń, np.:  -i PLIK1 -i PLIK2 oraz  -i
-	      PLIK2  -i  PLIK1 mogą utworzyć inne identyfikatory (gramps ID) w
-	      bazie wynikowej.
-
-
-       **-e** , **--export=** *PLIK*
-	      Eksportuje dane do *PLIKU* . Dla formatu iso, PLIK natomiast  nazwą
-	      katalogu,  do którego baza danych gramps zostanie zapisana.  Dla
-	      gramps-xml, gedcom, wft, gramps-pkg,  oraz  geneweb,  PLIK  jest
-	      nazwą pliku wynikowego.
-
-	      Kiedy  więcej  niż  jeden plik wyjściowy jest podany, każdy musi
-	      być poprzedzony flagą  -e.  Pliki  będą  zapisywane  kolejno,  w
-	      podanej przez parametry kolejności.
-
-
-       **-a** , **--action=** *AKCJA*
-	      Wykonuje	AKCJĘ  na  zaimportowanych  danych.  Działanie to jest
-	      wykonywane dopiero, gdy wszystkie określone importy zakończą się
-	      powodzeniem. Aktualnie dostępne akcje to:
-	      summary  (taka  sama  jak  Raporty->Wyświetl->Podsumowanie  bazy
-	      danych),
-	      check  (tożsama  z  Narzędzia->Naprawa  bazy  danych->Sprawdź  i
-	      napraw bazę),
-	      report (generuje raport), oraz
-	      tool  (uruchamia	narzędzie/wtyczkę).  Zarówno report jak i tool
-	      wymagają podania CIĄGU_OPCJI poprzedzonego flagą -p ).
-
-	      CIĄG_OPCJI powinien spełniać następujące warunki:
-	      Nie może zawierać spacji.   Jeśli  niektóre  argumenty  wymagają
-	      spacji,  ciąg  powinien  być enkapsulowany w znakach cudzysłowu,
-	      (zobacz składnię powłoki). Ciąg opcji jest  listą  parametrów  z
-	      nazwą i wartością oddzielonymi znakiem równości. Kolejne parame‐
-	      try muszą być oddzielone od siebie znakiem przecinka.
-
-	      Większość opcji dla raportów czy narzędzi jest  specyficzna  dla
-	      konkretnej opcji, jednak część z opcji jest wspólna, szczególnie
-	      dla raportów.
-
-	      **name=nazwa**
-	      Opcja wymagana, określający który raport	czy  narzędzie	będzie
-	      uruchamiane.   Jeśli  podana wartość nazwy nie pasuje do żadnego
-	      dostępnego raportu czy narzędzia, zostanie wyświetlony komunikat
-	      o   błędzie   oraz  lista  dostępnych  raportów  albo  opcji  (w
-	      zależności od wartości parametru AKCJA).
-
-	      **show=all**
-	      Wyświetla listę wszystkich nazw dostępnych opcji wraz z  krótkim
-	      opisem dla danego raportu albo narzędzia.
-
-	      **show=nazwa_opcji**
-	      Wyświetla opis funkcji udostępnianej przez daną nazwę_opcji, jak
-	      również listę parametrów, które akceptuje dana opcja.
-
-	      Używając powyższych opcji  jesteś  w  stanie  dowiedzieć	się  o
-	      wszystkich możliwościach danego raportu.
-
-
-       Kiedy  więcej  niż  jeden  akcja  wyjściowa jest podana, każda musi być
-       poprzedzona flagą -a. Akcje są wykonywane jedna	po  drugiej,  w  kole‐
-       jności w jakiej występują w linii poleceń.
-
-
-       **-d** , **--debug=** *NAZWA_LOGGERA*
-	      Włącza   logi   debuggowania   dla   celów  programistycznych  i
-	      testowych. Zobacz do kodu źródłowego po szczegóły.
-
-
-       **--version**
-	      Wyświetla wersję programu i kończy działanie.
-
-
-**Działanie**
-       Jeśli  pierwszy	argument nie rozpoczyna się znakiem myślnik, (nie jest
-       flagą), to gramps będzie próbował otworzyć plik podany  przez  pierwszy
-       argument, a następnie sesję interaktywną a pozostałą część parametrów w
-       linii poleceń zignoruje.
-
-
-       Jeśli podana jest flaga -O, będzie próbował otworzyć podaną bazę i pra‐
-       cować  na danych w niej zawartych realizując podane później polecenia z
-       linii komend.
-
-
-       Z flagą -O czy bez, może  występować  wiele  importów,  eksportów  oraz
-       akcji określonych za pomocą flag -i, -e, oraz -a .
-
-
-       Kolejność  podawania opcji -i, -e, czy -a nie ma znaczenia.  Wykonywane
-       są one zawsze w kolejności: wszystkie importy (jeśli podane) ->	wszys‐
-       tkie  akcje  (jeśli  podane)  ->  wszystkie eksporty (jeśli podane) Ale
-       otwarcie bazy zawsze musi być na pierwszym parametrem !
-
-
-       Jeśli nie podano opcji -O lub -i, gramps uruchomi swoje główne  okno  i
-       rozpocznie  normalną  sesję  interaktywną z pustą bazą danych (ponieważ
-       nie zdołał przetworzyć do niej żadnych danych).
-
-
-       Jeśli nie podano opcji-e albo -a gramps uruchomi swoje  głowne  okno  i
-       rozpocznie  normalną  sesję interaktywną z bazą będącą wynikiem wszyst‐
-       kich importów. Ta baza będzie znajdować się w  pliku  import_db.grdb  w
-       katalogu ~/.gramps/import.
-
-
-       Błąd podczas importu, eksportu albo dowolnej akcji będzie przekierowany
-       na stdout (jeśli wyjątek  zostanie  obsłużony  przez  gramps)  albo  na
-       stderr  (jeśli  nie  jest  obsłużony).  Użyj standardowych przekierowań
-       strumieni stdout oraz stderr jeśli chcesz zapisać wyświetlane  informa‐
-       cje i błędy do pliku.
-
-
-**PRZYKŁADY**
-       Aby  otworzyć  istniejące drzewo rodzinne i zaimportować dane do niego,
-       można wpisać:
-       
-	      gramps -O 'Moje drzewo' -i ~/db3.gramps
-
-       Powyższa opcja otwiera istniejące drzewo, ale gdy chcesz zrobić wykonać
-       taką samą  akcję  tworząc tymczasowe drzewo: wystarczy wpisać: 
-          
-          gramps -i 'Moje drzewo' -i ~/db3.gramps
-
-       Aby zaimportować cztery bazy (których formaty zostaną określone na pod‐
-       stawie ich  nazw)  i następnie sprawdić powstałą bazę pod kątem błędów,
-       należy wpisać: 
-          
-          gramps -i plik1.ged -i plik2.tgz -i  ~/db3.gramps
-	      -i plik4.wft -a check
-
-       Aby jawnie określić formaty w powyższym przykładzie, należy dodać nazwy
-       plików z odpowiednimi opcjami -f options: 
-       
-       gramps -i plik1.ged -f gedcom -i  plik2.tgz  -f  gramps-pkg  -i  
-       ~/db3.gramps -f gramps-xml -i plik4.wft -f wft -a check
-
-       Aby zachować bazę z wynikami wszystkich importów, należy dodać flagę -e
-       (należy użyć -f jeśli nazwa pliku nie pozwala gramps'owi na odgadnięcie
-       formatu wyjściowego):
-       
-	      gramps -i plik1.ged -i plik2.tgz -e ~/nowy-pakiet -f gramps-pkg
-
-       W celu zaimportwania trzech baz i  rozpoczęcia  sesji  interaktywnej  z
-       wynikiem importu należy użyć polecenia podobnego do poniższego: 
-       
-          gramps -i plik1.ged -i plik22.tgz -i ~/db3.gramps
-
-       Aby uruchomić narzędzie weryfikacji z linii poleceń i wyświetlić wyniki
-       na stdout: 
-       
-          gramps -O 'Moje drzewo' -a tool -p name=verify
-
-       Zawsze można też po prostu uruchomić sesję interaktywną wpisująć:
-       
-	      gramps
-
-
-**ZMIENNE ŚRODOWISKOWE**
-
-       Program	sprawdza  w systemie istnienie i wartości następujących zmien‐
-       nych:
-
-       **LANG** - określa ustawienia, jaki język zostanie wybrany.	Np.: polski to
-       pl_PL.UTF-8.
-
-       **GRAMPSHOME**  -  określa  folder, w którym będzie zapisywane ustawienia i
-       bazy programu. Domyślnie jest on nieustawiony, a program przyjmuje,  że
-       katalog z danymi zostanie utworzony w profilu użytkownika (zmienna HOME
-       pod Linuxem albo USERPROFILE pod Windows 2000/XP).
-
-
-
-**KONCEPCJA**
-       Obsługa systemu rozszerzeń bazującego  na  pythonie,  pozwalającego  na
-       dodawanie  formatów  importu  i eksportu zapisów, generatorów raportów,
-       narzędzi i filtrów wyświetlania bez modyfikowania głównego programu
-
-       Dodatkowo oprócz generowania standardowego wyjścia na drukarkę, raporty
-       mogą  także  być  generowane  dla  innch systemów i do innych formatów,
-       takich jak: OpenOffice.org, AbiWord,  HTML,  lub  LaTeX	aby  umożliwić
-       użytkownikm wybór formatu wyjściowego w zależności od ich potrzeb.
-
-
-**ZNANE BŁĘDY I OGRANICZENIA**
-       Prawdopodobne. Lista błędów i propozycji znajduje się na: 
-       http://www.gramps-project.org/wiki/index.php?title=Portal:Developers .
-
-
-**PLIKI**
-       
-       *${PREFIX}/bin/gramps*
-       
-       *${PREFIX}/lib/python/dist-packages/gramps/*
-       
-       *${PREFIX}/share/*
-       
-       *${HOME}/.gramps (jeśli nie użyta została  zmienna  środowiskowa	GRAMP‐
-       SHOME)*
-
-
-**AUTORZY**
-       Donald Allingham <don@gramps-project.org>
-       http://gramps-project.org/
-
-       Ta strona man jest tłumaczeniem strony man napisanej przez:
-       Brandon L. Griffith <brandon@debian.org>
-       dla systemu Debian GNU/Linux.
-
-       Ta strona aktualnie jest pod opeką:
-       Projekt Gramps<xxx@gramps-project.org>
-       Tłumaczenie na polski: Łukasz Rymarczyk <yenidai@poczta.onet.pl>
-
-
-**DOCUMENTATION**
-       Dokumentacja użytkownika jest dostępna poprzez standardową przeglądarkę.
-
-       Dokumentacja  dla  programistów	jest  dostępna	na  stronie  projektu:
-       http://www.gramps-project.org/wiki/index.php?title=Portal:Developers 
-
-
-
-January 2008			     4.0.0			     gramps(1)
--- a/data/man/pt_BR/conf.py
+++ b/data/man/pt_BR/conf.py
@@ -1,243 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Gramps documentation build configuration file, created by
-# sphinx-quickstart on Sat Dec  1 14:38:29 2012.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'pt_BR'
-
-# General information about the project.
-project = u'Gramps'
-copyright = u'2015, Gramps project'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '4.2'
-# The full version, including alpha/beta/rc tags.
-release = '4.2.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-locale_dirs = './locale'
-gettext_compact = True
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'Grampsdoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'Gramps.tex', u'Gramps Documentation',
-   u'.', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('pt_BR', 'gramps', u'Gramps Documentation',
-     [u'.'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'Gramps', u'Gramps Documentation',
-   u'.', 'Gramps', 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
--- a/data/man/pt_BR/gramps.1.in
+++ b/data/man/pt_BR/gramps.1.in
@@ -1,325 +0,0 @@
-.TH gramps 1 "@VERSION@" "Janeiro de 2008" "@VERSION@"
-.SH NOME
-gramps \- Programa para pesquisa genealógica.
-
-.SH RESUMO
-.B gramps
-.RB [ \-?|\-\^\-help ]
-.RB [ \-\^\-usage ]
-.RB [ \-\^\-version ]
-.RB [ \-l ]
-.RB [ \-u|\-\^\-force-unlock ]
-.RB [ \-O|\-\^\-open=
-.IR BANCODEDADOS 
-.RB [ \-f|\-\^\-format= 
-.IR FORMATO ]] 
-.RB [ \-i|\-\^\-import=
-.IR ARQUIVO 
-.RB [ \-f|\-\^\-format= 
-.IR FORMATO ]] 
-.RB [ \-i|\-\^\-import= 
-.IR ... ] 
-.RB [ \-e|\-\^\-export= 
-.IR ARQUIVO
-.RB [ \-f|\-\^\-format= 
-.IR FORMATO ]] 
-.RB [ \-a|\-\^\-action= 
-.IR AÇÃO ]
-.RB [ \-p|\-\^\-options= 
-.IR OPÇÕES ]]
-.RB [
-.IR ARQUIVO
-.RB ]
-.if 0 .RB [ bonobo\ options ]
-.if 0 .RB [ sound\ options ]
-.RB [ \-\-version ]
-
-.SH DESCRIÇÃO
-.PP 
-\fIGramps\fP é um programa de genealogia livre e de código aberto. Ele é escrito
-em Python e usa a interface GTK+/GNOME.
-Gramps deve parecer familiar a qualquer pessoa que já tenha usado outro programa
-de genealogia, tais como o \fIFamily Tree Maker (TM)\fR,  \fIPersonal Ancestral
-Files (TM)\fR, ou o GNU Geneweb.
-Ele suporta a importação do formato GEDCOM, que é amplamente usado por quase 
-todos os outros programas de genealogia.
-
-.SH OPÇÕES
-.TP 
-.BI gramps " ARQUIVO" 
-Quando \fIARQUIVO\fR for indicado (sem qualquer outra opção) como um nome de
-árvore genealógica ou como pasta do banco de dados, ela será aberta e iniciada
-uma sessão interativa. Se ARQUIVO for um formato compreendido pelo Gramps, será 
-criada uma árvore genealógica vazia com o nome baseado no \fIARQUIVO\fP
-e os dados são importados para ela. As demais opções serão ignoradas. Esta forma
-de execução é apropriada para usar o Gramps como manipulador de dados genealógicos
-em, por exemplo, navegadores Web. Este método aceita qualquer formato de dados 
-nativo do Gramps, conforme abaixo.
-.br
-
-.TP 
-.BI \-f,\-\^\-format= " FORMATO"
-Indica expressamente o formato do \fIARQUIVO\fR, precedente das opções  
-.ig
-\fB\-O\fR,
-..
-\fB\-i\fR ou 
-\fB\-e\fR. Se a opção \fB\-f\fR não for fornecida para um \fIARQUIVO\fR, 
-o formato será identificado de acordo com a sua extensão ou tipo MIME. 
-.br
-
-Os formatos disponíveis para exportação são \fBgramps\-xml\fR (se o \fIARQUIVO\fR 
-terminar com \fB.gramps\fR), \fBgedcom\fR (se o \fIARQUIVO\fR terminar com \fB.ged\fR) 
-ou qualquer outro formato de arquivo disponível através do sistema de plugins do 
-Gramps.
-.br
-
-Os formatos disponíveis para importação são \fBgrdb\fR, \fBgramps\-xml\fR, \fBgedcom\fR,  
-\fBgramps\-pkg\fR (se o \fIARQUIVO\fR terminar com \fB.gpkg\fR), e \fBgeneweb\fR 
-(se o \fIARQUIVO\fR terminar com \fB.gw\fR).
-.br
-
-Os formatos disponíveis para exportação são
-.ig
-\fBgrdb\fR,
-..
-\fBgramps\-xml\fR, \fBgedcom\fR,
-\fBgramps\-pkg\fR, \fBwft\fR (se o \fIARQUIVO\fR terminar com \fB.wft\fR),
-\fBgeneweb\fR, e \fBiso\fR (deve sempre ser indicado com a opção
-\fB\-f\fR).
-
-.TP 
-.BI \-l
-Exibe uma lista com as árvores genealógicas conhecidas.
-
-.TP
-.BI \-u,\-\^\-force-unlock
-Desbloqueia um banco de dados previamente bloqueado.
-
-.TP 
-.BI \-O,\-\^\-open= " BANCODEDADOS"
-Abre o \fIBANCODEDADOS\fR, que deve ser uma pasta de banco de dados ou um nome de árvore
-genealógica existentes.
-Se não forem indicadas opções de ação, importação ou exportação na linha de comando, 
-será iniciada uma sessão interativa usando este banco de dados.
-
-.TP 
-.BI \-i,\-\^\-import= " ARQUIVO"
-Importa os dados do \fIARQUIVO\fR. Se não for indicado um banco de dados, o Gramps usará
-um arquivo temporário, que será excluído ao sair do programa.
-.br
-
-Quando mais de um arquivo de origem for indicado, cada um deles deve ser precedido da
-opção \fB\-i\fR. Os arquivos são importados na ordem indicada, por exemplo, 
-\fB\-i\fR \fIARQUIVO1\fR \fB\-i\fR \fIARQUIVO2\fR  
-e \fB\-i\fR \fIARQUIVO2\fR \fB\-i\fR \fIARQUIVO1\fR poderá produzir diferentes gramps IDs 
-no banco de dados resultante. 
-
-.TP 
-.BI \-a,\-\^\-action= " AÇÃO"
-Executa a \fIAÇÃO\fR nos dados importados. Isto será executado após a conclusão de todas
-as importações. Até o momento, as ações disponíveis são \fBsummary\fR (o mesmo que 
-Relatórios->Exibir->Resumo), 
-\fBcheck\fR (o mesmo que Ferramentas->Processamento do banco de dados->Verificar e reparar), 
-\fBreport\fR (gera o relatório), e
-\fBtool\fR (executa uma ferramenta de plugin).
-Para o \fBreport\fR e \fBtool\fR é necessário fornecer \fIOPÇÕES\fR (com uso da opção  
-\fB\-p\fR). 
-.br
-
-As \fIOPÇÕES\fR devem satisfazer as seguintes condições:
-.br
-Não podem conter espaços.
-Se alguns argumentos precisam incluir espaços, a string deve
-ser colocada entre aspas, ou seja, seguir a sintaxe do shell.
-String de opção é uma lista de pares com o nome e o valor (separados por 
-sinal de igual). Os pares de nome e valor devem ser separados por vírgula.
-.br
-
-Muitas opções são específicas de cada relatório ou ferramenta. 
-Entretanto, algumas opções são comuns.
-
-.BI "name=nome"
-.br
-Esta opção obrigatória determina qual relatório ou ferramenta será executado.
-Se o \fInome\fR fornecido não corresponder a um relatório ou ferramenta, será
-exibida uma mensagem de erro seguida de uma lista de relatórios e ferramentas
-disponíveis (dependendo da \fIAÇÃO\fR).
-
-.BI "show=all"
-.br
-Isto irá gerar uma lista com os nomes para todas as opções disponíveis de um determinado
-relatório ou ferramenta.
-
-.BI "show="nome_opção
-.br
-Isto irá exibir a descrição da funcionalidade indicada por \fInome_opção\fR, bem 
-como quais são os tipos aceitáveis e os valores para esta opção.
-
-.br
-Use as opções acima para descobrir
-tudo sobre um determinado relatório.
-
-.LP
-Quando mais de uma ação de saída for indicada, cada uma deve ser precedida da opção 
-\fB\-a\fR. As ações são realizadas uma a uma, na ordem indicada.
-
-.TP 
-.BI \-d,\-\^\-debug= " ARQUIVO_REGISTRO"
-Ativa os registros para desenvolvimento e testes. Veja o código-fonte para mais detalhes.
-.TP
-.BI \-\^\-version
-Exibe o número da versão do Gramps e finaliza.
-\" altera de 0 para 1 para ativar a saída das opções OAF
-.if 0 \{
-.PP
-As opções a seguir são usadas para ativação do Bonobo.
-.TP 
-.BI \-\^\-oaf-ior-fd= "FD"
-Descritor do arquivo para exibir o OAF IOR em
-.TP 
-.BI \-\^\-oaf-activate-iid= " IID"
-OAF IID para ativar
-.TP 
-.BI \-\^\-oaf-private
-Impedir o registro do servidor com OAF
-\}
-\" altera de 0 para 1 para ativar a saída das opções de som do Gnome
-.if 0 \{
-.PP
-As opções a seguir são usadas para controlar o som usando a biblioteca do Gnome.
-.TP
-.BI \-\^\-disable-sound
-Desativa o servidor de som
-.TP
-.BI \-\^\-enable-sound
-Ativa o servidor de som
-.TP
-.BI \-\^\-espeaker= " HOSTNAME:PORT"
-Máquina:porta que o servidor de som utiliza para execução
-\}
-
-.SH "Operação"
-.br
-Se o primeiro argumento da linha de comando não começar com um traço (isto é, 
-sem uma opção), o Gramps tentará abrir o arquivo com o nome fornecido pelo primeiro
-argumento e iniciar a sessão interativa, ignorando o resto dos argumentos da
-linha de comando.
-
-.LP
-Se for fornecida a opção \fB\-O\fR, então o Gramps tentará abrir o banco de dados
-indicado e trabalhar com estes dados, de acordo com as instruções dos parâmetros 
-adicionais da linha de comando.
-
-.LP
-Com ou sem a opção \fB\-O\fR, pode haver múltiplas importações, exportações e
-ações indicadas pela linha de comando usando as opções \fB\-i\fR,
-\fB\-e\fR e \fB\-a\fR.  
-
-.LP
-A ordem das opções \fB\-i\fR, \fB\-e\fR ou \fB\-a\fR não importa. A ordem
-utilizada será sempre esta: todas as importações (se existirem) -> todas
-as ações (se existirem) -> todas as exportações (se existirem). Mas a abertura 
-deve estar sempre em primeiro lugar!
-
-.LP
-Se as opções \fB\-O\fR ou \fB\-i\fR não forem fornecidas, o Gramps será aberto
-com a sua janela principal e iniciará a sessão interativa padrão com um banco
-de dados vazio, uma vez que não há nada a processar.
-
-.LP
-Se as opções \fB\-e\fR ou \fB\-a\fR não forem fornecidas, o Gramps será aberto
-com a sua janela principal e iniciará a sessão interativa padrão com um banco
-de dados resultante de todas as importações. Este banco de dados está localizado
-no arquivo \fBimport_db.grdb\fR da pasta \fB~/.gramps/import\fR.
-
-.LP
-Os erros encontrados durante a importação, exportação ou ação, serão direcionados 
-para \fIstdout\fR (se forem exceções tratadas pelo Gramps) ou para \fIstderr\fR
-(se não forem tratadas). Use redirecionamentos usuais de \fIstdout\fR e 
-\fIstderr\fR do shell para salvar mensagens e erros em arquivos.
-
-.SH EXEMPLOS
-.TP 
-Abrir uma árvore genealógica existente e importar um arquivo xml para ela:
-\fBgramps\fR \fB\-O\fR \fI'Minha árvore genealógica'\fR \fB\-i\fR \fI~/db3.gramps\fR
-.TP 
-Fazer as mesmas alterações da árvore genealógica do comando anterior, mas importar a árvore genealógica temporária e iniciar uma sessão interativa:
-\fBgramps\fR \fB\-i\fR \fI'Minha árvore genealógica'\fR \fB\-i\fR \fI~/db3.gramps\fR
-.TP 
-Importar quatro bancos de dados (cujos formatos podem ser reconhecidos pelos nomes) e verificar a existência de erros no banco de dados resultante:
-\fBgramps\fR \fB\-i\fR \fIarquivo1.ged\fR \fB\-i\fR \fIarquivo2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-i\fR \fIarquivo4.wft\fR \fB\-a\fR \fIcheck\fR 
-.TP 
-Indicar de forma explícita os formatos do exemplo acima, atribuindo os nomes dos arquivos com as opções \fB\-f\fR apropriadas:
-\fBgramps\fR \fB\-i\fR \fIarquivo1.ged\fR \fB\-f\fR \fIgedcom\fR \fB\-i\fR \fIarquivo2.tgz\fR \fB\-f\fR \fIgramps-pkg\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-f\fR \fIgramps-xml\fR \fB\-i\fR \fIarquivo4.wft\fR \fB\-f\fR \fIwft\fR  \fB\-a\fR \fIcheck\fR 
-.TP 
-Gravar o banco de dados resultante de todas as importações, indicando a opção \fB\-e\fR (use \fB\-f\fR se o nome do arquivo não permirtir que o gramps reconheça o formato automaticamente):
-\fBgramps\fR \fB\-i\fR \fIarquivo1.ged\fR \fB\-i\fR \fIarquivo2.tgz\fR \fB\-e\fR \fI~/novo-pacote\fR \fB\-f\fR \fIgramps-pkg\fR 
-.TP 
-Importar três bancos de dados e iniciar a sessão interativa do Gramps com o resultado:
-\fBgramps\fR \fB\-i\fR \fIarquivo1.ged\fR \fB\-i\fR \fIarquivo2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR 
-.TP 
-Executar a ferramenta de verificação a partir da linha de comando e direcionar o resultado para stdout:
-\fBgramps\fR \fB\-O\fR \fI'Minha árvore genealógica'\fR \fB-a\fR \fItool\fR \fB-p\fR \fBname\fR=\fIverify\fR
-.TP 
-Finalmente, para iniciar uma sessão interativa normal, digite:
-\fBgramps\fR 
-
-.SH VARIÁVEIS DE AMBIENTE
-O programa verifica se estas variáveis de ambiente estão definidas:
-
-\fBLANG\fR - identifica o idioma a ser usado.
-Ex.: Para o idioma português do Brasil, a variável deve ser definida como pt_BR.UTF-8.
-
-\fBGRAMPSHOME\fR - se definida, força o Gramps a usar a pasta indicada para armazenar
-as configurações e os bancos de dados do programa. Por padrão, esta variável não é 
-definida e o Gramps assume que a pasta com todos os bancos de dados e configurações
-do perfil devem ser criadas na pasta do usuário (descrita na variável de ambiente 
-HOME no Linux ou USERPROFILE no Windows 2000/XP).
-
-.SH CONCEITOS
-Suporta um sistema de plugins baseado em Python, permitindo acrescentar importações 
-e exportações adicionais, geradores de relatórios, ferramentas e filtros de exibição, 
-sem modificação do programa principal.
-.LP 
-Além da impressão direta, é possível gerar relatórios em diversos formatos de
-arquivo, tais como \fIOpenOffice.org\fR, \fIAbiWord\fR, HTML ou LaTeX, para permitir
-aos usuários a modificação de acordo com suas necessidades.
-
-.SH LIMITAÇÕES E ERROS CONHECIDOS
-
-.SH ARQUIVOS
-.LP 
-\fI${PREFIX}/bin/gramps\fP 
-.br 
-\fI${PREFIX}/share/gramps\fP
-.br 
-\fI${HOME}/.gramps\fP 
-
-.SH AUTORES
-Donald Allingham \fI<don@gramps-project.org>\fR
-.br 
-\fIhttp://gramps.sourceforge.net\fR
-.LP 
-Este manual foi originalmente escrito por:
-.br 
-Brandon L. Griffith \fI<brandon@debian.org>\fR
-.br
-para inclusão na distribuição Debian GNU/Linux.
-.LP 
-Este manual é atualmente mantido pelo:
-.br 
-Projeto Gramps \fI<xxx@gramps-project.org>\fR
-.br 
-
-.SH DOCUMENTAÇÃO
-A documentação para usuários está disponível através da opção de ajuda padrão
-do GNOME, na forma de Manual do Gramps. O Manual também está disponível no 
-formato XML como \fBgramps-manual.xml\fR em \fIdoc/gramps-manual/$LANG\fR 
-nas fontes oficiais da sua distribuição.
-.LP 
-A documentação para desenvolvedores pode ser encontrada na página 
-\fIhttp://developers.gramps-project.org\fR. 
-
-.SH TRADUÇÃO
-\&\fR\&\f(CWAndré Marcelo Alvarenga <andrealvarenga@gmx.net> em 05/08/2012\fR
--- a/data/man/pt_BR/pt_BR.rst
+++ b/data/man/pt_BR/pt_BR.rst
@@ -1,293 +0,0 @@
-Portuguese (Brazil)
-===================
-
-gramps(1)                4.0.0               gramps(1)
-
-
-**NOME**
-
-        gramps - Programa para pesquisa genealógica.
-
-
-**RESUMO**
-
-        gramps [-?|--help] [--usage] [--version] [-l] [-u|--force-unlock]
-        [-O|--open= BANCODEDADOS [-f|--format= FORMATO]] [-i|--import= ARQUIVO 
-        [-f|--format= FORMATO]] [-i|--import= ...] [-e|--export= ARQUIVO 
-        [-f|--format= FORMATO]] [-a|--action= AÇÃO] [-p|--options= OPÇÕES]] 
-        [ ARQUIVO ] [--version]
-
-
-**DESCRIÇÃO**
-
-        Gramps é um programa de genealogia livre e de código aberto. 
-        Ele é escrito em Python e usa a interface GTK+/GNOME. 
-        Gramps deve parecer familiar a qualquer pessoa que já tenha usado 
-        outro programa de genealogia, tais como o Family Tree Maker (TM), 
-        Personal Ancestral Files (TM), ou o GNU Geneweb. Ele suporta a 
-        importação do formato GEDCOM, que é amplamente usado por quase 
-        todos os outros programas de genealogia.
-
-
-**OPÇÕES**
-
-       **gramps** *ARQUIVO*
-        Quando *ARQUIVO* for indicado (sem qualquer outra opção) como um 
-        nome de árvore genealógica ou como pasta do banco de dados, 
-        ela será aberta e iniciada uma sessão interativa. Se *ARQUIVO* for 
-        um formato compreendido pelo Gramps, será criada uma árvore 
-        genealógica vazia com o nome baseado no ARQUIVO e os dados são 
-        importados para ela. As demais opções serão ignoradas. Esta 
-        forma de execução é apropriada para usar o Gramps como manipulador 
-        de dados genealógicos em, por exemplo, navegadores Web. Este método 
-        aceita qualquer formato de dados nativo do Gramps, conforme abaixo. 
-
-
-       **-f** , **--format=** *FORMATO*
-        Indica expressamente o formato do *ARQUIVO*, precedente das opções 
-        -i ou -e. Se a opção -f não for fornecida para um ARQUIVO, o 
-        formato será identificado de acordo com a sua extensão ou tipo MIME. 
-
-        Os formatos disponíveis para exportação são gramps-xml (se o ARQUIVO 
-        terminar com .gramps), gedcom (se o ARQUIVO terminar com .ged) ou 
-        qualquer outro formato de arquivo disponível através do sistema de 
-        plugins do Gramps. 
-
-
-        Os formatos disponíveis para importação são grdb, gramps-xml, gedcom, 
-        gramps-pkg (se o ARQUIVO terminar com .gpkg), e geneweb 
-        (se o ARQUIVO terminar com .gw). 
-
-
-        Os formatos disponíveis para exportação são gramps-xml, gedcom, 
-        gramps-pkg, wft (se o ARQUIVO terminar com .wft), geneweb.
-
-       **-l**
-        Exibe uma lista com as árvores genealógicas conhecidas.
-
-
-       **-u** , **--force-unlock**
-        Desbloqueia um banco de dados previamente bloqueado.
-
-
-       **-O** , **--open=** *BANCODEDADOS*
-        Abre o *BANCODEDADOS* , que deve ser uma pasta de banco de dados 
-        ou um nome de árvore genealógica existentes. Se não forem indicadas 
-        opções de ação, importação ou exportação na linha de comando, 
-        será iniciada uma sessão interativa usando este banco de dados.
-
-
-       **-i** , **--import=** *ARQUIVO*
-        Importa os dados do ARQUIVO. Se não for indicado um banco de dados, 
-        o Gramps usará um arquivo temporário, que será excluído ao sair 
-        do programa. 
-
-
-        Quando mais de um arquivo de origem for indicado, cada um deles 
-        deve ser precedido da opção -i. Os arquivos são importados na ordem 
-        indicada, por exemplo, -i ARQUIVO1 -i ARQUIVO2 e -i ARQUIVO2 -i 
-        ARQUIVO1 poderá produzir diferentes gramps IDs no banco de dados 
-        resultante.
-
-
-       **-a** , **--action=** *AÇÃO*
-        Executa a *AÇÃO* nos dados importados. Isto será executado após a 
-        conclusão de todas as importações. Até o momento, as ações 
-        disponíveis são summary (o mesmo que Relatórios->Exibir->Resumo), 
-        check (o mesmo que Ferramentas->Processamento do banco de dados->
-        Verificar e reparar), report (gera o relatório), e tool (executa 
-        uma ferramenta de plugin). Para o report e tool é necessário 
-        fornecer OPÇÕES (com uso da opção -p). 
-
-
-        As OPÇÕES devem satisfazer as seguintes condições: 
-        Não podem conter espaços. Se alguns argumentos precisam incluir 
-        espaços, a string deve ser colocada entre aspas, ou seja, seguir 
-        a sintaxe do shell. String de opção é uma lista de pares com o 
-        nome e o valor (separados por sinal de igual). Os pares de nome 
-        e valor devem ser separados por vírgula. 
-
-
-        Muitas opções são específicas de cada relatório ou ferramenta. 
-        Entretanto, algumas opções são comuns.
-
-        **name=nome** 
-        Esta opção obrigatória determina qual relatório ou ferramenta 
-        será executado. Se o nome fornecido não corresponder a um 
-        relatório ou ferramenta, será exibida uma mensagem de erro 
-        seguida de uma lista de relatórios e ferramentas disponíveis 
-        dependendo da AÇÃO).
-
-        **show=all**
-        Isto irá gerar uma lista com os nomes para todas as opções 
-        disponíveis de um determinado relatório ou ferramenta.
-
-        **show=nome_opção**
-        Isto irá exibir a descrição da funcionalidade indicada por nome_opção, 
-        bem como quais são os tipos aceitáveis e os valores para esta opção.
-
-
-        Use as opções acima para descobrir tudo sobre um determinado relatório.
-
-        Quando mais de uma ação de saída for indicada, cada uma deve ser 
-        precedida da opção -a. As ações são realizadas uma a uma, na ordem 
-        indicada.
-
-       **-d** , **--debug=** *ARQUIVO_REGISTRO*
-        Ativa os registros para desenvolvimento e testes. Veja o código-fonte 
-        para mais detalhes.
-        
-       **--version**
-        Exibe o número da versão do Gramps e finaliza.
- 
-**Operação**
-        Se o primeiro argumento da linha de comando não começar com um 
-        traço (isto é, sem uma opção), o Gramps tentará abrir o arquivo 
-        com o nome fornecido pelo primeiro argumento e iniciar a sessão 
-        interativa, ignorando o resto dos argumentos da linha de comando.
-
-
-        Se for fornecida a opção -O, então o Gramps tentará abrir o banco 
-        de dados indicado e trabalhar com estes dados, de acordo com as 
-        instruções dos parâmetros adicionais da linha de comando.
-
-
-        Com ou sem a opção -O, pode haver múltiplas importações, exportações 
-        e ações indicadas pela linha de comando usando as opções -i, -e e -a.
-
-
-        A ordem das opções -i, -e ou -a não importa. A ordem utilizada 
-        será sempre esta: todas as importações (se existirem) -> todas 
-        as ações (se existirem) -> todas as exportações (se existirem). 
-        Mas a abertura deve estar sempre em primeiro lugar!
-
-
-        Se as opções -O ou -i não forem fornecidas, o Gramps será aberto 
-        com a sua janela principal e iniciará a sessão interativa padrão 
-        com um banco de dados vazio, uma vez que não há nada a processar.
-
-
-        Se as opções -e ou -a não forem fornecidas, o Gramps será aberto 
-        com a sua janela principal e iniciará a sessão interativa padrão 
-        com um banco de dados resultante de todas as importações. Este 
-        banco de dados está localizado no arquivo import_db.grdb da 
-        pasta ~/.gramps/import.
-
-
-        Os erros encontrados durante a importação, exportação ou ação, 
-        serão direcionados para stdout (se forem exceções tratadas pelo 
-        Gramps) ou para stderr (se não forem tratadas). Use redirecionamentos 
-        usuais de stdout e stderr do shell para salvar mensagens e erros 
-        em arquivos.
-
-
-
-**EXEMPLOS**
-
-        Abrir uma árvore genealógica existente e importar um arquivo xml para 
-        ela:
-        
-           gramps -O 'Minha árvore genealógica' -i ~/db3.gramps
-
-        Fazer as mesmas alterações da árvore genealógica do comando anterior, 
-        mas importar a árvore genealógica temporária e iniciar uma sessão 
-        interativa:
-        
-           gramps -i 'Minha árvore genealógica' -i ~/db3.gramps
-
-        Importar quatro bancos de dados (cujos formatos podem ser 
-        reconhecidos pelos nomes) e verificar a existência de erros no 
-        banco de dados resultante:
-        
-           gramps -i arquivo1.ged -i arquivo2.tgz -i ~/db3.gramps -i 
-           arquivo4.wft -a check
-
-        Indicar de forma explícita os formatos do exemplo acima, atribuindo 
-        os nomes dos arquivos com as opções -f apropriadas:
-        
-           gramps -i arquivo1.ged -f gedcom -i arquivo2.tgz -f gramps-pkg 
-           -i ~/db3.gramps -f gramps-xml -i arquivo4.wft -f wft -a check
-
-        Gravar o banco de dados resultante de todas as importações, 
-        indicando a opção -e (use -f se o nome do arquivo não permirtir 
-        que o gramps reconheça o formato automaticamente):
-        
-           gramps -i arquivo1.ged -i arquivo2.tgz -e ~/novo-pacote -f gramps-pkg
-
-        Importar três bancos de dados e iniciar a sessão interativa do 
-        Gramps com o resultado:
-        
-           gramps -i arquivo1.ged -i arquivo2.tgz -i ~/db3.gramps
-
-        Executar a ferramenta de verificação a partir da linha de 
-        comando e direcionar o resultado para stdout:
-        
-           gramps -O 'Minha árvore genealógica' -a tool -p name=verify
-
-        Finalmente, para iniciar uma sessão interativa normal, digite:
-        
-           gramps
- 
-**VARIÁVEIS DE AMBIENTE**
-
-        O programa verifica se estas variáveis de ambiente estão definidas:
-        **LANG** - identifica o idioma a ser usado. Ex.: Para o idioma português do Brasil, a variável deve ser definida como pt_BR.UTF-8.
-
-        **GRAMPSHOME** - se definida, força o Gramps a usar a pasta indicada para armazenar as configurações e os bancos de dados do programa. Por padrão, esta variável não é definida e o Gramps assume que a pasta com todos os bancos de dados e configurações do perfil devem ser criadas na pasta do usuário (descrita na variável de ambiente HOME no Linux ou USERPROFILE no Windows 2000/XP).
-
-
-
-**CONCEITOS**
-
-        Suporta um sistema de plugins baseado em Python, permitindo acrescentar 
-        importações e exportações adicionais, geradores de relatórios, 
-        ferramentas e filtros de exibição, sem modificação do programa principal.
-
-        Além da impressão direta, é possível gerar relatórios em diversos 
-        formatos de arquivo, tais como OpenOffice.org, AbiWord, HTML ou 
-        LaTeX, para permitir aos usuários a modificação de acordo com 
-        suas necessidades.
-
-
-
-**LIMITAÇÕES E ERROS CONHECIDOS**
-
-*ARQUIVOS**
-
-       *${PREFIX}/bin/gramps*
-       
-       *${PREFIX}/lib/python/dist-packages/gramps/*
-       
-       *${PREFIX}/share/*
-       
-       *${HOME}/.gramps*
-
-
-*AUTORES*
-
-       Donald Allingham <don@gramps-project.org> 
-       http://gramps.sourceforge.net
-       Este manual foi originalmente escrito por: 
-       Brandon L. Griffith <brandon@debian.org> 
-       para inclusão na distribuição Debian GNU/Linux.
-
-       Este manual é atualmente mantido pelo: 
-       Projeto Gramps <xxx@gramps-project.org> 
- 
-
-**DOCUMENTAÇÃO**
-
-        A documentação para usuários está disponível através da 
-        opção de ajuda.
-
-        A documentação para desenvolvedores pode ser encontrada na 
-        página http://developers.gramps-project.org.
-
-
-
-**TRADUÇÃO**
-
-André Marcelo Alvarenga <andrealvarenga@gmx.net> em 05/08/2012
-
-January 2013                 4.0.0               gramps(1)
-
--- a/data/man/sv/Makefile.am
+++ b/data/man/sv/Makefile.am
@@ -0,0 +1,14 @@
+# This is the data/man/sv level Makefile for Gramps
+# $Id: Makefile.am 6189 2006-03-21 19:05:46Z rshura $
+
+man_IN_FILES = gramps.1.in
+man_MANS = $(man_IN_FILES:.1.in=.1)
+
+mandir = @mandir@/sv
+
+EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
+
+gramps.1: $(top_builddir)/config.status gramps.1.in
+	cd $(top_builddir) && CONFIG_FILES=data/man/sv/$@ $(SHELL) ./config.status
+
+CLEANFILES=$(man_MANS)
--- a/data/man/sv/conf.py
+++ b/data/man/sv/conf.py
@@ -1,243 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Gramps documentation build configuration file, created by
-# sphinx-quickstart on Sat Dec  1 14:38:29 2012.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'sv'
-
-# General information about the project.
-project = u'Gramps'
-copyright = u'2015, Gramps project'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '4.2'
-# The full version, including alpha/beta/rc tags.
-release = '4.2.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-locale_dirs = './locale'
-gettext_compact = True
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'Grampsdoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'Gramps.tex', u'Gramps Documentation',
-   u'.', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('sv', 'gramps', u'Gramps Documentation',
-     [u'.'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'Gramps', u'Gramps Documentation',
-   u'.', 'Gramps', 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
--- a/data/man/sv/sv.rst
+++ b/data/man/sv/sv.rst
@@ -1,281 +0,0 @@
-Swedish
-=======
-
-Gramps(1)			     3.4.0			     Gramps(1)
-
-
-
-**NAMN**
-       Gramps - Genealogical Research and Analysis Management Programming Sys‐
-       tem.
-
-
-**SAMMANFATTNING**
-       Gramps  [-?|--help]  [--usage]  [--version]  [-l]   [-u|--force-unlock]
-       [-O|--open= DATABAS [-f|--format= FORMAT]] [-i|--import= FIL [-f|--for‐
-       mat= FORMAT]] [-i|--import= ...]  [-e|--export= FIL [-f|--format=  FOR‐
-       MAT]]  [-a|--action=  ÅTGÄRD] [-p|--options= ALTERNATIVSTRÄNG]] [ FIL ]
-       [--version]
-
-
-**BESKRIVNING**
-       Gramps är ett Free/OpenSource släktforskningsprogram. Det är skrivet  i
-       Python, med hjälp av GTK+/GNOME gränssnittet.  Gramps bör kännas bekant
-       för de flesta, som har använt  andra  släktforskningsprogram  tidigare,
-       som Family Tree Maker (TM), Personal Ancestral Files (TM), DISGEN eller
-       GNU Geneweb.  Det stöder import via det populära  GEDCOM-formatet,  som
-       används över hela världen av nästan all släktforskningsprogramvara.
-
-
-**ALTERNATIV**
-       **Gramps** *FIL*
-	      När *FIL* ges  (utan  några flaggor) som namn på ett familjeträd
-	      eller som en mapp med familjeträd, så öppnas detta och en inter‐
-	      aktiv session startas.  Om FIL är en fil, vars format förstås av
-	      Gramps, skapas ett tomt famljeträd, vars namn är grundat på nam‐
-	      net  FIL och vars data importeras till det.  Resterande alterna‐
-	      tiv ignoreras. Detta sätt att starta passar  vid	användning  av
-	      Gramps som en hanterare för släktforskningsdata i t. ex. en web-
-	      läsare.  Detta startsätt accepterar alla inbyggda dataformat för
-	      Gramps, se nedan.
-
-
-       **-f** , **--format=** *FORMAT*
-	      Uttryckligen  specificera  format  på FIL givet av föregående -i
-	      eller -e-alternativ. Om -f-alternativet inte ges för någon  FIL,
-	      gissas  filformat  för  den  filen utgående från dess filändelse
-	      eller dess MIME-typ.
-
-	      De format, som är tillgängliga för utmatnig, är Gramps-xml (gis‐
-	      sas  om FIL slutar på .Gramps), gedcom (gissas om FIL slutar med
-	      .ged) eller någon  filexport,  som  är  tillgänglig  via	Gramps
-	      tilläggsprogramsystem.
-
-	      De   format,   som   är  tillgängliga  för  inmatnig,  är  grdb,
-	      Gramps-xml, gedcom, Gramps-pkg (gissas om FIL slutar med	.gpkg)
-	      och geneweb (gissas om FIL slutar med .gw).
-
-	      De format, som är tillgängliga för export är Gramps-xml, gedcom,
-	      Gramps-pkg, wft (gissas om FIL slutar med .wft), geneweb och iso
-	      (gissas aldrig, specificeras alltid med -f-alternativ).
-
-
-       **-l**     
-          Listar alla databaser/familjeträd.
-
-
-       **-u** , **--force-unlock**
-	      Tvingar upplåsning av databas.
-
-
-       **-O** , **--open=** *DATABAS*
-	      Öppnar *DATABAS* , som måste vara en befitlig databasmapp eller ett
-	      befintligt familjeträd.  Om ingen åtgärd, import	eller  export-
-	      alternativ  anges på kommandoraden så startas en interaktiv ses‐
-	      sion med den angivna databasen.
-
-
-       **-i** , **--import=** *FIL*
-	      Importera data från FIL. Om du inte har specificerat en databas,
-	      skapas en temporär sådan, som tas bort när Gramps avslutas.
-
-	      Om  mer  är  en  indatafil  anges, måste varje föregås av en -i-
-	      flagga.  Filerna importeras i den givna ordningen, t.ex. -i FIL1
-	      -i  FIL2	och  -i FIL2 -i FIL1 kan skapa skilda Gramps IDs i den
-	      resulterande databasen.
-
-
-       **-e** , **--export=** *FIL*
-	      Exporterar data till *FIL* . För iso-format, är *FIL* i själva verket
-	      namnet  på den mapp, som Gramps databas kommer att skrivas till.
-	      För Gramps-xml, gedcom, wft, Gramps-pkg och geneweb, är *FIL* nam‐
-	      net på resultatfilen.
-
-	      Om  mer  är  en  utdatafil  anges, måste varje föregås av en -e-
-	      flagga.  Filerna skrivs en efter en i den givna ordningen.
-
-
-       **-a** , **--action=** *ÅTGÄRD*
-	      Utför ÅTGÄRD på importerade  data.  Detta  görs  efter  att  all
-	      import har avslutats felfritt. F. n. är följand åtgärder möjliga
-	      summary	(samma	  som	 Rapporter->Visa->Sammanfattning    av
-	      databasen) ,  check  (samma  som Verktyg->Reparera databas ->Kon‐
-	      trollera och reparera) samt report ( skapar report, kräver
-	      en *ALTERNATIVSTRÄNG* lämnad via **-p** flaggan ) .
-
-	      *ALTERNATIVSTRÄNG* -en måste uppfylla följand villkor:
-	      Får ej innehålla några mellanslag.  Om  några  argument  behöver
-	      inbegripa  mellanslag,  måste  strängen  omslutas  av  anföring‐
-	      stecken.	Alternativsträngen är en lista med  par  av  namn  och
-	      värden  (åtskiljda  av  likhetstecken).	Namn  och  värde måste
-	      åtskiljas med komma.
-
-	      De flesta rapportalternativ är unika  för  varje	rapport  eller
-	      verktyg. Emellertid finns det gemensamm alternativ.
-
-	      **name=rapportnamn**
-	      Detta  är  obligatoriskt	och bestämmer vilken rapport som skall
-	      skapas.  Om det givna namn inte motsvarar någon  möjlig  rapport
-	      eller verktyg, kommer ett felmeddelande att skrivas ut, följt av
-	      möjliga namn på rapporter eller verktyg.
-
-	      **show=all**
-	      Detta ger en lista med namn på alla möjliga  alternativ  för  en
-	      bestämd rapport eller verktyg.
-
-	      **show=optionname**
-	      Detta  skriver  ut beskrivningen av den funktion, som optionname
-	      innebär, likväl vad som är godkända typer och värden  för  detta
-	      alternativ.
-
-	      Använd  alternativen ovan för att ta reda på all om en viss rap‐
-	      port.
-
-
-       Om mer än en utdataåtgärd givits måste varje föregås av	en  -a-flagga.
-       Åtgärderna utförs en och en i den givna turordningen.
-
-
-       **-d** , **--debug=** *LOGGER_NAME*
-	      Kopplar  på avlusningshjälpmedel för utveckling och tester.  För
-	      detaljer hänvisas till källkoder
-
-       **--version**
-	      Skriver ur Gramps versionsnummer och avslutar
-
-
-**Operation**
-       Om första argumentet på kommandoraden inte inledds med ett  minustecken
-       (d.  v. s. ingen flagga), kommer Gramps att försöka öppna den fil, vars
-       namn givits av det första argumentet samt påbörja en interaktiv session
-       utan att ta hänsyn till resten av argumenten på kommandoraden.
-
-
-       Om  -O-flagga  givits,  kommer  Gramps  att  försöka öppna den omnämnda
-       databasen och sedan arbeta med dess data, enligt  ytterligare  instruk‐
-       tioner på kommandoraden.
-
-
-       Med eller utan -Oflagga, kan det ske många importeringar, exporteringar
-       och åtgärder beskrivna ytterligare på kommanodraden genom  att  använda
-       -i-, -e- samt -a-flaggor.
-
-
-       Ordningen  på  -i-,  -e-  eller -a-alternativen spelar ingen roll.  Den
-       gällande ordningen är alltid: all import (om någon)  ->	alla  åtgärder
-       (om  några)  ->	all  export  (om  någon). Men öppning måste alltid ske
-       först!
-
-
-       Om inget -O- eller -i-alternativ givits, kommer Gramps att starta  sitt
-       huvudfönster  samt påbörja den vanliga interaktiva sessionen med en tom
-       databas, då hur som helst inget data finns att bearbeta.
-
-
-       Om inget -e- eller -a-alternativ givits, kommer Gramps att starta  sitt
-       huvudfönster  samt  påbörja  den  vanliga interaktiva sessionen med den
-       databas, som blev resultet från all import. Denna databas  återfinns  i
-       import_db.grdb under ~/.Gramps/import-mappen.
-
-
-       De  fel	som  inträffar	under import, export eller vid åtgärder kommer
-       antingen att skrivas till stdout (om dessa avbrott hanteras av  Gramps)
-       eller  till stderr (om dessa inte hanteras). Använd vanliga skalkomman‐
-       don för att styra om stdout och stderr till att	spara  medelanden  och
-       fel i filer.
-
-
-**EXAMPEL**
-       För  att öppna ett befintligt familjeträd och importera en xml-fil till
-       det, kan man skriva:
-       
-	      Gramps -O 'Mitt familjeträd' -i ~/db3.Gramps
-
-       Ovanstående ändrar det öppnade familjeträdet, för att göra  samma  sak,
-       men  importera  bägge  till  ett tillfälligt familjeträd och påbörja en
-       interaktiv session, kan man skriva:
-       
-	      Gramps -i 'My Family Tree' -i ~/db3.Gramps
-
-       För att importera fyra databaser (vars  format  kan  avgöras  av  deras
-       namn)  och  sedan  felkontrollera  den resulterande  databasen, kan man
-       skriva:
-       
-	      Gramps -i FIL1.ged -i FIL2.tgz -i ~/db3.Gramps  -i  FIL4.wft  -a
-	      check
-
-       För  att  uttryckligen  specificera formaten i examplet ovan, lägg till
-       filnamn med passande -f-alternativ:
-       
-	      Gramps -i FIL1.ged  -f  gedcom  -i  FIL2.tgz  -f	Gramps-pkg  -i
-	      ~/db3.Gramps -f Gramps-xml -i FIL4.wft -f wft -a check
-
-       För  att  spara	den  databas,  som är resultat av all import, ange -e-
-       flagga (använd -f om filnamnet inte tillåter Gramps att gissa dess for‐
-       mat):
-       
-	      Gramps -i FIL1.ged -i FIL2.tgz -e ~/new-package -f Gramps-pkg
-
-       För  att importera tre databaser och påbörja en interaklive Gramps-ses‐
-       sion med importresultatet:
-       
-	      Gramps -i FIL1.ged -i FIL2.tgz -i ~/db3.Gramps
-
-       För att köra  verifieringsverktyget  från  kommandoraden  och  mata  ut
-       resultatet till stdout:
-       
-	      Gramps -O file.grdb -a tool -p name=verify
-
-       Slutligen, för att påbörja en normal interaktiv session skriv bara:
-       
-	      Gramps
-
-
-**BEGREPP**
-       Stöder ett python-baserat system för tilläggsprogram, som möjliggör att
-       import- och export-funktioner, rapportgeneratorer,  verktyg  samt  vis‐
-       ningsfilter, kan komplettera Gramps utan ändringar i huvudprogrammet.
-
-       Förutom	att  skapa utskrift på skrivare direkt, kan rapportgeneratorer
-       ha andra målsystem som OpenOffice.org, AbiWord, HTML eller LaTeX så att
-       användaren kan tillåtas att ändra format för att passa behoven.
-
-
-**KÄNDA FEL OCH BEGRÄNSNINGAR**
-**FILER**
-
-       *${PREFIX}/bin/gramps*
-       
-       *${PREFIX}/lib/python/dist-packages/gramps/*
-       
-       *${PREFIX}/share/*
-       
-       *${HOME}/.gramps*
-
-
-**FÖRFATTARE**
-       Donald Allingham <don@gramps-project.org>
-       http://gramps-project.org/
-
-       Denna man-sida skrevs ursprungligen av:
-       Brandon L. Griffith <brandon@debian.org>
-       till att ingå i Debians GNU/Linux-system.
-
-       Denna man-sida underhålls f. n. av:
-       Alex Roitman <shura@gramps-project.org>
-
-       Denna man-sida har översatts till svenska av:
-       Peter Landgren <peter.talken@telia.com>
-
-
-**DOCUMENTATION**
-       Användardokumentationen	är  tillgänglig  genom GNOME's standard hjälp-
-       bläddrare i form av Gramps-handboken. Handboken finns även i XML-format
-       som  gramps-manual.xml  under  doc/gramps-manual/$LANG i den officiella
-       källdistributionen. Dock ej på svenska.
-
-       Utvecklingsdokumentationen kan hittas på
-       http://www.gramps-project.org/wiki/index.php?title=Portal:Developers 
-
-
-Januari 2013			     4.0.0			     Gramps(1)
--- a/data/man/update_man.py
+++ b/data/man/update_man.py
@@ -1,183 +0,0 @@
-#! /usr/bin/env python
-#
-# update_po - a gramps tool to update translations
-#
-# Copyright (C) 2006-2006  Kees Bakker
-# Copyright (C) 2006       Brian Matherly
-# Copyright (C) 2008       Stephen George
-# Copyright (C) 2012
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-"""
-update_man.py for command line documentation.
-
-Examples:
-   python update_man.py -t
-
-      Tests if 'sphinx' and 'python' are well configured.
-"""
-
-from __future__ import print_function
-
-import os
-import sys
-from argparse import ArgumentParser
-
-DOCUTILS = True
-try:
-    import docutils.core, docutils.writers
-except:
-    DOCUTILS = False
-
-LANGUAGES = ['sv', 'nl', 'pl', 'cs', 'pt_BR', 'fr']
-VERSION = '5.0.0'
-DATE = ''
-
-# You can set these variables from the command line.
-SPHINXBUILD   = 'sphinx-build'
-
-if sys.platform == 'win32':
-    pythonCmd = os.path.join(sys.prefix, 'bin', 'python.exe')
-    sphinxCmd = os.path.join(sys.prefix, 'bin', 'sphinx-build.exe')
-elif sys.platform in ['linux2', 'darwin', 'cygwin']:
-    pythonCmd = os.path.join(sys.prefix, 'bin', 'python')
-    sphinxCmd = SPHINXBUILD
-else:
-    print ("Update Man ERROR: unknown system, don't know sphinx, ... commands")
-    sys.exit(0)
-
-def tests():
-    """
-    Testing installed programs.
-    We made tests (-t flag) by displaying versions of tools if properly
-    installed. Cannot run all commands without 'sphinx' and 'python'.
-    """
-    try:
-        print("\n=================='python'=============================\n")
-        os.system('''%(program)s -V''' % {'program': pythonCmd})
-    except:
-        print ('Please, install python')
-
-    try:
-        print("\n=================='Sphinx-build'=============================\n")
-        os.system('''%(program)s''' % {'program': sphinxCmd})
-    except:
-        print ('Please, install sphinx')
-
-    if not DOCUTILS:
-        print('\nNo docutils support, cannot use -m/--man and -o/--odt arguments.')
-
-def main():
-    """
-    The utility for handling documentation stuff.
-    What is need by Gramps, nothing more.
-    """
-
-    parser = ArgumentParser(
-                         description='This program aims to handle documentation'
-                                      ' and related translated versions.',
-                         )
-
-    parser.add_argument("-t", "--test",
-            action="store_true", dest="test",  default=True,
-            help="test if 'python' and 'sphinx' are properly installed")
-
-    parser.add_argument("-b", "--build",
-            action="store_true", dest="build",  default=False,
-            help="build man documentation (via sphinx-build)")
-
-    parser.add_argument("-m", "--man",
-            action="store_true", dest="man",  default=False,
-            help="build man documentation (via docutils)")
-
-    parser.add_argument("-o", "--odt",
-            action="store_true", dest="odt",  default=False,
-            help="build odt documentation (via docutils)")
-
-    args = parser.parse_args()
-
-    if args.test:
-        tests()
-
-    if args.build:
-        build()
-
-    if args.man and DOCUTILS:
-        man()
-
-    if args.odt and DOCUTILS:
-        odt()
-
-def build():
-    """
-    Build documentation.
-    """
-
-    # testing stage
-
-    os.system('''%(program)s -b html . _build/html''' % {'program': sphinxCmd})
-    os.system('''%(program)s -b htmlhelp . _build/htmlhelp''' % {'program': sphinxCmd})
-    if DOCUTILS:
-        os.system('''%(program)s -b man . .''' % {'program': sphinxCmd})
-    os.system('''%(program)s -b text . _build/text''' % {'program': sphinxCmd})
-    os.system('''%(program)s -b changes . _build/changes''' % {'program': sphinxCmd})
-    #os.system('''%(program)s -b linkcheck . _build/linkcheck''' % {'program': sphinxCmd})
-    os.system('''%(program)s -b gettext . _build/gettext''' % {'program': sphinxCmd})
-
-    for lang in LANGUAGES:
-        os.system('''%(program)s -b html -D language="%(lang)s" master_doc="%(lang)s" %(lang)s %(lang)s'''
-                   % {'lang': lang, 'program': sphinxCmd})
-        os.system('''%(program)s -b htmlhelp -D language="%(lang)s" master_doc="%(lang)s" %(lang)s %(lang)s'''
-                   % {'lang': lang, 'program': sphinxCmd})
-        if DOCUTILS:
-            os.system('''%(program)s -b man %(lang)s %(lang)s'''
-                       % {'lang': lang, 'program': sphinxCmd})
-        os.system('''%(program)s -b text -D language="%(lang)s" master_doc="%(lang)s" %(lang)s %(lang)s'''
-                   % {'lang': lang, 'program': sphinxCmd})
-        # for update/migration
-        os.system('''%(program)s -b gettext -D language="%(lang)s" master_doc="%(lang)s" . _build/gettext/%(lang)s'''
-                   % {'lang': lang, 'program': sphinxCmd})
-
-def man():
-    """
-    man file generation via docutils (python)
-
-    from docutils.core import publish_cmdline, default_description
-    from docutils.writers import manpage
-    """
-
-    os.system('''rst2man en.rst gramps.1''')
-
-    for lang in LANGUAGES:
-        os.system('''rst2man %(lang)s/%(lang)s.rst -l %(lang)s %(lang)s/gramps.1'''
-                   % {'lang': lang})
-
-def odt():
-    """
-    odt file generation via docutils (python)
-
-    from docutils.core import publish_cmdline_to_binary, default_description
-    from docutils.writers.odf_odt import Writer, Reader
-    """
-
-    os.system('''rst2odt en.rst gramps.odt''')
-
-    for lang in LANGUAGES:
-        os.system('''rst2odt %(lang)s/%(lang)s.rst -l %(lang)s %(lang)s/gramps.odt'''
-                   % {'lang': lang})
-
-if __name__ == "__main__":
-    main()
--- a/data/tests/O0.jpg
+++ b/data/tests/O0.jpg
--- a/data/tests/PG30-1GB.DEF
+++ b/data/tests/PG30-1GB.DEF
@@ -1,236 +0,0 @@
-[PRO-GEN]
-version=3.0b
-type=def
-format=2
-
-[general]
-dateformat=DD/MM/YYYY
-pointerlength=4
-tables=2
-
-[Table_1]
-name1=Person
-name2=Persons
-fileext=.PER
-indexext=.IXP
-n_lines=42
-hiddenlines=4,5,6,7,8,10,12,13,14,15,19,25,30,32,33,34,35,36,40
-t01=ÉÍµINDIVIDUAL       ÆÍÍÍÍÍÍÍÍÍÍÍÍÍÍµpg30-1gbÆÍÍÍÍÍÍÍÍÍµLAST CHANGE           ÆÍ»
-t02=º ÛGiven name:                                                                  º
-t03=º Surname   :                                                Sex:              º
-t04=º Patronym  :                                                                  º
-t05=º Call name :                    Alias:                     Code:              º
-t06=º Title 1   :                  Title 2:                  Title 3:              º
-t07=º Father    :                                                                  º
-t08=º Mother    :                                                                  º
-t09=º Occupation:                                                                  º
-t10=º Scratch   :                                                                  º
-t11=º Info      :                                                                  º
-t12=ÇÄ´ÛAddressÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
-t13=º Date  :            Street:                                                   º
-t14=º Zip   :             Place:                             Country:              º
-t15=º Phone :              Info:                                                   º
-t16=ÇÄ´ÛBirthÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
-t17=º Date  :             Place:                                Time:              º
-t18=º Source:                                              Reference:              º
-t19=º Text  :                                                                      º
-t20=º Info  :                                                                      º
-t21=ÇÄ´ÛChristeningÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
-t22=º Date  :             Place:                            Religion:              º
-t23=º Witn. :                                                                      º
-t24=º Source:                                              Reference:              º
-t25=º Text  :                                                                      º
-t26=º Info  :                                                                      º
-t27=ÇÄ´ÛDeathÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
-t28=º Date  :             Place:                                Time:              º
-t29=º Source:                                              Reference:              º
-t30=º Text  :                                                                      º
-t31=º Info  :                                                                      º
-t32=ÇÄ´CÛremationÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
-t33=º Date  :             Place:                                                   º
-t34=º Source:                                              Reference:              º
-t35=º Text  :                                                                      º
-t36=º Info  :                                                                      º
-t37=ÇÄ´BÛurialÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
-t38=º Date  :             Place:                                                   º
-t39=º Source:                                              Reference:              º
-t40=º Text  :                                                                      º
-t41=º Info  :                                                                      º
-t42=ÈÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ¼
-n_fields=58
-f01=Person_record       ,31, 6, 0, 1,15,"","INDI RFN"
-f02=Person_last_change  ,32,10,10, 1,68,"","INDI CHAN DATE"
-f03=Given_name          ,47,64, 4, 2,15,"",""
-f04=Surname             ,47,40, 4, 3,15,"","INDI NAME"
-f05=Sex                 ,45, 1, 1, 3,67,"MMFFmmff??","INDI SEX"
-f06=Patronym            ,47,40, 4, 4,15,"","INDI _PATR"
-f07=Call_name           ,47,18, 4, 5,15,"","INDI NAME NICK/INDI NAME ALIA/INDI CHR NICK"
-f08=Alias               ,47,19, 4, 5,41,"","INDI NAME _ALIA/INDI NAME COMM"
-f09=Person_code         ,47,12, 4, 5,67,"","INDI REFN/INDI CODE"
-f10=Title1              ,47,16, 4, 6,15,"","INDI TITL"
-f11=Title2              ,47,16, 4, 6,41,"","INDI _TITL2"
-f12=Title3              ,47,12, 4, 6,67,"","INDI _TITL3"
-f13=Father              , 2,64, 4, 7,15,"",""
-f14=Mother              , 3,64, 4, 8,15,"",""
-f15=Occupation          ,47,64, 4, 9,15,"","INDI OCCU"
-f16=Person_scratch      ,46,64, 4,10,15,"","INDI _COMM/INDI COMM"
-f17=Person_info         ,46,64, 4,11,15,"","INDI NOTE"
-f18=Address_date        ,44,10,10,13,11,"","INDI RESI DATE"
-f19=Address_street      ,47,49, 4,13,30,"","INDI RESI ADDR"
-f20=Address_zip         ,47,11, 4,14,11,"","INDI RESI ADDR POST/INDI RESI POST"
-f21=Address_place       ,47,27, 4,14,30,"","INDI RESI ADDR CITY/INDI RESI PLAC"
-f22=Address_country     ,47,12, 4,14,67,"","INDI RESI ADDR CTRY/INDI RESI CTRY"
-f23=Address_phone       ,47,12, 4,15,11,"","INDI RESI PHON/INDI PHON"
-f24=Address_info        ,46,49, 4,15,30,"","INDI RESI NOTE/INDI ADDR"
-f25=Birth_date          ,44,10,10,17,11,"","INDI BIRT DATE"
-f26=Birth_place         ,47,30, 4,17,30,"","INDI BIRT PLAC"
-f27=Birth_time          ,45, 5, 5,17,67,"09::..","INDI BIRT TIME"
-f28=Birth_source        ,47,44, 4,18,11,"","INDI BIRT SOUR/INDI BIRT SOUR TITL"
-f29=Birth_ref           ,45,12,12,18,67,"","INDI BIRT SOUR REFN"
-f30=Birth_text          ,46,68, 4,19,11,"","INDI BIRT SOUR TEXT"
-f31=Birth_info          ,46,68, 4,20,11,"","INDI BIRT NOTE"
-f32=Christening_date    ,44,10,10,22,11,"","INDI CHR DATE"
-f33=Christening_place   ,47,26, 4,22,30,"","INDI CHR PLAC"
-f34=Religion            ,47,12, 4,22,67,"","INDI CHR RELI/INDI RELI"
-f35=Christening_witness ,47,68, 4,23,11,"","INDI CHR _WITN/INDI CHR WITN"
-f36=Christening_source  ,47,44, 4,24,11,"","INDI CHR SOUR/INDI CHR SOUR TITL"
-f37=Christening_ref     ,45,12,12,24,67,"","INDI CHR SOUR REFN"
-f38=Christening_text    ,46,68, 4,25,11,"","INDI CHR SOUR TEXT"
-f39=Christening_info    ,46,68, 4,26,11,"","INDI CHR NOTE"
-f40=Death_date          ,44,10,10,28,11,"","INDI DEAT DATE"
-f41=Death_place         ,47,30, 4,28,30,"","INDI DEAT PLAC"
-f42=Death_time          ,45, 5, 5,28,67,"09::..","INDI DEAT TIME"
-f43=Death_source        ,47,44, 4,29,11,"","INDI DEAT SOUR/INDI DEAT SOUR TITL"
-f44=Death_ref           ,45,12,12,29,67,"","INDI DEAT SOUR REFN"
-f45=Death_text          ,46,68, 4,30,11,"","INDI DEAT SOUR TEXT"
-f46=Death_info          ,46,68, 4,31,11,"","INDI DEAT NOTE"
-f47=Cremation_date      ,44,10,10,33,11,"","INDI CREM DATE"
-f48=Cremation_place     ,47,49, 4,33,30,"","INDI CREM PLAC"
-f49=Cremation_source    ,47,44, 4,34,11,"","INDI CREM SOUR/INDI CREM SOUR TITL"
-f50=Cremation_ref       ,45,12,12,34,67,"","INDI CREM SOUR REFN"
-f51=Cremation_text      ,46,68, 4,35,11,"","INDI CREM SOUR TEXT"
-f52=Cremation_info      ,46,68, 4,36,11,"","INDI CREM NOTE"
-f53=Burial_date         ,44,10,10,38,11,"","INDI BURI DATE"
-f54=Burial_place        ,47,49, 4,38,30,"","INDI BURI PLAC"
-f55=Burial_source       ,47,44, 4,39,11,"","INDI BURI SOUR/INDI BURI SOUR TITL"
-f56=Burial_ref          ,45,12,12,39,67,"","INDI BURI SOUR REFN"
-f57=Burial_text         ,46,68, 4,40,11,"","INDI BURI SOUR TEXT"
-f58=Burial_info         ,46,68, 4,41,11,"","INDI BURI NOTE"
-n_replace=4
-r01=Surname,Patronym
-r02=Birth_date,Christening_date/Birth_place,Christening_place
-r03=Death_date,Burial_date/Death_place,Burial_place
-r04=Burial_date,Cremation_date/Burial_place,Cremation_place
-
-[Table_2]
-name1=Marriage
-name2=Marriages
-fileext=.REL
-indexext=.IXR
-n_lines=35
-hiddenlines=5,7,8,9,10,11,16,22,28,30,31,32,33,34
-t01=ÉÍµMARRIAGE       ÆÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍµpg30-1gbÆÍÍÍÍÍÍÍÍÍµLAST CHANGE           ÆÍ»
-t02=º ÛHusband:                                                                     º
-t03=º Wife   :                                                                     º
-t04=º Code   :                                                                     º
-t05=º Scratch:                                                                     º
-t06=º Info   :                                                                     º
-t07=ÇÄ´ÛLiving togetherÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
-t08=º Date  :             Place:                                                   º
-t09=º Source:                                              Reference:              º
-t10=º Text  :                                                                      º
-t11=º Info  :                                                                      º
-t12=ÇÄ´Publication of the ÛbannsÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
-t13=º Date  :             Place:                                                   º
-t14=º Witn. :                                                                      º
-t15=º Source:                                              Reference:              º
-t16=º Text  :                                                                      º
-t17=º Info  :                                                                      º
-t18=ÇÄ´Civil ÛmarriageÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
-t19=º Date  :             Place:                                                   º
-t20=º Witn. :                                                                      º
-t21=º Source:                                              Reference:              º
-t22=º Text  :                                                                      º
-t23=º Info  :                                                                      º
-t24=ÇÄ´ÛChurch marriageÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
-t25=º Date  :             Place:                              Church:              º
-t26=º Witn. :                                                                      º
-t27=º Source:                                              Reference:              º
-t28=º Text  :                                                                      º
-t29=º Info  :                                                                      º
-t30=ÇÄ´ÛDivorceÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¶
-t31=º Date  :             Place:                                                   º
-t32=º Source:                                              Reference:              º
-t33=º Text  :                                                                      º
-t34=º Info  :                                                                      º
-t35=ÈÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ¼
-n_fields=41
-f01=Relation_record     ,31, 6, 0, 1,13,"","FAM RFN"
-f02=Relation_last_change,32,10,10, 1,68,"","FAM CHAN DATE"
-f03=Husband             ,22,67, 4, 2,12,"","FAM HUSB"
-f04=Wife                ,23,67, 4, 3,12,"","FAM WIFE"
-f05=Relation_code       ,47,12, 4, 4,12,"","FAM REFN/FAM CODE"
-f06=Relation_scratch    ,46,67, 4, 5,12,"","FAM _COMM/FAM COMM"
-f07=Relation_info       ,46,67, 4, 6,12,"","FAM NOTE"
-f08=Living_date         ,44,10,10, 8,11,"","FAM _LIV DATE"
-f09=Living_place        ,47,49, 4, 8,30,"","FAM _LIV PLAC"
-f10=Living_source       ,47,44, 4, 9,11,"","FAM _LIV SOUR/FAM _LIV SOUR TITL"
-f11=Living_ref          ,45,12,12, 9,67,"","FAM _LIV SOUR REFN"
-f12=Living_text         ,46,68, 4,10,11,"","FAM _LIV SOUR TEXT"
-f13=Living_info         ,46,68, 4,11,11,"","FAM _LIV NOTE"
-f14=Banns_date          ,44,10,10,13,11,"","FAM MARB DATE/FAM REGS DATE"
-f15=Banns_place         ,47,49, 4,13,30,"","FAM MARB PLAC/FAM REGS PLAC"
-f16=banns_witnesses     ,47,68, 4,14,11,"","FAM MARB _WITN/FAM MARB WITN"
-f17=Banns_source        ,47,44, 4,15,11,"","FAM MARB SOUR/FAM MARB SOUR TITL/FAM REGS SOUR"
-f18=Banns_ref           ,45,12,12,15,67,"","FAM MARB SOUR REFN/FAM REGS SOUR REFN"
-f19=Banns_text          ,46,68, 4,16,11,"","FAM MARB SOUR TEXT"
-f20=Banns_info          ,46,68, 4,17,11,"","FAM MARB NOTE"
-f21=Civil_date          ,44,10,10,19,11,"","FAM MARR(Civil) DATE/FAM MARR DATE"
-f22=Civil_place         ,47,49, 4,19,30,"","FAM MARR(Civil) PLAC/FAM MARR PLAC"
-f23=Civil_witnesses     ,47,68, 4,20,11,"","FAM MARR(Civil) _WITN/FAM MARR _WITN/FAM MARR WITN/FAM WITN"
-f24=Civil_source        ,47,44, 4,21,11,"","FAM MARR(Civil) SOUR/FAM MARR SOUR/FAM MARR SOUR TITL"
-f25=Civil_ref           ,45,12,12,21,67,"","FAM MARR(Civil) SOUR REFN/FAM MARR SOUR REFN"
-f26=Civil_text          ,46,68, 4,22,11,"","FAM MARR(Civil) SOUR TEXT/FAM MARR SOUR TEXT"
-f27=Civil_info          ,46,68, 4,23,11,"","FAM MARR(Civil) NOTE/FAM MARR NOTE"
-f28=Church_date         ,44,10,10,25,11,"","FAM MARR(Church) DATE/FAM ORDI DATE"
-f29=Church_place        ,47,28, 4,25,30,"","FAM MARR(Church) PLAC/FAM ORDI PLAC"
-f30=Church              ,47,12, 4,25,67,"","FAM MARR(Church) _CHUR/FAM ORDI _CHUR/FAM ORDI RELI"
-f31=Church_witnesses    ,47,68, 4,26,11,"","FAM MARR(Church) _WITN/FAM ORDI _WITN/FAM ORDI WITN"
-f32=Church_source       ,47,44, 4,27,11,"","FAM MARR(Church) SOUR/FAM ORDI SOUR/FAM ORDI SOUR TITL"
-f33=Church_ref          ,45,12,12,27,67,"","FAM MARR(Church) SOUR REFN/FAM ORDI SOUR REFN"
-f34=Church_text         ,46,68, 4,28,11,"","FAM MARR(Church) SOUR TEXT/FAM ORDI SOUR TEXT"
-f35=Church_info         ,46,68, 4,29,11,"","FAM MARR(Church) NOTE/FAM ORDI NOTE"
-f36=Divorce_date        ,44,10,10,31,11,"","FAM DIV DATE/FAM DIVO DATE"
-f37=Divorce_place       ,47,49, 4,31,30,"","FAM DIV PLAC/FAM DIVO PLAC"
-f38=Divorce_source      ,47,44, 4,32,11,"","FAM DIV SOUR/FAM DIV SOUR TITL"
-f39=Divorce_ref         ,45,12,12,32,67,"","FAM DIV SOUR REFN"
-f40=Divorce_text        ,46,68, 4,33,11,"","FAM DIV SOUR TEXT"
-f41=Divorce_info        ,46,68, 4,34,11,"","FAM DIV NOTE"
-n_replace=3
-r01=Banns_date,Living_date/Banns_place,Living_place
-r02=Civil_date,Church_date/Civil_place,Church_place
-r03=Church_date,Banns_date/Church_place,Banns_place
-
-[Genealogical]
-male=M
-female=F
-function_father=[FATHER]
-function_mother=[MOTHER]
-function_husband=[HUSBAND]
-function_wife=[WIFE]
-function_age=[AGE]
-function_initials=[INITIALS]
-field_father=Father
-field_mother=Mother
-field_givenname=Given_name
-field_surname=Surname
-field_sex=Sex
-field_birthdate=Birth_date
-field_christeningdate=Christening_date
-field_deathdate=Death_date
-field_burialdate=Burial_date
-field_husband=Husband
-field_wife=Wife
-field_marriagedate=Civil_date
-field_churchdate=Church_date
-field_divorcedate=Divorce_date
--- a/data/tests/SAMPLE.DEF
+++ b/data/tests/SAMPLE.DEF
@@ -1,2 +0,0 @@
-\0
-PG30-1GB.DEF
--- a/data/tests/SAMPLE.IXI
+++ b/data/tests/SAMPLE.IXI
@@ -1,22 +0,0 @@
-[PRO-GEN]
-version=3.21
-type=ixi
-indexformat=2
-
-[Table_1]
-current_record=0
-current_index=1
-indexes=1
-sel_1=
-sort_1=
-mark_1=
-marked_1=0
-
-[Table_2]
-current_record=0
-current_index=1
-indexes=1
-sel_1=
-sort_1=
-mark_1=
-marked_1=0
--- a/data/tests/SAMPLE.IXP
+++ b/data/tests/SAMPLE.IXP
--- a/data/tests/SAMPLE.IXR
+++ b/data/tests/SAMPLE.IXR
--- a/data/tests/SAMPLE.MEM
+++ b/data/tests/SAMPLE.MEM
--- a/data/tests/SAMPLE.PER
+++ b/data/tests/SAMPLE.PER
--- a/data/tests/SAMPLE.REL
+++ b/data/tests/SAMPLE.REL
--- a/data/tests/SAMPLE.REM
+++ b/data/tests/SAMPLE.REM
@@ -1,20 +0,0 @@
-File of remarks for GEDCOM import.
-
-GEDCOM file   : D:\Users\PRC\Documents\Gramps\data\tests\exp_sample_ged.ged
-PRO-GEN file  : C:\PG30\GB\DATA\SAMPLE
-Date          : 13/01/2017
-
-Rec.   Remarks (P=person, R=Marriage)
--------------------------------------------------------------------------------
-    P1 (@I0000@) Surname (Anna Nana /Hansdotter/) has already been entered.
-2 FAMC @F0008@
-   P25 (@I0024@) Death_date (BEF 23 JUL 1930) too long.
-2 FAMC @F0010@
-   P43 (@I0042@) Surname (Frank /Neilsen/) has already been entered.
-2 FAMC @F0005@
-   P47 (@I0046@) Address_date (FROM 1 JAN 1964 TO 3 MAR 1970) too long.
-       (@I0046@) Address_date (I think 1970 to 1971) has already been entered.
-2 FAMC @F0016@
-2 FAMC @F0016@
-2 FAMC @F0016@
--------------------------------------------------------------------------------
--- a/data/tests/SAMPLE.X11
+++ b/data/tests/SAMPLE.X11
--- a/data/tests/SAMPLE.X21
+++ b/data/tests/SAMPLE.X21
--- a/data/tests/SAMPLE.gramps
+++ b/data/tests/SAMPLE.gramps
--- a/data/tests/child-father-child-loop.gramps
+++ b/data/tests/child-father-child-loop.gramps
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE database PUBLIC "-//Gramps//DTD Gramps XML 1.6.0//EN"
-"http://gramps-project.org/xml/1.6.0/grampsxml.dtd">
-<database xmlns="http://gramps-project.org/xml/1.6.0/">
-  <header>
-    <created date="2015-07-21" version="GrampsAIO64-4.1.3-1"/>
-    <researcher>
-    </researcher>
-  </header>
-  <people>
-    <person handle="_d12d89b02aa5121726adba4f517" change="1437459556" id="I0000">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>Child</first>
-        <surname>Child</surname>
-      </name>
-      <childof hlink="_d12d8a32ae01d9449d5da18eda0"/>
-      <parentin hlink="_d12d8a7573462f21848658c9c5d"/>
-    </person>
-    <person handle="_d12d89d4dce7eaaa68e31f6100e" change="1437459556" id="I0001">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>Father</first>
-        <surname>Father</surname>
-      </name>
-      <childof hlink="_d12d8a7573462f21848658c9c5d"/>
-      <parentin hlink="_d12d8a32ae01d9449d5da18eda0"/>
-    </person>
-  </people>
-  <families>
-    <family handle="_d12d8a32ae01d9449d5da18eda0" change="1437459531" id="F0000">
-      <rel type="Unknown"/>
-      <father hlink="_d12d89d4dce7eaaa68e31f6100e"/>
-      <childref hlink="_d12d89b02aa5121726adba4f517"/>
-    </family>
-    <family handle="_d12d8a7573462f21848658c9c5d" change="1437459556" id="F0001">
-      <rel type="Unknown"/>
-      <father hlink="_d12d89b02aa5121726adba4f517"/>
-      <childref hlink="_d12d89d4dce7eaaa68e31f6100e"/>
-    </family>
-  </families>
-</database>
--- a/data/tests/data.gramps
+++ b/data/tests/data.gramps
--- a/data/tests/datetest.gramps
+++ b/data/tests/datetest.gramps
@@ -1,782 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE database PUBLIC "-//Gramps//DTD Gramps XML 1.5.0//EN"
-"http://gramps-project.org/xml/1.5.0/grampsxml.dtd">
-<database xmlns="http://gramps-project.org/xml/1.5.0/">
-  <header>
-    <created date="2015-05-14" version="3.4.0"/>
-    <researcher>
-    </researcher>
-  </header>
-  <events>
-    <event handle="_cde77b2c30c13ea85db" change="1426803047" id="E0000">
-      <type>Birth</type>
-      <dateval val="1823" type="before"/>
-    </event>
-    <event handle="_cde77b7eff96ae8455f" change="1426803072" id="E0001">
-      <type>Birth</type>
-      <dateval val="1823-03" type="before"/>
-    </event>
-    <event handle="_cde77be2a67401f7b16" change="1426803096" id="E0002">
-      <type>Birth</type>
-      <dateval val="1823-03-13" type="before"/>
-    </event>
-    <event handle="_cde7b70d22b30f00b14" change="1426802975" id="E0003">
-      <type>Birth</type>
-      <dateval val="1822" type="after"/>
-    </event>
-    <event handle="_cde7b8eb90e0a8792a9" change="1426802998" id="E0004">
-      <type>Birth</type>
-      <dateval val="1822-02" type="after"/>
-    </event>
-    <event handle="_cde7b95cb7e40432538" change="1426803021" id="E0005">
-      <type>Birth</type>
-      <dateval val="1822-02-13" type="after"/>
-    </event>
-    <event handle="_cde7b9b2b00713c42af" change="1426802885" id="E0006">
-      <type>Birth</type>
-      <dateval val="1821" type="about"/>
-    </event>
-    <event handle="_cde7b9f0da51d2ff10a" change="1426802925" id="E0007">
-      <type>Birth</type>
-      <dateval val="1821-01" type="about"/>
-    </event>
-    <event handle="_cde7ba310240e18a0ea" change="1426802949" id="E0008">
-      <type>Birth</type>
-      <dateval val="1821-01-13" type="about"/>
-    </event>
-    <event handle="_ce00f22be3443f0c30b" change="1426803671" id="E0009">
-      <type>Birth</type>
-      <dateval val="1851"/>
-    </event>
-    <event handle="_ce00f2ab83911df5354" change="1426803701" id="E0010">
-      <type>Birth</type>
-      <dateval val="1852-02"/>
-    </event>
-    <event handle="_ce00f2eb2f86d94ece0" change="1426803729" id="E0011">
-      <type>Birth</type>
-      <dateval val="1853-03-04"/>
-    </event>
-    <event handle="_cfa02e904f161e652da" change="1426793018" id="E0014">
-      <type>Birth</type>
-      <dateval val="1801-01"/>
-    </event>
-    <event handle="_cfa02efc75b0eb05cfa" change="1426793062" id="E0015">
-      <type>Birth</type>
-      <dateval val="1801-01-13"/>
-    </event>
-    <event handle="_cfa02f60fbe55ad36f7" change="1426793103" id="E0016">
-      <type>Birth</type>
-      <dateval val="1802-02"/>
-    </event>
-    <event handle="_cfa02fd93615614dc94" change="1426793153" id="E0017">
-      <type>Birth</type>
-      <dateval val="1802-02-13"/>
-    </event>
-    <event handle="_cfa030376d1228fb29b" change="1426793191" id="E0018">
-      <type>Birth</type>
-      <dateval val="1803-03"/>
-    </event>
-    <event handle="_cfa0308a9e766a18a5a" change="1426793225" id="E0019">
-      <type>Birth</type>
-      <dateval val="1803-03-13"/>
-    </event>
-    <event handle="_cfa0311ff9474a33dad" change="1426793404" id="E0020">
-      <type>Birth</type>
-      <dateval val="1804-04"/>
-    </event>
-    <event handle="_cfa0314208a175c695f" change="1426793300" id="E0021">
-      <type>Birth</type>
-      <dateval val="1804-04-13"/>
-    </event>
-    <event handle="_cfa031df6bb2f50f9c5" change="1426793365" id="E0022">
-      <type>Birth</type>
-      <dateval val="1805-05"/>
-    </event>
-    <event handle="_cfa0335efcf6eeb6bf6" change="1426793522" id="E0024">
-      <type>Birth</type>
-      <dateval val="1805-05-13"/>
-    </event>
-    <event handle="_cfa0342171e10e9a0c8" change="1426793602" id="E0025">
-      <type>Birth</type>
-      <dateval val="1806-06"/>
-    </event>
-    <event handle="_cfa03468bc76cf7a295" change="1426793631" id="E0026">
-      <type>Birth</type>
-      <dateval val="1807-07"/>
-    </event>
-    <event handle="_cfa034b07c9408b12cc" change="1426793660" id="E0027">
-      <type>Birth</type>
-      <dateval val="1808-08"/>
-    </event>
-    <event handle="_cfa034f8da44738c323" change="1426793690" id="E0028">
-      <type>Birth</type>
-      <dateval val="1809-09"/>
-    </event>
-    <event handle="_cfa03547c3765017895" change="1426793722" id="E0029">
-      <type>Birth</type>
-      <dateval val="1810-10"/>
-    </event>
-    <event handle="_cfa035965a02da81147" change="1426793754" id="E0030">
-      <type>Birth</type>
-      <dateval val="1811-11"/>
-    </event>
-    <event handle="_cfa035ee99b03f59cbc" change="1426793790" id="E0031">
-      <type>Birth</type>
-      <dateval val="1812-12"/>
-    </event>
-    <event handle="_cfa038cce441e73b1c5" change="1426794091" id="E0032">
-      <type>Birth</type>
-      <dateval val="1806-06-13"/>
-    </event>
-    <event handle="_cfa039308b34bf173be" change="1426794132" id="E0033">
-      <type>Birth</type>
-      <dateval val="1807-07-13"/>
-    </event>
-    <event handle="_cfa0399114e40ffcadf" change="1426794172" id="E0034">
-      <type>Birth</type>
-      <dateval val="1808-08-13"/>
-    </event>
-    <event handle="_cfa039f6e510c198300" change="1426794213" id="E0035">
-      <type>Birth</type>
-      <dateval val="1809-09-13"/>
-    </event>
-    <event handle="_cfa03a5c2fe4ce6e75d" change="1426794255" id="E0036">
-      <type>Birth</type>
-      <dateval val="1810-10-13"/>
-    </event>
-    <event handle="_cfa03aabe141219bb22" change="1426794287" id="E0037">
-      <type>Birth</type>
-      <dateval val="1811-11-13"/>
-    </event>
-    <event handle="_cfa03afa2ac4d140d9d" change="1426794319" id="E0038">
-      <type>Birth</type>
-      <dateval val="1812-12-13"/>
-    </event>
-    <event handle="_cfa0424ffcb19aed9f7" change="1426804001" id="E0039">
-      <type>Birth</type>
-      <datespan start="1876" stop="1877"/>
-    </event>
-    <event handle="_cfa042e5a0d52e9c63f" change="1426804044" id="E0040">
-      <type>Birth</type>
-      <datespan start="1876-06" stop="1877-07"/>
-    </event>
-    <event handle="_cfa0436b49b7746d225" change="1426804087" id="E0041">
-      <type>Birth</type>
-      <datespan start="1876-06-13" stop="1877-07-13"/>
-    </event>
-    <event handle="_cfa044b58de7b9a9759" change="1426803857" id="E0042">
-      <type>Birth</type>
-      <daterange start="1864" stop="1865"/>
-    </event>
-    <event handle="_cfa0454785d7f7fe074" change="1426803895" id="E0043">
-      <type>Birth</type>
-      <daterange start="1864-04" stop="1865-05"/>
-    </event>
-    <event handle="_cfa045f559074cd25a6" change="1426803934" id="E0044">
-      <type>Birth</type>
-      <daterange start="1864-04-13" stop="1865-05-13"/>
-    </event>
-    <event handle="_cfa05eab109493097d1" change="1426803468" id="E0045">
-      <type>Birth</type>
-      <dateval val="1849" quality="estimated"/>
-    </event>
-    <event handle="_cfa05fb82182cf228bc" change="1426803506" id="E0046">
-      <type>Birth</type>
-      <dateval val="1849-09" quality="estimated"/>
-    </event>
-    <event handle="_cfa0604633236ff9d43" change="1426803535" id="E0047">
-      <type>Birth</type>
-      <dateval val="1849-09-13" quality="estimated"/>
-    </event>
-    <event handle="_cfa060d09d433ae6313" change="1426803223" id="E0048">
-      <type>Birth</type>
-      <dateval val="1835" quality="calculated"/>
-    </event>
-    <event handle="_cfa062751af6a105a82" change="1426803248" id="E0049">
-      <type>Birth</type>
-      <dateval val="1835-05" quality="calculated"/>
-    </event>
-    <event handle="_cfa062e50d3096da9a5" change="1426803275" id="E0050">
-      <type>Birth</type>
-      <dateval val="1835-05-13" quality="calculated"/>
-    </event>
-    <event handle="_cfa063e88800cb80b33" change="1426803138" id="E0051">
-      <type>Birth</type>
-      <dateval val="1834" type="before" quality="calculated"/>
-    </event>
-    <event handle="_cfa064a6da37f0563f5" change="1426803166" id="E0052">
-      <type>Birth</type>
-      <dateval val="1834-04" type="before" quality="calculated"/>
-    </event>
-    <event handle="_cfa0654060124488afa" change="1426803189" id="E0053">
-      <type>Birth</type>
-      <dateval val="1834-04-13" type="before" quality="calculated"/>
-    </event>
-    <event handle="_cfa0670f11e1049f07b" change="1426803306" id="E0054">
-      <type>Birth</type>
-      <dateval val="1846" type="about" quality="estimated"/>
-    </event>
-    <event handle="_cfa067a8bbe2900a40c" change="1426803330" id="E0055">
-      <type>Birth</type>
-      <dateval val="1846-06" type="about" quality="estimated"/>
-    </event>
-    <event handle="_cfa0681c5085ac5e9e0" change="1426803354" id="E0056">
-      <type>Birth</type>
-      <dateval val="1846-06-13" type="about" quality="estimated"/>
-    </event>
-    <event handle="_cfa069a50b23f6b87fa" change="1426803388" id="E0057">
-      <type>Birth</type>
-      <daterange start="1848" stop="1849" quality="estimated"/>
-    </event>
-    <event handle="_cfa086bc43c31bcd49b" change="1426803415" id="E0058">
-      <type>Birth</type>
-      <daterange start="1848-08" stop="1849-09" quality="estimated"/>
-    </event>
-    <event handle="_cfa0873e5170a315aea" change="1426803439" id="E0059">
-      <type>Birth</type>
-      <daterange start="1848-08-13" stop="1849-09-13" quality="estimated"/>
-    </event>
-    <event handle="_cfa087488800cb80b33" change="1426803138" id="E0060">
-      <type>Birth</type>
-      <dateval val="1847" type="after" quality="estimated"/>
-    </event>
-    <event handle="_cfa08756da37f0563f5" change="1426803166" id="E0061">
-      <type>Birth</type>
-      <dateval val="1847-07" type="after" quality="estimated"/>
-    </event>
-    <event handle="_cfa0876060124488afa" change="1426803189" id="E0062">
-      <type>Birth</type>
-      <dateval val="1847-07-13" type="after" quality="estimated"/>
-    </event>
-    <event handle="_cfa0877ffcb19aed9f7" change="1426804001" id="E0063">
-      <type>Birth</type>
-      <datespan start="1878" stop="1879" quality="estimated"/>
-    </event>
-    <event handle="_cfa08785a0d52e9c63f" change="1426804044" id="E0064">
-      <type>Birth</type>
-      <datespan start="1878-08" stop="1879-09" quality="estimated"/>
-    </event>
-    <event handle="_cfa0879b49b7746d225" change="1426804087" id="E0065">
-      <type>Birth</type>
-      <datespan start="1878-08-13" stop="1879-09-13" quality="estimated"/>
-    </event>
-    <event handle="_d0545e83fa37336070a" change="1431629910" id="E0066">
-      <type>Birth</type>
-      <dateval val="1800-00-13"/>
-    </event>
-  </events>
-  <people home="_ce00f22fdb926a87cdd">
-    <person handle="_cde77b359d42a7abeb8" change="1426803052" id="I0000">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Before-Person</surname>
-      </name>
-      <eventref hlink="_cde77b2c30c13ea85db" role="Primary"/>
-    </person>
-    <person handle="_cde77b89083519bcf0b" change="1426803077" id="I0001">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Before-Person</surname>
-      </name>
-      <eventref hlink="_cde77b7eff96ae8455f" role="Primary"/>
-    </person>
-    <person handle="_cde77be591457afcffb" change="1426803099" id="I0002">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Before-Person</surname>
-      </name>
-      <eventref hlink="_cde77be2a67401f7b16" role="Primary"/>
-    </person>
-    <person handle="_cde7b70f31a17456a2e" change="1426802978" id="I0003">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>After-Person</surname>
-      </name>
-      <eventref hlink="_cde7b70d22b30f00b14" role="Primary"/>
-    </person>
-    <person handle="_cde7b8ed6cd11b5562e" change="1426803002" id="I0004">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>After-Person</surname>
-      </name>
-      <eventref hlink="_cde7b8eb90e0a8792a9" role="Primary"/>
-    </person>
-    <person handle="_cde7b95ec952bc2b12d" change="1426803025" id="I0005">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>After-Person</surname>
-      </name>
-      <eventref hlink="_cde7b95cb7e40432538" role="Primary"/>
-    </person>
-    <person handle="_cde7b9b4e9e5e81800d" change="1426802890" id="I0006">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>About-Person</surname>
-      </name>
-      <eventref hlink="_cde7b9b2b00713c42af" role="Primary"/>
-    </person>
-    <person handle="_cde7b9f2d2e633055b9" change="1426802928" id="I0007">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>About-Person</surname>
-      </name>
-      <eventref hlink="_cde7b9f0da51d2ff10a" role="Primary"/>
-    </person>
-    <person handle="_cde7ba324d85d019053" change="1426802954" id="I0008">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>About-Person</surname>
-      </name>
-      <eventref hlink="_cde7ba310240e18a0ea" role="Primary"/>
-    </person>
-    <person handle="_ce00f22fdb926a87cdd" change="1426803678" id="I0009">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Normal-Person</surname>
-      </name>
-      <eventref hlink="_ce00f22be3443f0c30b" role="Primary"/>
-    </person>
-    <person handle="_ce00f2aeb776bb53be5" change="1426803705" id="I0010">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Normal-Person</surname>
-      </name>
-      <eventref hlink="_ce00f2ab83911df5354" role="Primary"/>
-    </person>
-    <person handle="_ce00f2eda384642791d" change="1426803733" id="I0011">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Normal-Person</surname>
-      </name>
-      <eventref hlink="_ce00f2eb2f86d94ece0" role="Primary"/>
-    </person>
-    <person handle="_cfa02ea21cf2c08d6e2" change="1426793828" id="I0014">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B01</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa02e904f161e652da" role="Primary"/>
-    </person>
-    <person handle="_cfa02f060870eef1f71" change="1426793996" id="I0015">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C01</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa02efc75b0eb05cfa" role="Primary"/>
-    </person>
-    <person handle="_cfa02f6db513f4e1c14" change="1426793845" id="I0016">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B02</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa02f60fbe55ad36f7" role="Primary"/>
-    </person>
-    <person handle="_cfa02fe4e8d3cad65e6" change="1426794012" id="I0017">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C02</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa02fd93615614dc94" role="Primary"/>
-    </person>
-    <person handle="_cfa03042b93635f71a0" change="1426793861" id="I0018">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B03</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa030376d1228fb29b" role="Primary"/>
-    </person>
-    <person handle="_cfa03092fb610f772ba" change="1426794027" id="I0019">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C03</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa0308a9e766a18a5a" role="Primary"/>
-    </person>
-    <person handle="_cfa0314a7de1852f830" change="1426794043" id="I0021">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C04</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa0314208a175c695f" role="Primary"/>
-    </person>
-    <person handle="_cfa031e7f6333a37f87" change="1426793893" id="I0022">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B05</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa031df6bb2f50f9c5" role="Primary"/>
-    </person>
-    <person handle="_cfa03248bae711cb306" change="1426793877" id="I0023">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B04</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa0311ff9474a33dad" role="Primary"/>
-    </person>
-    <person handle="_cfa033674d813cb83fb" change="1426794060" id="I0024">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C05</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa0335efcf6eeb6bf6" role="Primary"/>
-    </person>
-    <person handle="_cfa03429a3506b90a17" change="1426793911" id="I0025">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B06</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa0342171e10e9a0c8" role="Primary"/>
-    </person>
-    <person handle="_cfa03471249305e11a3" change="1426793926" id="I0026">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B07</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa03468bc76cf7a295" role="Primary"/>
-    </person>
-    <person handle="_cfa034ba95d55bbb30d" change="1426793947" id="I0027">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B08</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa034b07c9408b12cc" role="Primary"/>
-    </person>
-    <person handle="_cfa035043d730daedcc" change="1426793965" id="I0028">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B09</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa034f8da44738c323" role="Primary"/>
-    </person>
-    <person handle="_cfa03553f6327fb3aa3" change="1426793727" id="I0029">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B10</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa03547c3765017895" role="Primary"/>
-    </person>
-    <person handle="_cfa035a31fd38ced89e" change="1426793759" id="I0030">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B11</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa035965a02da81147" role="Primary"/>
-    </person>
-    <person handle="_cfa035f87450688702b" change="1426793794" id="I0031">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B12</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa035ee99b03f59cbc" role="Primary"/>
-    </person>
-    <person handle="_cfa038d6790220eb6a0" change="1426794095" id="I0032">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C06</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa038cce441e73b1c5" role="Primary"/>
-    </person>
-    <person handle="_cfa039412cf2c81aaa6" change="1426794139" id="I0033">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C07</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa039308b34bf173be" role="Primary"/>
-    </person>
-    <person handle="_cfa0399d5b4296c09ed" change="1426794177" id="I0034">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C08</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa0399114e40ffcadf" role="Primary"/>
-    </person>
-    <person handle="_cfa03a00ae7431e3c10" change="1426794217" id="I0035">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C09</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa039f6e510c198300" role="Primary"/>
-    </person>
-    <person handle="_cfa03a68a5e1f70d524" change="1426794260" id="I0036">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C10</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa03a5c2fe4ce6e75d" role="Primary"/>
-    </person>
-    <person handle="_cfa03ab437d05844dc3" change="1426794291" id="I0037">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C11</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa03aabe141219bb22" role="Primary"/>
-    </person>
-    <person handle="_cfa03b0c1635ed179a5" change="1426794327" id="I0038">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C12</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa03afa2ac4d140d9d" role="Primary"/>
-    </person>
-    <person handle="_cfa0425f40e5bd7f546" change="1426804005" id="I0039">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>SpanFrom-Person</surname>
-      </name>
-      <eventref hlink="_cfa0424ffcb19aed9f7" role="Primary"/>
-    </person>
-    <person handle="_cfa0431254247adca83" change="1426804048" id="I0040">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>SpanFrom-Person</surname>
-      </name>
-      <eventref hlink="_cfa042e5a0d52e9c63f" role="Primary"/>
-    </person>
-    <person handle="_cfa0439de437d741e80" change="1426804091" id="I0041">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>SpanFrom-Person</surname>
-      </name>
-      <eventref hlink="_cfa0436b49b7746d225" role="Primary"/>
-    </person>
-    <person handle="_cfa044c262e1e5c8503" change="1426803860" id="I0042">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>RangeBetween-Person</surname>
-      </name>
-      <eventref hlink="_cfa044b58de7b9a9759" role="Primary"/>
-    </person>
-    <person handle="_cfa04565ce470dcd2f8" change="1426803898" id="I0043">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>RangeBetween-Person</surname>
-      </name>
-      <eventref hlink="_cfa0454785d7f7fe074" role="Primary"/>
-    </person>
-    <person handle="_cfa0460050935c9a427" change="1426803937" id="I0044">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>RangeBetween-Person</surname>
-      </name>
-      <eventref hlink="_cfa045f559074cd25a6" role="Primary"/>
-    </person>
-    <person handle="_cfa05ec0033766aaf99" change="1426803473" id="I0045">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Estimated-Person</surname>
-      </name>
-      <eventref hlink="_cfa05eab109493097d1" role="Primary"/>
-    </person>
-    <person handle="_cfa05fccf2c4051824b" change="1426803510" id="I0046">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Estimated-Person</surname>
-      </name>
-      <eventref hlink="_cfa05fb82182cf228bc" role="Primary"/>
-    </person>
-    <person handle="_cfa060511337394614d" change="1426803539" id="I0047">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Estimated-Person</surname>
-      </name>
-      <eventref hlink="_cfa0604633236ff9d43" role="Primary"/>
-    </person>
-    <person handle="_cfa060e177361c262d1" change="1426803227" id="I0048">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Calculated-Person</surname>
-      </name>
-      <eventref hlink="_cfa060d09d433ae6313" role="Primary"/>
-    </person>
-    <person handle="_cfa0627d4346f5a6156" change="1426803252" id="I0049">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Calculated-Person</surname>
-      </name>
-      <eventref hlink="_cfa062751af6a105a82" role="Primary"/>
-    </person>
-    <person handle="_cfa062f0f6d6be03ddb" change="1426803278" id="I0050">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Calculated-Person</surname>
-      </name>
-      <eventref hlink="_cfa062e50d3096da9a5" role="Primary"/>
-    </person>
-    <person handle="_cfa063f5677702eaa46" change="1426803142" id="I0051">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Calculated-Before-Person</surname>
-      </name>
-      <eventref hlink="_cfa063e88800cb80b33" role="Primary"/>
-    </person>
-    <person handle="_cfa064bb7630e608798" change="1426803169" id="I0052">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Calculated-Before-Person</surname>
-      </name>
-      <eventref hlink="_cfa064a6da37f0563f5" role="Primary"/>
-    </person>
-    <person handle="_cfa0654ca9f46930cc4" change="1426803193" id="I0053">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Calculated-Before-Person</surname>
-      </name>
-      <eventref hlink="_cfa0654060124488afa" role="Primary"/>
-    </person>
-    <person handle="_cfa06717fb57c27f756" change="1426803310" id="I0054">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Estimated-About-Person</surname>
-      </name>
-      <eventref hlink="_cfa0670f11e1049f07b" role="Primary"/>
-    </person>
-    <person handle="_cfa067b2e020880caf3" change="1426803333" id="I0055">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Estimated-About-Person</surname>
-      </name>
-      <eventref hlink="_cfa067a8bbe2900a40c" role="Primary"/>
-    </person>
-    <person handle="_cfa068250bc3c821f3c" change="1426803357" id="I0056">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Estimated-About-Person</surname>
-      </name>
-      <eventref hlink="_cfa0681c5085ac5e9e0" role="Primary"/>
-    </person>
-    <person handle="_cfa069b80556bceaf0b" change="1426803392" id="I0057">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Estimated-RangeBetween-Person</surname>
-      </name>
-      <eventref hlink="_cfa069a50b23f6b87fa" role="Primary"/>
-    </person>
-    <person handle="_cfa086c6e4e248b4ac6" change="1426803418" id="I0058">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Estimated-RangeBetween-Person</surname>
-      </name>
-      <eventref hlink="_cfa086bc43c31bcd49b" role="Primary"/>
-    </person>
-    <person handle="_cfa0874684b42b63ab7" change="1426803443" id="I0059">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Estimated-RangeBetween-Person</surname>
-      </name>
-      <eventref hlink="_cfa0873e5170a315aea" role="Primary"/>
-    </person>
-    <person handle="_cfa087580556bceaf0b" change="1426803392" id="I0060">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Estimated-After-Person</surname>
-      </name>
-      <eventref hlink="_cfa087488800cb80b33" role="Primary"/>
-    </person>
-    <person handle="_cfa08766e4e248b4ac6" change="1426803418" id="I0061">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Estimated-After-Person</surname>
-      </name>
-      <eventref hlink="_cfa08756da37f0563f5" role="Primary"/>
-    </person>
-    <person handle="_cfa0877684b42b63ab7" change="1426803443" id="I0062">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Estimated-After-Person</surname>
-      </name>
-      <eventref hlink="_cfa0876060124488afa" role="Primary"/>
-    </person>
-    <person handle="_cfa087780556bceaf0b" change="1426803392" id="I0063">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Estimated-SpanFrom-Person</surname>
-      </name>
-      <eventref hlink="_cfa0877ffcb19aed9f7" role="Primary"/>
-    </person>
-    <person handle="_cfa08786e4e248b4ac6" change="1426803418" id="I0064">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Estimated-SpanFrom-Person</surname>
-      </name>
-      <eventref hlink="_cfa08785a0d52e9c63f" role="Primary"/>
-    </person>
-    <person handle="_cfa0879684b42b63ab7" change="1426803443" id="I0065">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Estimated-SpanFrom-Person</surname>
-      </name>
-      <eventref hlink="_cfa0879b49b7746d225" role="Primary"/>
-    </person>
-    <person handle="_d0545e25fed7da2d864" change="1431629912" id="I0066">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>Zero-Month</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_d0545e83fa37336070a" role="Primary"/>
-    </person>
-  </people>
-</database>
--- a/data/tests/example.gramps
+++ b/data/tests/example.gramps
--- a/data/tests/exp_sample.gramps
+++ b/data/tests/exp_sample.gramps
--- a/data/tests/exp_sample.gw
+++ b/data/tests/exp_sample.gw
@@ -1,114 +0,0 @@
-fam Smith Gustaf.0 +27/11/1885 #mp Rønne,_Bornholm,_Denmark Hansdotter Anna.1 2/10/1864 #bp Löderup,_Malmöhus_Län,_Sweden 29/9/1945 #dp Sparks,_Washoe_Co.,_NV 
-beg
- f Kirsti_Marie.2 15/12/1886 #bp Rønne,_Bornholm,_Denmark 18/7/1966 #dp San_Francisco,_San_Francisco_Co.,_CA 
- f Astrid_Shermanna_Augusta.3 31/1/1889 #bp Rønne,_Bornholm,_Denmark 21/12/1963 #dp San_Francisco,_San_Francisco_Co.,_CA 
- h Hjalmar.4 31/1/1893 #bp Rønne,_Bornholm,_Denmark 25/9/1894 #dp Rønne,_Bornholm,_Denmark 
- h Hjalmar.5 7/4/1895 #bp Rønne,_Bornholm,_Denmark 26/6/1975 #dp Reno,_Washoe_Co.,_NV 
- h Gus.6 11/9/1897 #bp Rønne,_Bornholm,_Denmark 21/10/1963 #dp San_Francisco,_San_Francisco_Co.,_CA 
- h Carl_Emil.7 20/12/1899 #bp Rønne,_Bornholm,_Denmark 28/1/1959 #dp Reno,_Washoe_Co.,_NV 
- h Hans_Peter.8 17/4/1904 #bp Rønne,_Bornholm,_Denmark 29/1/1977 #dp San_Francisco,_San_Francisco_Co.,_CA 
-end
-
-notes Smith Hjalmar.5
-beg
-BIOGRAPHY
-
-Hjalmar sailed from Copenhagen, Denmark on the OSCAR II, 14 November 1912 arriving in New York 27 November 1912. He was seventeen years old. On the ship passenger list his trade was listed as a Blacksmith.  He came to Reno, Nevada and lived with his sister Marie for a time before settling in Sparks. He worked for Southern Pacific Railroad as a car inspector for a time, then went to work for Standard Oil
-Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corporal in the Medical Corp until his discharge 12 August 1919 at the Presidio in San Francisco, California. Both he and Marjorie are buried in the Masonic Memorial Gardens Mausoleum in Reno, he the 30th June 1975, and she the 25th of June 1980. 
-end notes
-
-fam Smith Lloyd.9 +10/8/1958 #mp San_Francisco,_San_Francisco_Co.,_CA Green Janis_Elaine.10 2/12/1935  
-beg
- h Eric_Lloyd.11 28/8/1963 #bp San_Francisco,_San_Francisco_Co.,_CA  
- h Keith_Lloyd.12 11/8/1966 #bp San_Francisco,_San_Francisco_Co.,_CA  
- h Craig_Peter.13 >1966 #bp San_Francisco,_San_Francisco_Co.,_CA  
- h The.14 Tester 29/12/1954 #bp 123_High_St,_Cleveland,_Cuyahoga,_Ohio,_USA  
-end
-
-fam Smith Hans_Peter.8 + #nm Jones Lillie_Harriet.15 2/5/1910 #bp Rønne,_Bornholm,_Denmark 26/6/1990 
-beg
- h Lloyd.9 13/3/1935 #bp San_Francisco,_San_Francisco_Co.,_CA  
-end
-
-fam Smith Hans_Peter.8 + #nm Anderson Jennifer.16 5/11/1907 #bp Rønne,_Bornholm,_Denmark 29/5/1985 #dp San_Francisco,_San_Francisco_Co.,_CA 
-
-fam Smith Martin.17 +~1816 #mp Gladsax,_Kristianstad_Län,_Sweden Jefferson Elna.18 14/9/1800 #bp Gladsax,_Kristianstad_Län,_Sweden  #dp Sweden 
-beg
- f Hanna.19 29/1/1821 #bp Gladsax,_Kristianstad_Län,_Sweden 0 
- f Ingar.20 >1823 #bp Gladsax,_Kristianstad_Län,_Sweden 0 
- h Ingeman.21 29/1/1826 #bp Gladsax,_Kristianstad_Län,_Sweden 0 
- h Martin.22 19/11/1830 #bp Gladsax,_Kristianstad_Län,_Sweden 1899..1905 #dp Sweden 
-end
-
-notes Smith Martin.22
-beg
-BIOGRAPHY
-Martin was listed as being a Husman, (owning a house as opposed to a farm) in the house records of Gladsax. 
-end notes
-
-fam Nielsen Herman_Julius.23 31/8/1889 #bp Rønne,_Bornholm,_Denmark 1945 +30/11/1912 #mp Rønne,_Bornholm,_Denmark Smith Astrid_Shermanna_Augusta.3 
-beg
- h &#38634;.24 Ke_&#26607; 0  
-end
-
-notes Ke_&#26607; &#38634;.24
-beg
-Some Unicode Characters: &#2294;&#508;&#1024;&#1580;&#12228;&#13405;&#15691;&#22299;&#22665;&#24181;&#32863;&#32870;&#65865;&#128694;&#128712;
-Some Bold Unicode Characters: &#2294;&#508;&#1024;&#1580;&#12228;&#13405;&#15691;&#22299;&#22665;&#24181;&#32863;&#32870;&#65865;&#128694;&#128712;
-Some Italic Unicode Characters: &#2294;&#508;&#1024;&#1580;&#12228;&#13405;&#15691;&#22299;&#22665;&#24181;&#32863;&#32870;&#65865;&#128694;&#128712;
-Some Unicode Characters: &#2294;&#508;&#1024;&#1580;&#12228;&#13405;&#15691;&#22299;&#22665;&#24181;&#32863;&#32870;&#65865;&#128694;&#128712;
-Some Bold Unicode Characters: &#2294;&#508;&#1024;&#1580;&#12228;&#13405;&#15691;&#22299;&#22665;&#24181;&#32863;&#32870;&#65865;&#128694;&#128712;
-Some Italic Unicode Characters: &#2294;&#508;&#1024;&#1580;&#12228;&#13405;&#15691;&#22299;&#22665;&#24181;&#32863;&#32870;&#65865;&#128694;&#128712; 
-end notes
-
-fam Smith Gus.6 +~1920 Michaels Evelyn.25 ~1897  
-
-fam Smith Hjalmar.5 +31/10/1927 #mp Reno,_Washoe_Co.,_NV Ohman Marjorie.26 3/6/1903 #bp Denver,_Denver_Co.,_CO,_Denver_Co.,_Colorado,_USA 22/6/1980 #dp Reno,_Washoe_Co.,_NV 
-beg
- h John_Hjalmar.27 30/1/1932 #bp San_Francisco,_San_Francisco_Co.,_CA  
- f Marjorie_Lee.28 4/11/1934 #bp Reno,_Washoe_Co.,_NV  
-end
-
-fam Smith John_Hjalmar.27 +4/6/1954 #mp Sparks,_Washoe_Co.,_NV Perkins Alice_Paula.29 22/11/1933 #bp Sparks,_Washoe_Co.,_NV  
-beg
- f Marjorie_Alice.30 5/2/1960 #bp San_Jose,_Santa_Clara_Co.,_CA  
- h Edwin_Michael.31 24/5/1961 #bp San_Jose,_Santa_Clara_Co.,_CA  
-end
-
-fam Smith Eric_Lloyd.11 +12/7/1986 #mp Woodland,_Yolo_Co.,_CA Horne Darcy.32 2/7/1966 #bp Sacramento,_Sacramento_Co.,_CA  
-beg
- h Lars_Peter.33 16/9/1991 #bp Santa_Rosa,_Sonoma_Co.,_CA  
-end
-
-fam Smith Edwin_Michael.31 +27/5/1995 #mp San_Ramon,_Conta_Costa_Co.,_CA Adams Janice_Ann.34 26/8/1965 #bp Fremont,_Alameda_Co.,_CA  
-beg
- h Mason_Michael.35 26/6/1996 #bp Hayward,_Alameda_Co.,_CA  
- f Amber_Marie.36 12/4/1998 #bp Hayward,_Alameda_Co.,_CA  
-end
-
-fam Smith Martin.22 +~1856 Hansdotter Kerstina.37 29/11/1832 #bp Smestorp,_Kristianstad_Län,_Sweden <1908 #dp Sweden 
-beg
- h Magnes.38 6/10/1858 #bp Simrishamn,_Kristianstad_Län,_Sweden 20/2/1910 #dp Rønne,_Bornholm,_Denmark 
- h Emil.39 27/9/1860 #bp Simrishamn,_Kristianstad_Län,_Sweden 0 
- h Gustaf.0 28/11/1862 #bp Grostorp,_Kristianstad_Län,_Sweden <23/7/1930 #dp Sparks,_Washoe_Co.,_NV 
-end
-
-fam Smith Ingeman.40 ~1770 #bp Sweden 0 +~1790 #mp Sweden Ericsdotter Marta.41 ~1775 #bp Sweden 0 
-beg
- h Martin.17 1794..1796 #bp Tommarp,_Kristianstad_Län,_Sweden  #dp Sweden 
-end
-
-fam Willard Edwin.42 ~1886  +~1910 Smith Kirsti_Marie.2 
-
-fam Smith Magnes.38 +24/8/1884 #mp Rønne,_Bornholm,_Denmark Streiffert Anna.43 23/9/1860 #bp Hoya/Jona/Hoia,_Sweden 2/2/1927 #dp Rønne,_Bornholm,_Denmark 
-
-fam Tester The.14 + Tester Mrs.44 0  
-beg
- h Tom.45 0  
-end
-
-notes Tester Mrs.44
-beg
-Address with PHON,FAX,EMAIL,WWW. attached directly to person is not legal Gedcom, but allowed here. 
-end notes
-
--- a/data/tests/exp_sample.vcf
+++ b/data/tests/exp_sample.vcf
@@ -1,518 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Anna Hansdotter
-N:Hansdotter;Anna;;;
-SORT-STRING:Hansdotter               Anna                          
-NICKNAME:Annanana
-X-GENDER:Female
-BDAY:1864-10-02
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Keith Lloyd Smith
-N:Smith;Keith;Lloyd;;
-SORT-STRING:Smith                    Keith Lloyd                   
-X-GENDER:Male
-BDAY:1966-08-11
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Hans Peter Smith
-N:Smith;Hans;Peter;;
-SORT-STRING:Smith                    Hans Peter                    
-X-GENDER:Male
-BDAY:1904-04-17
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Hanna Smith
-N:Smith;Hanna;;;
-SORT-STRING:Smith                    Hanna                         
-X-GENDER:Female
-BDAY:1821-01-29
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Herman Julius Nielsen
-N:Nielsen;Herman;Julius;;
-SORT-STRING:Nielsen                  Herman Julius                 
-X-GENDER:Male
-BDAY:1889-08-31
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Evelyn Michaels
-N:Michaels;Evelyn;;;
-SORT-STRING:Michaels                 Evelyn                        
-X-GENDER:Female
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Marjorie Lee Smith
-N:Smith;Marjorie;Lee;;
-SORT-STRING:Smith                    Marjorie Lee                  
-X-GENDER:Female
-BDAY:1934-11-04
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Gus Smith
-N:Smith;Gus;;;
-SORT-STRING:Smith                    Gus                           
-X-GENDER:Male
-BDAY:1897-09-11
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Jennifer Anderson
-N:Anderson;Jennifer;;;
-SORT-STRING:Anderson                 Jennifer                      
-X-GENDER:Female
-BDAY:1907-11-05
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Lillie Harriet Jones
-N:Jones;Lillie;Harriet;;
-SORT-STRING:Jones                    Lillie Harriet                
-X-GENDER:Female
-BDAY:1910-05-02
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:John Hjalmar Smith
-N:Smith;John;Hjalmar;;
-SORT-STRING:Smith                    John Hjalmar                  
-X-GENDER:Male
-BDAY:1932-01-30
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Dr. Eric Lloyd Smith
-N:Smith;Eric;Lloyd;Dr.;
-SORT-STRING:Smith                    Eric Lloyd                    
-X-GENDER:Male
-BDAY:1963-08-28
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Amber Marie Smith
-N:Smith;Amber;Marie;;
-SORT-STRING:Smith                    Amber Marie                   
-X-GENDER:Female
-BDAY:1998-04-12
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Carl Emil Smith
-N:Smith;Carl;Emil;;
-SORT-STRING:Smith                    Carl Emil                     
-X-GENDER:Male
-BDAY:1899-12-20
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Hjalmar Smith
-N:Smith;Hjalmar;;;
-SORT-STRING:Smith                    Hjalmar                       
-X-GENDER:Male
-BDAY:1893-01-31
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Martin Smith
-N:Smith;Martin;;;
-SORT-STRING:Smith                    Martin                        
-X-GENDER:Male
-BDAY:1830-11-19
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Astrid Shermanna Augusta Smith
-N:Smith;Astrid;Shermanna,Augusta;;
-SORT-STRING:Smith                    Astrid Shermanna Augusta      
-X-GENDER:Female
-BDAY:1889-01-31
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Gustaf Smith\, Sr.
-N:Smith;Gustaf;;;Sr.
-SORT-STRING:Smith                    Gustaf                        Sr.
-X-GENDER:Male
-BDAY:1862-11-28
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Marta Ericsdotter
-N:Ericsdotter;Marta;;;
-SORT-STRING:Ericsdotter              Marta                         
-X-GENDER:Female
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Kirsti Marie Smith
-N:Smith;Kirsti;Marie;;
-SORT-STRING:Smith                    Kirsti Marie                  
-X-GENDER:Female
-BDAY:1886-12-15
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Ingeman Smith
-N:Smith;Ingeman;;;
-SORT-STRING:Smith                    Ingeman                       
-X-GENDER:Male
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Anna Streiffert
-N:Streiffert;Anna;;;
-SORT-STRING:Streiffert               Anna                          
-X-GENDER:Female
-BDAY:1860-09-23
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Craig Peter Smith
-N:Smith;Craig;Peter;;
-SORT-STRING:Smith                    Craig Peter                   
-X-GENDER:Male
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Magnes Smith
-N:Smith;Magnes;;;
-SORT-STRING:Smith                    Magnes                        
-X-GENDER:Male
-BDAY:1858-10-06
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Janice Ann Adams
-N:Adams;Janice;Ann;;
-SORT-STRING:Adams                    Janice Ann                    
-X-GENDER:Female
-BDAY:1965-08-26
-ROLE:Retail Manager
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Marjorie Ohman
-N:Ohman;Marjorie;;;
-SORT-STRING:Ohman                    Marjorie                      
-X-GENDER:Female
-BDAY:1903-06-03
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Darcy Horne
-N:Horne;Darcy;;;
-SORT-STRING:Horne                    Darcy                         
-X-GENDER:Female
-BDAY:1966-07-02
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Lloyd Smith
-N:Smith;Lloyd;;;
-SORT-STRING:Smith                    Lloyd                         
-X-GENDER:Male
-BDAY:1935-03-13
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Alice Paula Perkins
-N:Perkins;Alice;Paula;;
-SORT-STRING:Perkins                  Alice Paula                   
-X-GENDER:Female
-BDAY:1933-11-22
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Lars Peter Smith
-N:Smith;Lars;Peter;;
-SORT-STRING:Smith                    Lars Peter                    
-X-GENDER:Male
-BDAY:1991-09-16
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Elna Jefferson
-N:Jefferson;Elna;;;
-SORT-STRING:Jefferson                Elna                          
-X-GENDER:Female
-BDAY:1800-09-14
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Edwin Michael Smith
-N:Smith;Edwin;Michael;;
-SORT-STRING:Smith                    Edwin Michael                 
-X-GENDER:Male
-BDAY:1961-05-24
-ROLE:Software Engineer
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Kerstina Hansdotter
-N:Hansdotter;Kerstina;;;
-SORT-STRING:Hansdotter               Kerstina                      
-X-GENDER:Female
-BDAY:1832-11-29
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Martin Smith
-N:Smith;Martin;;;
-SORT-STRING:Smith                    Martin                        
-X-GENDER:Male
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Ingeman Smith
-N:Smith;Ingeman;;;
-SORT-STRING:Smith                    Ingeman                       
-X-GENDER:Male
-BDAY:1826-01-29
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Marjorie Alice Smith
-N:Smith;Marjorie;Alice;;
-SORT-STRING:Smith                    Marjorie Alice                
-X-GENDER:Female
-BDAY:1960-02-05
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Janis Elaine Green
-N:Green;Janis;Elaine;;
-SORT-STRING:Green                    Janis Elaine                  
-X-GENDER:Female
-BDAY:1935-12-02
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Mason Michael Smith
-N:Smith;Mason;Michael;;
-SORT-STRING:Smith                    Mason Michael                 
-X-GENDER:Male
-BDAY:1996-06-26
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Edwin Willard
-N:Willard;Edwin;;;
-SORT-STRING:Willard                  Edwin                         
-X-GENDER:Male
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Ingar Smith
-N:Smith;Ingar;;;
-SORT-STRING:Smith                    Ingar                         
-X-GENDER:Female
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Hjalmar Smith
-N:Smith;Hjalmar;;;
-SORT-STRING:Smith                    Hjalmar                       
-X-GENDER:Male
-BDAY:1895-04-07
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Emil Smith
-N:Smith;Emil;;;
-SORT-STRING:Smith                    Emil                          
-X-GENDER:Male
-BDAY:1860-09-27
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:雪 Ke 柯
-N:Ke 柯;雪;;;
-SORT-STRING:Ke 柯                     雪                             
-X-GENDER:Male
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:ピーター リチミシキスイミ
-N:リチミシキスイミ;ピーター;;;
-SORT-STRING:リチミシキスイミ                 ピーター                          
-X-GENDER:Male
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:The Tester
-N:Tester;The;;;
-SORT-STRING:Tester                   The                           
-X-GENDER:Male
-BDAY:1954-12-29
-ADR:;;;Akron;OH;44177;Cuyahoga
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Mrs Tester
-N:Tester;Mrs;;;
-SORT-STRING:Tester                   Mrs                           
-X-GENDER:Female
-ADR:;;123 Main St.;Winslow;PA;12345;
-URL:440-871-3401
-URL:800-871-3401
-EMAIL:mrstester@gmail.com
-URL:440-321-4568
-URL:http://mrstester.com
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Tom Von Tester y tested
-N:Von Tester y,tested;Tom;;;
-SORT-STRING:Tester                   Tom                           
-NICKNAME:TesterNickname
-X-GENDER:Male
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Fake person Fake von Person\, I
-N:von Person;Person;Fake;Fake,person;I
-SORT-STRING:Person                   Fake                          I
-NICKNAME:Fake
-ADR:;;8888 Cliff Dr;Bay Village;Ohio;44140;Cuyahoga
-TEL:440-871-3400
-URL:ftp://whoknows.org
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Mary Tester
-N:Tester;Mary;;;
-SORT-STRING:Tester                   Mary                          
-X-GENDER:Female
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Martha Tester
-N:Tester;Martha;;;
-SORT-STRING:Tester                   Martha                        
-X-GENDER:Female
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:John Tester
-N:Tester;John;;;
-SORT-STRING:Tester                   John                          
-X-GENDER:Male
-END:VCARD
-
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Gramps//NONSGML Gramps 5.0.0-alpha1//EN
-FN:Mark Tester
-N:Tester;Mark;;;
-SORT-STRING:Tester                   Mark                          
-X-GENDER:Male
-END:VCARD
-
--- a/data/tests/exp_sample.vcs
+++ b/data/tests/exp_sample.vcs
@@ -1,856 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//GNU//Gramps//EN
-VERSION:1.0
-
-BEGIN:VEVENT
-SUMMARY:Birth of Hansdotter, Anna
-LOCATION:Löderup, Malmöhus Län, Sweden
-DTSTART:18641002T000001
-DTEND:18641002T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Hansdotter, Anna
-LOCATION:Löderup, Malmöhus Län, Sweden
-RRULE:FREQ=YEARLY
-DTSTART:20161002T000001
-DTEND:20161002T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Death of Hansdotter, Anna
-LOCATION:Sparks, Washoe Co., NV
-DTSTART:19450929T000001
-DTEND:19450929T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Death of Hansdotter, Anna
-LOCATION:Sparks, Washoe Co., NV
-RRULE:FREQ=YEARLY
-DTSTART:20160929T000001
-DTEND:20160929T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Keith Lloyd
-LOCATION:San Francisco, San Francisco Co., CA
-DTSTART:19660811T000001
-DTEND:19660811T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Keith Lloyd
-LOCATION:San Francisco, San Francisco Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160811T000001
-DTEND:20160811T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Hans Peter
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:19040417T000001
-DTEND:19040417T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Hans Peter
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20160417T000001
-DTEND:20160417T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Death of Smith, Hans Peter
-LOCATION:San Francisco, San Francisco Co., CA
-DTSTART:19770129T000001
-DTEND:19770129T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Death of Smith, Hans Peter
-LOCATION:San Francisco, San Francisco Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160129T000001
-DTEND:20160129T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Hanna
-LOCATION:Gladsax, Kristianstad Län, Sweden
-DTSTART:18210129T000001
-DTEND:18210129T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Hanna
-LOCATION:Gladsax, Kristianstad Län, Sweden
-RRULE:FREQ=YEARLY
-DTSTART:20160129T000001
-DTEND:20160129T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Nielsen, Herman Julius
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:18890831T000001
-DTEND:18890831T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Nielsen, Herman Julius
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20160831T000001
-DTEND:20160831T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Marjorie Lee
-LOCATION:Reno, Washoe Co., NV
-DTSTART:19341104T000001
-DTEND:19341104T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Marjorie Lee
-LOCATION:Reno, Washoe Co., NV
-RRULE:FREQ=YEARLY
-DTSTART:20161104T000001
-DTEND:20161104T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Gus
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:18970911T000001
-DTEND:18970911T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Gus
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20160911T000001
-DTEND:20160911T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Death of Smith, Gus
-LOCATION:San Francisco, San Francisco Co., CA
-DTSTART:19631021T000001
-DTEND:19631021T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Death of Smith, Gus
-LOCATION:San Francisco, San Francisco Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20161021T000001
-DTEND:20161021T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Anderson, Jennifer
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:19071105T000001
-DTEND:19071105T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Anderson, Jennifer
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20161105T000001
-DTEND:20161105T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Death of Anderson, Jennifer
-LOCATION:San Francisco, San Francisco Co., CA
-DTSTART:19850529T000001
-DTEND:19850529T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Death of Anderson, Jennifer
-LOCATION:San Francisco, San Francisco Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160529T000001
-DTEND:20160529T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Jones, Lillie Harriet
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:19100502T000001
-DTEND:19100502T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Jones, Lillie Harriet
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20160502T000001
-DTEND:20160502T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Death of Jones, Lillie Harriet
-DTSTART:19900626T000001
-DTEND:19900626T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Death of Jones, Lillie Harriet
-RRULE:FREQ=YEARLY
-DTSTART:20160626T000001
-DTEND:20160626T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, John Hjalmar
-LOCATION:San Francisco, San Francisco Co., CA
-DTSTART:19320130T000001
-DTEND:19320130T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, John Hjalmar
-LOCATION:San Francisco, San Francisco Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160130T000001
-DTEND:20160130T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Eric Lloyd
-LOCATION:San Francisco, San Francisco Co., CA
-DTSTART:19630828T000001
-DTEND:19630828T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Eric Lloyd
-LOCATION:San Francisco, San Francisco Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160828T000001
-DTEND:20160828T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Amber Marie
-LOCATION:Hayward, Alameda Co., CA
-DTSTART:19980412T000001
-DTEND:19980412T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Amber Marie
-LOCATION:Hayward, Alameda Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160412T000001
-DTEND:20160412T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Carl Emil
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:18991220T000001
-DTEND:18991220T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Carl Emil
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20161220T000001
-DTEND:20161220T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Death of Smith, Carl Emil
-LOCATION:Reno, Washoe Co., NV
-DTSTART:19590128T000001
-DTEND:19590128T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Death of Smith, Carl Emil
-LOCATION:Reno, Washoe Co., NV
-RRULE:FREQ=YEARLY
-DTSTART:20160128T000001
-DTEND:20160128T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Hjalmar
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:18930131T000001
-DTEND:18930131T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Hjalmar
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20160131T000001
-DTEND:20160131T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Death of Smith, Hjalmar
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:18940925T000001
-DTEND:18940925T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Death of Smith, Hjalmar
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20160925T000001
-DTEND:20160925T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Martin
-LOCATION:Gladsax, Kristianstad Län, Sweden
-DTSTART:18301119T000001
-DTEND:18301119T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Martin
-LOCATION:Gladsax, Kristianstad Län, Sweden
-RRULE:FREQ=YEARLY
-DTSTART:20161119T000001
-DTEND:20161119T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Astrid Shermanna Augusta
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:18890131T000001
-DTEND:18890131T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Astrid Shermanna Augusta
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20160131T000001
-DTEND:20160131T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Death of Smith, Astrid Shermanna Augusta
-LOCATION:San Francisco, San Francisco Co., CA
-DTSTART:19631221T000001
-DTEND:19631221T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Death of Smith, Astrid Shermanna Augusta
-LOCATION:San Francisco, San Francisco Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20161221T000001
-DTEND:20161221T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Gustaf Sr.
-LOCATION:Grostorp, Kristianstad Län, Sweden
-DTSTART:18621128T000001
-DTEND:18621128T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Gustaf Sr.
-LOCATION:Grostorp, Kristianstad Län, Sweden
-RRULE:FREQ=YEARLY
-DTSTART:20161128T000001
-DTEND:20161128T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Kirsti Marie
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:18861215T000001
-DTEND:18861215T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Kirsti Marie
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20161215T000001
-DTEND:20161215T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Death of Smith, Kirsti Marie
-LOCATION:San Francisco, San Francisco Co., CA
-DTSTART:19660718T000001
-DTEND:19660718T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Death of Smith, Kirsti Marie
-LOCATION:San Francisco, San Francisco Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160718T000001
-DTEND:20160718T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Streiffert, Anna
-LOCATION:Hoya/Jona/Hoia, Sweden
-DTSTART:18600923T000001
-DTEND:18600923T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Streiffert, Anna
-LOCATION:Hoya/Jona/Hoia, Sweden
-RRULE:FREQ=YEARLY
-DTSTART:20160923T000001
-DTEND:20160923T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Death of Streiffert, Anna
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:19270202T000001
-DTEND:19270202T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Death of Streiffert, Anna
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20160202T000001
-DTEND:20160202T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Magnes
-LOCATION:Simrishamn, Kristianstad Län, Sweden
-DTSTART:18581006T000001
-DTEND:18581006T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Magnes
-LOCATION:Simrishamn, Kristianstad Län, Sweden
-RRULE:FREQ=YEARLY
-DTSTART:20161006T000001
-DTEND:20161006T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Death of Smith, Magnes
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:19100220T000001
-DTEND:19100220T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Death of Smith, Magnes
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20160220T000001
-DTEND:20160220T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Adams, Janice Ann
-LOCATION:Fremont, Alameda Co., CA
-DTSTART:19650826T000001
-DTEND:19650826T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Adams, Janice Ann
-LOCATION:Fremont, Alameda Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160826T000001
-DTEND:20160826T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Ohman, Marjorie
-LOCATION:Denver, Denver Co., CO, Denver Co., Colorado, USA
-DTSTART:19030603T000001
-DTEND:19030603T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Ohman, Marjorie
-LOCATION:Denver, Denver Co., CO, Denver Co., Colorado, USA
-RRULE:FREQ=YEARLY
-DTSTART:20160603T000001
-DTEND:20160603T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Death of Ohman, Marjorie
-LOCATION:Reno, Washoe Co., NV
-DTSTART:19800622T000001
-DTEND:19800622T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Death of Ohman, Marjorie
-LOCATION:Reno, Washoe Co., NV
-RRULE:FREQ=YEARLY
-DTSTART:20160622T000001
-DTEND:20160622T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Horne, Darcy
-LOCATION:Sacramento, Sacramento Co., CA
-DTSTART:19660702T000001
-DTEND:19660702T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Horne, Darcy
-LOCATION:Sacramento, Sacramento Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160702T000001
-DTEND:20160702T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Perkins, Alice Paula
-LOCATION:Sparks, Washoe Co., NV
-DTSTART:19331122T000001
-DTEND:19331122T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Perkins, Alice Paula
-LOCATION:Sparks, Washoe Co., NV
-RRULE:FREQ=YEARLY
-DTSTART:20161122T000001
-DTEND:20161122T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Lars Peter
-LOCATION:Santa Rosa, Sonoma Co., CA
-DTSTART:19910916T000001
-DTEND:19910916T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Lars Peter
-LOCATION:Santa Rosa, Sonoma Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160916T000001
-DTEND:20160916T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Ingeman
-LOCATION:Gladsax, Kristianstad Län, Sweden
-DTSTART:18260129T000001
-DTEND:18260129T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Ingeman
-LOCATION:Gladsax, Kristianstad Län, Sweden
-RRULE:FREQ=YEARLY
-DTSTART:20160129T000001
-DTEND:20160129T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Lloyd
-LOCATION:San Francisco, San Francisco Co., CA
-DTSTART:19350313T000001
-DTEND:19350313T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Lloyd
-LOCATION:San Francisco, San Francisco Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160313T000001
-DTEND:20160313T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Jefferson, Elna
-LOCATION:Gladsax, Kristianstad Län, Sweden
-DTSTART:18000914T000001
-DTEND:18000914T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Jefferson, Elna
-LOCATION:Gladsax, Kristianstad Län, Sweden
-RRULE:FREQ=YEARLY
-DTSTART:20160914T000001
-DTEND:20160914T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Edwin Michael
-LOCATION:San Jose, Santa Clara Co., CA
-DTSTART:19610524T000001
-DTEND:19610524T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Edwin Michael
-LOCATION:San Jose, Santa Clara Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160524T000001
-DTEND:20160524T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Hansdotter, Kerstina
-LOCATION:Smestorp, Kristianstad Län, Sweden
-DTSTART:18321129T000001
-DTEND:18321129T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Hansdotter, Kerstina
-LOCATION:Smestorp, Kristianstad Län, Sweden
-RRULE:FREQ=YEARLY
-DTSTART:20161129T000001
-DTEND:20161129T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Marjorie Alice
-LOCATION:San Jose, Santa Clara Co., CA
-DTSTART:19600205T000001
-DTEND:19600205T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Marjorie Alice
-LOCATION:San Jose, Santa Clara Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160205T000001
-DTEND:20160205T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Green, Janis Elaine
-DTSTART:19351202T000001
-DTEND:19351202T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Green, Janis Elaine
-RRULE:FREQ=YEARLY
-DTSTART:20161202T000001
-DTEND:20161202T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Mason Michael
-LOCATION:Hayward, Alameda Co., CA
-DTSTART:19960626T000001
-DTEND:19960626T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Mason Michael
-LOCATION:Hayward, Alameda Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160626T000001
-DTEND:20160626T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Hjalmar
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:18950407T000001
-DTEND:18950407T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Hjalmar
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20160407T000001
-DTEND:20160407T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Death of Smith, Hjalmar
-LOCATION:Reno, Washoe Co., NV
-DTSTART:19750626T000001
-DTEND:19750626T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Death of Smith, Hjalmar
-LOCATION:Reno, Washoe Co., NV
-RRULE:FREQ=YEARLY
-DTSTART:20160626T000001
-DTEND:20160626T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Smith, Emil
-LOCATION:Simrishamn, Kristianstad Län, Sweden
-DTSTART:18600927T000001
-DTEND:18600927T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Smith, Emil
-LOCATION:Simrishamn, Kristianstad Län, Sweden
-RRULE:FREQ=YEARLY
-DTSTART:20160927T000001
-DTEND:20160927T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Birth of Tester, The
-LOCATION:123 High St, Cleveland, Cuyahoga, Ohio, USA
-DTSTART:19541229T000001
-DTEND:19541229T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Birth of Tester, The
-LOCATION:123 High St, Cleveland, Cuyahoga, Ohio, USA
-RRULE:FREQ=YEARLY
-DTSTART:20161229T000001
-DTEND:20161229T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Marriage of Smith, Gustaf Sr. and Hansdotter, Anna
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:18851127T000001
-DTEND:18851127T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Marriage of Smith, Gustaf Sr. and Hansdotter, Anna
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20161127T000001
-DTEND:20161127T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Marriage of Smith, Lloyd and Green, Janis Elaine
-LOCATION:San Francisco, San Francisco Co., CA
-DTSTART:19580810T000001
-DTEND:19580810T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Marriage of Smith, Lloyd and Green, Janis Elaine
-LOCATION:San Francisco, San Francisco Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160810T000001
-DTEND:20160810T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Marriage of Nielsen, Herman Julius and Smith, Astrid Shermanna Augusta
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:19121130T000001
-DTEND:19121130T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Marriage of Nielsen, Herman Julius and Smith, Astrid Shermanna Augusta
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20161130T000001
-DTEND:20161130T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Marriage of Smith, Hjalmar and Ohman, Marjorie
-LOCATION:Reno, Washoe Co., NV
-DTSTART:19271031T000001
-DTEND:19271031T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Marriage of Smith, Hjalmar and Ohman, Marjorie
-LOCATION:Reno, Washoe Co., NV
-RRULE:FREQ=YEARLY
-DTSTART:20161031T000001
-DTEND:20161031T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Marriage of Smith, John Hjalmar and Perkins, Alice Paula
-LOCATION:Sparks, Washoe Co., NV
-DTSTART:19540604T000001
-DTEND:19540604T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Marriage of Smith, John Hjalmar and Perkins, Alice Paula
-LOCATION:Sparks, Washoe Co., NV
-RRULE:FREQ=YEARLY
-DTSTART:20160604T000001
-DTEND:20160604T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Marriage of Smith, Eric Lloyd and Horne, Darcy
-LOCATION:Woodland, Yolo Co., CA
-DTSTART:19860712T000001
-DTEND:19860712T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Marriage of Smith, Eric Lloyd and Horne, Darcy
-LOCATION:Woodland, Yolo Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160712T000001
-DTEND:20160712T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Marriage of Smith, Edwin Michael and Adams, Janice Ann
-LOCATION:San Ramon, Conta Costa Co., CA
-DTSTART:19950527T000001
-DTEND:19950527T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Marriage of Smith, Edwin Michael and Adams, Janice Ann
-LOCATION:San Ramon, Conta Costa Co., CA
-RRULE:FREQ=YEARLY
-DTSTART:20160527T000001
-DTEND:20160527T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Marriage of Smith, Magnes and Streiffert, Anna
-LOCATION:Rønne, Bornholm, Denmark
-DTSTART:18840824T000001
-DTEND:18840824T235959
-END:VEVENT
-
-BEGIN:VEVENT
-SUMMARY:Anniversary: Marriage of Smith, Magnes and Streiffert, Anna
-LOCATION:Rønne, Bornholm, Denmark
-RRULE:FREQ=YEARLY
-DTSTART:20160824T000001
-DTEND:20160824T235959
-END:VEVENT
-
-END:VCALENDAR
--- a/data/tests/exp_sample.wft
+++ b/data/tests/exp_sample.wft
@@ -1,47 +0,0 @@
-Anna Hansdotter;;;;;2/10/1864-29/9/1945
-Keith Lloyd Smith;Lloyd Smith;Janis Green;;;11/8/1966
-Hans Peter Smith;Gustaf Smith;Anna Hansdotter;;;17/4/1904-29/1/1977
-Hanna Smith;Martin Smith0;Elna Jefferson;;;29/1/1821
-Herman Julius Nielsen;;;;;31/8/1889-1945
-Evelyn Michaels;;;;;1897
-Marjorie Lee Smith;Hjalmar Smith0;Marjorie Ohman;;;4/11/1934
-Gus Smith;Gustaf Smith;Anna Hansdotter;;;11/9/1897-21/10/1963
-Jennifer Anderson;;;;;5/11/1907-29/5/1985
-Lillie Harriet Jones;;;;;2/5/1910-26/6/1990
-John Hjalmar Smith;Hjalmar Smith0;Marjorie Ohman;;;30/1/1932
-Eric Lloyd Smith;Lloyd Smith;Janis Green;;;28/8/1963
-Amber Marie Smith;Edwin Smith;Janice Adams;;;12/4/1998
-Carl Emil Smith;Gustaf Smith;Anna Hansdotter;;;20/12/1899-28/1/1959
-Hjalmar Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1893-25/9/1894
-Martin Smith;Martin Smith0;Elna Jefferson;;;19/11/1830-1899
-Astrid Shermanna Augusta Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1889-21/12/1963
-Gustaf Smith, Sr.;Martin Smith;Kerstina Hansdotter;;;28/11/1862-23/7/1930
-Marta Ericsdotter;;;;;1775
-Kirsti Marie Smith;Gustaf Smith;Anna Hansdotter;;;15/12/1886-18/7/1966
-Ingeman Smith;;;;;1770
-Anna Streiffert;;;;;23/9/1860-2/2/1927
-Craig Peter Smith;Lloyd Smith;Janis Green;;;1966
-Magnes Smith;Martin Smith;Kerstina Hansdotter;;;6/10/1858-20/2/1910
-Janice Ann Adams;;;;;26/8/1965
-Marjorie Ohman;;;;;3/6/1903-22/6/1980
-Darcy Horne;;;;;2/7/1966
-Alice Paula Perkins;;;;;22/11/1933
-Lars Peter Smith;Eric Smith;Darcy Horne;;;16/9/1991
-Ingeman Smith0;Martin Smith0;Elna Jefferson;;;29/1/1826
-Lloyd Smith;Hans Smith;Lillie Jones;;;13/3/1935
-Elna Jefferson;;;;;14/9/1800-
-Edwin Michael Smith;John Smith;Alice Perkins;;;24/5/1961
-Kerstina Hansdotter;;;;;29/11/1832-1908
-Martin Smith0;Ingeman Smith;Marta Ericsdotter;;;1794-
-Marjorie Alice Smith0;John Smith;Alice Perkins;;;5/2/1960
-Janis Elaine Green;;;;;2/12/1935
-Mason Michael Smith;Edwin Smith;Janice Adams;;;26/6/1996
-Edwin Willard;;;;;1886
-Ingar Smith;Martin Smith0;Elna Jefferson;;;1823
-Hjalmar Smith0;Gustaf Smith;Anna Hansdotter;;;7/4/1895-26/6/1975
-Emil Smith;Martin Smith;Kerstina Hansdotter;;;27/9/1860
-雪 Ke 柯;Herman Nielsen;Astrid Smith;;;
-The Tester;Lloyd Smith;Janis Green;;;29/12/1954
-Mrs Tester;;;;;
-ピーター リチミシキスイミ;;;;;
-Tom Tester;The Tester;Mrs Tester;;;
--- a/data/tests/exp_sample_csv.csv
+++ b/data/tests/exp_sample_csv.csv
@@ -1,123 +0,0 @@
-Place,Title,Name,Type,Latitude,Longitude,Code,Enclosed_by,Date
-[P0000],"Löderup, Malmöhus Län, Sweden","Löderup, Malmöhus Län, Sweden",Unknown,,,,,
-[P0001],"Sparks, Washoe Co., NV","Sparks, Washoe Co., NV",Unknown,,,,,
-[P0002],"San Francisco, San Francisco Co., CA","San Francisco, San Francisco Co., CA",Unknown,,,,,
-[P0003],"Rønne, Bornholm, Denmark","Rønne, Bornholm, Denmark",Unknown,,,,,
-[P0004],"Gladsax, Kristianstad Län, Sweden","Gladsax, Kristianstad Län, Sweden",Unknown,,,,,
-[P0005],"Reno, Washoe Co., NV","Reno, Washoe Co., NV",Unknown,,,,,
-[P0006],"Hayward, Alameda Co., CA","Hayward, Alameda Co., CA",Unknown,,,,,
-[P0007],"Community Presbyterian Church, Danville, CA","Community Presbyterian Church, Danville, CA",Unknown,,,,,
-[P0008],Sweden,Sweden,Unknown,,,,,
-[P0009],"Grostorp, Kristianstad Län, Sweden","Grostorp, Kristianstad Län, Sweden",Unknown,,,,,
-[P0010],"Copenhagen, Denmark","Copenhagen, Denmark",Unknown,,,,,
-[P0011],"Hoya/Jona/Hoia, Sweden","Hoya/Jona/Hoia, Sweden",Unknown,,,,,
-[P0012],"Simrishamn, Kristianstad Län, Sweden","Simrishamn, Kristianstad Län, Sweden",Unknown,,,,,
-[P0013],"Fremont, Alameda Co., CA","Fremont, Alameda Co., CA",Unknown,,,,,
-[P0016],"Santa Rosa, Sonoma Co., CA","Santa Rosa, Sonoma Co., CA",Unknown,,,,,
-[P0017],"San Jose, Santa Clara Co., CA","San Jose, Santa Clara Co., CA",Unknown,,,,,
-[P0018],UC Berkeley,UC Berkeley,Unknown,,,,,
-[P0019],"Smestorp, Kristianstad Län, Sweden","Smestorp, Kristianstad Län, Sweden",Unknown,,,,,
-[P0020],"Tommarp, Kristianstad Län, Sweden","Tommarp, Kristianstad Län, Sweden",Unknown,,,,,
-[P0021],"Rønne Bornholm, Denmark","Rønne Bornholm, Denmark",Unknown,,,,,
-[P0022],"Woodland, Yolo Co., CA","Woodland, Yolo Co., CA",Unknown,,,,,
-[P0023],"San Ramon, Conta Costa Co., CA","San Ramon, Conta Costa Co., CA",Unknown,,,,,
-[P0026],United States of America,USA,Country,,,,,
-[P0028],"California, USA",California,State,,,,[P0026],2016-06-04
-[P0025],"Colorado, USA",Colorado,State,,,,[P0026],
-[P0027],"Sacramento Co., California, USA",Sacramento Co.,County,,,,[P0028],2016-06-01
-[P0015],"Sacramento, Sacramento Co., CA","Sacramento, Sacramento Co., CA",City,,,,[P0027],2016-06-04
-[P0024],"Denver Co., Colorado, USA",Denver Co.,County,,,,[P0025],
-[P0014],"Denver, Denver Co., CO","Denver, Denver Co., CO",City,39.7392,104.9903 W,,[P0024],
-
-Person,Surname,Given,Call,Suffix,Prefix,Title,Gender,Birth date,Birth place,Birth source,Baptism date,Baptism place,Baptism source,Death date,Death place,Death source,Burial date,Burial place,Burial source,Note
-[I0030],Adams,Janice Ann,,,,,female,26 Aug 1965,"Fremont, Alameda Co., CA",,,,,,,,,,,
-[I0016],Anderson,Jennifer,,,,,female,5 Nov 1907,"Rønne, Bornholm, Denmark",,,,,29 May 1985,"San Francisco, San Francisco Co., CA",,,,,
-[I0025],Ericsdotter,Marta,,,,,female,about 1775,Sweden,,,,,,,,,,,
-[I0041],Green,Janis Elaine,,,,,female,2 Dec 1935,,,,,,,,,,,,
-[I0000],Hansdotter,Anna,,,,,female,2 Oct 1864,"Löderup, Malmöhus Län, Sweden",,,,,29 Sep 1945,"Sparks, Washoe Co., NV",,,,,
-[I0038],Hansdotter,Kerstina,,,,,female,29 Nov 1832,"Smestorp, Kristianstad Län, Sweden",,,,,before 1908,Sweden,,,,,
-[I0032],Horne,Darcy,,,,,female,2 Jul 1966,"Sacramento, Sacramento Co., CA",,,,,,,,,,,
-[I0036],Jefferson,Elna,,,,,female,14 Sep 1800,"Gladsax, Kristianstad Län, Sweden",,,,,,Sweden,,,,,
-[I0017],Jones,Lillie Harriet,,,,,female,2 May 1910,"Rønne, Bornholm, Denmark",,,,,26 Jun 1990,,,,,,
-[I0042],Ke 柯,雪,,,,,male,,,,,,,,,,,,,
-[I0013],Michaels,Evelyn,,,,,female,about 1897,,,,,,,,,,,,
-[I0012],Nielsen,Herman Julius,,,,,male,31 Aug 1889,"Rønne, Bornholm, Denmark",,,,,1945,,,,,,
-[I0031],Ohman,Marjorie,,,,,female,3 Jun 1903,"Denver, Denver Co., CO, Denver Co., Colorado, USA",,,,,22 Jun 1980,"Reno, Washoe Co., NV",,,,,
-[I0034],Perkins,Alice Paula,,,,,female,22 Nov 1933,"Sparks, Washoe Co., NV",,,,,,,,,,,
-[I0002],Smith,Amber Marie,,,,,female,12 Apr 1998,"Hayward, Alameda Co., CA",,,,,,,,,,,
-[I0023],Smith,Astrid Shermanna Augusta,,,,,female,31 Jan 1889,"Rønne, Bornholm, Denmark",,,,,21 Dec 1963,"San Francisco, San Francisco Co., CA",,,,,
-[I0020],Smith,Carl Emil,,,,,male,20 Dec 1899,"Rønne, Bornholm, Denmark",,,,,28 Jan 1959,"Reno, Washoe Co., NV",,,,,
-[I0029],Smith,Craig Peter,,,,,male,after 1966,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
-[I0037],Smith,Edwin Michael,,,,,male,24 May 1961,"San Jose, Santa Clara Co., CA","Birth, Death and Marriage Records",,,,,,,,,,
-[I0009],Smith,Emil,,,,,male,27 Sep 1860,"Simrishamn, Kristianstad Län, Sweden",,,,,,,,,,,
-[I0019],Smith,Eric Lloyd,,,,Dr.,male,28 Aug 1963,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
-[I0015],Smith,Gus,,,,,male,11 Sep 1897,"Rønne, Bornholm, Denmark",,,,,21 Oct 1963,"San Francisco, San Francisco Co., CA",,,,,
-[I0024],Smith,Gustaf,,Sr.,,,male,28 Nov 1862,"Grostorp, Kristianstad Län, Sweden",,,,,before 23 Jul 1930,"Sparks, Washoe Co., NV",,,,,
-[I0011],Smith,Hanna,,,,,female,29 Jan 1821,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,,
-[I0010],Smith,Hans Peter,,,,,male,17 Apr 1904,"Rønne, Bornholm, Denmark",Birth Records,,,,29 Jan 1977,"San Francisco, San Francisco Co., CA",,5 Feb 1977,"San Francisco, San Francisco Co., CA",findagrave.com,
-[I0021],Smith,Hjalmar,,,,,male,31 Jan 1893,"Rønne, Bornholm, Denmark",,,,,25 Sep 1894,"Rønne, Bornholm, Denmark",,,,,
-[I0008],Smith,Hjalmar,,,,,male,7 Apr 1895,"Rønne, Bornholm, Denmark",,3 Jun 1895,"Rønne Bornholm, Denmark",,26 Jun 1975,"Reno, Washoe Co., NV",,,,,
-[I0007],Smith,Ingar,,,,,female,after 1823,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,,
-[I0027],Smith,Ingeman,,,,,male,about 1770,Sweden,,,,,,,,,,,
-[I0004],Smith,Ingeman,,,,,male,29 Jan 1826,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,,
-[I0018],Smith,John Hjalmar,,,,,male,30 Jan 1932,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
-[I0001],Smith,Keith Lloyd,,,,,male,11 Aug 1966,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
-[I0026],Smith,Kirsti Marie,,,,,female,15 Dec 1886,"Rønne, Bornholm, Denmark",,,,,18 Jul 1966,"San Francisco, San Francisco Co., CA",,,,,
-[I0035],Smith,Lars Peter,,,,,male,16 Sep 1991,"Santa Rosa, Sonoma Co., CA",,,,,,,,,,,
-[I0033],Smith,Lloyd,,,,,male,13 Mar 1935,"San Francisco, San Francisco Co., CA",,,,,,,,,,,
-[I0003],Smith,Magnes,,,,,male,6 Oct 1858,"Simrishamn, Kristianstad Län, Sweden",,,,,20 Feb 1910,"Rønne, Bornholm, Denmark",,,,,
-[I0040],Smith,Marjorie Alice,,,,,female,5 Feb 1960,"San Jose, Santa Clara Co., CA",,,,,,,,,,,
-[I0014],Smith,Marjorie Lee,,,,,female,4 Nov 1934,"Reno, Washoe Co., NV",,,,,,,,,,,
-[I0022],Smith,Martin,,,,,male,19 Nov 1830,"Gladsax, Kristianstad Län, Sweden",,23 Nov 1830,"Gladsax, Kristianstad Län, Sweden",,between 1899 and 1905,Sweden,,,,,
-[I0039],Smith,Martin,,,,,male,between 1794 and 1796,"Tommarp, Kristianstad Län, Sweden",,,,,,Sweden,,,,,
-[I0005],Smith,Mason Michael,,,,,male,26 Jun 1996,"Hayward, Alameda Co., CA",,,,,,,,,,,
-[I0028],Streiffert,Anna,,,,,female,23 Sep 1860,"Hoya/Jona/Hoia, Sweden",,,,,2 Feb 1927,"Rønne, Bornholm, Denmark",,,,,
-[I0006],Willard,Edwin,,,,,male,about 1886,,,,,,,,,,,,
-[I0043],リチミシキスイミ,ピーター,,,,,male,,,,,,,,,,,,,
-
-Marriage,Husband,Wife,Date,Place,Source,Note
-[F0000],[I0039],[I0036],about 1816,"Gladsax, Kristianstad Län, Sweden",,
-[F0001],[I0027],[I0025],about 1790,Sweden,,
-[F0002],[I0022],[I0038],about 1856,,,
-[F0003],[I0024],[I0000],27 Nov 1885,"Rønne, Bornholm, Denmark",,
-[F0004],[I0006],[I0026],about 1910,,,
-[F0005],[I0012],[I0023],30 Nov 1912,"Rønne, Bornholm, Denmark",,
-[F0006],[I0008],[I0031],31 Oct 1927,"Reno, Washoe Co., NV",,
-[F0007],[I0015],[I0013],about 1920,,,
-[F0008],[I0033],[I0041],10 Aug 1958,"San Francisco, San Francisco Co., CA",,
-[F0009],[I0010],[I0017],,,,
-[F0010],[I0019],[I0032],12 Jul 1986,"Woodland, Yolo Co., CA",,
-[F0011],[I0003],[I0028],24 Aug 1884,"Rønne, Bornholm, Denmark",,
-[F0012],[I0018],[I0034],4 Jun 1954,"Sparks, Washoe Co., NV",Marriage Certificae,
-[F0013],[I0037],[I0030],27 May 1995,"San Ramon, Conta Costa Co., CA",,
-[F0014],[I0010],[I0016],,,,
-
-Family,Child
-[F0000],[I0011]
-[F0000],[I0007]
-[F0000],[I0004]
-[F0000],[I0022]
-[F0001],[I0039]
-[F0002],[I0003]
-[F0002],[I0009]
-[F0002],[I0024]
-[F0003],[I0026]
-[F0003],[I0023]
-[F0003],[I0021]
-[F0003],[I0008]
-[F0003],[I0015]
-[F0003],[I0020]
-[F0003],[I0010]
-[F0005],[I0042]
-[F0006],[I0018]
-[F0006],[I0014]
-[F0008],[I0019]
-[F0008],[I0001]
-[F0008],[I0029]
-[F0009],[I0033]
-[F0010],[I0035]
-[F0012],[I0040]
-[F0012],[I0037]
-[F0013],[I0005]
-[F0013],[I0002]
-
--- a/data/tests/exp_sample_csv.gramps
+++ b/data/tests/exp_sample_csv.gramps
--- a/data/tests/exp_sample_ged.ged
+++ b/data/tests/exp_sample_ged.ged
--- a/data/tests/imp_ANSEL_CR.ged
+++ b/data/tests/imp_ANSEL_CR.ged
--- a/Show More
+++ b/Show More