8555: Database repair tool always modify all source objects

9003: Locality data in address was not imported
Update Greek translation
2016-11-26 12:54:08 +01:00 · 2015-10-27 09:50:28 +01:00 · 2015-10-05 15:19:43 +02:00 · 2015-04-18 16:14:40 +02:00 · 2015-03-31 10:22:09 -07:00 · 2015-03-19 16:08:11 +01:00
1150 changed files with 113158 additions and 86321 deletions
@@ -15,7 +15,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 #

 # $Id$
@@ -72,12 +72,12 @@ from the source directory.
   this for you.

 b) You downloaded the Gramps source code to a directory, and want to run it.
-    First, copy/rename the gramps/gen/const.py.in to gramps/gen/const.py. 
-    Edit this file if needed. Now you can start Gramps from the source code
-    directory with
+    You can start Gramps from the source code directory with

     python Gramps.py

+    See gramps/gen/const.py how Gramps finds his resource directories in case
+    you encounter problems.

 Custom directory installation
 -------------------------------------
@@ -1,6 +1,7 @@
 include AUTHORS
 include COPYING
 include FAQ
+include Gramps.py
 include INSTALL
 include LICENSE
 include MANIFEST.in
@@ -21,7 +22,6 @@ recursive-include windows *

 # Remove files created in the build
 exclude data/tips.xml
-#exclude gramps/gen/const.py
 exclude gramps/plugins/lib/holidays.xml
 exclude po/.intltool-merge-cache
 global-exclude *.pyc
@@ -1,22 +1,74 @@
+2014-05-22
+Version 4.0.4, "Not the comfy chair", a maintenance release.
+* Upgrade to db version 17 fails in Python 3 due to use of iteritems
+* Database corrupted - TypeError: unhashable type: 'list'
+* Fix bug in abandon changes and quit
+* Consistency on create_id method
+* Better handling for non-ASCII characters on database-path
+* Better support for ANSEL characters
+* 'Display as' field in Name Editor reverts to Preferences default
+* Fix vcard date converter
+* View does not communicate over proxy server with autorisation
+* Enhanced Bookmark support
+* Event gramplet filter does not have field for primary role,
+* New HasDayOfWeek filter rule
+* Error when leaving a Gramps type field blank in an editor
+* Fix creation of events with same Gramps-ID
+* Crash when opening details of a person
+* Fix spacing on dialogs for some recent linux distribution
+* date editor and Date class allow e.g. Hebrew dates with newyear (Mar25)
+* Fix crash in fan chart view when scrolling
+* Poor contrast mouse on mouse over
+* Drag and drop only one data into Editors tabs
+* Enhancements and consitency on events gramplet, selector and view
+* Sometimes says 'no data exists for note' when saving
+* Enhanced Citation Editor
+* Do not always raise errors when some plugins are hidden
+* Remove hover selection from embedded lists
+* Fix update of active object after merge
+* Cleanup on warnings and messages around locale directory
+* Media Editor error if Path value was changed to a non existing file
+* Register history objects at startup
+* Avoid dumb encoding error when compiling gpr file
+* Work around Py2Cairo
+* Given Name Cloud Gramplet splits up given names into words
+* Users should not be allowed to edit and delete 'default' style into Style Editor
+* Filename Decoding Error in Graphical Reports
+* Missing closing bracket in Web_Basic-Spruce.css
+* Reorder tool: global name 'gen' is not defined
+* Fix start in East Asian language, force UTF-8 locale on Mac
+* Fix apple_collation
+* Spelling messages at random cause hang for a few seconds.
+* Media viewer list crashes during start if one try to select an entry where the media isn't available
+* 'Available Gramps Updates for Addons' window not on top
+* HTML View fails to load
+* Paper names and Styles values are now translated
+* Sort failure using glocale.sort_key
+* Improve support for collation variants
+* Translate some punctuation marks
+* Fix unit tests and python3 issues
+* Fix Relationships handler for Portuguese
+* Updated translations: ar, cs, de, fi, fr, he, it, lt, nb, nl, pl, pt_BR, ru, sv, uk
+
 2014-01-27
 Version 4.0.3, "It's tomorrow, ask me now", a maintenance release.
-* Fix copy via context menu on Views into Charts Category / 7399
-* Fix Tab sequence in Name Editor / 6868
-* Fix citations gramplet into media view / 7232
-* Fix unhandled exception when inspecting media / 7348
-* Fix Citation sidebar filter for python3 / 7370
-* Fix add link to a "Html code" note / 7357
-* Fix message on backup dialog / 6690
-* Fix space for selection lists / 7331 7409
-* Fix spell with myspell and LANG / 7339
-* Fix changes root cursor to hand / 7336
-* Recent file parser now gives the file location / 7327
-* Fix vertical overflows on check and repair-tool dialog / 7316
-* Fix custom key/value (data item) on Database difference report / 7209
-* Fix unhandled exception in media exif information under Windows OS / 7182
-* Fix person selector in searchfilter under Windows OS/ 7179
-* Starting Gramps without console is now possible under Windows OS/ 7378
-* Specific OS handling / 7313
+* Fix copy via context menu on Views into Charts Category
+* Fix Tab sequence in Name Editor
+* Fix citations gramplet into media view
+* Fix unhandled exception when inspecting media
+* Fix Citation sidebar filter for python3
+* Fix add link to a "Html code" note
+* Fix message on backup dialog
+* Fix space for selection lists
+* Fix spell with myspell and LANG
+* Fix changes root cursor to hand
+* Recent file parser now gives the file location
+* Fix vertical overflows on check and repair-tool dialog
+* Fix custom key/value (data item) on Database difference report
+* Fix unhandled exception in media exif information under Windows OS
+* Fix person selector in searchfilter under Windows OS
+* Starting Gramps without console is now possible under Windows OS
+* Specific OS handling
 * Common fixes and changes with 3.4.7.
 * Updated translations: ca, de, fi, fr, ru

