5554: back-port to gramps32 to debug 6757

Back-port the following commit: commit d43545a98a00b01228786776f74121d58bb73966 Author: Josip Pisoj <josip@pisoj.com> Date: Fri Feb 10 20:25:15 2012 +0000 bug #5554: Automake problem git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/trunk@18851 4ae1f11a-8b86-4847-b8af-ab372f36d1fd svn: r23210
czech translation update
2013-09-27 21:40:49 +00:00 · 2011-11-09 13:05:44 +00:00 · 2011-10-18 21:16:25 +00:00 · 2011-08-23 20:01:50 +00:00 · 2011-07-01 08:16:08 +00:00 · 2011-06-30 20:42:05 +00:00
434 changed files with 389842 additions and 362943 deletions
@@ -1,3 +1,86 @@
+Version 3.2.6 -- the "So far, so good." bug fix release.
+* fix memory leaks
+* fix corrupted reports
+* fix crash in cramplets
+* fix gedcom import and export
+* import speed improvements
+* NarrativeWeb fixes
+* prevent corrupting databases
+* many translation updates
+* other changes; see the changelog and the 3.2.6 roadmap: http://www.gramps-project.org/bugs/roadmap_page.php?version_id=23
+
+Version 3.2.5 -- the "I intend to live forever" bug fix release.
+* fix Gramps so it again runs with Python 2.5
+* write all notes and sources to gedcom files
+* cli fixes
+* GeneWeb and LegacyGedcom fixes
+* NarrativeWeb fixes
+* memory leak fixes
+* various other small fixes
+* many translation updates
+
+Version 3.2.4 -- the "Tententen" bug fix release.
+* fix a crash on newer distro's after an export is finished
+* styled notes cleanup and consistency improvement (nar web behaves like the pdf/html output of reports)
+* newlines in styled notes are written as newlines so users can make simple lists
+* many NarrativeWeb fixes
+* gedcom output fixes
+* non latin character fixes (mainly for windows)
+* recursive filter fixes
+* undo fixes
+* many translation updates
+
+Version 3.2.3 -- the "I used to eat there. Really good noodles." release.
+* Bug fixes:
+ -> several GLADE fixes
+ -> several GEDCOM fixes (both export and import)
+ -> several crash fixes
+ -> encoding fix (Windows only)
+ -> privacy/living fixes
+ -> updates to NarrativeWeb and the css stylsheets
+* Translation updates: bg, ca, de, es, fr, he, nb, nl, pl, sk, sv
+
+Version 3.2.2 -- the "Mea navis aëricumbens anguillis abundat" release.
+* This release is a quick fix to a problem introduced by NarrativeWeb in the previous release.
+* Also includes a few small fixes and translation updates to hr and it.
+* See the release notes from the 3.2.1 release for the full list of changes and translation updates.
+
+Version 3.2.1 -- the "One of those men is my father" release.
+* Many bug fixes:
+ -> fixed missing icons
+ -> load/reload plugins must unload old plugins
+ -> import/export fixes (date ranges, underscore, latitude/longitude)
+ -> narrative web crash fixes and many updates, html notes, css updates
+ -> geoview fixes and updates
+ -> unicode error in soundex
+ -> fixed crash on data entry
+* Translation updates: bg, ca, de, es, fr, he, hr, it, nb, nl, sk, sv
+
+Version 3.2.0 -- the "I am your father" release.
+* 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.
+* Faster:
+ -> Many under the hood improvements have occurred that should improve
+    performance enormously.  New features are implemented as plugins that can
+    be hidden.
+ -> Performance improvement example:  Insertion of a new person in a family
+    tree with 30000 people previously took 4 seconds on a 1.4GHz PC running
+    Gramps 3.1, but now takes milliseconds.
+* New Views:
+ -> There are new views, and some existing 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, a fast internet connection is required)
+ -> Help Menu -> Extra Reports/Tools open a webpage with downloadable views
+* Other Improvements:
+ -> Styled Notes now in most output formats that support styles
+ -> New languages
+ -> Select language in which report should be created (not yet available in
+    all reports)
+
 Version 3.1.3 -- the "What name?" release.
 * contains translation updates, crash fixes, bug fixes, and minor updates.
 * fixes and updates to:
@@ -1,24 +0,0 @@
-Gramps 3.2 Release Notes
-
-General Improvements
-
-* 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.
-
-* 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.
-
-*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
-
-
-Other Improvements
-
-* 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)
@@ -5,14 +5,14 @@ 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.2.0, [gramps-bugs@lists.sourceforge.net])
+AC_INIT(gramps, 3.2.7, [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=0beta3
 dnl RELEASE=0rc1
 dnl RELEASE=1

@@ -33,7 +33,7 @@ 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 ro ru sv eo fi lt sk tr bg hr sl ca mk sq he"
+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.])
@@ -3,9 +3,16 @@ gramps for Debian

 This is the Debian package of GRAMPS.

-If you do not install python-reportlab (gramps Recommends it be
-installed) then you will be able to create usable PDF files only if
-your database contains solely latin (iso-8859-1) characters. Reportlab
-will generate PDF files containing non-latin characters although they
-are quite large as the font must be included in the file.
+Regarding the extra dependencies:

+Recommends: graphviz
+  Enable creation of graphs 
+Recommends: python-gtkmozembed
+Recommends: python-webkit
+  Enable html rendering for Geographic view and Web view. If both
+  are installed webkit will be used. python-gtkmozembed may be more
+  stable.
+Suggests: ttf-freefont
+  Allows more fonts in reports
+Suggests: python-gtkspell python-enchant
+  allows spell checking in the notes. Both need to be installed.
@@ -1,20 +1,265 @@
-gramps (3.0.0-1) gutsy; urgency=low
+gramps (3.2.0-0beta1) unstable; urgency=low
+
+  * New upstream release
+  * works with gtk 2.19. Closes: #566958
+
+ -- James A. Treacy <treacy@debian.org>  Fri, 05 Mar 2010 14:05:39 -0500
+
+gramps (3.1.3-2) unstable; urgency=low
+
+  * Switch to dpkg-source 3.0 (quilt) format
+
+ -- James A. Treacy <treacy@debian.org>  Tue, 05 Jan 2010 20:04:30 -0500
+
+gramps (3.1.3-1) unstable; urgency=low

  * New upstream release

- -- Stephane Charette <stephanecharette@gmail.com>  Mon, 31 Mar 2008 19:42:05 -0700
+ -- James A. Treacy <treacy@debian.org>  Sun, 06 Dec 2009 13:46:48 -0500

-gramps (2.90.0-0beta) unstable; urgency=low
+gramps (3.1.2-2) unstable; urgency=low
+
+  * allow python >= 2.5. Closes: #547150
+  * fix Relationship Graph to use new format for URLs. Closes: #532559
+  * Web report creation fixed. Closes: #537355
+
+ -- James A. Treacy <treacy@debian.org>  Tue, 17 Nov 2009 11:38:43 -0500
+
+gramps (3.1.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control: drop Recommends on python-gnome2-desktop: it is now
+    gone and none of its modules are used anyhow (Closes: #541560)
+
+ -- Stefano Zacchiroli <zack@debian.org>  Thu, 08 Oct 2009 13:52:35 +0200
+
+gramps (3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Replace Recommends on python-gnome2-extras with python-gtkspell
+  * Do not create the directory /etc/gconf/schemas/. Closes: Bug#525683
+
+ -- James A. Treacy <treacy@debian.org>  Sun, 07 Jun 2009 14:01:16 -0400
+
+gramps (3.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- James A. Treacy <treacy@debian.org>  Tue, 10 Mar 2009 09:26:52 -0400
+
+gramps (3.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * link /usr/share/common-licenses/GPL-2 from /usr/share/gramps/COPYING
+    so gramps can find the file.
+
+ -- James A. Treacy <treacy@debian.org>  Sat, 07 Mar 2009 22:03:09 -0500
+
+gramps (3.0.4-1) unstable; urgency=low
+
+  * New upstream version. Closes: #506621, #506818
+
+ -- James A. Treacy <treacy@debian.org>  Sun, 07 Dec 2008 21:39:55 -0500
+
+gramps (3.0.3-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 20 Oct 2008 20:43:35 -0400
+
+gramps (3.0.2-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- James A. Treacy <treacy@debian.org>  Sat, 27 Sep 2008 17:25:09 -0400
+
+gramps (3.0.1-2) unstable; urgency=low
+
+  * Remove dependency on gnome-doc-utils and scrollkeeper
+  * Disable spell checking in src/Spell.py due to the spell checker
+    crashing. Closes: #492212
+    Spell checking will be reenabled once the offending package is
+    identified and fixed.
+
+ -- James A. Treacy <treacy@debian.org>  Fri, 29 Aug 2008 11:09:04 -0400
+
+gramps (3.0.1-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 19 May 2008 09:38:28 -0400
+
+gramps (3.0.0-6) unstable; urgency=low
+
+  * Fix typo in _EditChildRef.py which can cause gramps to crash. Closes: #476163
+
+ -- James A. Treacy <treacy@debian.org>  Tue, 15 Apr 2008 23:37:04 -0400
+
+gramps (3.0.0-5) unstable; urgency=low
+
+  * Remove gtkspell Recommends as it is now provided by python-gnome2-extras.
+    Closes: Bug#474755
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 07 Apr 2008 17:25:18 -0400
+
+gramps (3.0.0-4) unstable; urgency=low
+
+  * Fix the binary package python dependency properly. A recent python
+    (>= 2.4.4-6) is needed to ensure python2.5 is supported properly.
+    Closes: #474056
+
+ -- James A. Treacy <treacy@debian.org>  Thu, 03 Apr 2008 09:46:28 -0400
+
+gramps (3.0.0-3) unstable; urgency=low
+
+  * Build-Depends on Python2.5. Closes: Bug#473946, #474056
+
+ -- James A. Treacy <treacy@debian.org>  Wed, 02 Apr 2008 08:28:27 -0400
+
+gramps (3.0.0-2) unstable; urgency=low
+
+  * Explicitly require python version >= 2.5
+
+ -- James A. Treacy <treacy@debian.org>  Wed, 26 Mar 2008 09:34:25 -0400
+
+gramps (3.0.0-1) unstable; urgency=low
+
+  * New upstream release. Closes: #472681
+
+ -- James A. Treacy <treacy@debian.org>  Tue, 25 Mar 2008 09:35:00 -0400
+
+gramps (2.2.10-2) unstable; urgency=low
+
+  * Remove build dependency on python-xml. Closes: Bug#468625
+
+ -- James A. Treacy <treacy@debian.org>  Fri, 29 Feb 2008 13:30:11 -0500
+
+gramps (2.2.10-1) unstable; urgency=low
+
+  * New upstream release
+  * Added dh_icons to debian/rules. Closes: #454761
+  * Remove version from scrollkeeper dependency. Closes: #456600
+  * Fixed typos in description. Closes: #433559
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 14 Jan 2008 09:57:25 -0500
+
+gramps (2.2.9-2) unstable; urgency=low
+
+  * Move debhelper to Build-Depends. Closes: #447948
+
+ -- James A. Treacy <treacy@debian.org>  Wed, 24 Oct 2007 20:03:36 -0400
+
+gramps (2.2.9-1) unstable; urgency=low

  * New upstream release

- -- Stephane Charette <stephanecharette@gmail.com>  Wed, 16 Jan 2008 21:45:00 -0800
+ -- James A. Treacy <treacy@debian.org>  Thu, 18 Oct 2007 13:14:30 -0400

-gramps (2.1.6-1) unstable; urgency=low
+gramps (2.2.8-2) unstable; urgency=low
+
+  * Work around a bug in gnome-python-extras which caused a deallocation
+    of the TextView in the check if a spell checker is present.
+    Closes: #445864
+
+ -- James A. Treacy <treacy@debian.org>  Tue, 09 Oct 2007 17:26:54 -0400
+
+gramps (2.2.8-1) unstable; urgency=low
+
+  * New Upstream version
+  * Misleading error message changed. Closes: #418033
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 28 May 2007 21:00:51 -0400
+
+gramps (2.2.7-2) unstable; urgency=low
+
+  * Added dependency on librsvg2-common
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 23 Apr 2007 19:32:00 -0400
+
+gramps (2.2.7-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- James A. Treacy <treacy@debian.org>  Sun, 22 Apr 2007 20:08:55 -0400
+
+gramps (2.2.6-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 29 Jan 2007 20:12:05 -0500
+
+gramps (2.2.5-0rc1-1) unstable; urgency=low
+
+  * rc1 of 2.2.5
+
+ -- James A. Treacy <treacy@debian.org>  Thu, 25 Jan 2007 23:04:24 -0500
+
+gramps (2.2.4-1) unstable; urgency=low

  * New upstream release

- -- Alex Roitman <shura@gramps-project.org>  Thu, 22 Jun 2006 13:28:14 -0700
+ -- James A. Treacy <treacy@debian.org>  Wed, 27 Dec 2006 18:04:11 -0500
+
+gramps (2.2.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 27 Nov 2006 00:27:23 -0500
+
+gramps (2.2.2-2) unstable; urgency=low
+
+  * call dh_desktop in debian/rules so .desktop file is registered. Closes: Bug#398423
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 13 Nov 2006 20:26:00 -0500
+
+gramps (2.2.2-1) unstable; urgency=low
+
+  * Bumped upstream version number. 2.2.1-3 and -4 should have been 2.2.2
+
+ -- James A. Treacy <treacy@debian.org>  Sat,  4 Nov 2006 16:34:47 -0500
+
+gramps (2.2.1-4) unstable; urgency=low
+
+  * add missing Build-Depends-Indep. Closes: #396874
+
+ -- James A. Treacy <treacy@debian.org>  Fri,  3 Nov 2006 11:03:35 -0500
+
+gramps (2.2.1-3) unstable; urgency=low
+
+  * New Upstream release
+
+ -- James A. Treacy <treacy@debian.org>  Fri,  3 Nov 2006 08:07:38 -0500
+
+gramps (2.2.1-2) unstable; urgency=low
+
+  * Upload to sid
+
+ -- James A. Treacy <treacy@debian.org>  Wed,  1 Nov 2006 20:50:28 -0500
+
+gramps (2.2.1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 30 Oct 2006 10:32:43 -0500
+
+gramps (2.1.95-1) experimental; urgency=low
+
+  * Beta release of version 2.2
+
+ -- James A. Treacy <treacy@debian.org>  Tue, 29 Aug 2006 11:40:08 -0400
+
+
+gramps (2.1.90-1) experimental; urgency=low
+
+  * Beta release of version 2.2
+
+ -- James A. Treacy <treacy@debian.org>  Tue, 25 Jul 2006 00:18:15 -0400
+
+gramps (2.0.11-2) unstable; urgency=low
+
+  * Complies with new python policy
+
+ -- James A. Treacy <treacy@debian.org>  Wed,  5 Jul 2006 14:47:56 -0400

 gramps (2.0.11-1) unstable; urgency=low

@@ -1 +1 @@
-4
+7
@@ -1,23 +1,27 @@
 Source: gramps
 Section: gnome
 Priority: optional
-Maintainer: James A. Treacy <treacy@debian.org>
-Build-Depends-Indep: debhelper (>=5.0.37.2), python-xml, python-gnome2, python-glade2, scrollkeeper, libglib2.0-dev, build-essential, gnome-doc-utils, intltool, xsltproc, python-central (>= 0.4.17)
-Standards-Version: 3.6.2
-XS-Python-Version: current
+Maintainer: Stéphane Charette <stephanecharette@gmail.com>
+Build-Depends-Indep: libxml-parser-perl, python-gtk2, gettext, python-central (>= 0.5.6), python, intltool
+Build-Depends:  debhelper (>= 7)
+Standards-Version: 3.8.3
+Homepage: http://www.gramps-project.org/
+XS-Python-Version: >=2.5

 Package: gramps
 Architecture: all
-Depends: ${python:Depends}, python-gnome2, python-glade2, ${misc:Depends}
-Replaces: gramps-manual, gramps-extending-doc, gramps-help
-Conflicts: gramps-manual, gramps-extending-doc, gramps-common
-Recommends: graphviz, ttf-freefont, python-reportlab, python-gnome2-extras
-Description: Genealogical Research and Analysis Management Program
- GRAMPS, the Genealogical Research and Analysis Management Programming
- System, is an Open Source genealogy program written in Python, using
- the GTK/GNOME interface.
- GRAMPS has the ability to import GEDCOM files that are used in such
- programs as FamilyTree Maker for Windows and can produce reports
- in various formats such as the popular ABIWord and OpenOffice.org
- formats as well as HTML and PDF.
+Depends: ${python:Depends}, librsvg2-common, python-gtk2, xdg-utils, ${misc:Depends}
+Replaces: gramps-manual, gramps-extending-doc
+Conflicts: gramps-manual, gramps-extending-doc, gramps-common, python-gtk-1.2
+Recommends: graphviz, python-webkit, python-gtkmozembed
+Suggests: ttf-freefont, python-enchant, python-gtkspell
+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
+ the needs for both the amateur genealogist and serious genealogical
+ researcher.
+ GRAMPS has the ability to import GEDCOM files exported from many
+ proprietary genealogy programs and can produce a large number of
+ reports in many popular formats.
+XB-Python-Version: ${python:Versions}

@@ -1 +1,2 @@
 usr/share/pixmaps
+usr/share/mime/packages
@@ -0,0 +1,3 @@
+/usr/bin/
+/usr/share/
+/etc
@@ -1,3 +1,3 @@
-?package(gramps):needs="X11" section="Apps/Tools"\
+?package(gramps):needs="X11" section="Applications/Office"\
  title="gramps" command="/usr/bin/gramps"\
  icon="/usr/share/pixmaps/gramps.xpm"
@@ -0,0 +1 @@
+2
@@ -4,71 +4,68 @@ build: build-stamp
 build-stamp:
 	dh_testdir

-	./configure \
-		--enable-packager-mode \
-		--disable-scrollkeeper \
-		--prefix=/usr \
-		--mandir=\$${prefix}/share/man \
-		--sysconfdir=/etc
+	#./autogen.sh --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc
+	./configure --enable-packager-mode --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc
+	# ./configure --prefix=`pwd`/debian/tmp/usr --mandir=\$${prefix}/share/man
 	$(MAKE)
+	# $(MAKE) html

 	touch build-stamp

 clean:
 	dh_testdir
 	dh_testroot
-	-rm -f build-stamp

-	-$(MAKE) clean
-	-rm -f src/*.pyo src/*/*.pyo src/*/*/*.pyo src/*/*/*/*.pyo
-	-rm -f config.status config.log
+	# [ ! -f Makefile ] || $(MAKE) distclean
+	# -rm -f src/*.pyo src/*/*.pyo
+	# -rm -f config.status config.log

+	dh_auto_clean
 	dh_clean

 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs

-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	# Add here commands to install the package into debian/tmp.
+	# GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 	$(MAKE) install DESTDIR=`pwd`/debian/gramps
-	# Remove help-related dirs, they will go into gramps-help package
-	-rm -rf debian/gramps/usr/share/gnome
-	-rm -rf debian/gramps/usr/share/omf
-
-	# Remove byte-compiled python files
+	-rm -f debian/gramps/usr/share/gramps/COPYING
+	ln -s /usr/share/common-licenses/GPL-2 debian/gramps/usr/share/gramps/COPYING
+	-rm -rf debian/gramps/usr/var
+	# cp src/data/gramps.xml debian/gramps/usr/share/mime/packages
 	-find debian/gramps/usr/share/ -name "*.pyo" -exec rm -f '{}' ';'

-	# Copy icon file
 	cp debian/gramps.xpm debian/gramps/usr/share/pixmaps/
 	# cp src/gramps.xpm debian/tmp/usr/share/pixmaps/
-	#cp src/data/gramps.svg debian/gramps/usr/share/pixmaps/
-	#chmod 644 debian/gramps/usr/share/pixmaps/gramps.svg
-
-	# Instal gramps-help things
-	#$(MAKE) -C help install DESTDIR=`pwd`/debian/gramps-help
+	# cp src/images/gramps.svg debian/gramps/usr/share/pixmaps/
+	# chmod 644 debian/gramps/usr/share/pixmaps/gramps.svg

 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs
-	dh_installmenu --package=gramps
-	dh_installman --package=gramps
+	dh_installdocs FAQ
+	dh_installmenu
+	# dh_installman
 	dh_installmime -i
-	dh_installchangelogs --package=gramps ChangeLog
-	#dh_installchangelogs --package=gramps-help help/ChangeLog
-	dh_gconf --package=gramps
-	#dh_scrollkeeper --package=gramps-help
+	# dh_installchangelogs ChangeLog
+	dh_installchangelogs
+	dh_icons
+	# dh_movefiles -i
+	# dh_gconf -i
+	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
-	dh_python  --package=gramps
-	dh_installdeb -i 
+	dh_pycentral -i
+	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i

+
 # Build architecture-dependent files here.
 binary-arch: build install

@@ -0,0 +1,11 @@
+#########################################
+The :class:`RelationshipCalculator` Class
+#########################################
+
+Contents:
+
+.. automodule:: Relationship
+.. autoclass:: RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
@@ -320,6 +320,7 @@ src/Merge/_MergePlace.py
 src/Merge/_MergeSource.py

 # DateHandler package
+src/DateHandler/_Date_bg.py
 src/DateHandler/_Date_cs.py
 src/DateHandler/_Date_de.py
 src/DateHandler/_DateDisplay.py
@@ -381,7 +382,6 @@ src/plugins/drawreport/TimeLine.py
 # plugins/export directory
 src/plugins/export/export.gpr.py
 src/plugins/export/ExportCsv.py
-src/plugins/export/ExportDjango.gpr.py
 src/plugins/export/ExportFtree.py
 src/plugins/export/ExportGedcom.py
 src/plugins/export/ExportGeneWeb.py
@@ -398,6 +398,7 @@ src/plugins/gramplet/AttributesGramplet.py
 src/plugins/gramplet/CalendarGramplet.py
 src/plugins/gramplet/DescendGramplet.py
 src/plugins/gramplet/FanChartGramplet.py
+src/plugins/gramplet/FaqGramplet.py
 src/plugins/gramplet/GivenNameGramplet.py
 src/plugins/gramplet/gramplet.gpr.py
 src/plugins/gramplet/PedigreeGramplet.py
@@ -420,8 +421,6 @@ src/plugins/graph/GVRelGraph.py
 # plugins/import directory
 src/plugins/import/import.gpr.py
 src/plugins/import/ImportCsv.py
-src/plugins/import/ImportDjango.gpr.py
-src/plugins/import/ImportDjango.py
 src/plugins/import/ImportGedcom.py
 src/plugins/import/ImportGeneWeb.py
 src/plugins/import/ImportGrdb.py
@@ -506,7 +505,6 @@ src/plugins/textreport/Summary.py
 src/plugins/textreport/textplugins.gpr.py

 # plugins/tool directory
-src/plugins/tool/CalculateEstimatedDates.py
 src/plugins/tool/ChangeNames.py
 src/plugins/tool/ChangeTypes.py
 src/plugins/tool/Check.py
@@ -534,8 +532,8 @@ src/plugins/tool/Verify.py
 #plugins/view directory
 src/plugins/view/eventview.py
 src/plugins/view/familyview.py
-src/plugins/view/fanchartview.gpr.py
 src/plugins/view/fanchartview.py
+src/plugins/view/fanchartview.gpr.py
 src/plugins/view/geoview.py
 src/plugins/view/geoview.gpr.py
 src/plugins/view/grampletview.py
@@ -543,8 +541,6 @@ src/plugins/view/htmlrenderer.py
 src/plugins/view/mediaview.py
 src/plugins/view/noteview.py
 src/plugins/view/pedigreeview.py
-src/plugins/view/pedigreeviewext.py
-src/plugins/view/pedigreeviewext.gpr.py
 src/plugins/view/personlistview.py
 src/plugins/view/persontreeview.py
 src/plugins/view/placelistview.py
@@ -895,8 +891,8 @@ src/plugins/tool/verify.glade
 #
 #	web
 #
-src/web/grampsdb/views.py
-src/web/utils.py
+#src/web/grampsdb/views.py
+#src/web/utils.py
 #
 #	Files to extract from and then merge into
 #
@@ -11,6 +11,8 @@ src/gen/lib/styledtexttagtype.py
 src/LdsUtils.py
 src/Mime/_WinMime.py
 src/plugins/docgen/PdfDoc.py
+src/plugins/export/ExportDjango.gpr.py
+src/plugins/import/ImportDjango.gpr.py
 src/plugins/gramplet/DeepConnections.py
 src/plugins/gramplet/NoteGramplet.py
 src/plugins/gramplet/PluginManagerGramplet.py
@@ -21,8 +23,9 @@ src/plugins/tool/DumpGenderStats.py
 src/plugins/tool/PHPGedViewConnector.py
 src/plugins/tool/TestcaseGenerator.py
 src/plugins/tool/phpgedview.glade
-src/plugins/gramplet/FaqGramplet.py
 src/plugins/gramplet/HeadlineNewsGramplet.py
 src/plugins/quickview/AllNames.py
 src/plugins/quickview/Query.py
 src/ReportBase/_DocReportDialog.py
+src/web/grampsdb/views.py
+src/web/utils.py
@@ -22,28 +22,14 @@

 """ Unittest for testing POTFILES.in and Makefile contents """

+# PYTHONPATH=/../src python po_test.py
+
 import unittest
 import os
 import glob
 from test import test_util
 test_util.path_append_parent() 

-excluded_files = ["src/DataViews/_MapView.py", 
-                  "src/plugins/PHPGedViewConnector.py",
-                  "src/plugins/phpgedview.glade",
-                  "src/plugins/Ancestors.py",
-                  "src/plugins/DesGraph.py",
-                  "src/plugins/FtmStyleAncestors.py", 
-                  "src/plugins/FtmStyleDescendants.py",
-                  "src/plugins/IndivSummary.py",
-                  "src/date_test.py",
-                  "src/plugins/CmdRef.py",
-                  "src/plugins/DumpGenderStats.py",
-                  "src/plugins/Eval.py",
-                  "src/plugins/Leak.py",
-                  "src/plugins/TestcaseGenerator.py"
-                  ]
-
 def get_potfile(filename):
    fp = open(filename, "r")
    retvals = []
@@ -53,6 +39,10 @@ def get_potfile(filename):
    fp.close()
    return retvals

+# POTFILES.skip
+
+excluded_files = get_potfile("../POTFILES.skip")
+
 class TestPOT(unittest.TestCase):
    potfiles = get_potfile("../POTFILES.in")
    count = 1
@@ -126,6 +126,7 @@ class Bookmarks :
            self.uistate.uimanager.remove_ui(self.active)
            self.uistate.uimanager.remove_action_group(self.action_group)
            self.action_group = gtk.ActionGroup('Bookmarks')
+            self.uistate.uimanager.ensure_update()
            self.active = DISABLED

    def redraw_and_report_change(self):
@@ -62,7 +62,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 from gen.ggettext import sgettext as _
-from gen.lib import Date
+from gen.lib.date import Date, NextYear
 import DateHandler
 import const
 import GrampsDisplay
@@ -150,6 +150,9 @@ class DateEdit(object):
        # if text could not be parsed it is assumed invalid
        if self.date_obj.get_modifier() == Date.MOD_TEXTONLY:
            return ValidationError(_('Bad Date'))
+        elif (self.date_obj.to_calendar(calendar_name=Date.CAL_GREGORIAN) >>
+              NextYear()):
+            return ValidationError(_('Date more than one year in the future'))

    def invoke_date_editor(self, obj):
        """
@@ -3,10 +3,9 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/DateHandler
-
-pkgdata_PYTHON = \
-        _Date_ca.py\
+pkgpython_PYTHON = \
+        _Date_bg.py\
+	_Date_ca.py\
 	_Date_cs.py\
 	_Date_de.py\
 	_Date_es.py\
@@ -21,6 +20,7 @@ pkgdata_PYTHON = \
 	_Date_pt.py\
 	_Date_ru.py\
 	_Date_sk.py\
+	_Date_sl.py\
 	_Date_sr.py\
 	_Date_sv.py\
 	_DateDisplay.py\
@@ -30,7 +30,7 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/DateHandler
-pkgpythondir = @pkgpythondir@/DateHandler
+pkgpythondir = $(datadir)/@PACKAGE@/DateHandler

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@@ -48,4 +48,4 @@ docs:

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -139,7 +139,12 @@ class DateDisplay(object):
        Formats the extra items (calendar, newyear) for a date.
        """
        scal = self.calendar[cal]
-        snewyear = self.newyear[newyear]
+        if isinstance(newyear, int) and newyear <= len(self.newyear):
+            snewyear = self.newyear[newyear]
+        elif isinstance(newyear, (list, tuple)):
+            snewyear = "%s-%s" % (newyear[0], newyear[1])
+        else:
+            snewyear = "Err"
        retval = ""
        for item in [scal, snewyear]:
            if item:
@@ -96,18 +96,20 @@ def julian_valid(date_tuple):

 def swedish_valid(date_tuple):
    """ Checks if date_tuple is a valid date in Swedish Calendar """
-    valid = gregorian_valid(date_tuple)
-    # not sure how <= and >= works with tuples???
+    valid_J = julian_valid(date_tuple)
    date_tuple = (date_tuple[2], date_tuple[1], date_tuple[0])
-    if date_tuple <= (1700, 2, 28):
-        valid = False 
-    if date_tuple == (1700, 2, 29):  # leapday 1700 was skipped
-        valid = False 
-    if date_tuple == (1712, 2, 30):  # extra day was inserted 1712
-        valid = True 
-    if date_tuple >= (1712, 3, 1):   # back to julian
-        valid = False
-    return valid
+    # Swedish calendar starts as Julian 1700-03-01 and ends 1712-03-01 as Julian
+    if date_tuple >= (1700, 2, 29) and  date_tuple < (1712, 3, 1):
+        if date_tuple == (1712, 2, 30):  # extra day was inserted 1712, not valid Julian
+            return True
+        if valid_J:
+            if date_tuple == (1700, 2, 29):  # leapday 1700 was skipped
+                return False
+            return True
+        else:
+            return False
+    else:
+        return False

 def french_valid(date_tuple):
    """ Checks if date_tuple is a valid date in French Calendar """
@@ -154,11 +156,17 @@ class DateParser(object):
    modifier_after_to_int = {}

    hebrew_to_int = {
-        "tishri"  : 1,   "heshvan" : 2,   "kislev"  : 3,
-        "tevet"   : 4,   "shevat"  : 5,   "adari"   : 6,
-        "adarii"  : 7,   "nisan"   : 8,   "iyyar"   : 9,
-        "sivan"   : 10,  "tammuz"  : 11,  "av"      : 12,
-        "elul"    : 13,
+        u"tishri"  : 1,   u"heshvan" : 2,   u"kislev"  : 3,
+        u"tevet"   : 4,   u"shevat"  : 5,   u"adari"   : 6,
+        u"adarii"  : 7,   u"nisan"   : 8,   u"iyyar"   : 9,
+        u"sivan"   : 10,  u"tammuz"  : 11,  u"av"      : 12,
+        u"elul"    : 13,
+        #alternative spelling
+        u"cheshvan": 2,   u"adar sheni":  7, u"iyar"    : 9,
+        #GEDCOM months
+        u"tsh" : 1, u"csh": 5, u"ksl": 3, u"tvt": 4, u"shv": 5, u"adr": 6, 
+        u"ads" : 7, u"nsn": 8, u"iyr": 9, u"svn":10, u"tmz":11, u"aav":12,
+        u"ell":13,
        }

    french_to_int = {
@@ -168,7 +176,15 @@ class DateParser(object):
        u'germinal'     : 7,    u'floréal' : 8,
        u'prairial'     : 9,    u'messidor'   : 10,
        u'thermidor'    : 11,   u'fructidor'  : 12,
-        u'extra'        : 13
+        u'extra'        : 13,
+        #GEDCOM months
+        u'vend'    : 1,    u'brum' : 2,
+        u'frim'    : 3,    u'nivo' : 4,
+        u'pluv'    : 5,    u'vent' : 6,
+        u'germ'    : 7,    u'flor' : 8,
+        u'prai'    : 9,    u'mess' : 10,
+        u'ther'    : 11,   u'fruc' : 12,
+        u'comp'    : 13,
        }

    islamic_to_int = {
@@ -202,7 +218,7 @@ class DateParser(object):
        "januari"    :  1, "februari"   :  2,
        "mars"       :  3, "april"      :  4,
        "maj"        :  5, "juni"       :  6,
-        "juli"       :  7, "augisti"    :  8,
+        "juli"       :  7, "augusti"    :  8,
        "september"  :  9, "oktober"    : 10,
        "november"   : 11, "december"   : 12,
        }
@@ -430,7 +446,6 @@ class DateParser(object):
                m = 0
            else:
                m = mmap[groups[1].lower()]
-
            d = self._get_int(groups[0])

            if groups[2] is None:
@@ -586,11 +601,15 @@ class DateParser(object):
            text_parser = self.parser[cal]
            (text1, bc1) = self.match_bce(match.group('start'))
            start = self._parse_subdate(text1, text_parser)
+            if start == Date.EMPTY and text1 != "":
+                return 0
            if bc1:
                start = self.invert_year(start)

            (text2, bc2) = self.match_bce(match.group('stop'))
            stop = self._parse_subdate(text2, text_parser)
+            if stop == Date.EMPTY and text2 != "":
+                return 0
            if bc2:
                stop = self.invert_year(stop)

@@ -609,11 +628,15 @@ class DateParser(object):
            text_parser = self.parser[cal]
            (text1, bc1) = self.match_bce(match.group('start'))
            start = self._parse_subdate(text1, text_parser)
+            if start == Date.EMPTY and text1 != "":
+                return 0
            if bc1:
                start = self.invert_year(start)

            (text2, bc2) = self.match_bce(match.group('stop'))
            stop = self._parse_subdate(text2, text_parser)
+            if stop == Date.EMPTY and text2 != "":
+                return 0
            if bc2:
                stop = self.invert_year(stop)
            
@@ -666,7 +689,10 @@ class DateParser(object):
                start = self._parse_subdate(grps[0], self.parser[cal])
                mod = self.modifier_after_to_int.get(grps[1].lower(),
                                                     Date.MOD_NONE)
-                if bc:
+                if start == Date.EMPTY:
+                    date.set_modifier(Date.MOD_TEXTONLY)
+                    date.set_text_value(text)
+                elif bc:
                    date.set(qual, mod, cal, self.invert_year(start), newyear=ny)
                else:
                    date.set(qual, mod, cal, start, newyear=ny)
@@ -676,7 +702,10 @@ class DateParser(object):
            grps = match.groups()
            start = self._parse_subdate(grps[0])
            mod = Date.MOD_ABOUT
-            if bc:
+            if start == Date.EMPTY:
+                date.set_modifier(Date.MOD_TEXTONLY)
+                date.set_text_value(text)
+            elif bc:
                date.set(qual, mod, cal, self.invert_year(start), newyear=ny)
            else:
                date.set(qual, mod, cal, start, newyear=ny)
@@ -712,6 +741,8 @@ class DateParser(object):
            if subdate == Date.EMPTY and text != "":
                date.set_as_text(text)
                return
+            #else:
+            #    print 'valid subdate', text, subdate
        except:
            date.set_as_text(text)
            return
@@ -0,0 +1,314 @@
+# -*- coding: utf-8 -*-
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2004-2006  Donald N. Allingham
+#
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+# $Id: _Date_bg.py 9101 2007-10-08 16:41:39Z dallingham $
+
+"""
+Bulgarian-specific classes for parsing and displaying dates.
+"""
+
+#-------------------------------------------------------------------------
+#
+# Python modules
+#
+#-------------------------------------------------------------------------
+import re
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from gen.lib import Date
+from _DateParser import DateParser
+from _DateDisplay import DateDisplay
+from _DateHandler import register_datehandler
+
+#-------------------------------------------------------------------------
+#
+# Bulgarian parser
+#
+#-------------------------------------------------------------------------
+class DateParserBG(DateParser):
+
+    modifier_to_int = {
+        u'преди'          : Date.MOD_BEFORE, 
+        u'пр.'            : Date.MOD_BEFORE,
+        u'пр'             : Date.MOD_BEFORE,
+        u'след'           : Date.MOD_AFTER,
+        u'сл.'            : Date.MOD_AFTER,
+        u'сл'             : Date.MOD_AFTER,
+        u'ок'             : Date.MOD_ABOUT,
+        u'ок.'            : Date.MOD_ABOUT,
+        u'около'          : Date.MOD_ABOUT,
+        u'примерно'       : Date.MOD_ABOUT,
+        u'прим'           : Date.MOD_ABOUT,
+        u'прим.'          : Date.MOD_ABOUT,
+        u'приблизително'  : Date.MOD_ABOUT,
+        u'приб.'          : Date.MOD_ABOUT,
+        u'прибл.'         : Date.MOD_ABOUT,
+        u'приб'           : Date.MOD_ABOUT,
+        u'прибл'          : Date.MOD_ABOUT,
+        }
+
+    calendar_to_int = {
+        u'григориански'          : Date.CAL_GREGORIAN, 
+        u'г'                     : Date.CAL_GREGORIAN, 
+        u'юлиански'              : Date.CAL_JULIAN, 
+        u'ю'                     : Date.CAL_JULIAN, 
+        u'еврейски'              : Date.CAL_HEBREW, 
+        u'е'                     : Date.CAL_HEBREW, 
+        u'ислямски'              : Date.CAL_ISLAMIC, 
+        u'и'                     : Date.CAL_ISLAMIC, 
+        u'френски републикански' : Date.CAL_FRENCH, 
+        u'републикански'         : Date.CAL_FRENCH,
+        u'фр.реп.'               : Date.CAL_FRENCH,
+        u'р'                     : Date.CAL_FRENCH,
+        u'френски'               : Date.CAL_FRENCH,
+        u'фр.'                   : Date.CAL_FRENCH,
+        u'персийски'             : Date.CAL_PERSIAN, 
+        u'п'                     : Date.CAL_PERSIAN, 
+        }
+
+    quality_to_int = {
+        u'приблизително'  : Date.QUAL_ESTIMATED,
+        u'прибл.'         : Date.QUAL_ESTIMATED,
+        u'изчислено'      : Date.QUAL_CALCULATED,
+        u'изчисл.'        : Date.QUAL_CALCULATED,
+        u'изч.'           : Date.QUAL_CALCULATED,
+        }
+
+    hebrew_to_int = {
+        u"тишрей":1, 
+        u"мархешван":2, 
+        u"кислев":3, 
+        u"тевет":4, 
+        u"шват":5, 
+        u"адар":6, 
+        u"адар бет":7, 
+        u"нисан":8, 
+        u"ияр":9, 
+        u"сиван":10, 
+        u"тамуз":11, 
+        u"ав":12, 
+        u"eлул":13, 
+    }
+
+    islamic_to_int = { 
+        u"мухаррам":1, 
+        u"саффар":2, 
+        u"рабиу-л-ауал":3, 
+        u"рабиу-с-сани":4, 
+        u"джумадал-уля":5, 
+        u"джумада-с-сания":6, 
+        u"раджаб":7, 
+        u"шаабан":8, 
+        u"рамадан":9, 
+        u"шауал":10, 
+        u"зу-л-кида":11, 
+        u"зул-л-хиджа":12, 
+        }
+
+    persian_to_int = {
+        u"фарвардин":1, 
+        u"урдбихищ":2, 
+        u"хурдад":3, 
+        u"тир":4, 
+        u"мурдад":5, 
+        u"шахривар":6, 
+        u"михр":7, 
+        u"абан":8, 
+        u"азар":9, 
+        u"дай":10, 
+        u"бахман":11, 
+        u"исфаидармуз":12, 
+        }
+
+    french_to_int = {
+        u"вандемер":1, 
+        u"брюмер":2, 
+        u"фример":3, 
+        u"нивоз":4, 
+        u"плювиоз":5, 
+        u"вантоз":6, 
+        u"жерминал":7, 
+        u"флореал":8, 
+        u"прериал":9, 
+        u"месидор":10, 
+        u"термидор":11, 
+        u"фрюктидор":12, 
+        u"допълнителен":13, 
+        }
+
+    bce = [
+        u'преди Христа', u'пр. Хр.', u'пр.Хр.'
+        ] + DateParser.bce
+
+    def init_strings(self):
+        DateParser.init_strings(self)
+        _span_1 = [u'от']
+        _span_2 = [u'до']
+        _range_1 = [u'между']
+        _range_2 = [u'и']
+        self._span  = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" % 
+                                 ('|'.join(_span_1), '|'.join(_span_2)), 
+                                 re.IGNORECASE)
+        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+                                 ('|'.join(_range_1), '|'.join(_range_2)), 
+                                 re.IGNORECASE)
+        
+#-------------------------------------------------------------------------
+#
+# Bulgarian displayer
+#
+#-------------------------------------------------------------------------
+class DateDisplayBG(DateDisplay):
+    """
+    Bulgarian language date display class. 
+    """
+    long_months = ( u"", u"януари", u"февруари", u"март", u"април", u"май", 
+                    u"юни", u"юли", u"август", u"септември", u"октомври", 
+                    u"ноември", u"декември" )
+    
+    short_months = ( u"", u"яну", u"февр", u"март", u"апр", u"май", u"юни", 
+                     u"юли", u"авг", u"септ", u"окт", u"ное", u"дек" )
+    
+
+    calendar = (
+        u"", 
+        u"юлиански", 
+        u"еврейски", 
+        u"републикански", 
+        u"персийски", 
+        u"ислямски",
+        u"шведски"
+        )
+
+    _mod_str = ("", "преди ", "след ", "около ", "", "", "")
+    
+    _qual_str = ("", "приблизително ", "изчислено ")
+
+    _bce_str = u"%s пр. Хр."
+
+    formats = (
+        "ГГГГ-ММ-ДД (ISO)", "Числов", "Месец Ден, Година", "Мес. Ден, Година", "Ден Месец Година", "Ден Мес. Година"
+        )
+
+    hebrew = ( u"", 
+        u"Тишрей", 
+        u"Мархешван", 
+        u"Кислев", 
+        u"Тевет", 
+        u"Шват", 
+        u"Адар", 
+        u"Адар бет", 
+        u"Нисан", 
+        u"Ияр", 
+        u"Сиван", 
+        u"Тамуз", 
+        u"Ав", 
+        u"Елул", 
+        )
+
+    islamic = ( u"", 
+        u"Мухаррам", 
+        u"Саффар", 
+        u"Рабиу-л-ауал", 
+        u"Рабиу-с-сани", 
+        u"Джумадал-уля", 
+        u"Джумада-с-сания", 
+        u"Раджаб", 
+        u"Шаабан", 
+        u"Рамадан", 
+        u"Шауал", 
+        u"Зу-л-кида", 
+        u"Зул-л-хиджа", 
+        )
+
+    persian = ( u"", 
+        u"Фарвардин", 
+        u"Урдбихищ", 
+        u"Хурдад", 
+        u"Тир", 
+        u"Мурдад", 
+        u"Шахривар", 
+        u"Михр", 
+        u"Абан", 
+        u"Азар", 
+        u"Дай", 
+        u"Бахман", 
+        u"Исфаидармуз", 
+        )
+
+    french = ( u"", 
+        u"Вандемер", 
+        u"Брюмер", 
+        u"Фример", 
+        u"Нивоз", 
+        u"Плювиоз", 
+        u"Вантоз", 
+        u"Жерминал", 
+        u"Флореал", 
+        u"Прериал", 
+        u"Мессидор", 
+        u"Термидор", 
+        u"Фрюктидор", 
+        u"Допълнителен"
+        )
+
+    def display(self, date):
+        """
+        Returns a text string representing the date.
+        """
+        mod = date.get_modifier()
+        cal = date.get_calendar()
+        qual = date.get_quality()
+        start = date.get_start_date()
+        newyear = date.get_new_year()
+
+        qual_str = self._qual_str[qual]
+        
+        if mod == Date.MOD_TEXTONLY:
+            return date.get_text()
+        elif start == Date.EMPTY:
+            return ""
+        elif mod == Date.MOD_SPAN:
+            d1 = self.display_cal[cal](start)
+            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, u'от', d1, u'до', d2, scal)
+        elif mod == Date.MOD_RANGE:
+            d1 = self.display_cal[cal](start)
+            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, u'между', d1, u'и', d2, scal)
+        else:
+            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
+            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, scal)
+
+#-------------------------------------------------------------------------
+#
+# Register classes
+#
+#-------------------------------------------------------------------------
+register_datehandler(('bg_BG', 'bg', 'bulgarian', 'Bulgarian'), 
+    DateParserBG, DateDisplayBG)
@@ -116,18 +116,17 @@ class DateDisplayCA(DateDisplay):
    """
    Catalan language date display class. 
    """
-    # TODO: Translate these month strings:
-    long_months = ( u"", u"January", u"February", u"March", u"April", u"May", 
-                    u"June", u"July", u"August", u"September", u"October", 
-                    u"November", u"December" )
+    long_months = ( u"", u"Gener", u"Febrer", u"Març", u"Abril", u"Maig", 
+                    u"Juny", u"Juliol", u"Agost", u"Setembre", u"Octubre", 
+                    u"Novembre", u"Desembre" )
    
-    short_months = ( u"", u"Jan", u"Feb", u"Mar", u"Apr", u"May", u"Jun",  
-                     u"Jul", u"Aug", u"Sep", u"Oct", u"Nov", u"Dec" )
+    short_months = ( u"", u"Gen", u"Feb", u"Mar", u"Abr", u"Mai", u"Jun",  
+                     u"Jul", u"Ago", u"Set", u"Oct", u"Nov", u"Des" )

    calendar = (
-        "", u" (Julià)", u" (Hebreu)", 
-        u" (Revolucionari)", u" (Persa)", u" (Islàmic)", 
-        u" (Swedish)" 
+        "", u"Julià", u"Hebreu", 
+        u"Revolucionari", u"Persa", u"Islàmic", 
+        u"Suec" 
        )

    _mod_str = ("", u"abans de ", u"després de ", u"cap a ", "", "", "")
@@ -164,6 +163,7 @@ class DateDisplayCA(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
        
@@ -174,14 +174,17 @@ class DateDisplayCA(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
-            return "%s%s %s %s %s%s" % (qual_str, u'des de', d1, u'fins a', d2, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, u'des de', d1, u'fins a', d2, scal)
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
-            return "%s%s %s %s %s%s" % (qual_str, u'entre', d1, u'i', d2, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, u'entre', d1, u'i', d2, scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
-            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, scal)

 #-------------------------------------------------------------------------
 #
@@ -102,18 +102,17 @@ class DateDisplayCZ(DateDisplay):
    """
    Czech language date display class. 
    """
-    # TODO: Translate these month strings:
-    long_months = ( u"", u"January", u"February", u"March", u"April", u"May", 
-                    u"June", u"July", u"August", u"September", u"October", 
-                    u"November", u"December" )
+    long_months = ( u"", u"Leden", u"Únor", u"Březen", u"Duben", u"Květen", 
+                    u"Červen", u"červenec", u"Srpen", u"Září", u"Říjen", 
+                    u"Listopad", u"Prosinec" )
    
-    short_months = ( u"", u"Jan", u"Feb", u"Mar", u"Apr", u"May", u"Jun", 
-                     u"Jul", u"Aug", u"Sep", u"Oct", u"Nov", u"Dec" )
+    short_months = ( u"", u"Led", u"Úno", u"Bře", u"Dub", u"Kvě", u"čer", 
+                     u"Čvc", u"Srp", u"Zář", u"Říj", u"Lis", u"Pro" )

    calendar = (
-        "", u" (juliánský)", u" (hebrejský)", 
-        u" (republikánský)", u" (perský)", u" (islámský)", 
-        u" (swedish)" 
+        "", u"juliánský", u"hebrejský", 
+        u"republikánský", u"perský", u"islámský", 
+        u"švédský" 
        )

    _mod_str = ("", u"před ", u"po ", u"kolem ", "", "", "")
@@ -133,6 +132,7 @@ class DateDisplayCZ(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
        
@@ -143,17 +143,20 @@ class DateDisplayCZ(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'od', d1, 
-                                        u'do', d2, self.calendar[cal])
+                                        u'do', d2, scal)
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'mezi', 
-                                        d1, u'a', d2, self.calendar[cal])
+                                        d1, u'a', d2, scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
            return "%s%s%s%s" % (qual_str, self._mod_str[mod],
-                                 text, self.calendar[cal])
+                                 text, scal)

 #-------------------------------------------------------------------------
 #
@@ -56,27 +56,87 @@ class DateParserDE(DateParser):
    month_to_int[u"jan"]    = 1
    month_to_int[u"jänner"] = 1
    month_to_int[u"jän"]    = 1
-    # Add other common latin, local and historical variants  
+
+    # Add other common latin, 
+
    month_to_int[u"januaris"] = 1
+    month_to_int[u"januarii"] = 1
+    month_to_int[u"januarius"] = 1
+    month_to_int[u"februaris"] = 2
+    month_to_int[u"februarii"] = 2
+    month_to_int[u"februarius"] = 2
+    month_to_int[u"martii"] = 3
+    month_to_int[u"martius"] = 3
+    month_to_int[u"aprilis"] = 4
+    month_to_int[u"maius"] = 5
+    month_to_int[u"maii"] = 5
+    month_to_int[u"junius"] = 6
+    month_to_int[u"junii"] = 6
+    month_to_int[u"julius"] = 7
+    month_to_int[u"julii"] = 7
+    month_to_int[u"augustus"] = 8
+    month_to_int[u"augusti"] = 8
+    month_to_int[u"septembris"] = 9
+    month_to_int[u"7bris"] = 9
+    month_to_int[u"september"] = 9
+    month_to_int[u"october"] = 10
+    month_to_int[u"octobris"] = 10
+    month_to_int[u"8bris"] = 10
+    month_to_int[u"novembris"] = 11
+    month_to_int[u"9bris"] = 11
+    month_to_int[u"november"] = 11
+    month_to_int[u"decembris"] = 12
+    month_to_int[u"10bris"] = 12
+    month_to_int[u"xbris"] = 12
+    month_to_int[u"december"] = 12
+
+    # local and historical variants  
+
    month_to_int[u"jenner"] = 1
    month_to_int[u"feber"]  = 2
-    month_to_int[u"februaris"]  = 2
    month_to_int[u"merz"]  = 3
-    month_to_int[u"aprilis"]  = 4
-    month_to_int[u"maius"]  = 5
-    month_to_int[u"junius"]  = 6
-    month_to_int[u"julius"]  = 7
    month_to_int[u"augst"]  = 8
    month_to_int[u"7ber"]  = 9
-    month_to_int[u"7bris"]  = 9
    month_to_int[u"8ber"]  = 10
-    month_to_int[u"8bris"]  = 10
    month_to_int[u"9ber"]  = 11
-    month_to_int[u"9bris"]  = 11
    month_to_int[u"10ber"]  = 12
-    month_to_int[u"10bris"]  = 12
    month_to_int[u"xber"]  = 12
-    month_to_int[u"xbris"]  = 12
+
+    # old german names
+
+    month_to_int[u"hartung"] = 1
+    month_to_int[u"eismond"] = 1
+    month_to_int[u"hornung"] = 2
+    month_to_int[u"schmelzmond"] = 2
+    month_to_int[u"taumond"] = 2
+    month_to_int[u"narrenmond"] = 2
+    month_to_int[u"rebmond"] = 2
+    month_to_int[u"hintester"] = 2
+    month_to_int[u"lenzing"] = 3
+    month_to_int[u"lenzmond"] = 3
+    month_to_int[u"launing"] = 4
+    month_to_int[u"ostermond"] = 4
+    month_to_int[u"winnemond"] = 5
+    month_to_int[u"weidenmonat"] = 5
+    month_to_int[u"blumenmond"] = 5
+    month_to_int[u"brachet"] = 6
+    month_to_int[u"brachmond"] = 6
+    month_to_int[u"heuert"] = 7
+    month_to_int[u"heumond"] = 7
+    month_to_int[u"ernting"] = 8
+    month_to_int[u"erntemond"] = 8
+    month_to_int[u"bisemond"] = 8
+    month_to_int[u"scheiding"] = 9
+    month_to_int[u"herbstmond"] = 9
+    month_to_int[u"gilbhard"] = 10
+    month_to_int[u"gilbhart"] = 10
+    month_to_int[u"windmond"] = 11
+    month_to_int[u"nebelung"] = 11
+    month_to_int[u"wintermond"] = 11
+    month_to_int[u"julmond"] = 12
+    month_to_int[u"heilmond"] = 12
+    month_to_int[u"christmond"] = 12
+    month_to_int[u"dustermond"] = 12
    
    modifier_to_int = {
        u'vor'    : Date.MOD_BEFORE, 
@@ -137,18 +197,18 @@ class DateDisplayDE(DateDisplay):
    """
    German language date display class. 
    """
-    # TODO: Translate these month strings:
-    long_months = (  u"", u"January", u"February", u"March", u"April", u"May", 
-                    u"June", u"July", u"August", u"September", u"October", 
-                    u"November", u"December" )
    
-    short_months = ( u"", u"Jan", u"Feb", u"Mar", u"Apr", u"May", u"Jun",  
-                     u"Jul", u"Aug", u"Sep", u"Oct", u"Nov", u"Dec" )
+    long_months = (  u"", u"Januar", u"Februar", u"März", u"April", u"Mai", 
+                    u"Juni", u"Juli", u"August", u"September", u"Oktober", 
+                    u"November", u"Dezember" )
+    
+    short_months = ( u"", u"Jan", u"Feb", u"Mär", u"Apr", u"Mai", u"Jun",  
+                     u"Jul", u"Aug", u"Sep", u"Okt", u"Nov", u"Dez" )

    calendar = (
-        "", u" (julianisch)", u" (hebräisch)", 
-        u" (französisch republikanisch)", u" (persisch)", u" (islamisch)", 
-        u" (schwedisch)" 
+        "", u"julianisch", u"hebräisch", 
+        u"französisch republikanisch", u"persisch", u"islamisch", 
+        u"schwedisch" 
        )

    _mod_str = ("", u"vor ", u"nach ", u"etwa ", "", "", "")
@@ -229,6 +289,7 @@ class DateDisplayDE(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
        
@@ -239,14 +300,17 @@ class DateDisplayDE(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
-            return "%s%s %s %s %s%s" % (qual_str, u'von', d1, u'bis', d2, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, u'von', d1, u'bis', d2, scal)
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
-            return "%szwischen %s und %s%s" % (qual_str, d1, d2, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%szwischen %s und %s%s" % (qual_str, d1, d2, scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
-            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, scal)

 #-------------------------------------------------------------------------
 #
@@ -127,9 +127,9 @@ class DateDisplayES(DateDisplay):
                     u"dic" )

    calendar = (
-        "", u" (Juliano)", u" (Hebreo)", 
-        u" (Revolucionario)", u" (Persa)", u" (Islámico)", 
-        u" (Swedish)" 
+        "", u"Juliano", u"Hebreo", 
+        u"Revolucionario", u"Persa", u"Islámico", 
+        u"Swedish" 
        )

    _mod_str = ("", u"antes de ", u"después de ", u"hacia ", "", "", "")
@@ -149,6 +149,7 @@ class DateDisplayES(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
        
@@ -159,14 +160,17 @@ class DateDisplayES(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
-            return "%s%s %s %s %s%s" % (qual_str, u'de', d1, u'a', d2, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, u'de', d1, u'a', d2, scal)
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
-            return "%s%s %s %s %s%s" % (qual_str, u'entre', d1, u'y', d2, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, u'entre', d1, u'y', d2, scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
-            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, scal)

 #-------------------------------------------------------------------------
 #
@@ -116,22 +116,22 @@ class DateDisplayFI(DateDisplay):
    """
    Finnish language date display class. 
    """
-    # TODO: Translate these month strings:
-    long_months = ( u"", u"January", u"February", u"March", u"April", u"May", 
-                    u"June", u"July", u"August", u"September", u"October", 
-                    u"November", u"December" )
+    long_months = (u"", u"Tammikuu", u"Helmikuu", u"Maaliskuu", u"Huhtikuu",
+                    u"Toukokuu", u"Kesäkuu", u"Heinäkuu", u"Elokuu",
+                    u"Syyskuu", u"Lokakuu", u"Marraskuu", u"Joulukuu")
    
-    short_months = ( u"", u"Jan", u"Feb", u"Mar", u"Apr", u"May", u"Jun", 
-                     u"Jul", u"Aug", u"Sep", u"Oct", u"Nov", u"Dec" )
+    short_months = (u"", u"Tammi", u"Helmi", u"Maali", u"Huhti", u"Touko",
+                     u"Kesäk", u"Heinä", u"Eloku", u"Syysk", u"Lokak", u"Marra",
+                     u"Joulu")
    
    calendar = ("", 
-        u"(juliaaninen)", 
-	u"(heprealainen)", 
-        u"(ranskan v.)", 
-	u"(persialainen)", 
-	u"(islamilainen)", 
-    u" (svensk)" 
-    )
+        u"juliaaninen", 
+        u"heprealainen", 
+        u"ranskan v.", 
+        u"persialainen", 
+        u"islamilainen", 
+        u"svensk" 
+        )

    _qual_str = (u"", u"arviolta", u"laskettuna")
    
@@ -139,7 +139,7 @@ class DateDisplayFI(DateDisplay):

    formats = (
        "VVVV-KK-PP (ISO)", 
-	"PP.KK.VVVV"
+        "PP.KK.VVVV"
        )
    
    def display(self, date):
@@ -150,6 +150,7 @@ class DateDisplayFI(DateDisplay):
        qual = date.get_quality()
        cal = date.get_calendar()
        start = date.get_start_date()
+        newyear = date.get_new_year()
        
        if mod == Date.MOD_TEXTONLY:
            return date.get_text()
@@ -185,9 +186,11 @@ class DateDisplayFI(DateDisplay):
        if qual:
            # prepend quality
            text = u"%s %s" % (self._qual_str[qual], text)
-        if cal:
+            
+        if cal or newyear:
            # append calendar type
-            text = u"%s %s" % (text, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            text = u"%s %s" % (text, scal)
    
        return text

@@ -58,6 +58,15 @@ class DateParserFR(DateParser):

    month_to_int = DateParser.month_to_int

+    # Custom short months not the same as long months
+
+    month_to_int[u"janv"] = 1
+    month_to_int[u"févr"] = 2
+    month_to_int[u"juil"] = 7
+    month_to_int[u"sept"] = 9
+    month_to_int[u"oct"] = 10
+    month_to_int[u"déc"] = 12
+
    # Add common value

    month_to_int[u"bluviose"] = 5
@@ -230,7 +239,6 @@ class DateParserFR(DateParser):
        self._stext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
                                  self._smon_str, re.IGNORECASE)

-
 #-------------------------------------------------------------------------
 #
 # French display
@@ -247,8 +255,8 @@ class DateDisplayFR(DateDisplay):
    short_months = ( u"", u"janv", u"févr", u"mars", u"avril", u"mai", u"juin", 
                     u"juil", u"août", u"sept", u"oct", u"nov", u"déc" )

-    calendar = ("", u" (Julien)", u" (Hébreu)", u" (Révolutionnaire)",
-                u" (Perse)", u" (Islamique)", u" (Suédois)")
+    calendar = ("", u"Julien", u"Hébreu", u"Révolutionnaire",
+                u"Perse", u"Islamique", u"Suédois")

    _mod_str = ("", u"avant ", u"après ", u"vers ", "", "", "")

@@ -383,6 +391,7 @@ class DateDisplayFR(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = (self._qual_str)[qual]

@@ -391,20 +400,22 @@ class DateDisplayFR(DateDisplay):
        elif start == Date.EMPTY:
            return ""
        elif mod == Date.MOD_SPAN:
-            date1 = (self.display_cal)[cal](start)
-            date2 = (self.display_cal)[cal](date.get_stop_date())
+            date1 = self.display_cal[cal](start)
+            date2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'de', date1, u'à', 
-            date2, (self.calendar)[cal])
+            date2, scal)
        elif mod == Date.MOD_RANGE:
-            date1 = (self.display_cal)[cal](start)
-            date2 = (self.display_cal)[cal](date.get_stop_date())
+            date1 = self.display_cal[cal](start)
+            date2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'entre', date1, u'et',
-                    date2, (self.calendar)[cal])
+                    date2, scal)
        else:
-            text = (self.display_cal)[date.get_calendar()](start)
+            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
            return "%s%s%s%s" % (qual_str, (self._mod_str)[mod], text, 
-            (self.calendar)[cal])
-
+            scal)

 #-------------------------------------------------------------------------
 #
@@ -115,6 +115,7 @@ class DateParserHR(DateParser):
    month_to_int[u"septembar"]  = 9
    month_to_int[u"septembra"]  = 9
    month_to_int[u"ix"]  = 9
+    month_to_int[u"7ber"]  = 9
    
    month_to_int[u"listopad"]  = 10
    month_to_int[u"listopada"]  = 10
@@ -122,6 +123,7 @@ class DateParserHR(DateParser):
    month_to_int[u"oktobar"]  = 10
    month_to_int[u"oktobra"]  = 10
    month_to_int[u"x"]  = 10
+    month_to_int[u"8ber"]  = 10
    
    month_to_int[u"studeni"]  = 11
    month_to_int[u"studenog"]  = 11
@@ -129,6 +131,7 @@ class DateParserHR(DateParser):
    month_to_int[u"novembar"]  = 11
    month_to_int[u"novembra"]  = 11
    month_to_int[u"xi"]  = 11
+    month_to_int[u"9ber"]  = 11
    
    month_to_int[u"prosinac"]  = 12
    month_to_int[u"prosinca"]  = 12
@@ -160,7 +163,7 @@ class DateParserHR(DateParser):
        u'franc.'         : Date.CAL_FRENCH,
        u'perzijski'       : Date.CAL_PERSIAN,
        u'perz. '       : Date.CAL_PERSIAN,
-        u'swedish'      : Date.CAL_SWEDISH, 
+        u'švedski'      : Date.CAL_SWEDISH, 
        u's'            : Date.CAL_SWEDISH, 
        }

@@ -224,9 +227,9 @@ class DateDisplayHR(DateDisplay):
        )
    
    calendar = (
-        "", u" (julijanski)", u" (hebrejski)", 
-        u" (francuski republikanski)", u" (perzijski)", u" (islamski)",
-        u" (swedish)" 
+        "", u"julijanski", u"hebrejski", 
+        u"francuski republikanski", u"perzijski", u"islamski",
+        u"swedish" 
        )

    _mod_str = ("", "prije ", "poslije ", "okolo ", "", "", "")
@@ -319,6 +322,7 @@ class DateDisplayHR(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
        
@@ -329,17 +333,20 @@ class DateDisplayHR(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d_1 = self.display_cal[cal](start)
            d_2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'od', d_1, u'do', d_2,
-                                                            self.calendar[cal])
+                                                            scal)
        elif mod == Date.MOD_RANGE:
            d_1 = self.display_cal[cal](start)
            d_2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'između', d_1, u'i', d_2, 
-                                                            self.calendar[cal])
+                                                            scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, 
-                                                self.calendar[cal])
+                                                scal)

 #-------------------------------------------------------------------------
 #
@@ -120,9 +120,9 @@ class DateDisplayIT(DateDisplay):
                     u"lug", u"ago", u"set", u"ott", u"nov", u"dic" )

    calendar = (
-        "", u" (Giuliano)", u" (Ebraico)", 
-        u" (Rivoluzionario)", u" (Persiano)", u" (Islamico)", 
-        u" (Svedese)" 
+        "", u"Giuliano", u"Ebraico", 
+        u"Rivoluzionario", u"Persiano", u"Islamico", 
+        u"Svedese" 
        )

    _mod_str = ("", u"prima del ", u"dopo del ", u"circa il ", "", "", "")