@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 ----------------------------------------------------------------------------
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id: Web_Basic-Blue.css 15540 2010-06-07 16:32:00Z robhealey1 $
 #
@@ -248,6 +248,14 @@ table.primobjlist tr.BeginLetter td, table.primobjlist tr.BeginSurname td {
 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%;
 }
@@ -514,6 +514,7 @@ i + div.grampsstylednote p {
 }
 div.grampsstylednote p {
    margin-bottom: 0.5em;
+}

 /* Subsection : Family Map
 ----------------------------------------------------- */
@@ -17,7 +17,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 ******************************************************
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #
@@ -17,7 +17,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 ******************************************************
@@ -17,7 +17,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 **************************************************************************************************
@@ -17,7 +17,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 **************************************************************************************************
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id: $
 #
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 **************************************************************************************************
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #
@@ -16,7 +16,7 @@

 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.


 $Id$
@@ -19,7 +19,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 # $Id$
 -->
@@ -18,7 +18,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 # Written by Alex Roitman

@@ -19,7 +19,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 """
 update_man.py for command line documentation.
@@ -1,4 +1,4 @@
-gramps for Debian
+Gramps for Debian
 ----------------------

 This is the Debian package of the 4.0 series of GRAMPS.
@@ -7,3 +7,12 @@ It is a major update of Gramps to upgrade to GTK 3. A switch was also made to di

 The 4.0 series of Gramps is being packaged for the experimental distribution until all dependencies are available
 and it proves stable.
+
+Webkit - gir1.2-webkit-3.0 crashes. Gramps has been patched disable the hidden
+HTML view instead until a solution is found.
+
+Goocanvas2 - The latest Goocanvas is not available in Debian yet. If you miss
+the Graphview plugin, you could try installing the gir1.2-goocanvas-2.0-9 which
+is available in Ubuntu.
+
+ -- Ross Gammon <rossgammon@mail.dk>  Sat, 25 Jan 2014 18:00:00 +0100
@@ -1,8 +1,14 @@
+gramps (4.0.3) precise; urgency=low
+
+  * - 4.0.4-git.f08e40 Experimental stream gramps.git
+
+ -- Jérôme Rapinat <romjerome@yahoo.fr>  Tue, 04 Feb 2014 19:49:32 +0100
+ 
 gramps (4.0.2) precise; urgency=low

  * experimental .deb for gramps 4.0.2
-
- -- Jérôme Rapinat <romjerome@yahoo.fr>  Wed, 04 Dec 2013 10:23:36 +0100
+  
+-- Jérôme Rapinat <romjerome@yahoo.fr>  Wed, 04 Dec 2013 10:23:36 +0100

 gramps (4.0.1-2) precise; urgency=low

@@ -2,18 +2,41 @@ Source: gramps
 Section: python
 Priority: optional
 Maintainer: Ross Gammon <rossgammon@mail.dk>
-Build-Depends-Indep: libxml-parser-perl, gettext, python, intltool, python-setuptools
-Build-Depends: debhelper (>= 9.0.0)
+Build-Depends-Indep:
+ dh-linktree,
+ gettext,
+ intltool,
+ libxml-parser-perl,
+ python-all,
+ python-setuptools
+Build-Depends:
+ debhelper (>= 9.0.0)
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/collab-maint/gramps.git
-Vcs-browser: http://anonscm.debian.org/git/collab-maint/gramps.git
+Vcs-browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gramps.git
 Homepage: http://www.gramps-project.org/
+X-Python-Version: >= 2.7

 Package: python-gramps
 Architecture: all
-Depends: ${python:Depends}, librsvg2-2, xdg-utils, python-gobject (>= 3.3.2), gir1.2-gtk-3.0, python-gi-cairo, python-bsddb3, ${misc:Depends}
-Recommends: graphviz, python-pyicu
-Suggests: fonts-freefont-ttf, gir1.2-gtkspell3-3.0, rcs, python-pil, gir1.2-goocanvas, gir1.2-webkit-3.0, gir1.2-osmgpsmap-1.0, gir1.2-gexiv2-0.4
+Depends:
+ gir1.2-gtk-3.0,
+ librsvg2-2,
+ python-gi,
+ python-gi-cairo,
+ xdg-utils,
+ ${misc:Depends},
+ ${python:Depends}
+Recommends:
+ graphviz,
+ libosmgpsmap-1.0-0-dev,
+ python-pyicu
+Suggests:
+ fonts-freefont-ttf,
+ gir1.2-gexiv2-0.4,
+ gir1.2-gtk-gtkspell3-3.0,
+ python-pil,
+ rcs
 Description: Genealogical research program
 GRAMPS is an Open Source genealogy program written in Python, using
 the GTK/GNOME interface. It is an extremely flexible program fitting
@@ -1,7 +0,0 @@
-[DEFAULT]
-# the default build command
-#builder=debuild -i\.git -I.git
-# the default branch for experimental upstream sources
-upstream-branch=upstream
-# the default branch for the debian patch
-debian-branch=experimental
@@ -1,2 +0,0 @@
-NEWS
-README
@@ -1,2 +0,0 @@
-usr/share/pixmaps
-usr/share/mime/packages
@@ -1,5 +0,0 @@
-AUTHORS
-FAQ
-NEWS
-README
-TODO
@@ -1,3 +0,0 @@
-/usr/bin/
-/usr/share/
-/etc
@@ -1 +1,2 @@
+# Install icon to the correct place
 debian/gramps.xpm usr/share/pixmaps/
@@ -1 +0,0 @@
-data/man/gramps.1.in
@@ -1,3 +0,0 @@
-?package(gramps):needs="X11" section="Applications/Office"\
-  title="gramps" command="/usr/bin/gramps"\
-  icon="/usr/share/pixmaps/gramps.xpm"
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# Update mime database postinst
-if [ -x /usr/sbin/update-mime-database ]; then
-	update-mime-database /usr/share/mime
-fi
-
-#DEBHELPER#
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# Update mime database postrm
-if [ -x /usr/sbin/update-mime-database ]; then
-	update-mime-database /usr/share/mime
-fi
-
-#DEBHELPER#
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-set -e
-
-# This was added by stdeb to workaround Debian #479852. In a nutshell,
-# pycentral does not remove normally remove its symlinks on an
-# upgrade. Since we're using python-support, however, those symlinks
-# will be broken. This tells python-central to clean up any symlinks.
-if [ -e /var/lib/dpkg/info/gramps.list ] && which pycentral >/dev/null 2>&1
-then
-    pycentral pkgremove gramps
-fi
-
-#DEBHELPER#
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-# #DEBHELPER#
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 3f702ae..9622d75 100644
+--- a/setup.py
+++ b/setup.py
+@@ -248,7 +248,7 @@ class install(_install):
+                                      'utils', 'resource-path')
+         with io.open(resource_file, 'w', encoding='utf-8',
+                      errors='strict') as fp:
+-            path = os.path.abspath(os.path.join(self.install_data, 'share'))
+            path = '/usr/share'
+             if sys.version_info[0] < 3:
+                 path = unicode(path)
+             fp.write(path)
@@ -0,0 +1,22 @@
+diff --git a/gramps/plugins/view/htmlrenderer.py b/gramps/plugins/view/htmlrenderer.py
+index c41942a..8f35b16 100644
+--- a/gramps/plugins/view/htmlrenderer.py
+++ b/gramps/plugins/view/htmlrenderer.py
+@@ -122,11 +122,12 @@ user_pref("general.useragent.locale, %(lang)s);
+ 
+ TOOLKIT = NOWEB
+ 
+-try:
+-    from gi.repository import WebKit as webkit
+-    TOOLKIT = WEBKIT
+-except:
+-    pass
+#Disable webkit as it is causing a crash in Gramps 4.0.2
+#try:
+#    from gi.repository import WebKit as webkit
+#    TOOLKIT = WEBKIT
+#except:
+#    pass
+ 
+ #no interfaces present, raise Error so that options for GeoView do not show
+ if TOOLKIT == NOWEB :
@@ -0,0 +1,2 @@
+0001-Correct-resource-path-in-setup.py.patch
+0002-Disable-HTML-View.patch
@@ -1 +0,0 @@
-2
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f

-# Remember to remove verbose option once testing is finished
-DH_VERBOSE=1
-export PYBUILD_NAME=python-gramps
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+export DH_OPTIONS=-v

 %:
 	dh $@ --with python2
@@ -10,16 +10,28 @@ export PYBUILD_NAME=python-gramps
 # Override auto test because upstream do not use the standard unittest discover
 override_dh_auto_test:

-# Override of auto_build to force python 3
+# Override of auto_build
 override_dh_auto_build:
 	python setup.py build

-# Override of auto_install to force python 3
+# Override of auto_install to remove information from package
 override_dh_auto_install:
-	python setup.py install --root=debian/python-gramps --install-layout=deb
+	#dh_auto_install
 	# Remove duplicate copyright information
-	rm debian/python-gramps/usr/share/doc/gramps/COPYING
+	#rm $(CURDIR)/debian/python-gramps/usr/share/doc/gramps/COPYING
 	# Remove install file as it is not needed by package users
-	rm debian/python-gramps/usr/share/doc/gramps/INSTALL
+	#rm $(CURDIR)/debian/python-gramps/usr/share/doc/gramps/INSTALL
 	# Remove duplicate license information
-	rm debian/python-gramps/usr/share/doc/gramps/LICENSE
+	#rm $(CURDIR)/debian/python-gramps/usr/share/doc/gramps/LICENSE
+	python setup.py install --root=debian/python-gramps --install-layout=deb
+
+# Make css style sheets and png icons non-executable
+override_dh_fixperms:
+	dh_fixperms
+	chmod a-x $(CURDIR)/debian/python-gramps/usr/share/gramps/css/Web_*.css
+	chmod a-x $(CURDIR)/debian/python-gramps/usr/share/gramps/images/22x22/gramps*.png
+	chmod a-x $(CURDIR)/debian/python-gramps/usr/share/gramps/images/16x16/gramps*.png
+
+# Avoid compressing COPYING file so that it can appear in the "About" dialog
+override_dh_compress:
+	dh_compress -X COPYING
@@ -0,0 +1 @@
+1.0
@@ -0,0 +1 @@
+unapply-patches
@@ -1,2 +0,0 @@
-shlibs:Depends=libbonobo2-0 (>= 2.4.3), libc6 (>= 2.3.2.ds1-4), libglib2.0-0 (>= 2.2.3), libgnomevfs2-0 (>= 2.4.1), libgnomevfs2-common (>= 2.4.1), liborbit2 (>= 1:2.8.0)
-python:Depends=python (>= 2.3), python (<< 2.4)
@@ -1,3 +1,4 @@
-# watch control file for uscan
 version=3
-http://sf.net/gramps/gramps-(.+)\.tar\.gz debian uupdate
+
+opts="dversionmangle=s/\+dfsg//g" \
+http://sf.net/gramps/gramps-(.+)\.tar\.gz
@@ -19,7 +19,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 """
 update_doc.py for Gramps API(s) documentation.
@@ -15,7 +15,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # gen/__init__.py
 # $Id$
@@ -14,7 +14,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -22,7 +22,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -46,8 +46,7 @@ import sys
 #
 #-------------------------------------------------------------------------
 from gramps.gen.recentfiles import recent_files
-from gramps.gen.utils.file import (rm_tempdir, get_empty_tempdir, 
-                                   get_unicode_path_from_env_var)
+from gramps.gen.utils.file import rm_tempdir, get_empty_tempdir
 from gramps.gen.db import DbBsddb
 from .clidbman import CLIDbManager, NAME_FILE, find_locker_name

@@ -56,6 +55,7 @@ from gramps.gen.plug.report import CATEGORY_BOOK, CATEGORY_CODE, BookList
 from .plug import cl_report, cl_book
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.gettext
+from gramps.gen.constfunc import conv_to_unicode

 #-------------------------------------------------------------------------
 #
@@ -213,7 +213,7 @@ class ArgHandler(object):
        """
        if value is None:
            return None
-        value = get_unicode_path_from_env_var(value)
+        value = conv_to_unicode(value, sys.stdin.encoding)
        db_path = self.__deduce_db_path(value)

        if db_path:
@@ -243,8 +243,7 @@ class ArgHandler(object):
        """
        # Need to convert path/filename to unicode before opening
        # For non latin characters in Windows path/file/user names