@@ -159,6 +159,7 @@ class DateDisplayIT(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
        
@@ -169,14 +170,17 @@ class DateDisplayIT(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
-            return "%s%s %s %s %s%s" % (qual_str, u'dal', d1, u'al', d2, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, u'dal', d1, u'al', d2, scal)
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
-            return "%s%s %s %s %s%s" % (qual_str, u'tra', d1, u'e', d2, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, u'tra', d1, u'e', d2, scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
-            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, scal)

 #-------------------------------------------------------------------------
 #
@@ -48,6 +48,59 @@ from _DateHandler import register_datehandler
 #
 #-------------------------------------------------------------------------
 class DateParserLT(DateParser):
+    """
+    Convert a text string into a Date object. If the date cannot be
+    converted, the text string is assigned.
+    """
+
+    month_to_int = DateParser.month_to_int
+
+    # Custom months not the same as long months
+
+    month_to_int[u"sausis"] = 1
+    month_to_int[u"vasaris"] = 2
+    month_to_int[u"kovas"] = 3
+    month_to_int[u"balandis"] = 4
+    month_to_int[u"gegužė"] = 5
+    month_to_int[u"gegužis"] = 5
+    month_to_int[u"birželis"] = 6
+    month_to_int[u"liepa"] = 7
+    month_to_int[u"rugpjūtis"] = 8
+    month_to_int[u"rugsėjis"] = 9
+    month_to_int[u"spalis"] = 10
+    month_to_int[u"lapkritis"] = 11
+    month_to_int[u"gruodis"] = 12
+    
+    # For not full months
+    
+    month_to_int[u"saus"] = 1
+    month_to_int[u"vasa"] = 2
+    month_to_int[u"vasar"] = 2
+    month_to_int[u"bala"] = 4
+    month_to_int[u"balan"] = 4
+    month_to_int[u"baland"] = 4
+    month_to_int[u"gegu"] = 5
+    month_to_int[u"geguž"] = 5
+    month_to_int[u"birž"] = 6
+    month_to_int[u"birže"] = 6
+    month_to_int[u"biržel"] = 6
+    month_to_int[u"liep"] = 7
+    month_to_int[u"rugp"] = 8
+    month_to_int[u"rugpj"] = 8
+    month_to_int[u"rugpjū"] = 8
+    month_to_int[u"rugpjūt"] = 8
+    month_to_int[u"rugs"] = 9
+    month_to_int[u"rugsė"] = 9
+    month_to_int[u"rugsėj"] = 9
+    month_to_int[u"rugsėjis"] = 9
+    month_to_int[u"spal"] = 10
+    month_to_int[u"lapk"] = 11
+    month_to_int[u"lapkr"] = 11
+    month_to_int[u"lapkri"] = 11
+    month_to_int[u"lapkrit"] = 11
+    month_to_int[u"gru"] = 12
+    month_to_int[u"gruo"] = 12
+    month_to_int[u"gruod"] = 12

    modifier_to_int = {
        u'prieš'    : Date.MOD_BEFORE, 
@@ -64,11 +117,11 @@ class DateParserLT(DateParser):
        u'h'         : Date.CAL_HEBREW, 
        u'islamo'         : Date.CAL_ISLAMIC, 
        u'i'                 : Date.CAL_ISLAMIC, 
-        u'prancuzų respublikos': Date.CAL_FRENCH, 
+        u'prancūzų respublikos': Date.CAL_FRENCH, 
        u'r'                 : Date.CAL_FRENCH, 
        u'persų'             : Date.CAL_PERSIAN, 
        u'p'             : Date.CAL_PERSIAN, 
-        u'swedish'      : Date.CAL_SWEDISH, 
+        u'švedų'      : Date.CAL_SWEDISH, 
        u's'            : Date.CAL_SWEDISH, 
        }

@@ -92,6 +145,27 @@ class DateParserLT(DateParser):
            ('|'.join(_range_1), '|'.join(_range_2)), 
            re.IGNORECASE)

+#------------------------------------------------------------------------
+#
+# FIXME: oficial long date format (ex, 2011 m. vasario 4 d.)
+#      is not recognized correctly:
+#      with self._text2 - day is recognized as year, year - as day
+#      with self._iso   - month not recognized, day recognized,
+#                         year increased by 1, date treated as double
+# TODO: in _DateParser.py in _parse_calendar modify groups
+#
+#------------------------------------------------------------------------
+#
+#     # gregorian and julian
+#
+#        self._text2 = re.compile('(\d+)?\s*?m\.?\s*?%s\.?\s*((\d+)(/\d+)?)?\s*?d?\.?' %
+#                                 self._mon_str, re.IGNORECASE)
+#        
+#        self._iso = re.compile('(\d+)(/\d+)?\s*?m?\.?\s+?%s\.?\s*((\d+))?\s*?d?\.?' %
+#                                 self._mon_str, re.IGNORECASE)
+#
+#-------------------------------------------------------------------------
+
 #-------------------------------------------------------------------------
 #
 # Lithuanian displayer
@@ -101,21 +175,25 @@ class DateDisplayLT(DateDisplay):
    """
    Lithuanian language date display class. 
    """
-    # TODO: Translate these month strings:
-    long_months = ( u"", u"January", u"February", u"March", u"April", u"May", 
-                    u"June", u"July", u"August", u"September", u"October", 
-                    u"November", u"December" )
+   
+    long_months = ( u"", u"sausio", u"vasario", u"kovo", u"balandžio", u"gegužės", 
+                    u"birželio", u"liepos", u"rugpjūčio", u"rugsėjo", u"spalio", 
+                    u"lapkričio", u"gruodžio" )
    
-    short_months = ( u"", u"Jan", u"Feb", u"Mar", u"Apr", u"May", u"Jun", 
-                     u"Jul", u"Aug", u"Sep", u"Oct", u"Nov", u"Dec" )
+    long_months_vardininkas = ( u"", u"sausis", u"vasaris", u"kovas", u"balandis", u"gegužė", 
+                    u"birželis", u"liepa", u"rugpjūtis", u"rugsėjis", u"spalis", 
+                    u"lapkritis", u"gruodis" )    
+    
+    short_months = ( u"", u"Sau", u"Vas", u"Kov", u"Bal", u"Geg", u"Bir", 
+                     u"Lie", u"Rgp", u"Rgs", u"Spa", u"Lap", u"Grd" )
    
    calendar = (
-        u"", u" (julijaus)", 
-        u" (hebrajų)", 
-        u" (prancuzų respublikos)", 
-        u" (persų)", 
-        u" (islamo)", 
-        u" (swedish)" 
+        u"", u"julijaus", 
+        u"hebrajų", 
+        u"prancūzų respublikos", 
+        u"persų", 
+        u"islamo", 
+        u"švedų" 
        )

    _mod_str = (u"", 
@@ -127,9 +205,47 @@ class DateDisplayLT(DateDisplay):
    _qual_str = (u"", u"apytikriai ", u"apskaičiuota ")

    formats = (
-        "YYYY-MM-DD (ISO)", "Skaitmeninis", "Mėnuo Diena, Metai", 
-        "Mėn DD, YYYY", "Diena Mėnuo Metai", "DD Mėn YYYY"
-        )
+        "mmmm-MM-DD (ISO)", "mmmm m. mėnesio diena d.", "Mėn diena, metai")
+
+    def _display_gregorian(self, date_val):
+        """
+        display gregorian calendar date in different format
+        """
+        year = self._slash_year(date_val[2], date_val[3])
+        value = self.display_iso(date_val)
+
+        if self.format == 0:
+            return self.display_iso(date_val)
+        elif self.format == 1:
+
+            # mmmm m. mėnesio diena d. (YYYY m. month DD d.)
+
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = year
+                else:
+                    value = "%s m. %s" % (year, self.long_months_vardininkas[date_val[1]])
+            else:
+                value = "%s m. %s %d d." % (year, self.long_months[date_val[1]],
+                                       date_val[0])
+        elif self.format == 2:
+
+            # MON Day, Year
+
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = year
+                else:
+                    value = "%s %s" % (self.short_months[date_val[1]], year)
+            else:
+                value = "%s %d, %s" % (self.short_months[date_val[1]],
+                                       date_val[0], year)
+        
+        
+        if date_val[2] < 0:
+            return self._bce_str % value
+        else:
+            return value

    def display(self, date):
        """
@@ -139,6 +255,7 @@ class DateDisplayLT(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
        
@@ -149,17 +266,20 @@ class DateDisplayLT(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'nuo', d1, u'iki', 
-                                        d2, self.calendar[cal])
+                                        d2, scal)
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'tarp', d1, u'ir', 
-                                        d2, self.calendar[cal])
+                                        d2, scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, 
-                                 self.calendar[cal])
+                                 scal)

 #-------------------------------------------------------------------------
 #
@@ -124,12 +124,12 @@ class DateDisplayNb(DateDisplay):

    calendar = (
        "", 
-        " (juliansk)", 
-        " (hebraisk)", 
-        " (fransk republikansk)", 
-        " (persisk)", 
-        " (islamisk)", 
-        " (svensk)" 
+        "juliansk", 
+        "hebraisk", 
+        "fransk republikansk", 
+        "persisk", 
+        "islamisk", 
+        "svensk" 
        )
    
    _mod_str = ("", u"før ", u"etter ", u"ca ", "", "", "")
@@ -146,6 +146,7 @@ class DateDisplayNb(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]

@@ -156,16 +157,19 @@ class DateDisplayNb(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
-            return u"%sfra %s til %s%s" % (qual_str, d1, d2, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return u"%sfra %s til %s%s" % (qual_str, d1, d2, scal)
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return u"%smellom %s og %s%s" % (qual_str, d1, d2, 
-                                              self.calendar[cal])
+                                              scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
            return u"%s%s%s%s" % (qual_str, self._mod_str[mod], 
-                                 text, self.calendar[cal])
+                                 text, scal)

 #-------------------------------------------------------------------------
 #
@@ -65,6 +65,9 @@ class DateParserNL(DateParser):
    month_to_int[u"feber"]  = 2
    month_to_int[u"februaris"]  = 2
    month_to_int[u"merz"]  = 3
+    #make sure on all distro mrt and maa are accepted
+    month_to_int[u"maa"]  = 3
+    month_to_int[u"mrt"]  = 3
    month_to_int[u"aprilis"]  = 4
    month_to_int[u"maius"]  = 5
    month_to_int[u"junius"]  = 6
@@ -143,13 +146,13 @@ class DateDisplayNL(DateDisplay):
                    u"juni", u"juli", u"augustus", u"september", u"oktober", 
                    u"november", u"december" )
    
-    short_months = ( u"", u"jan", u"feb", u"maa", u"apr", u"mei", u"jun", 
+    short_months = ( u"", u"jan", u"feb", u"mrt", u"apr", u"mei", u"jun", 
                     u"jul", u"aug", u"sep", u"okt", u"nov", u"dec" )
    
    calendar = (
-        "", u" (juliaans)", u" (hebreeuws)", 
-        u" (franse republiek)", u" (persisch)", u" (islamitisch)",
-        u" (zweeds)" )
+        "", u"juliaans", u"hebreeuws", 
+        u"franse republiek", u"persisch", u"islamitisch",
+        u"zweeds" )

    _mod_str = ("", u"voor ", u"na ", u"rond ", "", "", "")
    
@@ -231,6 +234,7 @@ class DateDisplayNL(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
        
@@ -241,17 +245,20 @@ class DateDisplayNL(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'van', d1, 
-                                        u'tot', d2, self.calendar[cal])
+                                        u'tot', d2, scal)
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%stussen %s en %s%s" % (qual_str, d1, d2, 
-                                            self.calendar[cal])
+                                            scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, 
-                                 self.calendar[cal])
+                                 scal)

 #-------------------------------------------------------------------------
 #
@@ -20,6 +20,7 @@
 #

 # Polish version 2007 by Piotr Czubaszek
+# Updated in 2010 by Łukasz Rymarczyk

 """
 Polish-specific classes for parsing and displaying dates.
@@ -85,7 +86,31 @@ class DateParserPL(DateParser):
    month_to_int[u"grudzień"]  = 12
    month_to_int[u"gru"]  = 12
    month_to_int[u"XII"]  = 12
-    
+    # Alternative forms: declined nouns
+    month_to_int[u"stycznia"] = 1
+    month_to_int[u"lutego"] = 2
+    month_to_int[u"marca"] = 3
+    month_to_int[u"kwietnia"] = 4
+    month_to_int[u"maja"] = 5
+    month_to_int[u"czerwca"] = 6
+    month_to_int[u"lipca"] = 7
+    month_to_int[u"sierpnia"] = 8
+    month_to_int[u"września"] = 9
+    month_to_int[u"października"] = 10
+    month_to_int[u"listopada"] = 11
+    month_to_int[u"grudnia"] = 12
+    # Alternative forms: nouns without polish accent letters
+    # (misspellings sometimes used in emails)
+    month_to_int[u"styczen"] = 1
+    month_to_int[u"kwiecien"] = 4
+    month_to_int[u"sierpien"] = 8
+    month_to_int[u"wrzesien"] = 9
+    month_to_int[u"pazdziernik"] = 10
+    month_to_int[u"grudzien"] = 12
+    month_to_int[u"wrzesnia"] = 9
+    month_to_int[u"pazdziernika"] = 10
+    month_to_int[u"paz"] = 10
+
    modifier_to_int = {
        u'przed'    : Date.MOD_BEFORE, 
        u'po'   : Date.MOD_AFTER,
@@ -93,26 +118,34 @@ class DateParserPL(DateParser):
        u'ok.'     : Date.MOD_ABOUT,
        u'circa'  : Date.MOD_ABOUT,
        u'ca.'  : Date.MOD_ABOUT,
+    	# Alternative forms: misspellings sometimes used in emails
+        u'okolo'  : Date.MOD_ABOUT,
+        u'ok'     : Date.MOD_ABOUT,
        }

    calendar_to_int = {
-        u'gregoriański'  : Date.CAL_GREGORIAN,
+        u'gregoriański'   : Date.CAL_GREGORIAN,
        u'greg.'          : Date.CAL_GREGORIAN,
-        u'juliański'     : Date.CAL_JULIAN,
+        u'juliański'      : Date.CAL_JULIAN,
        u'jul.'           : Date.CAL_JULIAN,
        u'hebrajski'      : Date.CAL_HEBREW,
        u'hebr.'          : Date.CAL_HEBREW,
-        u'islamski'      : Date.CAL_ISLAMIC,
+        u'islamski'       : Date.CAL_ISLAMIC,
        u'isl.'           : Date.CAL_ISLAMIC,
        u'francuski republikański': Date.CAL_FRENCH,
        u'franc.'         : Date.CAL_FRENCH,
-        u'perski'       : Date.CAL_PERSIAN,
-        u'swedish'      : Date.CAL_SWEDISH, 
-        u's'            : Date.CAL_SWEDISH, 
+        u'perski'         : Date.CAL_PERSIAN,
+        u'szwedzki'       : Date.CAL_SWEDISH, 
+        u's'              : Date.CAL_SWEDISH,
+    # Alternative forms: nouns without polish accent letters
+    # (misspellings sometimes used in emails)
+        u'gregorianski'   : Date.CAL_GREGORIAN,
+        u'julianski'      : Date.CAL_JULIAN,
+        u'francuski republikanski': Date.CAL_FRENCH,
        }

    quality_to_int = {
-        u'szacowany' : Date.QUAL_ESTIMATED,
+        u'szacowany'  : Date.QUAL_ESTIMATED,
        u'szac.'      : Date.QUAL_ESTIMATED,
        u'obliczony'  : Date.QUAL_CALCULATED,
        u'obl.'       : Date.QUAL_CALCULATED,
@@ -123,11 +156,12 @@ class DateParserPL(DateParser):
    
    def init_strings(self):
        DateParser.init_strings(self)
-        self._span  = re.compile("(od)\s+(?P<start>.+)\s+(do)\s+(?P<stop>.+)",re.IGNORECASE)
-        self._range = re.compile(u"(między)\s+(?P<start>.+)\s+(a)\s+(?P<stop>.+)", re.IGNORECASE)
+        self._span  = re.compile("(od)\s+(?P<start>.+)\s+(do)\s+(?P<stop>.+)", re.IGNORECASE)
+        # Also handle a common mistakes
+        self._range = re.compile(u"((?:po)?mi(?:ę|e)dzy)\s+(?P<start>.+)\s+(a)\s+(?P<stop>.+)", re.IGNORECASE)
        self._text2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' % self._mon_str,
                                 re.IGNORECASE)
-        self._jtext2= re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' % self._jmon_str,
+        self._jtext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' % self._jmon_str,
                                 re.IGNORECASE)

 #-------------------------------------------------------------------------
@@ -139,18 +173,18 @@ class DateDisplayPL(DateDisplay):
    """
    Polish language date display class. 
    """
-    # TODO: Translate these month strings:
-    long_months = ( u"", u"January", u"February", u"March", u"April", u"May", 
-                    u"June", u"July", u"August", u"September", u"October", 
-                    u"November", u"December" )
+
+    long_months = ( u"", u"Styczeń", u"Luty", u"Marzec", u"Kwiecień", u"Maj", 
+                    u"Czerwiec", u"Lipiec", u"Sierpień", u"Wrzesień", u"Październik", 
+                    u"Listopad", u"Grudzień" )
    
-    short_months = ( u"", u"Jan", u"Feb", u"Mar", u"Apr", u"May", u"Jun", 
-                     u"Jul", u"Aug", u"Sep", u"Oct", u"Nov", u"Dec" )
+    short_months = ( u"", u"Sty", u"Lut", u"Mar", u"Kwi", u"Maj", u"Cze", 
+                     u"Lip", u"Sie", u"Wrz", u"Paź", u"Lis", u"Gru" )
    
    calendar = (
-        "", u" (juliański)", u" (hebrajski)", 
-        u" (francuski republikański)", u" (perski)", u" (islamski)", 
-        u" (swedish)" 
+        "", u"juliański", u"hebrajski", 
+        u"francuski republikański", u"perski", u"islamski", 
+        u"swedish" 
        )

    _mod_str = ("", u"przed ", u"po ", u"ok. ", "", "", "")