-        value = get_unicode_path_from_env_var(value)
-        fname = value
+        fname = conv_to_unicode(value, sys.stdin.encoding)
        fullpath = os.path.abspath(os.path.expanduser(fname))
        if fname != '-' and not os.path.exists(fullpath):
            self.__error(_('Error: Import file %s not found.') % fname)
@@ -280,8 +279,7 @@ class ArgHandler(object):
            return
        # Need to convert path/filename to unicode before opening
        # For non latin characters in Windows path/file/user names
-        value = get_unicode_path_from_env_var(value)
-        fname = value
+        fname = conv_to_unicode(value, sys.stdin.encoding)
        if fname == '-':
            fullpath = '-'
        else:
@@ -364,7 +362,7 @@ class ArgHandler(object):
                # Apparently it is not a database. See if it is a file that
                # can be imported.
                db_path, title = self.dbman.import_new_db(self.open_gui, self.user)
-
+        # Handle the "-l" List Family Trees option.  
            if db_path:
                # Test if not locked or problematic
                if not self.check_db(db_path, self.force_unlock):
@@ -375,6 +373,7 @@ class ArgHandler(object):
                    title = db_path
                recent_files(db_path, title)
                self.open = db_path
+        # Handle the "-L" List Family Trees in detail option.  
                self.__open_action()
            else:
                sys.exit(0)
@@ -394,7 +393,7 @@ class ArgHandler(object):
        @param: climan: the manager of a CLI session
        @type: CLIManager object
        """
-
+        # Handle the "-l" List Family Trees option.  
        if self.list:
            print(_('List of known Family Trees in your database path\n'))

@@ -405,6 +404,7 @@ class ArgHandler(object):
                              % {'full_DB_path' : dirname, 'f_t_name' : name})
            sys.exit(0)

+        # Handle the "-L" List Family Trees in detail option.  
        if self.list_more:
            print(_('Gramps Family Trees:'))
            summary_list = self.dbman.family_tree_summary()
@@ -416,23 +416,26 @@ class ArgHandler(object):
                        print("   %s: %s" % (item, summary[item]))
            sys.exit(0)
           
+        # Handle the "-t" List Family Trees, tab delimited option.  
        if self.list_table:
            print(_('Gramps Family Trees:'))
            summary_list = self.dbman.family_tree_summary()
-            print(_("Family Tree"), end="")
+            if not summary_list:
+                sys.exit(0)
+            # We have to construct the line elements together, to avoid
+            # insertion of blank spaces when print on the same line is used
+            line_list = [_("Family Tree")]
            for key in sorted(summary_list[0]):
-                if key !=  "Family Tree":
-                    print("\t ", end="")
-                    print(key, end="")
-            print()
+                if key !=  _("Family Tree"):
+                    line_list += [key]
+            print("\t".join(line_list))
            for summary in sorted(summary_list,
                                  key=lambda sum: sum[_("Family Tree")].lower()):
-                print('"%s"' % summary[_("Family Tree")], end="")
+                line_list = [('"%s"' % summary[_("Family Tree")])]
                for item in sorted(summary):
                    if item != _("Family Tree"):
-                        print("\t ", end="")
-                        print('"%s"' % summary[item], end="")
-                print()
+                        line_list += [('"%s"' % summary[item])]
+                print("\t".join(line_list))
            sys.exit(0)

        self.__open_action()
@@ -549,12 +552,6 @@ class ArgHandler(object):
            if family_tree_format == plugin.get_extension():
                import_function = plugin.get_import_function()
                import_function(self.dbstate.db, filename, self.user)
-        
-        if not self.cl:
-            if self.imp_db_path:
-                return self.sm.open_activate(self.imp_db_path)
-            else:
-                return self.sm.open_activate(self.open)

    #-------------------------------------------------------------------------
    #
@@ -22,7 +22,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -36,7 +36,7 @@ Module responsible for handling the command line arguments for GRAMPS.
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 import sys
 import getopt
 import logging
@@ -49,9 +49,9 @@ import logging
 from gramps.gen.const import LONGOPTS, SHORTOPTS
 from gramps.gen.config import config
 from gramps.gen.utils.cast import get_type_converter
-from gramps.gen.utils.file import get_unicode_path_from_env_var
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.gettext
+from gramps.gen.constfunc import conv_to_unicode

 _HELP = _("""
 Usage: gramps.py [OPTION...]
@@ -225,7 +225,8 @@ class ArgParser(object):
            # -Ärik is '-\xc3\x84rik' and getopt will respond :
            # option -\xc3 not recognized
            for arg in range(len(self.args) - 1):
-                self.args[arg+1] = get_unicode_path_from_env_var(self.args[arg + 1])
+                self.args[arg+1] = conv_to_unicode(self.args[arg + 1],
+                                                   sys.stdin.encoding)
            options, leftargs = getopt.getopt(self.args[1:],
                                             SHORTOPTS, LONGOPTS)
        except getopt.GetoptError as msg:
@@ -371,7 +372,8 @@ class ArgParser(object):
            # but not for non-latin characters in list elements
            cliargs = "[ "
            for arg in range(len(self.args) - 1):
-                cliargs += get_unicode_path_from_env_var(self.args[arg + 1]) + " "
+                cliargs += conv_to_unicode(self.args[arg + 1],
+                                           sys.stdin.encoding) + ' '
            cliargs += "]"
            self.errors += [(_('Error parsing the arguments'),
                             _("Error parsing the arguments: %s \n"
@@ -17,7 +17,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -37,6 +37,7 @@ from __future__ import print_function
 import os
 import sys
 import time
+import io
 if sys.version_info[0] < 3:
    from urlparse import urlparse
    from urllib2 import urlopen, url2pathname
@@ -64,7 +65,7 @@ _ = glocale.translation.gettext
 from gramps.gen.db import DbBsddb
 from gramps.gen.plug import BasePluginManager
 from gramps.gen.config import config
-from gramps.gen.constfunc import win, conv_to_unicode
+from gramps.gen.constfunc import win, conv_to_unicode, UNITYPE
 #-------------------------------------------------------------------------
 #
 # constants
@@ -217,10 +218,7 @@ class CLIDbManager(object):
                retval[_("Locked?")] = _("no")
            retval[_("Bsddb version")] = bsddb_version
            retval[_("Schema version")] = schema_version
-            if sys.version_info[0] < 3:
-                retval[_("Family Tree")] = name.encode(glocale.getfilesystemencoding())
-            else:
-                retval[_("Family Tree")] = name
+            retval[_("Family Tree")] = name
            retval[_("Path")] = dirpath
            retval[_("Last accessed")] = time.strftime('%x %X', 
                                                    time.localtime(tval))
@@ -232,8 +230,6 @@ class CLIDbManager(object):
        """
        # make the default directory if it does not exist
        dbdir = os.path.expanduser(config.get('behavior.database-path'))
-        if sys.version_info[0] < 3:
-            dbdir = dbdir.encode(glocale.getfilesystemencoding())
        db_ok = make_dbdir(dbdir)

        self.current_names = []
@@ -242,7 +238,7 @@ class CLIDbManager(object):
                dirpath = os.path.join(dbdir, dpath)
                path_name = os.path.join(dirpath, NAME_FILE)
                if os.path.isfile(path_name):
-                    file = open(path_name)
+                    file = io.open(path_name, 'r', encoding='utf8')
                    name = file.readline().strip()
                    file.close()

@@ -299,8 +295,8 @@ class CLIDbManager(object):
        if title is None:
            name_list = [ name[0] for name in self.current_names ]
            title = find_next_db_name(name_list)
-        
-        name_file = open(path_name, "w")
+
+        name_file = io.open(path_name, "w", encoding='utf8')
        name_file.write(title)
        name_file.close()

@@ -407,10 +403,12 @@ class CLIDbManager(object):
        Returns old_name, new_name if success, None, None if no success
        """
        try:
-            name_file = open(filepath, "r")
+            filepath = conv_to_unicode(filepath, 'utf8')
+            new_text = conv_to_unicode(new_text, 'utf8')
+            name_file = io.open(filepath, "r", encoding='utf8')
            old_text=name_file.read()
            name_file.close()
-            name_file = open(filepath, "w")
+            name_file = io.open(filepath, "w", encoding='utf8')
            name_file.write(new_text)
            name_file.close()
        except (OSError, IOError) as msg:
@@ -448,7 +446,6 @@ def make_dbdir(dbdir):
        if not os.path.isdir(dbdir):
            os.makedirs(dbdir)
    except (IOError, OSError) as msg:
-        msg = conv_to_unicode(str(msg), glocale.getfilesystemencoding())
        LOG.error(_("\nERROR: Wrong database path in Edit Menu->Preferences.\n"
                    "Open preferences and set correct database path.\n\n"
                    "Details: Could not make database directory:\n    %s\n\n") % msg)
@@ -464,7 +461,7 @@ def find_next_db_name(name_list):
    while True:
        title = "%s %d" % (DEFAULT_TITLE, i)
        if title not in name_list:
-            return title
+            return conv_to_unicode(title)
        i += 1

 def find_next_db_dir():
@@ -476,8 +473,6 @@ def find_next_db_dir():
    while True:
        base = "%x" % int(time.time())
        dbdir = os.path.expanduser(config.get('behavior.database-path'))
-        if sys.version_info[0] < 3:
-            dbdir = dbdir.encode(glocale.getfilesystemencoding())
        new_path = os.path.join(dbdir, base)
        if not os.path.isdir(new_path):
            break
@@ -515,12 +510,8 @@ def find_locker_name(dirpath):
    """
    try:
        fname = os.path.join(dirpath, "lock")
-        ifile = open(fname, 'rb')
+        ifile = io.open(fname, 'r', encoding='utf8')
        username = ifile.read().strip()
-        # Convert username to unicode according to system encoding
-        # Otherwise problems with non ASCII characters in
-        # username in Windows
-        username = conv_to_unicode(username, glocale.getfilesystemencoding())
        # feature request 2356: avoid genitive form
        last = _("Locked by %s") % username
        ifile.close()
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -248,6 +248,13 @@ class CLIManager(object):
                    _("Family Tree does not exist, as it has been deleted."))
            return

+        if os.path.isfile(os.path.join(filename, "lock")):
+            self._errordialog(
+                    _("The database is locked."),
+                    _("Use the --force-unlock option if you are sure "
+                      "that the database is not in use."))
+            return
+
        if self.db_loader.read_file(filename):
            # Attempt to figure out the database title
            path = os.path.join(filename, "name.txt")
@@ -289,7 +296,10 @@ class CLIManager(object):
        # apply preferred researcher if loaded file has none
        res = self.dbstate.db.get_researcher()
        owner = get_researcher()
-        if res.get_name() == "" and owner.get_name() != "":
+        # If the DB Owner Info is empty and
+        # [default] Researcher is not empty and
+        # database is empty, then copy default researcher to DB owner
+        if res.is_empty() and not owner.is_empty() and self.dbstate.db.is_empty():
            self.dbstate.db.set_researcher(owner)
        
        name_displayer.set_name_format(self.dbstate.db.name_formats)
@@ -20,7 +20,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 #
 # cli.plug.__init__
@@ -309,7 +309,7 @@ class CommandLineReport(object):

        self.options_help['papers'][2] = \
            [ paper.get_name() for paper in paper_sizes 
-                        if paper.get_name() != _("Custom Size") ]
+                        if paper.get_name() != 'Custom Size' ]

        self.options_help['papero'][2] = [
            "%d\tPortrait" % PAPER_PORTRAIT,
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -15,7 +15,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -25,6 +25,10 @@
 import os
 import unittest
 import re
+import io
+import sys
+
+from gramps.gen.constfunc import cuni

 test_ged = """0 HEAD
 1 SOUR min1r.ged min 1-rec
@@ -37,6 +41,13 @@ test_ged = """0 HEAD
 0 TRLR
 """

+# see gramps.grampsapp.py
+## hack to avoid mentioning 'utf8' encoding everywhere unicode or str is is used
+if sys.version_info[0] < 3:
+    reload(sys)
+    sys.setdefaultencoding('utf8')
+##
+
 ddir = os.path.dirname(__file__)
 min1r = os.path.join(ddir,"min1r.ged")
 out_ged = os.path.join(ddir,"test_out.ged")
@@ -102,6 +113,42 @@ class Test(unittest.TestCase):
        for fn in bogofiles:
            self.assertFalse(os.path.exists(fn))

+class UnicodeTest(unittest.TestCase):
+
+    @unittest.skipIf(sys.version_info[0] < 3 and sys.platform == 'win32',
+                     "Python2 bsddb doesn't handle unicode paths")
+
+    def setUp(self):
+        from gramps.cli.clidbman import CLIDbManager
+        from gramps.gen.config import set as setconfig
+        from gramps.gen.dbstate import DbState
+        self.newpath = os.path.join(os.path.dirname(__file__),
+                                    cuni('\u0393\u03c1\u03b1\u03bc\u03c3\u03c0'))
+        self.newtitle = cuni('Gr\u00e4mps T\u00e9st')
+        os.makedirs(self.newpath)
+        setconfig('behavior.database-path', self.newpath)
+        self.cli = CLIDbManager(DbState())
+
+    def tearDown(self):
+        for (dirpath, dirnames, filenames) in os.walk(self.newpath, False):
+            for afile in filenames:
+                os.remove(os.path.join(dirpath, afile))
+            for adir in dirnames:
+                os.rmdir(os.path.join(dirpath, adir))
+        os.rmdir(self.newpath)
+        pass
+
+    # Test that clidbman will open files in a path containing
+    # arbitrary Unicode characters.
+    def test4_arbitrary_uncode_path(self):
+        (dbpath, title) = self.cli.create_new_db_cli(self.newtitle)
+
+        self.assertEquals(self.newpath, os.path.dirname(dbpath),
+                          "Compare paths %s and %s" % (repr(self.newpath),
+                                                       repr(dbpath)))
+        self.assertEquals(self.newtitle, title, "Compare titles %s and %s" %
+                          (repr(self.newtitle), repr(title)))
+

 if __name__ == "__main__":
    unittest.main()
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -153,8 +153,6 @@ class TestUser_quiet(unittest.TestCase):

@unittest.skipUnless(MOCKING, "Requires unittest.mock to run")
 class TestUser_progress(unittest.TestCase):
-    _progress_begin_step_end = \
-            TestUser_quiet.test_progress_can_begin_step_end.__func__

    def setUp(self):
        self.user = user.User()
@@ -186,5 +184,11 @@ class TestUser_progress(unittest.TestCase):
                pass
        self.assertTrue(MockEP.called)

+    def _progress_begin_step_end(self):
+        self.user.begin_progress("Foo", "Bar", 0)
+        for i in range(10):
+            self.user.step_progress()
+        self.user.end_progress()
+
 if __name__ == "__main__":
    unittest.main()
@@ -15,7 +15,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #
@@ -15,7 +15,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # gen/__init__.py
 # $Id$
@@ -19,7 +19,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -145,7 +145,7 @@ register('behavior.max-sib-age-diff', 20)
 register('behavior.min-generation-years', 13)
 register('behavior.owner-warn', False)
 register('behavior.pop-plugin-status', False)
-register('behavior.recent-export-type', 1)
+register('behavior.recent-export-type', 3)
 register('behavior.spellcheck', False)
 register('behavior.startup', 0)
 register('behavior.surname-guessing', 0)
@@ -214,6 +214,7 @@ register('interface.grampletbar-close', False)
 register('interface.height', 500)
 register('interface.ignore-gexiv2', False)
 register('interface.ignore-osmgpsmap', False)
+register('interface.ignore-webkit', False)
 register('interface.lds-height', 450)
 register('interface.lds-width', 600)
 register('interface.location-height', 250)
@@ -18,7 +18,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -44,7 +44,7 @@ import uuid
 #
 #-------------------------------------------------------------------------
 from .git_revision import get_git_revision
-
+from .constfunc import get_env_var, conv_to_unicode
 #-------------------------------------------------------------------------
 #
 # Gramps Version
@@ -88,28 +88,18 @@ APP_VCARD       = ["text/x-vcard", "text/x-vcalendar"]
 #
 #-------------------------------------------------------------------------
 if 'GRAMPSHOME' in os.environ:
-    USER_HOME = os.environ['GRAMPSHOME'] 
+    USER_HOME = get_env_var('GRAMPSHOME') 
    HOME_DIR = os.path.join(USER_HOME, 'gramps')
 elif 'USERPROFILE' in os.environ:
-    USER_HOME = os.environ['USERPROFILE'] 
+    USER_HOME = get_env_var('USERPROFILE') 
    if 'APPDATA' in os.environ:
-        HOME_DIR = os.path.join(os.environ['APPDATA'], 'gramps')
+        HOME_DIR = os.path.join(get_env_var('APPDATA'), 'gramps')
    else:
        HOME_DIR = os.path.join(USER_HOME, 'gramps')
 else:
-    USER_HOME = os.environ['HOME'] 
+    USER_HOME = get_env_var('HOME') 
    HOME_DIR = os.path.join(USER_HOME, '.gramps')

-# Conversion of USER_HOME to unicode was needed to have better
-# support for non ASCII path names in Windows for the Gramps database.
-
-if sys.version_info[0] < 3:
-    if not isinstance(USER_HOME, unicode):
-        USER_HOME = unicode(USER_HOME, sys.getfilesystemencoding())
-    if not isinstance(HOME_DIR, unicode):
-        HOME_DIR = unicode(HOME_DIR, sys.getfilesystemencoding())
-else:
-    pass

 VERSION_DIR    = os.path.join(
    HOME_DIR, "gramps%s%s" % (VERSION_TUPLE[0], VERSION_TUPLE[1]))
@@ -125,7 +115,7 @@ THUMB_NORMAL   = os.path.join(THUMB_DIR, "normal")
 THUMB_LARGE    = os.path.join(THUMB_DIR, "large")
 USER_PLUGINS   = os.path.join(VERSION_DIR, "plugins")
 # dirs checked/made for each Gramps session
-USER_DIRLIST = (HOME_DIR, VERSION_DIR, ENV_DIR, TEMP_DIR, THUMB_DIR,
+USER_DIRLIST = (USER_HOME, HOME_DIR, VERSION_DIR, ENV_DIR, TEMP_DIR, THUMB_DIR,
                THUMB_NORMAL, THUMB_LARGE, USER_PLUGINS)

 #-------------------------------------------------------------------------
@@ -134,19 +124,20 @@ USER_DIRLIST = (HOME_DIR, VERSION_DIR, ENV_DIR, TEMP_DIR, THUMB_DIR,
 # above this one, and that the plugins directory is below the root directory.
 #
 #-------------------------------------------------------------------------
-ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(
-            __file__), os.pardir))
-if sys.version_info[0] < 3:
-    # test for sys.frozen to detect a py2exe executable on Windows
-    if hasattr(sys, "frozen"):
-        ROOT_DIR = os.path.abspath(os.path.dirname(
-            unicode(sys.executable, sys.getfilesystemencoding())))
-    else:
-        ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(
-            unicode(__file__, sys.getfilesystemencoding())), os.pardir))
+# test for sys.frozen to detect a py2exe executable on Windows

-#VERSION += get_git_revision(ROOT_DIR)
-VERSION += "-1"
+if sys.version_info[0] < 3 and hasattr(sys, "frozen"):
+    ROOT_DIR = os.path.abspath(os.path.dirname(unicode(sys.executable)))
+else:
+    ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(
+        conv_to_unicode(__file__)), os.pardir))
+
+sys.path.insert(0, ROOT_DIR)
+git_revision = get_git_revision(ROOT_DIR)
+if sys.platform == 'win32' and git_revision == "":
+    git_revision = get_git_revision(os.path.split(ROOT_DIR)[1])
+VERSION += git_revision
+#VERSION += "-1"

 #
 # Glade files