@@ -246,6 +280,7 @@ class DateDisplayPL(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
        
@@ -256,17 +291,20 @@ class DateDisplayPL(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'od', d1, u'do', d2, 
-                                        self.calendar[cal])
+                                        scal)
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'między', d1, u'a', d2, 
-                                        self.calendar[cal])
+                                        scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, 
-                                 self.calendar[cal])
+                                 scal)

 #-------------------------------------------------------------------------
 #
@@ -52,20 +52,26 @@ from _DateHandler import register_datehandler
 class DateParserPT(DateParser):

    modifier_to_int = {
-        u'antes de'   : Date.MOD_BEFORE, 
-        u'antes'      : Date.MOD_BEFORE, 
-        u'ant.'       : Date.MOD_BEFORE, 
-        u'ant'        : Date.MOD_BEFORE, 
-        u'após'       : Date.MOD_AFTER,
-        u'aprox.'     : Date.MOD_ABOUT,
-        u'aprox'      : Date.MOD_ABOUT,
-        u'apr.'       : Date.MOD_ABOUT,
-        u'apr'        : Date.MOD_ABOUT,
-        u'cerca de'   : Date.MOD_ABOUT,
-        u'ca.'        : Date.MOD_ABOUT,
-        u'ca'         : Date.MOD_ABOUT,
-        u'c.'         : Date.MOD_ABOUT,
-        u'até'       : Date.MOD_ABOUT,
+        u'antes de'     : Date.MOD_BEFORE, 
+        u'antes'        : Date.MOD_BEFORE, 
+        u'ant.'         : Date.MOD_BEFORE, 
+        u'ant'          : Date.MOD_BEFORE, 
+        u'até'          : Date.MOD_BEFORE,
+        u'depois de'    : Date.MOD_AFTER,
+        u'depois'       : Date.MOD_AFTER,
+        u'dep.'         : Date.MOD_AFTER,
+        u'dep'          : Date.MOD_AFTER,
+        u'aprox.'       : Date.MOD_ABOUT,
+        u'aprox'        : Date.MOD_ABOUT,
+        u'apr.'         : Date.MOD_ABOUT,
+        u'apr'          : Date.MOD_ABOUT,
+        u'cerca de'     : Date.MOD_ABOUT,
+        u'ca.'          : Date.MOD_ABOUT,
+        u'ca'           : Date.MOD_ABOUT,
+        u'c.'           : Date.MOD_ABOUT,
+        u'por volta de' : Date.MOD_ABOUT,
+        u'por volta'    : Date.MOD_ABOUT,
+        u'pvd.'         : Date.MOD_ABOUT,
        }

    calendar_to_int = {
@@ -116,21 +122,20 @@ class DateDisplayPT(DateDisplay):
    """
    Portuguese language date display class. 
    """
-    # TODO: Translate these month strings:
-    long_months = ( u"", u"January", u"February", u"March", u"April", u"May", 
-                    u"June", u"July", u"August", u"September", u"October", 
-                    u"November", u"December" )
+    long_months = ( u"", u"Janeiro", u"Fevereiro", u"Março", u"Abril", u"Maio", 
+                    u"Junho", u"Julho", u"Agosto", u"Setembro", u"Outubro", 
+                    u"Novembro", u"Dezembro" )
    
-    short_months = ( u"", u"Jan", u"Feb", u"Mar", u"Apr", u"May", u"Jun", 
-                     u"Jul", u"Aug", u"Sep", u"Oct", u"Nov", u"Dec" )
+    short_months = ( u"", u"Jan", u"Fev", u"Mar", u"Abr", u"Mai", u"Jun", 
+                     u"Jul", u"Ago", u"Set", u"Out", u"Nov", u"Dez" )
    
    calendar = (
-        "", u" (Juliano)", u" (Hebreu)", 
-        u" (Revolucionário)", u" (Persa)", u" (Islâmico)", 
-        u" (Swedish)" 
+        "", u"Juliano", u"Hebreu", 
+        u"Revolucionário", u"Persa", u"Islâmico", 
+        u"Sueco" 
        )

-    _mod_str = ("",u"antes de ",u"depois de ",u"até ","","","")
+    _mod_str = ("",u"antes de ",u"depois de ",u"por volta de ","","","")

    _qual_str = ("","estimado ","calculado ")

@@ -147,6 +152,7 @@ class DateDisplayPT(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
        
@@ -157,14 +163,17 @@ class DateDisplayPT(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
-            return "%s%s %s %s %s%s" % (qual_str, u'de', d1, u'a', d2,self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, u'de', d1, u'a', d2, scal)
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
-            return "%s%s %s %s %s%s" % (qual_str, u'entre', d1, u'e', d2, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, u'entre', d1, u'e', d2, scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
-            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, scal)

 #-------------------------------------------------------------------------
 #
@@ -187,22 +187,21 @@ class DateDisplayRU(DateDisplay):
    """
    Russian language date display class. 
    """
-    # TODO: Translate these month strings:
-    long_months = ( u"", u"January", u"February", u"March", u"April", u"May", 
-                    u"June", u"July", u"August", u"September", u"October", 
-                    u"November", u"December" )
+    long_months = ( u"", u"января", u"февраля", u"марта", u"апреля", u"мая", 
+                    u"июня", u"июля", u"августа", u"сентября", u"октября", 
+                    u"ноября", u"декабря" )
    
-    short_months = ( u"", u"Jan", u"Feb", u"Mar", u"Apr", u"May", u"Jun", 
-                     u"Jul", u"Aug", u"Sep", u"Oct", u"Nov", u"Dec" )
+    short_months = ( u"", u"янв", u"фев", u"мар", u"апр", u"мая", u"июн", 
+                     u"июл", u"авг", u"сен", u"окт", u"ноя", u"дек" )
    
    calendar = (
        u"", 
-        u" (юлианский)", 
-        u" (еврейский)", 
-        u" (республиканский)", 
-        u" (персидский)", 
-        u" (исламский)", 
-        u" (Swedish)" 
+        u"юлианский", 
+        u"еврейский", 
+        u"республиканский", 
+        u"персидский", 
+        u"исламский", 
+        u"шведский" 
        )

    _mod_str = (
@@ -222,65 +221,65 @@ class DateDisplayRU(DateDisplay):
        )

    hebrew = ( u"", 
-        u"Тишрей", 
-        u"Хешван", 
-        u"Кислев", 
-        u"Тевет", 
-        u"Шеват", 
-        u"Адар", 
-        u"Адар бет", 
-        u"Нисан", 
-        u"Ияр", 
-        u"Сиван", 
-        u"Таммуз", 
-        u"Ав", 
-        u"Элул", 
+        u"тишрея", 
+        u"хешвана", 
+        u"кислева", 
+        u"тевета", 
+        u"шевата", 
+        u"адара", 
+        u"адар бета", 
+        u"нисана", 
+        u"ияра", 
+        u"сивана", 
+        u"таммуза", 
+        u"ава", 
+        u"элула", 
        )

    islamic = ( u"", 
-        u"Мухаррам", 
-        u"Сафар", 
-        u"Раби-аль-авваль", 
-        u"Раби-ассани", 
-        u"Джумада-аль-уля", 
-        u"Джумада-аль-ахира", 
-        u"Раджаб", 
-        u"Шаабан", 
-        u"Рамадан", 
-        u"Шавваль", 
-        u"Зуль-каада", 
-        u"Зуль-хиджжа", 
+        u"мухаррама", 
+        u"сафара", 
+        u"раби-аль-авваля", 
+        u"раби-ассани", 
+        u"джумада-аль-уля", 
+        u"джумада-аль-ахира", 
+        u"раджаба", 
+        u"шаабана", 
+        u"рамадана", 
+        u"шаввальа", 
+        u"зуль-каада", 
+        u"зуль-хиджжа", 
        )

    persian = ( u"", 
-        u"Фарвардин", 
-        u"Урдбихишт", 
-        u"Хурдад", 
-        u"Тир", 
-        u"Мурдад", 
-        u"Шахривар", 
-        u"Михр", 
-        u"Абан", 
-        u"Азар", 
-        u"Дай", 
-        u"Бахман", 
-        u"Исфаидармуз", 
+        u"фарвардина", 
+        u"урдбихишта", 
+        u"хурдада", 
+        u"тира", 
+        u"мурдада", 
+        u"шахривара", 
+        u"михра", 
+        u"абана", 
+        u"азара", 
+        u"дайа", 
+        u"бахмана", 
+        u"исфаидармуза", 
        )

    french = ( u"", 
-        u"Вандемьер", 
-        u"Брюмер", 
-        u"Фример", 
-        u"Нивоз", 
-        u"Плювиоз", 
-        u"Вантоз", 
-        u"Жерминаль", 
-        u"Флореаль", 
-        u"Прериаль", 
-        u"Мессидор", 
-        u"Термидор", 
-        u"Фрюктидор", 
-        u"Дополнит."
+        u"вандемьера", 
+        u"брюмера", 
+        u"фримера", 
+        u"нивоза", 
+        u"плювиоза", 
+        u"вантоза", 
+        u"жерминаля", 
+        u"флореаля", 
+        u"прериаля", 
+        u"мессидора", 
+        u"термидора", 
+        u"фрюктидора", 
+        u"дополнит."
        )

    def display(self, date):
@@ -291,6 +290,7 @@ class DateDisplayRU(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
        
@@ -301,17 +301,20 @@ class DateDisplayRU(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%sс %s %s %s%s" % (qual_str, d1, u'по', d2, 
-                                       self.calendar[cal])
+                                       scal)
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'между', d1, u'и', 
-                                        d2, self.calendar[cal])
+                                        d2, scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
            return "%s%s%s%s" % (qual_str, self._mod_str[mod], 
-                                 text, self.calendar[cal])
+                                 text, scal)

 #-------------------------------------------------------------------------
 #
@@ -104,18 +104,17 @@ class DateDisplaySK(DateDisplay):
    """
    Slovak language date display class. 
    """
-    # TODO: Translate these month strings:
-    long_months = ( u"", u"January", u"February", u"March", u"April", u"May", 
-                    u"June", u"July", u"August", u"September", u"October", 
-                    u"November", u"December" )
+    long_months = ( u"", u"január", u"február", u"marec", u"apríl", u"máj", 
+                    u"jún", u"júl", u"august", u"september", u"október", 
+                    u"november", u"december" )
    
-    short_months = ( u"", u"Jan", u"Feb", u"Mar", u"Apr", u"May", u"Jun", 
-                     u"Jul", u"Aug", u"Sep", u"Oct", u"Nov", u"Dec" )
+    short_months = ( u"", u"jan", u"feb", u"mar", u"apr", u"máj", u"jún", 
+                     u"júl", u"aug", u"sep", u"okt", u"nov", u"dec" )
    
    calendar = (
-        "", u" (juliánský)", u" (hebrejský)", 
-        u" (republikánsky)", u" (perzský)", u" (islamský)", 
-        u" (swedish)" 
+        "", u"juliánský", u"hebrejský", 
+        u"republikánsky", u"perzský", u"islamský", 
+        u"swedish" 
        )

    _mod_str = ("", u"pred ", u"po ", u"okolo ", "", "", "")
@@ -135,6 +134,7 @@ class DateDisplaySK(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
        
@@ -145,17 +145,20 @@ class DateDisplaySK(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'od', d1, 
-                                        u'do', d2, self.calendar[cal])
+                                        u'do', d2, scal)
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'medzi', 
-                                        d1, u'a', d2, self.calendar[cal])
+                                        d1, u'a', d2, scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
            return "%s%s%s%s" % (qual_str, self._mod_str[mod],
-                                 text, self.calendar[cal])
+                                 text, scal)

 #-------------------------------------------------------------------------
 #