@@ -203,7 +194,7 @@ GTK_GETTEXT_DOMAIN = 'gtk30'
 #
 #-------------------------------------------------------------------------
 COPYRIGHT_MSG  = "© 2001-2006 Donald N. Allingham\n" \
-                 "© 2007-2014 The Gramps Developers"
+                 "© 2007-2015 The Gramps Developers"
 COMMENTS       = _("Gramps (Genealogical Research and Analysis "
                   "Management Programming System)\n" 
                   "is a personal genealogy program.")
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -34,6 +34,8 @@ perform a translation on import, eg Gtk.
 #------------------------------------------------------------------------
 import platform
 import sys
+import ctypes
+import os

 #-------------------------------------------------------------------------
 #
@@ -53,20 +55,26 @@ WINDOWS = ["Windows", "win32"]

 #python 2 and 3 support, use correct conversion to unicode
 if sys.version_info[0] < 3:
-    conv_to_unicode = unicode
    conv_to_unicode_direct = unicode
    STRTYPE = basestring
    UNITYPE = unicode
 else:
-    def conv_to_unicode(x, y):
-        if isinstance(x, str):
-            return x
-        else:
-            return x.decode(y)
    conv_to_unicode_direct = str
    STRTYPE = str
    UNITYPE = str
 cuni = conv_to_unicode_direct