@@ -0,0 +1,313 @@
+# -*- coding: utf-8 -*-
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2004-2007  Donald N. Allingham
+#
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+# Slovenian version 2010 by Bernard Banko, based on croatian one by Josip
+
+"""
+Slovenian-specific classes for parsing and displaying dates.
+"""
+
+#-------------------------------------------------------------------------
+#
+# Python modules
+#
+#-------------------------------------------------------------------------
+import re
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from gen.lib import Date
+from _DateParser import DateParser
+from _DateDisplay import DateDisplay
+from _DateHandler import register_datehandler
+
+#-------------------------------------------------------------------------
+#
+# Slovenian parser
+#
+#-------------------------------------------------------------------------
+class DateParserSL(DateParser):
+    """
+    Converts a text string into a Date object
+    """
+    month_to_int = DateParser.month_to_int
+    
+    month_to_int[u"januar"] = 1
+    month_to_int[u"januarja"] = 1
+    month_to_int[u"januarjem"] = 1
+    month_to_int[u"jan"] = 1
+    month_to_int[u"i"] = 1
+    
+    month_to_int[u"februar"] = 2
+    month_to_int[u"februarjem"] = 2
+    month_to_int[u"februarja"] = 2
+    month_to_int[u"feb"] = 2
+    month_to_int[u"ii"]  = 2
+    
+    month_to_int[u"mar"] = 3
+    month_to_int[u"marcem"] = 3
+    month_to_int[u"marec"] = 3
+    month_to_int[u"marca"] = 3
+    month_to_int[u"iii"]  = 3
+    
+    month_to_int[u"apr"] = 4
+    month_to_int[u"april"] = 4
+    month_to_int[u"aprilom"] = 4
+    month_to_int[u"aprila"] = 4
+    month_to_int[u"iv"]  = 4
+
+    month_to_int[u"maj"] = 5
+    month_to_int[u"maja"] = 5
+    month_to_int[u"majem"] = 5
+    month_to_int[u"v"]  = 5
+    
+    month_to_int[u"jun"] = 6
+    month_to_int[u"junij"] = 6
+    month_to_int[u"junijem"] = 6
+    month_to_int[u"junija"] = 6
+    month_to_int[u"vi"]  = 6
+
+    month_to_int[u"jul"]  = 7
+    month_to_int[u"julij"]  = 7
+    month_to_int[u"julijem"]  = 7
+    month_to_int[u"julija"]  = 7
+    month_to_int[u"vii"]  = 7
+    
+    month_to_int[u"avg"]  = 8
+    month_to_int[u"avgust"]  = 8
+    month_to_int[u"avgustom"]  = 8
+    month_to_int[u"avgusta"]  = 8
+    month_to_int[u"viii"]  = 8
+    
+    month_to_int[u"sep"]  = 9
+    month_to_int[u"sept"]  = 9
+    month_to_int[u"september"]  = 9
+    month_to_int[u"septembrom"]  = 9
+    month_to_int[u"septembra"]  = 9
+    month_to_int[u"ix"]  = 9
+    
+    month_to_int[u"okt"]  = 10
+    month_to_int[u"oktober"]  = 10
+    month_to_int[u"oktobrom"]  = 10
+    month_to_int[u"oktobra"]  = 10
+    month_to_int[u"x"]  = 10
+    
+    month_to_int[u"nov"]  = 11
+    month_to_int[u"november"]  = 11
+    month_to_int[u"novembrom"]  = 11
+    month_to_int[u"novembra"]  = 11
+    month_to_int[u"xi"]  = 11
+    
+    month_to_int[u"dec"]  = 12
+    month_to_int[u"december"]  = 12
+    month_to_int[u"decembrom"]  = 12
+    month_to_int[u"decembra"]  = 12
+    month_to_int[u"xii"]  = 12
+    
+    modifier_to_int = {
+        u'pred'   : Date.MOD_BEFORE, 
+        u'pr.'    : Date.MOD_BEFORE,
+        u'po'     : Date.MOD_AFTER,
+        u'okoli'  : Date.MOD_ABOUT,
+        u'okrog'  : Date.MOD_ABOUT,
+        u'okr.'   : Date.MOD_ABOUT,
+        u'ok.'    : Date.MOD_ABOUT,
+        u'cca.'   : Date.MOD_ABOUT,
+        u'cca'    : Date.MOD_ABOUT,                      
+        u'circa'  : Date.MOD_ABOUT, 
+        u'ca.'    : Date.MOD_ABOUT, 
+        }
+
+    calendar_to_int = {
+        u'gregorijanski'  : Date.CAL_GREGORIAN,
+        u'greg.'          : Date.CAL_GREGORIAN,
+        u'julijanski'     : Date.CAL_JULIAN,
+        u'jul.'           : Date.CAL_JULIAN,
+        u'hebrejski'      : Date.CAL_HEBREW,
+        u'hebr.'          : Date.CAL_HEBREW,
+        u'islamski'       : Date.CAL_ISLAMIC,
+        u'isl.'           : Date.CAL_ISLAMIC,
+        u'francoski republikanski': Date.CAL_FRENCH,
+        u'franc.'         : Date.CAL_FRENCH,
+        u'perzijski'      : Date.CAL_PERSIAN,
+        u'perz. '         : Date.CAL_PERSIAN,
+        u'švedski'        : Date.CAL_SWEDISH, 
+        u'šved.'          : Date.CAL_SWEDISH, 
+        }
+
+    quality_to_int = {
+        u'približno'   : Date.QUAL_ESTIMATED,
+        u'pribl.'      : Date.QUAL_ESTIMATED,
+        u'izračunano'  : Date.QUAL_CALCULATED,
+        u'izrač.'        : Date.QUAL_CALCULATED,
+        }
+
+    bce = ["pred našim štetjem", "pred Kristusom",
+           "p.n.š.", "p. n. š.", "pr.Kr.", "pr. Kr."] + DateParser.bce
+
+    def init_strings(self):
+        """
+        compiles regular expression strings for matching dates
+        """
+        DateParser.init_strings(self)
+        # match 'Day. MONTH year.' format with or without dots
+        self._text2 = re.compile('(\d+)?\.?\s*?%s\.?\s*((\d+)(/\d+)?)?\s*\.?$'
+                                % self._mon_str, re.IGNORECASE)
+        # match Day.Month.Year.
+        self._numeric  = re.compile("((\d+)[/\.-])?\s*((\d+)[/\.-])?\s*(\d+)\.?$")
+       
+        self._span  = re.compile("od\s+(?P<start>.+)\s+do\s+(?P<stop>.+)", 
+                                re.IGNORECASE)
+        self._range = re.compile(
+                            u"med\s+(?P<start>.+)\s+in\s+(?P<stop>.+)", 
+                            re.IGNORECASE)
+        self._jtext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?'\
+                                % self._jmon_str, re.IGNORECASE)
+
+#-------------------------------------------------------------------------
+#
+# Slovenian display
+#
+#-------------------------------------------------------------------------
+class DateDisplaySL(DateDisplay):
+    """
+    Slovenian language date display class. 
+    """
+    long_months = ( u"", u"januarja", u"februarja", u"marca",u"aprila",
+        u"maja", u"junija", u"julija", u"avgusta", u"septembra",
+        u"oktobra", u"novembra", u"decembra" 
+        )
+   
+    short_months = ( u"", u"jan", u"feb", u"mar", u"apr", u"maj", u"jun",
+        u"jul", u"avg", u"sep", u"okt", u"nov", u"dec"
+        )
+    
+    calendar = (
+        "", u"julijanski", u"hebrejski", 
+        u"francoski republikanski", u"perzijski", u"islamski",
+        u"švedski" 
+        )
+
+    _mod_str = ("", "pred ", "po ", "okrog ", "", "", "")
+
+    _qual_str = ("", "približno ", "izračunano ")
+    
+    _bce_str = "%s p.n.š."
+
+    formats = (
+        "ISO (leto-mm-dd)", 
+        "številčno", 
+        "dan. mes. leto",
+        "dan. mesec leto"
+        )
+         
+    def _display_gregorian(self, date_val):
+        """
+        display gregorian calendar date in different format
+        """
+        year = self._slash_year(date_val[2], date_val[3])
+        if self.format == 0:
+            return self.display_iso(date_val)
+        elif self.format == 1:
+            # D. M. YYYY
+            if date_val[3]:
+                return self.display_iso(date_val)
+            else:
+                if date_val[0] == 0 and date_val[1] == 0:
+                    value = str(date_val[2])
+                else:
+                    value = self._tformat.replace('%m', str(date_val[1]))
+                    value = value.replace('%d', str(date_val[0]))
+                    value = value.replace('%Y', str(date_val[2]))
+                    value = value.replace('-', '. ')
+        elif self.format == 2:
+            # D. mon. YYYY
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = year
+                else:
+                    value = "%s. %s" % (self.short_months[date_val[1]], year)
+            else:
+                value = "%d. %s. %s" % (date_val[0],
+                                        self.short_months[date_val[1]], year)
+        else:
+            # D. month YYYY
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = "%s." % year
+                else:
+                   value = "%s %s" % (self.long_months[date_val[1]], year)
+            else:
+                value = "%d. %s %s" % (
+                  date_val[0],self.long_months[date_val[1]], year)
+        if date_val[2] < 0:
+            return self._bce_str % value
+        else:
+            return value
+
+    def display(self, date):
+        """
+        Return a text string representing the date.
+        """
+        mod = date.get_modifier()
+        cal = date.get_calendar()
+        qual = date.get_quality()
+        start = date.get_start_date()
+        newyear = date.get_new_year()
+
+        qual_str = self._qual_str[qual]
+        
+        if mod == Date.MOD_TEXTONLY:
+            return date.get_text()
+        elif start == Date.EMPTY:
+            return u""
+        elif mod == Date.MOD_SPAN:
+            d_1 = self.display_cal[cal](start)
+            d_2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return u"%sod %s do %s%s" % (qual_str, d_1, d_2, scal)
+        elif mod == Date.MOD_RANGE:
+            d_1 = self.display_cal[cal](start)
+            d_2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            date_string = u"%smed %s in %s%s" % (qual_str, d_1, d_2, scal)
+            date_string = date_string.replace(u"a ",u"em ") #to correct declination
+            date_string = date_string.replace(u"lem ",u"lom ")
+            date_string = date_string.replace(u"rem ",u"rom ")
+            date_string = date_string.replace(u"tem ",u"tom ")
+            return date_string
+        else:
+            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
+            date_string = "%s%s%s%s" % (qual_str, self._mod_str[mod], text, scal)
+        return date_string
+
+#-------------------------------------------------------------------------
+#
+# Register classes
+#
+#-------------------------------------------------------------------------
+register_datehandler(("sl", "SL", "sl_SI", "slovenščina", "slovenian", "Slovenian", 
+                 "sl_SI.UTF8", "sl_SI.UTF-8", "sl_SI.utf-8", "sl_SI.utf8"),
+                                    DateParserSL, DateDisplaySL)
@@ -251,9 +251,9 @@ class DateDisplaySR_latin(DateDisplay):
        )
    
    calendar = (
-        "", u" (julijanski)", u" (hebrejski)", 
-        u" (francuski republikanski)", u" (persijski)", u" (islamski)",
-        u" (švedski)" 
+        "", u"julijanski", u"hebrejski", 
+        u"francuski republikanski", u"persijski", u"islamski",
+        u"švedski" 
        )

    _mod_str = ("", "pre ", "posle ", "oko ", "", "", "")
@@ -334,6 +334,7 @@ class DateDisplaySR_latin(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
        
@@ -344,17 +345,20 @@ class DateDisplaySR_latin(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d_1 = self.display_cal[cal](start)
            d_2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'od', d_1, u'do', d_2,
-                                                            self.calendar[cal])
+                                                            scal)
        elif mod == Date.MOD_RANGE:
            d_1 = self.display_cal[cal](start)
            d_2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return "%s%s %s %s %s%s" % (qual_str, u'između', d_1, u'i', d_2, 
-                                                            self.calendar[cal])
+                                                            scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, 
-                                                self.calendar[cal])
+                                                scal)


 #-------------------------------------------------------------------------
@@ -64,7 +64,7 @@ class DateParserSv(DateParser):
        u'c:a'     : Date.MOD_ABOUT
        }

-    bce = ["f Kr"]
+    bce = [u"f Kr"]

    calendar_to_int = {
        u'gregoriansk   '      : Date.CAL_GREGORIAN, 
@@ -128,20 +128,20 @@ class DateDisplaySv(DateDisplay):
        )

    calendar = (
-        "", 
-        " (juliansk)", 
-        " (hebreisk)", 
-        " (fransk republikansk)", 
-        " (persisk)", 
-        " (islamisk)", 
-        " (svensk)"
+        u"", 
+        u"juliansk", 
+        u"hebreisk", 
+        u"fransk republikansk", 
+        u"persisk", 
+        u"islamisk", 
+        u"svensk"
        )
    
-    _mod_str = ("", u"före ", u"efter ", u"c:a ", "", "", "")
+    _mod_str = (u"", u"före ", u"efter ", u"c:a ", u"", u"", u"")

-    _qual_str = ("", u"uppskattat ", u"beräknat ")
+    _qual_str = (u"", u"uppskattat ", u"beräknat ")
    
-    _bce_str = "%s f Kr"
+    _bce_str = u"%s f Kr"

    def display(self, date):
        """
@@ -151,6 +151,7 @@ class DateDisplaySv(DateDisplay):
        cal = date.get_calendar()
        qual = date.get_quality()
        start = date.get_start_date()
+        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]

@@ -161,16 +162,19 @@ class DateDisplaySv(DateDisplay):
        elif mod == Date.MOD_SPAN:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
-            return u"%sfrån %s till %s%s" % (qual_str, d1, d2, self.calendar[cal])
+            scal = self.format_extras(cal, newyear)
+            return u"%sfrån %s till %s%s" % (qual_str, d1, d2, scal)
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
            return u"%smellan %s och %s%s" % (qual_str, d1, d2, 
-                                              self.calendar[cal])
+                                              scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
            return u"%s%s%s%s" % (qual_str, self._mod_str[mod], 
-                                 text, self.calendar[cal])
+                                 text, scal)

 #-------------------------------------------------------------------------
 #
@@ -29,6 +29,7 @@ from _DateHandler import (LANG, LANG_SHORT, LANG_TO_PARSER, LANG_TO_DISPLAY,
                          register_datehandler)

 # Import all the localized handlers
+import _Date_bg
 import _Date_ca
 import _Date_cs
 import _Date_de
@@ -44,6 +45,7 @@ import _Date_pl
 import _Date_pt
 import _Date_ru
 import _Date_sk
+import _Date_sl
 import _Date_sr
 import _Date_sv

@@ -80,10 +80,22 @@ class History(gen.utils.Callback):
        'mru-changed' : (list, )
        }

-    def __init__(self):
+    def __init__(self, dbstate, nav_type):
        gen.utils.Callback.__init__(self)
        self.clear()

+        dbstate.connect('database-changed', self.connect_signals)
+        self.signal_map = {}
+        self.signal_map[nav_type.lower() + '-delete'] = self.handles_removed
+        self.signal_map[nav_type.lower() + '-rebuild'] = self.history_changed
+
+    def connect_signals(self, dbstate):
+        """
+        Connects database signals when the database has changed.
+        """
+        for sig in self.signal_map:
+            dbstate.connect(sig, self.signal_map[sig])
+            
    def clear(self):
        """
        Clears the history, resetting the values back to their defaults
@@ -191,6 +203,22 @@ class History(gen.utils.Callback):
        if not self.at_end():
            self.history = self.history[0:self.index+1]

+    def handles_removed(self, handle_list):
+        """
+        Called in response to an object-delete signal.
+        Removes a list of handles from the history.
+        """
+        for handle in handle_list:
+            self.remove(handle)
+            
+    def history_changed(self):
+        """
+        Called in response to an object-rebuild signal.
+        Objects in the history list may have been deleted.
+        """
+        self.clear()
+        self.emit('mru-changed', (self.mru, ))
+        
 #-------------------------------------------------------------------------
 #
 # Recent Docs Menu
@@ -279,19 +307,30 @@ class WarnHandler(RotateHandler):
        self.button = button
        button.on_clicked(self.display)
        self.timer = None
+        self.last_line = '-1'

    def emit(self, record):
-        if self.timer:
-            gobject.source_remove(self.timer)
-        gobject.timeout_add(180*1000, self._clear)
+        if self.timer is None:
+            #check every 3 minutes if warn button can disappear
+            self.timer = gobject.timeout_add(3*60*1000, self._check_clear)
        RotateHandler.emit(self, record)
        self.button.show()

+    def _check_clear(self):
+        new_last_line = self.get_buffer()[-1]
+        if self.last_line == new_last_line:
+            #buffer has not changed for 3 minutes, let's clear it:
+            self._clear()
+            return False
+        else:
+            self.last_line = new_last_line
+            return True
+
    def _clear(self):
        self.button.hide()
        self.set_capacity(self._capacity)
+        self.last_line = '-1'
        self.timer = None
-        return False

    def display(self, obj):
        obj.hide()
@@ -301,7 +340,6 @@ class WarnHandler(RotateHandler):
        buf = msg.get_buffer()
        for i in self.get_formatted_log():
            buf.insert_at_cursor(i + '\n')
-        self.set_capacity(self._capacity)
        top.run()
        top.destroy()

@@ -370,13 +408,13 @@ class DisplayState(gen.utils.Callback):
        """
        return self.history_lookup.get((nav_type, nav_group))

-    def register(self, nav_type, nav_group):
+    def register(self, dbstate, nav_type, nav_group):
        """
        Create a history and navigation object for the specified
        navigation type and group, if they don't exist.
        """
        if (nav_type, nav_group) not in self.history_lookup:
-            history = History()
+            history = History(dbstate, nav_type)
            self.history_lookup[(nav_type, nav_group)] = history

    def get_active(self, nav_type, nav_group=0):
@@ -385,7 +423,7 @@ class DisplayState(gen.utils.Callback):
        navigation type and group.
        """
        history = self.get_history(nav_type, nav_group)
-        return history.present()
+        return history.present() if history else None

    def set_active(self, handle, nav_type, nav_group=0):
        """
@@ -393,7 +431,8 @@ class DisplayState(gen.utils.Callback):
        the given handle.
        """
        history = self.get_history(nav_type, nav_group)
-        history.push(handle)
+        if history:
+            history.push(handle)

    def set_sensitive(self, state):
        self.window.set_sensitive(state)
@@ -3,6 +3,7 @@
 #
 # Copyright (C) 2004-2007 Donald N. Allingham
 # Copyright (C) 2008      Brian G. Matherly
+# Copyright (C) 2008      Benny Malengier
 # Contribution  2009 by   Brad Crittenden <brad [AT] bradcrittenden.net>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -92,6 +93,7 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
    
    """

+    #override predefined do_xxx signal handlers
    __gsignals__ = {"apply": "override", "cancel": "override",
                    "close": "override", "prepare": "override"}
                    
@@ -164,6 +166,22 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
        if isinstance(arg, gtk.Button) and arg.get_label() == 'gtk-go-forward':
            self.forward_button = arg

+    def get_cancel_button(self, arg):
+        if isinstance(arg, gtk.HBox):
+            arg.forall(self._cancel_btn)
+
+    def _cancel_btn(self, arg):
+        if isinstance(arg, gtk.Button) and arg.get_label() == 'gtk-cancel':
+            self.cancel_button = arg
+
+    def get_close_button(self, arg):
+        if isinstance(arg, gtk.HBox):
+            arg.forall(self._close_btn)
+
+    def _close_btn(self, arg):
+        if isinstance(arg, gtk.Button) and arg.get_label() == 'gtk-close':
+            self.close_button = arg
+
    def build_menu_names(self, obj):
        """Override ManagedWindow method."""
        return (self.top_title, None)
@@ -382,22 +400,18 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
        self.set_page_complete(page, False)
        self.set_page_type(page, gtk.ASSISTANT_PAGE_SUMMARY)

-        
    def do_apply(self):
        pass

-    def do_cancel(self):
-        if self.writestarted :
-            return True
-        else : 
-            self.close()
-
    def do_close(self):
        if self.writestarted :
-            return True
-        else : 
+            pass
+        else :
            self.close()

+    def do_cancel(self):
+        self.do_close()
+
    def do_prepare(self, page):
        """
        The "prepare" signal is emitted when a new page is set as the 