+def conv_to_unicode(x, y='utf8'):
+    return x if x is None or isinstance(x, UNITYPE) else cuni(x, y) if y else cuni(x)
+
+def uni_to_gui(x):
+    '''
+    In Py2 we need to convert strings to utf8 before passing them to
+    Gtk functions.
+    '''
+    if sys.version_info[0] < 3 and isinstance(x, UNITYPE):
+        return x.encode('utf8')
+    else:
+        return x

 # handle in database is bytes, while internally Gramps wants unicode for py3
 if sys.version_info[0] < 3:
@@ -159,3 +167,52 @@ def mod_key():
        return "<ctrl>"

    return "<alt>"
+
+# Python2 on Windows munges environemnt variables to match the system
+# code page. This breaks all manner of things and the workaround
+# though a bit ugly, is encapsulated here. Use this to retrieve
+# environment variables if there's any chance they might contain
+# Unicode, and especially for paths.
+
+# Shamelessly lifted from http://stackoverflow.com/questions/2608200/problems-with-umlauts-in-python-appdata-environvent-variable, answer 1.
+
+
+def get_env_var(name, default=None):
+    '''
+    Python2 on Windows can't directly read unicode values from
+    environment variables. This routine does so using the native C
+    wide-character function.
+    '''
+    if not name or not name in os.environ:
+        return default
+
+    if sys.version_info[0] < 3 and win():
+        name = unicode(name) # make sure string argument is unicode
+        n = ctypes.windll.kernel32.GetEnvironmentVariableW(name, None, 0)
+        if n==0:
+            return default
+        # n is number of codepoints
+        buf = ctypes.create_unicode_buffer(n+1)
+        ctypes.windll.kernel32.GetEnvironmentVariableW(name, buf, n)
+        return buf.value
+
+    return os.environ[name]
+
+def get_curr_dir():
+    '''
+    In Python2 on Windows, os.getcwd() returns a string encoded with
+    the current code page, which may not be able to correctly handle
+    an arbitrary unicode character in a path. This function uses the
+    native GetCurrentDirectory function to return a unicode cwd.
+    '''
+    if not (sys.version_info[0] < 3 and win()):
+        return os.getcwd()
+
+    n = ctypes.windll.kernel32.GetCurrentDirectoryW(0, None)
+    if n == 0:
+        return None
+    buf = ctypes.create_unicode_buffer(n+1)
+    ctypes.windll.kernel32.GetCurrentDirectoryW(n, buf)
+    return buf.value
+
+
@@ -15,7 +15,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #
@@ -165,8 +165,10 @@ class DateParserCZ(DateParser):
        }

    quality_to_int = {
+        'přibližně'  : Date.QUAL_ESTIMATED,
        'odhadované' : Date.QUAL_ESTIMATED, 
        'odh.'       : Date.QUAL_ESTIMATED, 
+        'vypočteno'  : Date.QUAL_CALCULATED,
        'vypočtené'  : Date.QUAL_CALCULATED, 
        'vyp.'       : Date.QUAL_CALCULATED, 
        }