@@ -462,7 +476,7 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
                #Allow for exotic error: file is still not correct
                self.check_fileselect(self.chooser, show=False)
                if self.get_page_complete(self.chooser) :
-                    filename = Utils.get_unicode_path(self.chooser.get_filename())
+                    filename = Utils.get_unicode_path_from_file_chooser(self.chooser.get_filename())
                    name = os.path.split(filename)[1]
                    folder = os.path.split(filename)[0]
                    confirm_text = _(
@@ -536,7 +550,7 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
        
    def close(self, *obj) :
        #clean up ManagedWindow menu, then destroy window, bring forward parent
-        
+        gtk.Assistant.destroy(self)
        ManagedWindow.ManagedWindow.close(self,*obj)

    def get_intro_text(self):
@@ -596,7 +610,7 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
            hasattr(self.option_box_instance, "no_fileselect")):
            filename = ""
        else:
-            filename = Utils.get_unicode_path(self.chooser.get_filename())
+            filename = Utils.get_unicode_path_from_file_chooser(self.chooser.get_filename())
            config.set('paths.recent-export-dir', os.path.split(filename)[0])
        ix = self.get_selected_format_index()
        config.set('behavior.recent-export-type', ix)
@@ -2,9 +2,9 @@

 SUBDIRS = Rules SideBar

-pkgdatadir = $(datadir)/@PACKAGE@/Filters
+pkgpythondir = $(datadir)/@PACKAGE@/Filters

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_FilterComboBox.py \
 	_FilterList.py \
 	_FilterMenu.py \
@@ -17,7 +17,6 @@ pkgdata_PYTHON = \
 	_SearchFilter.py

 pkgpyexecdir = @pkgpyexecdir@/Filters
-pkgpythondir = @pkgpythondir@/Filters

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@@ -26,4 +25,4 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -1,8 +1,8 @@
 # This is the src/Filters/Rules/Event level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Event
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Event

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ChangedSince.py\
 	_MatchesFilter.py\
 	_EventPrivate.py\
@@ -24,7 +24,7 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Event
-pkgpythondir = @pkgpythondir@/Filters/Rules/Event
+

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@@ -33,4 +33,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -40,5 +40,5 @@ from Filters.Rules._HasSourceBase import HasSourceBase
 class HasSource(HasSourceBase):
    """Events with sources"""

-    name        = _('Events with <count> source')
-    description = _("Matches events with a certain number of items in the source")
+    name        = _('Events with <count> sources')
+    description = _("Matches events with a certain number of sources connected to it")
@@ -1,8 +1,8 @@
 # This is the src/Filters/Rules/Family level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Family
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Family

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllFamilies.py\
 	_ChangedSince.py\
 	_FamilyPrivate.py\
@@ -38,7 +38,6 @@ pkgdata_PYTHON = \


 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Family
-pkgpythondir = @pkgpythondir@/Filters/Rules/Family

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@@ -47,4 +46,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -43,5 +43,5 @@ from Filters.Rules._HasSourceBase import HasSourceBase
 class HasSource(HasSourceBase):
    """Families with sources"""

-    name        = _('Families with <count> source')
-    description = _("Matches families with a certain number of items in the source")
+    name        = _('Families with <count> sources')
+    description = _("Matches families with a certain number of sources connected to it")
@@ -2,9 +2,9 @@

 SUBDIRS = Person Family Event Place Source MediaObject Repository Note

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ChangedSinceBase.py\
 	_Everything.py\
 	_HasEventBase.py\
@@ -29,7 +29,6 @@ pkgdata_PYTHON = \
 	_HasMarkerBase.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules
-pkgpythondir = @pkgpythondir@/Filters/Rules

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@@ -38,4 +37,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -1,8 +1,8 @@
 # This is the src/Filters/Rules/MediaObject level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/MediaObject
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/MediaObject

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllMedia.py\
 	_ChangedSince.py\
 	_HasIdOf.py\
@@ -17,7 +17,7 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/MediaObject
-pkgpythondir = @pkgpythondir@/Filters/Rules/MediaObject
+

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@@ -26,4 +26,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -1,8 +1,8 @@
 # This is the src/Filters/Rules/Note level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Note
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Note

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllNotes.py\
 	_ChangedSince.py\
 	_HasIdOf.py\
@@ -17,7 +17,6 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Note
-pkgpythondir = @pkgpythondir@/Filters/Rules/Note

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@@ -26,4 +25,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -57,7 +57,7 @@ class MatchesRegexpOf(Rule):
            
    def apply(self, db, note):
        """ Apply the filter """
-        text = unicode(note.get())
+        text = note.get()
        if self.match.match(text) is not None:
            return True
        return False
@@ -49,7 +49,7 @@ class MatchesSubstringOf(Rule):

    def apply(self, db, note):
        """ Apply the filter """
-        text = unicode(note.get())
+        text = note.get()
        if text.upper().find(self.list[0].upper()) != -1:
            return True
        return False
@@ -1,8 +1,8 @@
 # This is the src/Filters/Rules/Person level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Person
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Person

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ChangedSince.py\
 	_Disconnected.py \
    _DeepRelationshipPathBetween.py \
@@ -74,7 +74,6 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Person
-pkgpythondir = @pkgpythondir@/Filters/Rules/Person

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@@ -83,4 +82,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -46,10 +46,10 @@ def filter_database(db, progress, filter_name):
    """Returns a list of person handles"""

    filt = MatchesFilter([filter_name])
-    progress.set_header('Preparing sub-filter')
-    filt.prepare(db)
+    progress.set_header(_('Preparing sub-filter'))
+    filt.requestprepare(db)

-    progress.set_header('Retrieving all sub-filter matches')
+    progress.set_header(_('Retrieving all sub-filter matches'))
    matches = []
    for handle in db.iter_person_handles():
        person = db.get_person_from_handle(handle)
@@ -57,7 +57,7 @@ def filter_database(db, progress, filter_name):
            matches.append(handle)
        progress.step()

-    filt.reset()
+    filt.requestreset()
    
    return matches

@@ -75,7 +75,8 @@ def get_family_handle_people(db, exclude_handle, family_handle):
    possibly_add_handle(family.get_mother_handle())

    for child_ref in family.get_child_ref_list():
-        possibly_add_handle(child_ref.get_reference_handle())
+        if child_ref:
+            possibly_add_handle(child_ref.get_reference_handle())
    
    return people

@@ -132,7 +133,7 @@ class DeepRelationshipPathBetween(Rule):
        root_person = db.get_person_from_gramps_id(root_person_id)
        
        progress = ProgressMeter(_('Finding relationship paths'))
-	progress.set_pass(header=_('Evaluating people'), mode=ProgressMeter.MODE_ACTIVITY)
+        progress.set_pass(header=_('Evaluating people'), mode=ProgressMeter.MODE_ACTIVITY)
        
        filter_name = self.list[1]
        target_people = filter_database(db, progress, filter_name)
@@ -48,11 +48,12 @@ class FamilyWithIncompleteEvent(Rule):
    def apply(self,db,person):
        for family_handle in person.get_family_handle_list():
            family = db.get_family_from_handle(family_handle)
-            for event_ref in family.get_event_ref_list():
-                if event_ref:
-                    event = db.get_event_from_handle(event_ref.ref)
-                    if not event.get_place_handle():
-                        return True
-                    if not event.get_date_object():
-                        return True
+            if family:
+                for event_ref in family.get_event_ref_list():
+                    if event_ref:
+                        event = db.get_event_from_handle(event_ref.ref)
+                        if not event.get_place_handle():
+                            return True
+                        if not event.get_date_object():
+                            return True
        return False
@@ -58,7 +58,9 @@ class HasBirth(Rule):
        
    def apply(self,db,person):
        for event_ref in person.get_event_ref_list():
-            if event_ref.role != EventRoleType.PRIMARY:
+            if not event_ref:
+                continue
+            elif event_ref.role != EventRoleType.PRIMARY:
                # Only match primaries, no witnesses
                continue
            event = db.get_event_from_handle(event_ref.ref)
@@ -63,19 +63,28 @@ class HasCommonAncestorWith(Rule):
    def add_ancs(self, db, person):
        if person.handle not in self.ancestor_cache:
            self.ancestor_cache[person.handle] = set()
+            # We are going to compare ancestors of one person with that of
+            # another person; if that other person is an ancestor and itself
+            # has no ancestors is must be included, this is achieved by the
+            # little trick of making a person his own ancestor.
+            self.ancestor_cache[person.handle].add(person.handle)
        else:
            return

        for fam_handle in person.get_parent_family_handle_list():
+            parentless_fam = True
            fam = db.get_family_from_handle(fam_handle)
-            for par_handle in (fam.get_father_handle(), fam.get_mother_handle()):
-                if par_handle:
-                    par = db.get_person_from_handle(par_handle)
-                    if par and par.handle not in self.ancestor_cache:
-                        self.add_ancs(db, par)
-                    if par:
-                        self.ancestor_cache[person.handle].add(par)
-                        self.ancestor_cache[person.handle] |= self.ancestor_cache[par.handle]
+            if fam:
+                for par_handle in (fam.get_father_handle(), fam.get_mother_handle()):
+                    if par_handle:
+                        parentless_fam = False
+                        par = db.get_person_from_handle(par_handle)
+                        if par and par.handle not in self.ancestor_cache:
+                            self.add_ancs(db, par)
+                        if par:
+                            self.ancestor_cache[person.handle] |= self.ancestor_cache[par.handle]
+                if parentless_fam:
+                    self.ancestor_cache[person.handle].add(fam_handle)

    def reset(self):
        self.ancestor_cache = {}
@@ -41,7 +41,7 @@ from _MatchesFilter import MatchesFilter
 # HasCommonAncestorWithFilterMatch
 #
 #-------------------------------------------------------------------------
-class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith,MatchesFilter):
+class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith):
    """Rule that checks for a person that has a common ancestor with
    someone matching a filter"""

@@ -64,7 +64,7 @@ class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith,MatchesFilter):
        self.ancestor_cache = {}
        self.with_people = []
        filt = MatchesFilter(self.list)
-        filt.prepare(db)
+        filt.requestprepare(db)
        for handle in db.iter_person_handles():
            person = db.get_person_from_handle(handle)
            if filt.apply (db, person):
@@ -73,4 +73,4 @@ class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith,MatchesFilter):
                #fill list of ancestor of person if not present yet
                if handle not in self.ancestor_cache:
                    self.add_ancs(db, person)
-        filt.reset()
+        filt.requestreset()
@@ -58,7 +58,9 @@ class HasDeath(Rule):

    def apply(self,db,person):
        for event_ref in person.get_event_ref_list():
-            if event_ref.role != EventRoleType.PRIMARY:
+            if not event_ref:
+                continue
+            elif event_ref.role != EventRoleType.PRIMARY:
                # Only match primaries, no witnesses
                continue
            event = db.get_event_from_handle(event_ref.ref)
@@ -53,10 +53,13 @@ class HasFamilyAttribute(Rule):
            return False
        for f_id in person.get_family_handle_list():
            f = db.get_family_from_handle(f_id)
+            if not f:
+                continue
            for attr in f.get_attribute_list():
-                name_match = self.list[0] == attr.get_type()
-                value_match = \
-                        attr.get_value().upper().find(self.list[1].upper()) != -1
-                if name_match and value_match:
-                    return True
+                if attr:
+                    name_match = self.list[0] == attr.get_type()
+                    value_match = \
+                            attr.get_value().upper().find(self.list[1].upper()) != -1
+                    if name_match and value_match:
+                        return True
        return False
@@ -64,6 +64,8 @@ class HasFamilyEvent(Rule):
    def apply(self,db,person):
        for f_id in person.get_family_handle_list():
            f = db.get_family_from_handle(f_id)
+            if not f:
+                continue
            for event_ref in f.get_event_ref_list():
                if not event_ref:
                    continue
@@ -61,9 +61,10 @@ class HasRelationship(Rule):
        # count children and look for a relationship type match
        for f_id in person.get_family_handle_list():
            f = db.get_family_from_handle(f_id)
-            cnt = cnt + len(f.get_child_ref_list())
-            if self.list[1] and specified_type == f.get_relationship():
-                rel_type = 1
+            if f:
+                cnt = cnt + len(f.get_child_ref_list())
+                if self.list[1] and specified_type == f.get_relationship():
+                    rel_type = 1

        # if number of relations specified
        if self.list[0]:
@@ -43,5 +43,5 @@ from Filters.Rules._HasSourceBase import HasSourceBase
 class HasSource(HasSourceBase):
    """People with sources"""

-    name        = _('People with <count> source')
-    description = _("Matches people with a certain number of items in the source")
+    name        = _('People with <count> sources')
+    description = _("Matches people with a certain number of sources connected to it")
@@ -171,7 +171,7 @@ class HasTextMatchingSubstringOf(Rule):
        self.repo_map.update(

            repo.handle for repo in self.db.iter_repositories()
-                if self.match_object(repo)
+                if repo and self.match_object(repo)

            )
    
@@ -48,9 +48,10 @@ class HaveAltFamilies(Rule):
    def apply(self,db,person):
        for fhandle in person.get_parent_family_handle_list():
            family = db.get_family_from_handle(fhandle)
-            ref = [ ref for ref in family.get_child_ref_list() \
-                    if ref.ref == person.handle]
-            if ref[0].get_father_relation() == ChildRefType.ADOPTED \
-                   or ref[0].get_mother_relation() == ChildRefType.ADOPTED:
-                return True
+            if family:
+                ref = [ ref for ref in family.get_child_ref_list() \
+                        if ref.ref == person.handle]
+                if ref[0].get_father_relation() == ChildRefType.ADOPTED \
+                       or ref[0].get_mother_relation() == ChildRefType.ADOPTED:
+                    return True
        return False
@@ -47,4 +47,4 @@ class HaveChildren(Rule):
    def apply(self,db,person):
        for family_handle in person.get_family_handle_list():
            family = db.get_family_from_handle(family_handle)
-            return len(family.get_child_ref_list()) > 0
+            return (family is not None) and len(family.get_child_ref_list()) > 0
@@ -40,7 +40,7 @@ from _MatchesFilter import MatchesFilter
 # IsAncestorOfFilterMatch
 #
 #-------------------------------------------------------------------------
-class IsAncestorOfFilterMatch(IsAncestorOf,MatchesFilter):
+class IsAncestorOfFilterMatch(IsAncestorOf):
    """Rule that checks for a person that is an ancestor of
    someone matched by a filter"""

@@ -66,11 +66,11 @@ class IsAncestorOfFilterMatch(IsAncestorOf,MatchesFilter):
            first = 1
            
        filt = MatchesFilter(self.list[0:1])
-        filt.prepare(db)
+        filt.requestprepare(db)
        for person in db.iter_people():
            if filt.apply(db, person):
                self.init_ancestor_list(db, person, first)
-        filt.reset()
+        filt.requestreset()

    def reset(self):
        self.map.clear()
@@ -32,6 +32,7 @@ from gen.ggettext import gettext as _
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
+from Filters.Rules import Rule
 from _MatchesFilter import MatchesFilter

 #-------------------------------------------------------------------------
@@ -39,7 +40,7 @@ from _MatchesFilter import MatchesFilter
 # IsChildOfFilterMatch
 #
 #-------------------------------------------------------------------------
-class IsChildOfFilterMatch(MatchesFilter):
+class IsChildOfFilterMatch(Rule):
    """Rule that checks for a person that is a child
    of someone matched by a filter"""

@@ -52,11 +53,11 @@ class IsChildOfFilterMatch(MatchesFilter):
        self.db = db
        self.map = set()
        filt = MatchesFilter(self.list)
-        filt.prepare(db)
+        filt.requestprepare(db)
        for person in db.iter_people():
            if filt.apply(db, person):
                self.init_list(person)
-        filt.reset()
+        filt.requestreset()

    def reset(self):
        self.map.clear()
@@ -69,5 +70,6 @@ class IsChildOfFilterMatch(MatchesFilter):
            return
        for fam_id in person.get_family_handle_list():
            fam = self.db.get_family_from_handle(fam_id)
-            self.map.update(child_ref.ref
-                for child_ref in fam.get_child_ref_list())
+            if fam:
+                self.map.update(child_ref.ref
+                   for child_ref in fam.get_child_ref_list())
--- a/Show More
+++ b/Show More