@@ -237,14 +239,14 @@ class DateDisplayCZ(DateDisplay):
            return date.get_text()
        elif start == Date.EMPTY:
            return ""
-        elif mod == Date.MOD_NONE:
-            date_decl_string = self.display_cal[cal](start)
-            date_decl_string = date_decl_string.replace("den ", "dna ")
-            date_decl_string = date_decl_string.replace("or ", "ora ")
-            date_decl_string = date_decl_string.replace("en ", "na ")
-            date_decl_string = date_decl_string.replace("ad ", "adu ")
-            date_decl_string = date_decl_string.replace("ec ", "ce ")
-            return date_decl_string
+#        elif mod == Date.MOD_NONE:
+#            date_decl_string = self.display_cal[cal](start)
+#            date_decl_string = date_decl_string.replace("den ", "dna ")
+#            date_decl_string = date_decl_string.replace("or ", "ora ")
+#            date_decl_string = date_decl_string.replace("en ", "na ")
+#            date_decl_string = date_decl_string.replace("ad ", "adu ")
+#            date_decl_string = date_decl_string.replace("ec ", "ce ")
+#            return date_decl_string
        elif mod == Date.MOD_SPAN:
            dat1 = self.display_cal[cal](start)
            dat2 = self.display_cal[cal](date.get_stop_date())
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -17,7 +17,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -18,7 +18,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Portuguese version translated by Duarte Loreto <happyguy_pt@hotmail.com>, 2007.
 # Based on the Spanish file.
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -16,11 +16,9 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

-# $Id$
-
 """
 Slovak-specific classes for parsing and displaying dates.
 """
@@ -61,7 +59,7 @@ class DateParserSK(DateParser):
    calendar_to_int = {
        'gregoriánsky'  : Date.CAL_GREGORIAN, 
        'g'             : Date.CAL_GREGORIAN, 
-        'juliánský'     : Date.CAL_JULIAN, 
+        'juliánsky'     : Date.CAL_JULIAN, 
        'j'             : Date.CAL_JULIAN, 
        'hebrejský'     : Date.CAL_HEBREW, 
        'h'             : Date.CAL_HEBREW, 
@@ -71,7 +69,7 @@ class DateParserSK(DateParser):
        'r'             : Date.CAL_FRENCH, 
        'perzský'       : Date.CAL_PERSIAN, 
        'p'             : Date.CAL_PERSIAN, 
-        'swedish'      : Date.CAL_SWEDISH, 
+        'švédsky'      : Date.CAL_SWEDISH, 
        's'            : Date.CAL_SWEDISH, 
        }

@@ -112,9 +110,9 @@ class DateDisplaySK(DateDisplay):
                     "júl", "aug", "sep", "okt", "nov", "dec" )
    
    calendar = (
-        "", "juliánský", "hebrejský", 
+        "", "juliánsky", "hebrejský", 
        "republikánsky", "perzský", "islamský", 
-        "swedish" 
+        "švédsky" 
        )

    _mod_str = ("", "pred ", "po ", "okolo ", "", "", "")
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -17,7 +17,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$
 #
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$

@@ -15,7 +15,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -15,7 +15,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -17,7 +17,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # $Id$

@@ -18,7 +18,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -15,7 +15,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # gen/db/__init__.py
 # $Id$
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # gen/db/backup.py
 # $Id$
@@ -17,7 +17,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -87,12 +87,6 @@ class DbReadBase(object):
        """
        raise NotImplementedError

-    def create_id(self):
-        """
-        Create an id
-        """
-        raise NotImplementedError
-
    def db_has_bm_changes(self):
        """
        Return whethere there were bookmark changes during the session.
@@ -15,7 +15,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

 # $Id$
@@ -15,7 +15,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # gen/db/cursor.py
 # $Id$