Fix Testcasegenerator to generate correct LDS ordinances for people and

families (avoids an error when the GEDCOM is reimported).

.gitignore

@@ -0,0 +1,38 @@
+# Python
+*.py[cod]
+
+# Distutils
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+Makefile
+Makefile*.in
+install-sh
+MANIFEST
+build/
+dist/
+m4/intltool.m4
+missing
+mkinstalldirs
+py-compile
+
+# Gramps
+src/const.py
+src/data/tips.xml
+src/plugins/lib/holidays.xml
+po/.intltool-merge-cache
+po/stamp-it
+po/POTFILES
+data/gramps.desktop
+data/gramps.keys
+data/gramps.xml
+*.gmo
+data/man/*.[1-8]
+data/man/*/*.[1-8]
+gramps.sh
+intltool-*.in
+
+#Editing
+tags

COPYING

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

Makefile.am

@@ -4,7 +4,7 @@
 SUBDIRS = m4 po src data example
 
 EXTRA_DIST = \
-	config.rpath autogen.sh \
+	config.rpath autogen.sh gramps-autogen.sh \
 	FAQ COPYING \
 	intltool-extract.in intltool-merge.in intltool-update.in
 

NEWS

@@ -1,3 +1,230 @@
+2014-04-30
+Version 3.4.9 of Gramps! "I am no longer infected", a maintenance release.
+* Error converting python2 utf-8 strings to python3 str when loading data from database
+* Gedcom input: SUBN and SUBM record handling
+* [Gedcom] import/export round trip causes lost information
+* [Gedcom] Gramps can't import estim. date period exported by itself
+* [Gedcom] import deletes first char of notes
+* [Gedcom] import of embedded notes attached to media does not work
+* [Gedcom] NameError in importer
+* [Gedcom] export does not export media attached to citations
+* [Gedcom] Errors handling owner/submitter information
+* [Gedcom] Event address is lost on import, i.e. disconnected from event
+* [Gedcom] Entering a witness to an event such as marriage might be ignored
+* [Gedcom] Importing file containing multibyte UTF-8 characters fails
+* Event list in editors does not display content into 'Main Participants' column
+* Fix 'Last Change' column into Person Selector
+* Support creating directories in various scenarios
+* tag_map is not initialized
+* Fix bad handle in explanation note for unknown event
+* Narrative website: Missing webpage for media with missing thumbnail on person page
+* Enable the "default" CSS choice for the narrated web report
+* Crash while scrolling in person view
+* Crash when attempting to create Places Report
+* Error in Session Log gramplet with no active person
+* In Ahnentafel Report, Use Christening Date if no Birth Date Present
+* Family with children but no parents is lost on filtered export
+* Some labels now fit better on citations sidebar filter
+* Can't disable box shadow in SVG descendant tree
+* Descendant tree graphical report, syntax error in svg output
+* Various problems with docgen.TextDoc.add_media_object
+* Spurious spaces in CLI List Family Trees, tab delimited output. Print statements changed to assemble the whole line before output.
+* GuiColorOption missing avail-changed event handler
+* Regression: running gramps from crontab fails
+* Better support for handling custom media attributes on edition
+* DB lock not checked when opening database from the recent opened trees menu item
+* List index out of range" on [initial CLI "gramps -t"]
+* HTML View fails to load on Debian unstable
+* Fix unknown gender relationships hander for the french locale
+* Can't fill in calculated and estimated dates in czech locale
+* Enhance Serbian date handler to handle Cyrillic dates
+* Updated translations: cs, de, fr, hu, it
+* Fix mac menubar setting
+* Fix mac OsmGpsMaps setting
+* Enable PIL with Freetype2 support on mac
+
+2014-05-29
+Version 3.4.8 of Gramps! "Forget about your sin, give the audience a grin", a maintenance release.
+* Database corrupted - TypeError: unhashable type: 'list'
+* Fix bug in abandon changes and quit
+* Fix error when importing database from the CLI
+* 'Display as' field in Name Editor reverts to Preferences default
+* Geography does not communicate over proxy server with autorisation
+* Event gramplet filter does not have field for primary role
+* New HasDayOfWeek filter rule
+* Error when leaving a Gramps type field blank in an editor
+* Fix creation of events with same Gramps-ID
+* Enhancements and consitency on events gramplet, selector and view
+* Enhanced Citation Editor
+* Fix update of active object after merge
+* Do not drag and drop more than one data into editor tabs
+* Media Editor error if Path value was changed to a non existing file
+* Register history objects at startup
+* Users should not be allowed to edit and delete 'default' style into Style Editor
+* Missing closing bracket in Web_Basic-Spruce.css
+* Some temporary files remains in /tmp with NarrativeWeb report
+* Some fixes and enhancements
+* No narrative.css File After Running Narrated Website Report
+* Paper names and Styles values are now translated
+* Translate some punctuation marks
+* Fix Relationships handler for Portuguese
+* Updated translations: ar, cs, de, es, fr, he, it, ru, sk, sv
+
+2014-01-27
+Version 3.4.7 of Gramps! "Ask me tomorrow, but not today", a maintenance release.
+* Gramps project web hosting now has an HTTPS interface; the old HTTP URLs redirect to it.
+* Development switched from SVN to git.
+* Add new filter rule matching citations having a source with a <text> on a note
+* Add primary role option to event filter
+* Add Groups support and reduce number of lines in Event types selector
+* Add 'Last Change' column on selectors, when missing
+* Fix a filter rule on citation sidebar (Source:Note)
+* Fix url in Welcome gramplet when detached
+* Fix bug in associations filter
+* Better support for objects having citations as subobjects
+* Check Tag handling on people views
+* Keep at least one column on views
+* Reorder tool now updates citation IDs
+* Performance improvement in ancestor filter
+* Reduce number of columns in LDS temple selector
+* Fix menu action for last recently opened family trees
+* Fix minor visual issue on Merge Person dialog
+* Use 'Bat Mitzvah' (en_US event name)
+* "Add citation" missing in pop-up menu
+* Fix HTML spacing on GraphViz output
+* Enhancement on date validation into Date Editor
+* Invalid dates (like 2013-02-30) no longer crash the date editor or file import.
+* Fixed image handling in ODF docgen, thanks to Matthias Basler for the initial patch.
+* Fixed GEDCOM export for family _UID, added support for _FSFTID, by Enno Borgsteede.
+* Fixed bookmark handling in navigation views.
+* Multiple maintainability and usability improvements.
+* Translation updates and translation-related fixes.
+
+2013-10-28
+Version 3.4.6 of Gramps! "The Answer to the Ultimate Question", a maintenance release.
+* Citation merge works better for all objects with citations
+* Fixed citations attached to family events
+* Fixed several crashes, hangs, and data corruption scenarios
+* Fixed bugs in determining whether a person is alive, potentially resolving private data leak via export or report
+* VCF export/import now support gender information
+* Several bugs with filtering fixed, most filters now support regular expressions
+* Fixed bug in Hebrew calendar date calculations
+* Support space in Gramps ID with GEDCOM file format export/import
+* Multiple fixes in gramplets
+* Multiple fixes in the narrated website report
+* Some fixes and improvements of the webapp
+* Enhancements of the citation tree view (Sources category)
+* Polish and consistency on Gramps XML export
+* Bump XML schema to 1.5.1
+* Fixed several long-standing problems with report generation
+* Better support of RTL locales (Arabic, Hebrew, etc.) in GUI
+* Platform-specific fixes for Mac and Windows
+* New date handler for Arabic
+* Translation updates and translation-related fixes
+* Repaired and enhanced tests broken since 3.3.x, resulting in overall reliability improvements
+
+2013-05-22
+Version 3.4.5 of Gramps! "We have also developed a tomato which can eject itself when an accident is imminent", a maintenance release.
+* problem after upgrading to 3.4.4 from 3.3.1
+* ability to keep custom filename on output
+* book report: sub reports forget/overwrite their settings when trying to re-configure them
+* end of line report options window - changing output format cause change active tab to "Report Options"
+* various updated translations: de, es, fr, nb, nl, pl, sk
+
+2013-05-15
+Version 3.4.4 of Gramps! "The Ministry of Silly Names", a maintenance release.
+* infinite recursion bug in narrative web generation
+* protection on family trees when using version 3.4 and 4.0 on the same PC (road to 4.0)
+* merging notes of media with citations now works
+* crash during Calculate Preview of a filtered XML export
+* fix annoying errors on navigation related to citations gramplet and tag object.
+* listing the Family Trees can corrupt them.
+* various fix around handling Gedcom file format
+* fix citations and sources import on ProGen format 
+* better date handling and better alternate translation support on some textual reports according to locale under windows 
+* avoid Errors when setting wrong value as markup for invalid dates (Preferences)
+* fix paragraph layout on PDF format or print output
+* New: New-Zealand holidays
+* Polish and backport code on XML import (road to 4.0)
+* Regular expression rules now use search rather than match, fix design issues on regex filter rules
+* Disable/Enable indent spouse on descendants tree
+* fix regular expressions on Place filter rule
+* consistency on cli arguments (road to 4.0)
+* fix call of non-existant process on references proxy, enhanced tests on proxy filter
+* fix NarWeb creation via cli for some non-english locales
+* Various updated translations: ca, de, fr, it, nl, pt_BR, ru, sv, uk
+
+2013-03-19
+Version 3.4.3 of Gramps! "Whenever life gets you down, Mrs. Brown", a maintenance release.
+* Sorting (both in the main display window, and particularly in Narrative Web output) now uses PyICU (if that module is available). Inclusion of PyICU is 'strongly recommended'. This resolves a number of bugs particularly related to sorting of non-Latin characters, and sorting on MS Windows and Mac OS X. Some changes have been made in Narrative Web to support contractions for alphabetic indices.
+* The automatic Addon checking and download now works once again (the location used in Gramps 3.4.2 and before had been changed, so the the automatic process was no longer working).
+* Import from Pro-Gen has been updated (at last) to take account of the change to Citations (in 3.4.0)
+* Import and Export of address fields in GEDCOM has been improved so that the round-trip works properly. 
+* GEDCOM Repositories not imported correctly from FTM for Windows and Heredis.
+* Fixes to a number of errors in filtering notes.
+* Fix some errors in determining whether someone is alive (e.g. for filtering out alive people).
+* Make availability of GraphViz settings depend on output format
+* Improve the descriptions and tooltip for GraphViz aspect ratio option
+* Fixed update problems with citation bottombar gramplet (bug #6336)
+* Fixed Open Document Text output in Book report (bug #6457)
+* A number of changes to Narrative Web:
+** Media objects attached to Marriage events and Sources are not included in Narrative Web Site 
+** restructure the families index so families are indexed under both spouses, and the family name is normalised
+** separate out Families section in individual and families pages so individual page links to the family page and family page links to both people
+** normalise links to families so the link is only displayed if the family page is present, and the gid is included when appropriate
+** remove highlighting of media subregions except in the media pages (it was confusing and not very well implemented)
+** include people whose surname is absent in the individual, surname and families indexes
+** html_escape names and surnames
+** always display media thumbnails for first image in Gallery list (in some cases they were suppressed if they had been displayed at the top of the page)
+** change partner and parent columns in families index to improve the layout of the HTML and put the comma between multiple partners in the right place
+** use event description (where present) instead of just event type in back references
+** fix bug in the way obj_dict and bkref_dict were initialised
+** fix missing document.png for missing media
+** fixed problems that bibliography ignores media attached to citations, so if that is the only 'interesting' thing about the citation, the citation media is not output
+** Replaced person link routine with one that takes into account whether there is a page for the person.
+** Included repository reference media type and call number in the 'Repositories' section of the relevant source instead of the Repository page.
+** Implemented a generalised back reference function to display the 'References' section of all pages. This recursively displays references till one is found for which a page exists.
+** Removed list of people and families from heading of the event pages as these are now in the 'References' section.
+** Fixed bug "0005968: Narrated Web Site not copying Source Citations files such as jpg or pdf docs to web site
+** Fixed bug "0005946 GRAMPS failed to insert jpeg image into proper place for an event" by displaying a thumbnail for citation media in the 'Source References' section (with a link to the media page) 
+** Tidy up media pages - remove unused parameters, use list of media items generated in first pass. Should fix bugs 2365, 5905 and 6009.
+** Tidy up sources pages - fix numbering of repositories, remove unused parameters, fix title of individual source pages
+** Bug: reset NarrWeb navigation menu layout when style sheet doesn't support it
+** Change Source Pages to use the list of sources generated by the first pass that finds objects to be output, and simplify references section on the Source page to use the references passed to it.
+** Fix option to suppress Gramps ID (bug #6237)
+* a number of technical changes to Narrative Web
+** Removed a lot of redundant code and parameters (mainly connected with the old way of determining the objects to be included in the report).
+** Movement of some large chunks of code within the source file and some initial work towards GEPS 022: Narrative Website Refactor. Functionality should be unchanged. 
+** Moved routines for calculating objects to be output so they can be part of default list building classes.
+* Various updated translations: da, de, es, fr, it, nb, nl, pt_BR, pt_PT, sv, uk
+
+2012-10-28
+Version 3.4.2 -- the "We're all individuals!" bug fix release.
+* Some fixes on NarrativeWeb report
+* Some fixes on book report
+* Improvement on database path interface and user's preferences
+* Consistency on Name display and regex support
+* Some platform-specific fixes for Windows system environment
+* Better support for media links on Gedcom file format
+* Fix possible incorrect family relations on Gedcom file format
+* Various fixes on citation records
+* Fix and improve places handling on Geography views
+* Fix on command line arguments
+* Consistency on PDF file format
+* New language: Greek
+* Various updated translations
+* Changelog: http://www.gramps-project.org/bugs/changelog_page.php?version_id=32
+
+2012-08-23
+Version 3.4.1 -- The "A tiger? In Africa?!" bug fix release.
+Mention in the release that upgrading is advised for two critical issues:
+ -> error in export to xml of family order in 3.4.0, now fixed
+ -> crash in windows after some use due to too much terminal output in 3.4.0, now fixed
+* Some platform-specific fixes (Windows, OSX)
+* Bug fixes
+* Translation updates
+* Changelog: http://www.gramps-project.org/bugs/changelog_page.php?version_id=31
+
 2012-05-21
 Version 3.4.0 -- The "always look on the bright side of life" feature release.
 * Lots of changes and bug fixes to every part of Gramps, including XML

README

@@ -30,7 +30,15 @@ The following packages are *STRONGLY RECOMMENDED* to be installed:
                     Obtain it from: http://www.graphviz.org
    pyexiv2          Enables Gramps to manage Exif metadata embedded in your
                     media. Gramps needs version 0.1.3 or greater.
-                    Obtain it from: http://tilloy.net/dev/pyexiv2/download.html  
+                    Obtain it from: http://tilloy.net/dev/pyexiv2/download.html
+   PyICU            Improves localised sorting in Gramps. In particular, this
+                    applies to sorting in the various views and in the Narrative
+                    Web output. It is particularly helpful for non-Latin
+                    characters, for non-English locales and on MS Windows and
+                    Mac OS X platforms. If it is not available, sorting is done
+                    through built-in libraries. PyICU is fairly widely available
+                    through the package managers of distributions. The home page
+                    is http://pyicu.osafoundation.org/
 
 The following packages are optional
    python gtkspell  Enable spell checking in the notes, gtkspell contains the
@@ -84,6 +92,14 @@ If make fails, use gmake (the name FreeBSD gives to GNU make) instead.
 You might need a patch also. FreeBSD has in ports a patch (  /usr/ports/science/gramps/files)
 you need to apply to po/Makefile.in.in 
 
+Note to Windows AIO-users
+---------------------
+Sometimes the theme used in Windows will not work properly.
+Run gtk2_prefs.exe, which can be found in
+C:\Program Files\GrampsAIO64\bin
+r in
+C:\Program Files (X86)\GrampsAIO32\bin
+and select "Crux" or "Clearlooks".
 
 --------------------------------
 The Gramps Project

TODO

@@ -1,76 +1 @@
-* Remove GCONF, provide up grade path - IN PROGRESS
-
-* Replace the LPRDoc interface (based on gnome-print) with a GTK based
-  print routine. This would remove one of the last gnome-specific 
-  libraries, and make portability better. Even more important, the 
-  gnome-print interface has been deprecated by the GNOME project, so it
-  will not be around forever. We need to adapt to the new GTK method. 
-  - IN PROGRESS
-
-* Add support for formatted notes. We have a start by ripping off code
-  from GPL code from grecipe-manager. - DONE
-
-* Allow for multiple notes. A tabbed interface would be really useful,
-  since there are no titles for notes. Not all objects would
-  necessarily need multiple notes. Determine which ones should and
-  shouldn't. - DONE
-
-* before release: fix command line options
-
-* remove critical bugs: 
-   - #1053 - DONE (testing of LDS privacy needed!!)
-   - #1318, wrong note backreferences - DONE
-   - #1208, relative path, see bug note for agreed solution
-
-* before release on multiple notes: 
-    --> in note: also public/private on GUI - DONE
-    --> on upgrade, the notetype should correspond to the object the note is made
-            from, so notetype SOURCE, SOURCEREF, ..., this gives information on 
-	    orphaned notes.(DONE for GRDB)
-	TODO: change notetype into note tags, so people can give notes multiple tags,
-	      Like this all source notes can have tag source, but also tag 'family history' (Discussion Alex/Benny)
-    --> in sourceref: 
-         * remove text tab. (DONE)
-         * On import of GEDCOM text tag, or upgrade of < 2.2 database, 
-           create a note with type TRANSCRIPT (DONE, type SOURCE_TEXT)
-         * On export, do not write the text tag in sourceref, write a
-           note instead (DONE)
-    --> A GrampsWidget for use in report dialogs to select which notetypes to include 
-        in a report (a filter?).
-    --> Support for multiple notes in all reports.
-    --> Empty text field on Saving Note should throw an error that Note is empty ! (?)
-    --> Undo in Note. Serious editing needs an undo function. Furthermore, the function
-        the Clear icon is unclear: tooltip? Other icon?
-
-* Remove import of global var in __init__.py, use functions or don't export. Eg.
-  PluginUtils/__init__.py export of plugin lists (tool_list, ...). E
-
-* Add forward/backward buttons (and active object) on all object views, not only person views.
-
-* Split views
-
-* Export to spreadsheet, print, CSV of views - DONE
-
-* Date calculator.  See
-  http://sourceforge.net/mailarchive/forum.php?thread_id=3252078&forum_id=1993
-
-* Add string substitutions for web page generation (name, report name,
-  date, etc).
-
-* Add support for sources of the parent/child relation
-
-* Add support for storing reliability (confidence) of the marriage
-  information; see
-  http://sourceforge.net/mailarchive/forum.php?thread_id=3066997&forum_id=1993
-  and
-  http://sourceforge.net/mailarchive/forum.php?thread_id=3134931&forum_id=1993
-  for the details.
-
-* Move LDS temple info out of const.py and into an XML file: DONE
-
-* Make the descendant graph adapt to the page size, not stuck with the
-  current 3 entries per page.
-
-* Add slideshow generation ability to web page generator
-
-* And a whole lot more....
+http://gramps-project.org/wiki/index.php?title=Category:GEPS

configure.in

@@ -5,16 +5,16 @@ 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.4.0, [gramps-bugs@lists.sourceforge.net])
+AC_INIT(gramps, 3.4.9, [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=$(git log -1 --format=%h .)
 dnl RELEASE=0beta
 dnl RELEASE=0rc1
-dnl RELEASE=1
+RELEASE=1
 
 VERSIONSTRING=$VERSION
 if test x"$RELEASE" != "x"
@@ -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 pt_PT ru sv fi lt sk bg hr sl ca sq he uk ja vi"
+ALL_LINGUAS="hu zh_CN cs da de es fr it nb nl nn pl pt_BR pt_PT ru sv fi lt sk bg hr sl ca sq he uk ja vi el ar"
 GETTEXT_PACKAGE=gramps
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the Gettext package name.])
@@ -168,6 +168,7 @@ data/man/fr/Makefile
 data/man/nl/Makefile
 data/man/pl/Makefile
 data/man/sv/Makefile
+data/man/pt_BR/Makefile
 example/Makefile
 example/gramps/Makefile
 ])

data/grampsxml.dtd

@@ -25,15 +25,15 @@
 -->
 
 <!--
-    This is the Document Type Definition file for v1.5.0
+    This is the Document Type Definition file for v1.5.1
     of the GRAMPS XML genealogy data format.
     Please use the following formal public identifier to identify it:
 
-    "-//GRAMPS//DTD GRAMPS XML V1.5.0//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.5.1//EN"
 
     For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.5.0//EN"
-                "http://gramps-project.org/xml/1.5.0/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.5.1//EN"
+                "http://gramps-project.org/xml/1.5.1/grampsxml.dtd"
                 [...]>
 -->
 
@@ -62,7 +62,7 @@ DATABASE
 <!ELEMENT database (header, name-formats?, tags?, events?, people?, families?,
                     citations?, sources?, places?, objects?, repositories?,
                     notes?, bookmarks?, namemaps?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.5.0/">
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.5.1/">
 
 
 <!--    ************************************************************
@@ -367,7 +367,7 @@ CITATIONS
 
 <!ELEMENT citations (citation)*>
 
-<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence?,
+<!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence,
                     noteref*, objref*, data_item*, sourceref)>
 <!ATTLIST citation
         id        CDATA #IMPLIED
@@ -383,7 +383,7 @@ BOOKMARKS
 <!ELEMENT bookmarks (bookmark)*>
 <!ELEMENT bookmark EMPTY>
 <!ATTLIST bookmark 
-        target (person|family|event|source|place|media|repository|
+        target (person|family|event|source|citation|place|media|repository|
                 note) #REQUIRED
         hlink  IDREF #REQUIRED
 >

data/grampsxml.rng

@@ -32,7 +32,7 @@
 
 <grammar
   datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/xml/1.5.0/"
+  ns="http://gramps-project.org/xml/1.5.1/"
   xmlns="http://relaxng.org/ns/structure/1.0">
 
   <start><element name="database">
@@ -434,7 +434,7 @@
     <ref name="primary-object"/>
     <optional><ref name="date-content"/></optional>
     <optional><element name="page"><text/></element></optional>
-    <optional><element name="confidence"><text/></element></optional>
+    <element name="confidence"><text/></element>
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
     </element></zeroOrMore>
@@ -546,6 +546,7 @@
         <value>family</value>
         <value>event</value>
         <value>source</value>
+        <value>citation</value>
         <value>place</value>
         <value>media</value>
         <value>repository</value>

data/man/Makefile.am

@@ -1,7 +1,7 @@
 # This is the data/man level Makefile for Gramps
 # $Id$
 
-SUBDIRS = fr sv nl pl cs
+SUBDIRS = fr sv nl pl cs pt_BR
 
 man_IN_FILES = gramps.1.in
 man_MANS = $(man_IN_FILES:.1.in=.1)

data/man/gramps.1.in

@@ -1,4 +1,4 @@
-.TH gramps 1 "@VERSION@" "January 2008" "@VERSION@"
+.TH gramps 1 "@VERSION@" "December 2012" "@VERSION@"
 .SH NAME
 gramps \- Genealogical Research and Analysis Management Programming System.
 
@@ -113,6 +113,16 @@ i.e. \fB\-i\fR \fIFILE1\fR \fB\-i\fR \fIFILE2\fR
 and \fB\-i\fR \fIFILE2\fR \fB\-i\fR \fIFILE1\fR might produce different 
 gramps IDs in the resulting database. 
 
+.TP 
+.BI \-e,\-\^\-export= " FILE"
+Export data into \fIFILE\fR. For \fBgramps\-xml\fR, \fBgedcom\fR, 
+\fBwft\fR, \fBgramps\-pkg\fR, and \fBgeneweb\fR, the \fIFILE\fR is 
+the name of the resulting file. 
+.br
+
+When more than one output file is given, each has to be preceded 
+by \fB\-e\fR flag. The files are written one by one, in the specified order.
+
 .TP 
 .BI \-a,\-\^\-action= " ACTION"
 Perform \fIACTION\fR on the imported data. This is done after all imports

data/man/pt_BR/Makefile.am

@@ -0,0 +1,14 @@
+# This is the data/pt_BR level Makefile for Gramps
+# $Id: Makefile.am 16377 2011-01-13 18:32:42Z matlas $
+
+man_IN_FILES = gramps.1.in
+man_MANS = $(man_IN_FILES:.1.in=.1)
+
+mandir = @mandir@/pt_BR
+
+EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
+
+gramps.1: $(top_builddir)/config.status gramps.1.in
+	cd $(top_builddir) && CONFIG_FILES=data/man/pt_BR/$@ $(SHELL) ./config.status
+
+CLEANFILES=$(man_MANS)

data/man/pt_BR/gramps.1.in

@@ -0,0 +1,325 @@
+.TH gramps 1 "@VERSION@" "Janeiro de 2008" "@VERSION@"
+.SH NOME
+gramps \- Programa para pesquisa genealógica.
+
+.SH RESUMO
+.B gramps
+.RB [ \-?|\-\^\-help ]
+.RB [ \-\^\-usage ]
+.RB [ \-\^\-version ]
+.RB [ \-l ]
+.RB [ \-u|\-\^\-force-unlock ]
+.RB [ \-O|\-\^\-open=
+.IR BANCODEDADOS 
+.RB [ \-f|\-\^\-format= 
+.IR FORMATO ]] 
+.RB [ \-i|\-\^\-import=
+.IR ARQUIVO 
+.RB [ \-f|\-\^\-format= 
+.IR FORMATO ]] 
+.RB [ \-i|\-\^\-import= 
+.IR ... ] 
+.RB [ \-e|\-\^\-export= 
+.IR ARQUIVO
+.RB [ \-f|\-\^\-format= 
+.IR FORMATO ]] 
+.RB [ \-a|\-\^\-action= 
+.IR AÇÃO ]
+.RB [ \-p|\-\^\-options= 
+.IR OPÇÕES ]]
+.RB [
+.IR ARQUIVO
+.RB ]
+.if 0 .RB [ bonobo\ options ]
+.if 0 .RB [ sound\ options ]
+.RB [ \-\-version ]
+
+.SH DESCRIÇÃO
+.PP 
+\fIGramps\fP é um programa de genealogia livre e de código aberto. Ele é escrito
+em Python e usa a interface GTK+/GNOME.
+Gramps deve parecer familiar a qualquer pessoa que já tenha usado outro programa
+de genealogia, tais como o \fIFamily Tree Maker (TM)\fR,  \fIPersonal Ancestral
+Files (TM)\fR, ou o GNU Geneweb.
+Ele suporta a importação do formato GEDCOM, que é amplamente usado por quase 
+todos os outros programas de genealogia.
+
+.SH OPÇÕES
+.TP 
+.BI gramps " ARQUIVO" 
+Quando \fIARQUIVO\fR for indicado (sem qualquer outra opção) como um nome de
+árvore genealógica ou como pasta do banco de dados, ela será aberta e iniciada
+uma sessão interativa. Se ARQUIVO for um formato compreendido pelo Gramps, será 
+criada uma árvore genealógica vazia com o nome baseado no \fIARQUIVO\fP
+e os dados são importados para ela. As demais opções serão ignoradas. Esta forma
+de execução é apropriada para usar o Gramps como manipulador de dados genealógicos
+em, por exemplo, navegadores Web. Este método aceita qualquer formato de dados 
+nativo do Gramps, conforme abaixo.
+.br
+
+.TP 
+.BI \-f,\-\^\-format= " FORMATO"
+Indica expressamente o formato do \fIARQUIVO\fR, precedente das opções  
+.ig
+\fB\-O\fR,
+..
+\fB\-i\fR ou 
+\fB\-e\fR. Se a opção \fB\-f\fR não for fornecida para um \fIARQUIVO\fR, 
+o formato será identificado de acordo com a sua extensão ou tipo MIME. 
+.br
+
+Os formatos disponíveis para exportação são \fBgramps\-xml\fR (se o \fIARQUIVO\fR 
+terminar com \fB.gramps\fR), \fBgedcom\fR (se o \fIARQUIVO\fR terminar com \fB.ged\fR) 
+ou qualquer outro formato de arquivo disponível através do sistema de plugins do 
+Gramps.
+.br
+
+Os formatos disponíveis para importação são \fBgrdb\fR, \fBgramps\-xml\fR, \fBgedcom\fR,  
+\fBgramps\-pkg\fR (se o \fIARQUIVO\fR terminar com \fB.gpkg\fR), e \fBgeneweb\fR 
+(se o \fIARQUIVO\fR terminar com \fB.gw\fR).
+.br
+
+Os formatos disponíveis para exportação são
+.ig
+\fBgrdb\fR,
+..
+\fBgramps\-xml\fR, \fBgedcom\fR,
+\fBgramps\-pkg\fR, \fBwft\fR (se o \fIARQUIVO\fR terminar com \fB.wft\fR),
+\fBgeneweb\fR, e \fBiso\fR (deve sempre ser indicado com a opção
+\fB\-f\fR).
+
+.TP 
+.BI \-l
+Exibe uma lista com as árvores genealógicas conhecidas.
+
+.TP
+.BI \-u,\-\^\-force-unlock
+Desbloqueia um banco de dados previamente bloqueado.
+
+.TP 
+.BI \-O,\-\^\-open= " BANCODEDADOS"
+Abre o \fIBANCODEDADOS\fR, que deve ser uma pasta de banco de dados ou um nome de árvore
+genealógica existentes.
+Se não forem indicadas opções de ação, importação ou exportação na linha de comando, 
+será iniciada uma sessão interativa usando este banco de dados.
+
+.TP 
+.BI \-i,\-\^\-import= " ARQUIVO"
+Importa os dados do \fIARQUIVO\fR. Se não for indicado um banco de dados, o Gramps usará
+um arquivo temporário, que será excluído ao sair do programa.
+.br
+
+Quando mais de um arquivo de origem for indicado, cada um deles deve ser precedido da
+opção \fB\-i\fR. Os arquivos são importados na ordem indicada, por exemplo, 
+\fB\-i\fR \fIARQUIVO1\fR \fB\-i\fR \fIARQUIVO2\fR  
+e \fB\-i\fR \fIARQUIVO2\fR \fB\-i\fR \fIARQUIVO1\fR poderá produzir diferentes gramps IDs 
+no banco de dados resultante. 
+
+.TP 
+.BI \-a,\-\^\-action= " AÇÃO"
+Executa a \fIAÇÃO\fR nos dados importados. Isto será executado após a conclusão de todas
+as importações. Até o momento, as ações disponíveis são \fBsummary\fR (o mesmo que 
+Relatórios->Exibir->Resumo), 
+\fBcheck\fR (o mesmo que Ferramentas->Processamento do banco de dados->Verificar e reparar), 
+\fBreport\fR (gera o relatório), e
+\fBtool\fR (executa uma ferramenta de plugin).
+Para o \fBreport\fR e \fBtool\fR é necessário fornecer \fIOPÇÕES\fR (com uso da opção  
+\fB\-p\fR). 
+.br
+
+As \fIOPÇÕES\fR devem satisfazer as seguintes condições:
+.br
+Não podem conter espaços.
+Se alguns argumentos precisam incluir espaços, a string deve
+ser colocada entre aspas, ou seja, seguir a sintaxe do shell.
+String de opção é uma lista de pares com o nome e o valor (separados por 
+sinal de igual). Os pares de nome e valor devem ser separados por vírgula.
+.br
+
+Muitas opções são específicas de cada relatório ou ferramenta. 
+Entretanto, algumas opções são comuns.
+
+.BI "name=nome"
+.br
+Esta opção obrigatória determina qual relatório ou ferramenta será executado.
+Se o \fInome\fR fornecido não corresponder a um relatório ou ferramenta, será
+exibida uma mensagem de erro seguida de uma lista de relatórios e ferramentas
+disponíveis (dependendo da \fIAÇÃO\fR).
+
+.BI "show=all"
+.br
+Isto irá gerar uma lista com os nomes para todas as opções disponíveis de um determinado
+relatório ou ferramenta.
+
+.BI "show="nome_opção
+.br
+Isto irá exibir a descrição da funcionalidade indicada por \fInome_opção\fR, bem 
+como quais são os tipos aceitáveis e os valores para esta opção.
+
+.br
+Use as opções acima para descobrir
+tudo sobre um determinado relatório.
+
+.LP
+Quando mais de uma ação de saída for indicada, cada uma deve ser precedida da opção 
+\fB\-a\fR. As ações são realizadas uma a uma, na ordem indicada.
+
+.TP 
+.BI \-d,\-\^\-debug= " ARQUIVO_REGISTRO"
+Ativa os registros para desenvolvimento e testes. Veja o código-fonte para mais detalhes.
+.TP
+.BI \-\^\-version
+Exibe o número da versão do Gramps e finaliza.
+\" altera de 0 para 1 para ativar a saída das opções OAF
+.if 0 \{
+.PP
+As opções a seguir são usadas para ativação do Bonobo.
+.TP 
+.BI \-\^\-oaf-ior-fd= "FD"
+Descritor do arquivo para exibir o OAF IOR em
+.TP 
+.BI \-\^\-oaf-activate-iid= " IID"
+OAF IID para ativar
+.TP 
+.BI \-\^\-oaf-private
+Impedir o registro do servidor com OAF
+\}
+\" altera de 0 para 1 para ativar a saída das opções de som do Gnome
+.if 0 \{
+.PP
+As opções a seguir são usadas para controlar o som usando a biblioteca do Gnome.
+.TP
+.BI \-\^\-disable-sound
+Desativa o servidor de som
+.TP
+.BI \-\^\-enable-sound
+Ativa o servidor de som
+.TP
+.BI \-\^\-espeaker= " HOSTNAME:PORT"
+Máquina:porta que o servidor de som utiliza para execução
+\}
+
+.SH "Operação"
+.br
+Se o primeiro argumento da linha de comando não começar com um traço (isto é, 
+sem uma opção), o Gramps tentará abrir o arquivo com o nome fornecido pelo primeiro
+argumento e iniciar a sessão interativa, ignorando o resto dos argumentos da
+linha de comando.
+
+.LP
+Se for fornecida a opção \fB\-O\fR, então o Gramps tentará abrir o banco de dados
+indicado e trabalhar com estes dados, de acordo com as instruções dos parâmetros 
+adicionais da linha de comando.
+
+.LP
+Com ou sem a opção \fB\-O\fR, pode haver múltiplas importações, exportações e
+ações indicadas pela linha de comando usando as opções \fB\-i\fR,
+\fB\-e\fR e \fB\-a\fR.  
+
+.LP
+A ordem das opções \fB\-i\fR, \fB\-e\fR ou \fB\-a\fR não importa. A ordem
+utilizada será sempre esta: todas as importações (se existirem) -> todas
+as ações (se existirem) -> todas as exportações (se existirem). Mas a abertura 
+deve estar sempre em primeiro lugar!
+
+.LP
+Se as opções \fB\-O\fR ou \fB\-i\fR não forem fornecidas, o Gramps será aberto
+com a sua janela principal e iniciará a sessão interativa padrão com um banco
+de dados vazio, uma vez que não há nada a processar.
+
+.LP
+Se as opções \fB\-e\fR ou \fB\-a\fR não forem fornecidas, o Gramps será aberto
+com a sua janela principal e iniciará a sessão interativa padrão com um banco
+de dados resultante de todas as importações. Este banco de dados está localizado
+no arquivo \fBimport_db.grdb\fR da pasta \fB~/.gramps/import\fR.
+
+.LP
+Os erros encontrados durante a importação, exportação ou ação, serão direcionados 
+para \fIstdout\fR (se forem exceções tratadas pelo Gramps) ou para \fIstderr\fR
+(se não forem tratadas). Use redirecionamentos usuais de \fIstdout\fR e 
+\fIstderr\fR do shell para salvar mensagens e erros em arquivos.
+
+.SH EXEMPLOS
+.TP 
+Abrir uma árvore genealógica existente e importar um arquivo xml para ela:
+\fBgramps\fR \fB\-O\fR \fI'Minha árvore genealógica'\fR \fB\-i\fR \fI~/db3.gramps\fR
+.TP 
+Fazer as mesmas alterações da árvore genealógica do comando anterior, mas importar a árvore genealógica temporária e iniciar uma sessão interativa:
+\fBgramps\fR \fB\-i\fR \fI'Minha árvore genealógica'\fR \fB\-i\fR \fI~/db3.gramps\fR
+.TP 
+Importar quatro bancos de dados (cujos formatos podem ser reconhecidos pelos nomes) e verificar a existência de erros no banco de dados resultante:
+\fBgramps\fR \fB\-i\fR \fIarquivo1.ged\fR \fB\-i\fR \fIarquivo2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-i\fR \fIarquivo4.wft\fR \fB\-a\fR \fIcheck\fR 
+.TP 
+Indicar de forma explícita os formatos do exemplo acima, atribuindo os nomes dos arquivos com as opções \fB\-f\fR apropriadas:
+\fBgramps\fR \fB\-i\fR \fIarquivo1.ged\fR \fB\-f\fR \fIgedcom\fR \fB\-i\fR \fIarquivo2.tgz\fR \fB\-f\fR \fIgramps-pkg\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-f\fR \fIgramps-xml\fR \fB\-i\fR \fIarquivo4.wft\fR \fB\-f\fR \fIwft\fR  \fB\-a\fR \fIcheck\fR 
+.TP 
+Gravar o banco de dados resultante de todas as importações, indicando a opção \fB\-e\fR (use \fB\-f\fR se o nome do arquivo não permirtir que o gramps reconheça o formato automaticamente):
+\fBgramps\fR \fB\-i\fR \fIarquivo1.ged\fR \fB\-i\fR \fIarquivo2.tgz\fR \fB\-e\fR \fI~/novo-pacote\fR \fB\-f\fR \fIgramps-pkg\fR 
+.TP 
+Importar três bancos de dados e iniciar a sessão interativa do Gramps com o resultado:
+\fBgramps\fR \fB\-i\fR \fIarquivo1.ged\fR \fB\-i\fR \fIarquivo2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR 
+.TP 
+Executar a ferramenta de verificação a partir da linha de comando e direcionar o resultado para stdout:
+\fBgramps\fR \fB\-O\fR \fI'Minha árvore genealógica'\fR \fB-a\fR \fItool\fR \fB-p\fR \fBname\fR=\fIverify\fR
+.TP 
+Finalmente, para iniciar uma sessão interativa normal, digite:
+\fBgramps\fR 
+
+.SH VARIÁVEIS DE AMBIENTE
+O programa verifica se estas variáveis de ambiente estão definidas:
+
+\fBLANG\fR - identifica o idioma a ser usado.
+Ex.: Para o idioma português do Brasil, a variável deve ser definida como pt_BR.UTF-8.
+
+\fBGRAMPSHOME\fR - se definida, força o Gramps a usar a pasta indicada para armazenar
+as configurações e os bancos de dados do programa. Por padrão, esta variável não é 
+definida e o Gramps assume que a pasta com todos os bancos de dados e configurações
+do perfil devem ser criadas na pasta do usuário (descrita na variável de ambiente 
+HOME no Linux ou USERPROFILE no Windows 2000/XP).
+
+.SH CONCEITOS
+Suporta um sistema de plugins baseado em Python, permitindo acrescentar importações 
+e exportações adicionais, geradores de relatórios, ferramentas e filtros de exibição, 
+sem modificação do programa principal.
+.LP 
+Além da impressão direta, é possível gerar relatórios em diversos formatos de
+arquivo, tais como \fIOpenOffice.org\fR, \fIAbiWord\fR, HTML ou LaTeX, para permitir
+aos usuários a modificação de acordo com suas necessidades.
+
+.SH LIMITAÇÕES E ERROS CONHECIDOS
+
+.SH ARQUIVOS
+.LP 
+\fI${PREFIX}/bin/gramps\fP 
+.br 
+\fI${PREFIX}/share/gramps\fP
+.br 
+\fI${HOME}/.gramps\fP 
+
+.SH AUTORES
+Donald Allingham \fI<don@gramps-project.org>\fR
+.br 
+\fIhttp://gramps.sourceforge.net\fR
+.LP 
+Este manual foi originalmente escrito por:
+.br 
+Brandon L. Griffith \fI<brandon@debian.org>\fR
+.br
+para inclusão na distribuição Debian GNU/Linux.
+.LP 
+Este manual é atualmente mantido pelo:
+.br 
+Projeto Gramps \fI<xxx@gramps-project.org>\fR
+.br 
+
+.SH DOCUMENTAÇÃO
+A documentação para usuários está disponível através da opção de ajuda padrão
+do GNOME, na forma de Manual do Gramps. O Manual também está disponível no 
+formato XML como \fBgramps-manual.xml\fR em \fIdoc/gramps-manual/$LANG\fR 
+nas fontes oficiais da sua distribuição.
+.LP 
+A documentação para desenvolvedores pode ser encontrada na página 
+\fIhttp://developers.gramps-project.org\fR. 
+
+.SH TRADUÇÃO
+\&\fR\&\f(CWAndré Marcelo Alvarenga <andrealvarenga@gmx.net> em 05/08/2012\fR

debian/README.Debian

@@ -1,18 +1,6 @@
 gramps for Debian
-----------------------
+-----------------
 
-This is the Debian package of GRAMPS.
+python-webkit is "Suggested" as upstream states it as optional in their README file. According to upstream, webkit needs to be tested for stability for Gramps (it is used in the hidden HTML View). If it is unstable, it may be necessary to revert to gecko (python-gtkmozembed).
 
-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.
+ -- Ross Gammon <rossgammon@mail.dk>  Wed, 23 Oct 2013 21:24:00 +0200

debian/compat

@@ -1 +1 @@
-7
+9

debian/control

@@ -1,20 +1,19 @@
 Source: gramps
 Section: gnome
 Priority: optional
-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
+Maintainer: Ross Gammon <rossgammon@mail.dk>
+Build-Depends-Indep: libxml-parser-perl, python-gtk2, gettext, python, intltool
+Build-Depends: debhelper (>= 9.0.0)
+Standards-Version: 3.9.5
+Vcs-Git: git://anonscm.debian.org/collab-maint/gramps.git
+Vcs-browser: http://anonscm.debian.org/git/collab-maint/gramps.git
 Homepage: http://www.gramps-project.org/
-XS-Python-Version: >=2.5
 
 Package: gramps
 Architecture: all
-Depends: ${python:Depends}, librsvg2-common, python-gtk2, python-pyexiv2, xdg-utils, graphviz, python-osmgpsmap ${misc:Depends}
-Replaces: gramps-manual, gramps-extending-doc
-Conflicts: gramps-manual, gramps-extending-doc, gramps-common, python-gtk-1.2
-Recommends: 
-Suggests: ttf-freefont, python-enchant, python-gtkspell
+Depends: ${python:Depends}, librsvg2-common, python-gtk2, xdg-utils, ${misc:Depends}
+Recommends: graphviz, python-pyicu, python-pyexiv2, python-osmgpsmap,
+Suggests: ttf-freefont, python-gtkspell, python-pygoocanvas, python-webkit
 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
@@ -23,5 +22,3 @@ Description: Genealogical research program
  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}
-

debian/copyright

@@ -1,251 +1,144 @@
-This package was originally debianized by Brandon L. Griffith
-<brandon@debian.org> on Sat, 19 May 2001 13:37:24 -0400.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Gramps
+Source: http://gramps-project.org
 
-The current Debian maintainer is James A. Treacy <treacy@debian.org>
+Files: *
+Copyright: 2000-2002, Bruce J. DeGrasse
+           2000-2008, Donald N. Allingham
+           2000-2007, Martin Hawlisch
+           2001, Andrés Sepúlveda
+           2001, David R. Hampton
+           2001-2013, Free Software Foundation, Inc.
+           2001, Jesper Zedlitz
+           2001-2013, the Gramps Project
+           2002, Gary Shao
+           2003-2006, Josiah Carlson
+           2004-2006, Eero Tamminen
+           2004-2013, Julio Sánchez
+           2004, Toshio Kuratomi
+           2005-2011, Serge Noiraud
+           2000-2007, Alex Roitman
+           2006-2011, Brian G. Matherly
+           2007-2011, Benny Malengier
+           2007-2012, Douglas S. Blank
+           2007-2012, Gary Burton
+           2007-2011, Jerome Rapinat
+           2007, Johan Gronqvist
+           2007, Robert Cawley
+           2007-2009, Stephane Charette
+           2007, Thom Sturgill
+           2007-2008, Zsolt Foldvari
+           2008-2010, 2012, Craig J. Anderson
+           2008-2009, James Friedmann
+           2008-2009, Jason Simanek
+           2008-2011, Kees Bakker
+           2008, Lukasz Rymarczyk
+           2008-2010, Peter G. Landgren
+           2008, 2010, Raphael Ackermann
+           2008-2011, Reinhard Mueller
+           2008, 2011, Robert Cheramy
+           2008-2012, Rob G. Healey
+           2008, Stefan Siegel
+           2009-2010, Andrew I Baznikin
+           2009, 2011, The Dojo Foundation
+           2009, Florian Heinle
+           2009, Gerald W. Britton
+           2009, 2011, John Resig
+           2009-2013, Nick Hall
+           2009, Pander Musubi
+           2009, Robert Ham
+           2009-2010, Stephen George
+           2009, Swoon on bug tracker
+           2009, Yevgeny Zegzda
+           2010, Gramps
+           2010, Jakim Friant
+           2010, Josip
+           2010, lcc & Robert Jerome
+           2010-2012, Michiel D. Nauta
+           2010-2013, Tim G L Lyons
+           2010-2011, Vlada Perić
+           2011, Adam Stein
+           2011, 2013 Heinz Brinker
+           2011, Helge Herz
+           2011, John Ralls
+           2011, Matt Keenan
+           2011-2013, Paul Franklin
+           2012, Mathieu MD
+           2013, Fedir Zinchuk
+           2013, Oleh Petrivk
+           2013, Vassilii Khachaturov
+           2013, Zissis Papadopoulos
+License: GPL-2+
 
-It was downloaded from http://gramps-project.org
+Files: debian/*
+Copyright: 2001-2002, Brandon L. Griffith
+           2002, Alex Roitman
+           2002-2012, James A. Treacy
+           2013, Ross Gammon
+License: GPL-2+
 
-Upstream Authors:
-   Donald N. Allingham, Alexander Roitman, Martin Hawlisch, Richard Taylor,
-   Brian Matherly, Tim Waugh, Donald A. Peterson, David Hampton
+Files: src/plugins/webstuff/js/jquery-ui-1.7.2.custom.min.js
+Copyright: 2009, jQuery UI Team (http://jqueryui.com/about/)
+License: MIT and GPL-2
 
-========================================================
-Copyright: 2001-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.
+Files: src/plugins/webstuff/js/jquery-1.7.1.js
+Copyright: 2009, jQuery UI Team (http://jqueryui.com/about/)
+License: MIT and GPL-2
 
-  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.
+Files: src/plugins/webstuff/js/jquery-1.3.2.min.js
+Copyright: 2009, jQuery UI Team (http://jqueryui.com/about/)
+License: MIT and GPL-2
 
-  You should have received a copy of the GNU General Public License with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 only of the License.
+ .
+ This package 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL
+License: GPL-2+
+ This package 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 package 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-========================================================
-The files in help/C directory are Copyright 2006  Alexander Roitman
-  This documentation 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 documentation 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 with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA 02111-1307 USA
-
-========================================================
-The files in help/fr directory are Copyright 2003-2006  Jerome Rapinat
-  This documentation 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 documentation 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 with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA 02111-1307 USA
-
-========================================================
-The data/grampsxml.dtd file is Copyright 2001 Graham J. William
-                           and Copyright 2000-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 with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
-
-========================================================
-The src/TreeTips.py file is Copyright 2004 Toshio Kuratomi
-
-  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 with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
-
-========================================================
-The src/data/fdl.txt file is Copyright 2000,2001,2002 
-                             Free Software Foundation, Inc.
-                             59 Temple Place, Suite 330,
-                             Boston, MA  02111-1307  USA
-  Everyone is permitted to copy and distribute verbatim copies
-  of this license document, but changing it is not allowed.
-
-========================================================
-The file src/docgen/ODFDoc.py file is Copyright 2005-2006 Serge Noiraud
-                                  and Copyright 2005-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 with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
-
-========================================================
-The file src/Mime/_WinMime.py file is Copyright 2006 Brian Matherly
-                                  and Copyright 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 with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
-
-========================================================
-The src/plugins/Ancestors.py file is Copyright 2003 Tim Waugh
-                                 and Copyright 2003-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 with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
-
-========================================================
-The src/plugins/CountAncestors.py file is Copyright 2001  Jesper Zedlitz
-                             and Copyright 2001-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 with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
-
-========================================================
-The files:
-   src/plugins/DetAncestralReport.py
-   src/plugins/DetDescendantReport.py
-are Copyright 2000-2002 Bruce J. DeGrasse
-and Copyright 2002-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 with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
-
-========================================================
-The files:
-   src/date_test.py
-   src/DataViews/_PedigreeView.py
-   src/plugins/DumpGenderStats.py
-   src/plugins/ExportVCalendar.py
-   src/plugins/ExportVCard.py
-   src/plugins/ImportGeneWeb.py
-   src/plugins/ImportvCard.py
-   src/plugins/TestcaseGenerator.py
-   src/plugins/WriteGeneWeb.py
-are Copyright 2001-2006 Martin Hawlisch, 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 with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
-
-========================================================
-The files:
-   src/ReportBase/__init__.py
-   src/ReportBase/_Report.py
-are Copyright 2001 David R. Hampton
-and Copyright 2001-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 with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.

debian/gramps.docs

@@ -1,5 +1,4 @@
 AUTHORS
-FAQ
 NEWS
 README
 TODO

debian/gramps.install

@@ -0,0 +1 @@
+debian/gramps.xpm usr/share/pixmaps/

debian/gramps.postinst

@@ -1,3 +1,9 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
+
+# Update mime database postinst
+if [ -x /usr/sbin/update-mime-database ]; then
+	update-mime-database /usr/share/mime
+fi
 
 #DEBHELPER#

debian/gramps.postrm

@@ -1,3 +1,9 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
+
+# Update mime database postrm
+if [ -x /usr/sbin/update-mime-database ]; then
+	update-mime-database /usr/share/mime
+fi
 
 #DEBHELPER#

debian/rules

@@ -1,73 +1,17 @@
 #!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
 
-build: build-stamp
-build-stamp:
-	dh_testdir
+%:
+	dh $@ --with python2
 
-	#./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
+# Remove COPYING file (duplicates standard copyright)
+override_dh_install:
+	dh_install
+	# Need COPYING file into About dialog
+	#rm debian/gramps/usr/share/gramps/COPYING
 
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	# [ ! -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_prep
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp.
-	# GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-	$(MAKE) install DESTDIR=`pwd`/debian/gramps
-	-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 '{}' ';'
-
-	cp debian/gramps.xpm debian/gramps/usr/share/pixmaps/
-	# cp src/gramps.xpm debian/tmp/usr/share/pixmaps/
-	# 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 FAQ
-	dh_installmenu
-	# dh_installman
-	dh_installmime -i
-	# dh_installchangelogs ChangeLog
-	dh_installchangelogs
-	dh_icons
-	# dh_movefiles -i
-	# dh_gconf -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -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
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+# Test packager mode to avoid installing mime type
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-packager-mode

debian/watch

@@ -0,0 +1,3 @@
+version=3
+
+http://sf.net/gramps/gramps-(.+)\.tar\.gz

docs/gen/gen_proxy.rst

@@ -34,10 +34,6 @@ Private
 
 References
 ====================================
-.. automodule:: gen.proxy.referenced
-   :members:
-   :undoc-members:
-   :show-inheritance:
 .. automodule:: gen.proxy.referencedbyselection
    :members:
    :undoc-members:

example/gedcom/sample.ged

@@ -25,7 +25,7 @@
 1 BIRT
 2 TYPE Birth of Anna Hansdotter
 2 DATE 2 OCT 1864
-2 PLAC Loderup, Malmous Lan, Sweden
+2 PLAC Löderup, Malmöhus Län, Sweden
 1 DEAT
 2 TYPE Death of Anna Hansdotter
 2 DATE 29 SEP 1945
@@ -55,7 +55,7 @@
 1 BIRT
 2 TYPE Birth of Hans Peter Smith
 2 DATE 17 APR 1904
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Hans Peter Smith
 2 DATE 29 JAN 1977
@@ -74,7 +74,7 @@
 1 BIRT
 2 TYPE Birth of Hanna Smith
 2 DATE 29 JAN 1821
-2 PLAC Gladsax, Kristianstad Lan, Sweden
+2 PLAC Gladsax, Kristianstad Län, Sweden
 1 FAMC @F0@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -87,7 +87,7 @@
 1 BIRT
 2 TYPE Birth of Herman Julius Nielsen
 2 DATE 31 AUG 1889
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Herman Julius Nielsen
 2 DATE 1945
@@ -128,7 +128,7 @@
 1 BIRT
 2 TYPE Birth of Gus Smith
 2 DATE 11 SEP 1897
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Gus Smith
 2 DATE 21 OCT 1963
@@ -146,7 +146,7 @@
 1 BIRT
 2 TYPE Birth of Jennifer Anderson
 2 DATE 5 NOV 1907
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Jennifer Anderson
 2 DATE 29 MAY 1985
@@ -163,7 +163,7 @@
 1 BIRT
 2 TYPE Birth of Lillie Harriet Jones
 2 DATE 2 MAY 1910
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Lillie Harriet Jones
 2 DATE 26 JUN 1990
@@ -227,7 +227,7 @@
 1 BIRT
 2 TYPE Birth of Carl Emil Smith
 2 DATE 20 DEC 1899
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Carl Emil Smith
 2 DATE 28 JAN 1959
@@ -245,11 +245,11 @@
 1 BIRT
 2 TYPE Birth of Hjalmar Smith
 2 DATE 31 JAN 1893
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Hjalmar Smith
 2 DATE 25 SEP 1894
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 FAMC @F3@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -262,7 +262,7 @@
 1 BIRT
 2 TYPE Birth of Martin Smith
 2 DATE 19 NOV 1830
-2 PLAC Gladsax, Kristianstad Lan, Sweden
+2 PLAC Gladsax, Kristianstad Län, Sweden
 1 DEAT
 2 TYPE Death of Martin Smith
 2 DATE BET 1899 AND 1905
@@ -270,7 +270,7 @@
 1 BAPM
 2 TYPE Baptism of Martin Smith
 2 DATE 23 NOV 1830
-2 PLAC Gladsax, Kristianstad Lan, Sweden
+2 PLAC Gladsax, Kristianstad Län, Sweden
 1 FAMC @F0@
 1 FAMS @F2@
 1 NOTE @N0002@
@@ -285,7 +285,7 @@
 1 BIRT
 2 TYPE Birth of Astrid Shermanna Augusta Smith
 2 DATE 31 JAN 1889
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Astrid Shermanna Augusta Smith
 2 DATE 21 DEC 1963
@@ -304,7 +304,7 @@
 1 BIRT
 2 TYPE Birth of Gustaf Smith, Sr.
 2 DATE 28 NOV 1862
-2 PLAC Grostorp, Kristianstad Lan, Sweden
+2 PLAC Grostorp, Kristianstad Län, Sweden
 1 DEAT
 2 TYPE Death of Gustaf Smith, Sr.
 2 DATE BEF 23 JUL 1930
@@ -316,7 +316,7 @@
 1 CHR
 2 TYPE Christening of Gustaf Smith, Sr.
 2 DATE 7 DEC 1862
-2 PLAC Gladsax, Kristianstad Lan, Sweden
+2 PLAC Gladsax, Kristianstad Län, Sweden
 1 FAMC @F2@
 1 FAMS @F3@
 1 CHAN
@@ -343,7 +343,7 @@
 1 BIRT
 2 TYPE Birth of Kirsti Marie Smith
 2 DATE 15 DEC 1886
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Kirsti Marie Smith
 2 DATE 18 JUL 1966
@@ -378,7 +378,7 @@
 1 DEAT
 2 TYPE Death of Anna Streiffert
 2 DATE 2 FEB 1927
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 FAMS @F11@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -407,11 +407,11 @@
 1 BIRT
 2 TYPE Birth of Magnes Smith
 2 DATE 6 OCT 1858
-2 PLAC Simrishamn, Kristianstad Lan, Sweden
+2 PLAC Simrishamn, Kristianstad Län, Sweden
 1 DEAT
 2 TYPE Death of Magnes Smith
 2 DATE 20 FEB 1910
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 FAMC @F2@
 1 FAMS @F11@
 1 CHAN
@@ -515,14 +515,14 @@
 1 BIRT
 2 TYPE Birth of Elna Jefferson
 2 DATE 14 SEP 1800
-2 PLAC Gladsax, Kristianstad Lan, Sweden
+2 PLAC Gladsax, Kristianstad Län, Sweden
 1 DEAT
 2 TYPE Death of Elna Jefferson
 2 PLAC Sweden
 1 CHR
 2 TYPE Christening of Elna Jefferson
 2 DATE 16 SEP 1800
-2 PLAC Gladsax, Kristianstad Lan, Sweden
+2 PLAC Gladsax, Kristianstad Län, Sweden
 1 FAMS @F0@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -560,7 +560,7 @@
 1 BIRT
 2 TYPE Birth of Kerstina Hansdotter
 2 DATE 29 NOV 1832
-2 PLAC Smestorp, Kristianstad Lan, Sweden
+2 PLAC Smestorp, Kristianstad Län, Sweden
 1 DEAT
 2 TYPE Death of Kerstina Hansdotter
 2 DATE BEF 1908
@@ -577,7 +577,7 @@
 1 BIRT
 2 TYPE Birth of Martin Smith
 2 DATE BET 1794 AND 1796
-2 PLAC Tommarp, Kristianstad Lan, Sweden
+2 PLAC Tommarp, Kristianstad Län, Sweden
 1 DEAT
 2 TYPE Death of Martin Smith
 2 PLAC Sweden
@@ -594,7 +594,7 @@
 1 BIRT
 2 TYPE Birth of Ingeman Smith
 2 DATE 29 JAN 1826
-2 PLAC Gladsax, Kristianstad Lan, Sweden
+2 PLAC Gladsax, Kristianstad Län, Sweden
 1 FAMC @F0@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -661,7 +661,7 @@
 1 BIRT
 2 TYPE Birth of Ingar Smith
 2 DATE AFT 1823
-2 PLAC Gladsax, Kristianstad Lan, Sweden
+2 PLAC Gladsax, Kristianstad Län, Sweden
 1 FAMC @F0@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -674,7 +674,7 @@
 1 BIRT
 2 TYPE Birth of Hjalmar Smith
 2 DATE 7 APR 1895
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Hjalmar Smith
 2 DATE 26 JUN 1975
@@ -682,7 +682,7 @@
 1 BAPM
 2 TYPE Baptism of Hjalmar Smith
 2 DATE 3 JUN 1895
-2 PLAC Ronne Bornholm, Denmark
+2 PLAC Rønne Bornholm, Denmark
 1 EVEN
 2 TYPE Immi
 2 DATE 14 NOV 1912
@@ -701,7 +701,7 @@
 1 BIRT
 2 TYPE Birth of Emil Smith
 2 DATE 27 SEP 1860
-2 PLAC Simrishamn, Kristianstad Lan, Sweden
+2 PLAC Simrishamn, Kristianstad Län, Sweden
 1 FAMC @F2@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -712,7 +712,7 @@
 1 MARR
 2 TYPE Marriage of Martin Smith and Elna Jefferson
 2 DATE ABT 1816
-2 PLAC Gladsax, Kristianstad Lan, Sweden
+2 PLAC Gladsax, Kristianstad Län, Sweden
 1 CHIL @I11@
 1 CHIL @I7@
 1 CHIL @I4@
@@ -748,7 +748,7 @@
 1 MARR
 2 TYPE Marriage of Magnes Smith and Anna Streiffert
 2 DATE 24 AUG 1884
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
@@ -805,7 +805,7 @@
 1 MARR
 2 TYPE Marriage of Gustaf Smith, Sr. and Anna Hansdotter
 2 DATE 27 NOV 1885
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 CHIL @I26@
 1 CHIL @I23@
 1 CHIL @I21@
@@ -831,7 +831,7 @@
 1 MARR
 2 TYPE Marriage of Herman Julius Nielsen and Astrid Shermanna Augusta Smith
 2 DATE 30 NOV 1912
-2 PLAC Ronne, Bornholm, Denmark
+2 PLAC Rønne, Bornholm, Denmark
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26

example/gramps/example.gramps

@@ -17848,6 +17848,16 @@
       <dateval val="1974-03-30"/>
       <description>Marriage of Peters, John C. and Cruz, Joyce Marie</description>
     </event>
+    <event handle="_c99c56a20172a29cfe0" change="1185458159" id="E3403">
+      <type>Birth</type>
+      <datestr val="1975-02-29"/>
+      <description>obviously invalid date, preserved as text in ISO fmt style</description>
+    </event>
+    <event handle="_E3404" change="1185458159" id="E3404">
+      <type>Death</type>
+      <datestr val="29 FEB 1995"/>
+      <description>obviously invalid date, preserved as text in Gedcom fmt style</description>
+    </event>
   </events>
   <people home="_GNUJQCL9MD64AM56OH">
     <person handle="_004KQCGYT27EEPQHK" change="1185438865" id="I0552">
@@ -40063,6 +40073,15 @@
       <parentin hlink="_F0WKQCXB6Y8RVGHIC7"/>
         <citationref hlink="_c140d280aa7494978c4"/>
     </person>
+    <person handle="_c99c56aa6b6598272c0" change="1185458163" id="I0000">
+      <gender>M</gender>
+      <name type="Birth Name">
+        <first>Вася</first>
+        <surname>Пупкин</surname>
+      </name>
+      <eventref hlink="_c99c56a20172a29cfe0" role="Primary"/>
+      <eventref hlink="_E3404" role="Primary"/>
+    </person>
   </people>
   <families>
     <family handle="_03GKQCH37C1SL9C5B3" change="1185438865" id="F0372">

mac/Imaging-Freetype2.patch

@@ -0,0 +1,27 @@
+*** a/_imagingft.c	Sat Oct 31 17:44:12 2009
+--- b/_imagingft.c	Thu May 22 12:30:02 2014
+***************
+*** 70,76 ****
+--- 70,80 ----
+      const char* message;
+  } ft_errors[] =
+  
++ #if defined(USE_FREETYPE_2_1)
++ #include <freetype2/fterrors.h>
++ #else
+  #include <freetype/fterrors.h>
++ #endif
+  
+  /* -------------------------------------------------------------------- */
+  /* font objects */
+--- a/setup.py	Sun Nov 15 08:06:10 2009
++++ b/setup.py	Fri May 23 11:26:20 2014
+@@ -348,7 +348,7 @@
+                     dir = os.path.join(root, "Tk.framework", "Headers")
+                     add_directory(self.compiler.include_dirs, dir, 1)
+                     break
+-            if frameworks:
++            if False:
+                 exts.append(Extension(
+                     "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
+                     extra_compile_args=frameworks, extra_link_args=frameworks

mac/Info.plist

@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>Gramps</string>
     <key>CFBundleGetInfoString</key>
-    <string>Trunk, (C) 1997-2012 The Gramps Team http://www.gramps-project.org</string>
+    <string>Gramps 3.4.9-1, (C) 1997-2015 The Gramps Team http://www.gramps-project.org</string>
     <key>CFBundleIconFile</key>
     <string>gramps.icns</string>
     <key>CFBundleIdentifier</key>
@@ -17,13 +17,15 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>Trunk</string>
+    <string>3.4.9-1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
+    <key>CFBundleName</key>
+    <string>Gramps</string>
     <key>CFBundleVersion</key>
-    <string>Trunk</string>
+    <string>3.4.9-1</string>
     <key>NSHumanReadableCopyright</key>
-    <string>Copyright 1997 - 2012 The Gramps Team, GNU General Public License.</string>
+    <string>Copyright 1997 - 2015 The Gramps Team, GNU General Public License.</string>
     <key>LSMinimumSystemVersion</key>
     <string>10.5</string>
 </dict>

mac/gramps.accel

@@ -5,23 +5,23 @@
 ; (gtk_accel_path "<Actions>/FileWindow/PluginStatus" "")
 ; (gtk_accel_path "<Actions>/ReportWindow/place_report" "")
 ; (gtk_accel_path "<Actions>/FileWindow/ViewMenu" "")
- (gtk_accel_path "<Actions>/Pedigree/Forward/Forward" "<Mod5>Right")
+ (gtk_accel_path "<Actions>/Pedigree/Forward/Forward" "<Alt>Right")
 ; (gtk_accel_path "<Actions>/ReportWindow/birthday_report" "")
 ; (gtk_accel_path "<Actions>/ReportWindow/marker_report" "")
 ; (gtk_accel_path "<Actions>/ReportWindow/Graphs" "")
 ; (gtk_accel_path "<Actions>/FileWindow/FAQ" "")
 ; (gtk_accel_path "<Actions>/ToolWindow/mediaman" "")
- (gtk_accel_path "<Actions>/Families/Forward/Forward" "<Mod5>Right")
- (gtk_accel_path "<Actions>/Events/ChangeOrder/Add" "<Mod5><Meta>i")
+ (gtk_accel_path "<Actions>/Families/Forward/Forward" "<Alt>Right")
+ (gtk_accel_path "<Actions>/Events/ChangeOrder/Add" "<Alt><Meta>i")
 ; (gtk_accel_path "<Actions>/ReportWindow/det_descendant_report" "")
 ; (gtk_accel_path "<Actions>/ReportWindow/statistics_chart" "")
 ; (gtk_accel_path "<Actions>/Person View/PersonAll/FilterEdit" "")
- (gtk_accel_path "<Actions>/Events/Backward/Back" "<Mod5>Left")
+ (gtk_accel_path "<Actions>/Events/Backward/Back" "<Alt>Left")
 ; (gtk_accel_path "<Actions>/ToolWindow/rebuild_refmap" "")
 ; (gtk_accel_path "<Actions>/ToolWindow/Database-Processing" "")
  (gtk_accel_path "<Actions>/Events/Bookmark/EditBook" "<Shift><Meta>b")
  (gtk_accel_path "<Actions>/People Tree View/PersonEdit/Remove" "<Meta>Delete")
- (gtk_accel_path "<Actions>/Notes/Forward/Forward" "<Mod5>Right")
+ (gtk_accel_path "<Actions>/Notes/Forward/Forward" "<Alt>Right")
  (gtk_accel_path "<Actions>/Undo/Undo" "<Meta>z")
  (gtk_accel_path "<Actions>/MainWindow/Import" "<Meta>i")
 ; (gtk_accel_path "<Actions>/FileWindow/Filter" "")
@@ -32,40 +32,40 @@
  (gtk_accel_path "<Actions>/Repositories/Bookmark/EditBook" "<Shift><Meta>b")
 ; (gtk_accel_path "<Actions>/ReportWindow/book" "")
 ; (gtk_accel_path "<Actions>/FileWindow/FileMenu" "")
- (gtk_accel_path "<Actions>/Person View/Backward/Back" "<Mod5>Left")
+ (gtk_accel_path "<Actions>/Person View/Backward/Back" "<Alt>Left")
 ; (gtk_accel_path "<Actions>/ReportWindow/records" "")
 ; (gtk_accel_path "<Actions>/ReportWindow/ancestor_report" "")
 ; (gtk_accel_path "<Actions>/ToolWindow/chname" "")
 ; (gtk_accel_path "<Actions>/Person View/PersonEdit/FastMerge" "")
- (gtk_accel_path "<Actions>/Relationships/Forward/Forward" "<Mod5>Right")
+ (gtk_accel_path "<Actions>/Relationships/Forward/Forward" "<Alt>Right")
 ; (gtk_accel_path "<Actions>/Person View/PersonEdit/ExportTab" "")
  (gtk_accel_path "<Actions>/Notes/ChangeOrder/Remove" "<Meta>Delete")
 ; (gtk_accel_path "<Actions>/ToolWindow/editowner" "")
 ; (gtk_accel_path "<Actions>/ReportWindow/hourglass_graph" "")
- (gtk_accel_path "<Actions>/Repositories/ChangeOrder/Add" "<Mod5><Meta>i")
- (gtk_accel_path "<Actions>/Media/Forward/Forward" "<Mod5>Right")
+ (gtk_accel_path "<Actions>/Repositories/ChangeOrder/Add" "<Alt><Meta>i")
+ (gtk_accel_path "<Actions>/Media/Forward/Forward" "<Alt>Right")
  (gtk_accel_path "<Actions>/AllMainWindow/<CONTROL>Delete" "<Meta>Delete")
 ; (gtk_accel_path "<Actions>/FileWindow/Toolbar" "")
- (gtk_accel_path "<Actions>/Place Tree View/ChangeOrder/Add" "<Mod5><Meta>i")
+ (gtk_accel_path "<Actions>/Place Tree View/ChangeOrder/Add" "<Alt><Meta>i")
 ; (gtk_accel_path "<Actions>/ReportWindow/number_of_ancestors_report" "")
- (gtk_accel_path "<Actions>/Families/ChangeOrder/Add" "<Mod5><Meta>i")
+ (gtk_accel_path "<Actions>/Families/ChangeOrder/Add" "<Alt><Meta>i")
  (gtk_accel_path "<Actions>/Person View/Bookmark/EditBook" "<Shift><Meta>b")
  (gtk_accel_path "<Actions>/Relationships/Bookmark/AddBook" "<Meta>d")
 ; (gtk_accel_path "<Actions>/ReportWindow/familylines_graph" "")
- (gtk_accel_path "<Actions>/Person View/Forward/Forward" "<Mod5>Right")
+ (gtk_accel_path "<Actions>/Person View/Forward/Forward" "<Alt>Right")
  (gtk_accel_path "<Actions>/Place View/ChangeOrder/Remove" "<Meta>Delete")
  (gtk_accel_path "<Actions>/Sources/ChangeOrder/Remove" "<Meta>Delete")
  (gtk_accel_path "<Actions>/Person View/ChangeOrder/Remove" "<Meta>Delete")
 ; (gtk_accel_path "<Actions>/ToolWindow/relcalc" "")
  (gtk_accel_path "<Actions>/AllMainWindow/Export" "<Meta>e")
- (gtk_accel_path "<Actions>/Pedigree/Backward/Back" "<Mod5>Left")
+ (gtk_accel_path "<Actions>/Pedigree/Backward/Back" "<Alt>Left")
  (gtk_accel_path "<Actions>/Relationships/Bookmark/EditBook" "<Shift><Meta>b")
 ; (gtk_accel_path "<Actions>/ToolWindow/reorder_ids" "")
  (gtk_accel_path "<Actions>/Place Tree View/Bookmark/EditBook" "<Shift><Meta>b")
 ; (gtk_accel_path "<Actions>/RecentFiles/RecentMenu0" "")
  (gtk_accel_path "<Actions>/Person View/PersonAll/Edit" "<Meta>Return")
 ; (gtk_accel_path "<Actions>/FileWindow/MailingLists" "")
- (gtk_accel_path "<Actions>/Place View/Forward/Forward" "<Mod5>Right")
+ (gtk_accel_path "<Actions>/Place View/Forward/Forward" "<Alt>Right")
 ; (gtk_accel_path "<Actions>/ReportWindow/kinship_report" "")
 ; (gtk_accel_path "<Actions>/MainWindow/BookMenu" "")
 ; (gtk_accel_path "<Actions>/ToolWindow/evname" "")
@@ -75,23 +75,23 @@
  (gtk_accel_path "<Actions>/Place Tree View/Bookmark/AddBook" "<Meta>d")
 ; (gtk_accel_path "<Actions>/AllMainWindow/F11" "F11")
 ; (gtk_accel_path "<Actions>/ToolWindow/sortevents" "")
- (gtk_accel_path "<Actions>/Fan Chart/Backward/Back" "<Mod5>Left")
-; (gtk_accel_path "<Actions>/Media/Backward/Back" "<Mod5>Left")
+ (gtk_accel_path "<Actions>/Fan Chart/Backward/Back" "<Alt>Left")
+; (gtk_accel_path "<Actions>/Media/Backward/Back" "<Alt>Left")
 ; (gtk_accel_path "<Actions>/Fan Chart/Bookmark/AddBook" "<Meta>d")
 ; (gtk_accel_path "<Actions>/Person View/PersonEdit/CmpMerge" "")
 ; (gtk_accel_path "<Actions>/MainWindow/ToolsMenu" "")
- (gtk_accel_path "<Actions>/Events/Forward/Forward" "<Mod5>Right")
- (gtk_accel_path "<Actions>/Families/Backward/Back" "<Mod5>Left")
- (gtk_accel_path "<Actions>/Place View/Backward/Back" "<Mod5>Left")
+ (gtk_accel_path "<Actions>/Events/Forward/Forward" "<Alt>Right")
+ (gtk_accel_path "<Actions>/Families/Backward/Back" "<Alt>Left")
+ (gtk_accel_path "<Actions>/Place View/Backward/Back" "<Alt>Left")
 ; (gtk_accel_path "<Actions>/ReportWindow/descend_chart" "")
 ; (gtk_accel_path "<Actions>/ToolWindow/dupfind" "")
 ; (gtk_accel_path "<Actions>/MainWindow/EditMenu" "")
  (gtk_accel_path "<Actions>/UndoHistory/UndoHistory" "<Meta>h")
  (gtk_accel_path "<Actions>/Sources/Bookmark/EditBook" "<Shift><Meta>b")
 ; (gtk_accel_path "<Actions>/FileWindow/ReportBug" "")
- (gtk_accel_path "<Actions>/AllMainWindow/<CONTROL>Insert" "<Mod5><Meta>i")
+ (gtk_accel_path "<Actions>/AllMainWindow/<CONTROL>Insert" "<Alt><Meta>i")
  (gtk_accel_path "<Actions>/Notes/Bookmark/AddBook" "<Meta>d")
- (gtk_accel_path "<Actions>/People Tree View/ChangeOrder/Add" "<Mod5><Meta>i")
+ (gtk_accel_path "<Actions>/People Tree View/ChangeOrder/Add" "<Alt><Meta>i")
 ; (gtk_accel_path "<Actions>/FileWindow/Sidebar" "")
 ; (gtk_accel_path "<Actions>/Person View/PersonAll/Dummy" "")
  (gtk_accel_path "<Actions>/Redo/Redo" "<Shift><Meta>z")
@@ -99,11 +99,11 @@
 ; (gtk_accel_path "<Actions>/ReportWindow/family_group" "")
 ; (gtk_accel_path "<Actions>/ToolWindow/excity" "")
  (gtk_accel_path "<Actions>/Repositories/ChangeOrder/Remove" "<Meta>Delete")
- (gtk_accel_path "<Actions>/Repositories/Forward/Forward" "<Mod5>Right")
+ (gtk_accel_path "<Actions>/Repositories/Forward/Forward" "<Alt>Right")
 ; (gtk_accel_path "<Actions>/FileWindow/UserManual" "F1")
 ; (gtk_accel_path "<Actions>/FileWindow/OpenRecent" "")
  (gtk_accel_path "<Actions>/Families/Bookmark/AddBook" "<Meta>d")
- (gtk_accel_path "<Actions>/Place Tree View/Forward/Forward" "<Mod5>Right")
+ (gtk_accel_path "<Actions>/Place Tree View/Forward/Forward" "<Alt>Right")
 ; (gtk_accel_path "<Actions>/ReportWindow/rel_graph" "")
 ; (gtk_accel_path "<Actions>/ReportWindow/Web-Pages" "")
 ; (gtk_accel_path "<Actions>/ReportWindow/WebCal" "")
@@ -112,7 +112,7 @@
 ; (gtk_accel_path "<Actions>/FileWindow/HomePage" "")
  (gtk_accel_path "<Actions>/Relationships/Family/Edit" "<Meta>Return")
 ; (gtk_accel_path "<Actions>/ToolWindow/patchnames" "")
- (gtk_accel_path "<Actions>/Relationships/Backward/Back" "<Mod5>Left")
+ (gtk_accel_path "<Actions>/Relationships/Backward/Back" "<Alt>Left")
 ; (gtk_accel_path "<Actions>/ReportWindow/det_ancestor_report" "")
  (gtk_accel_path "<Actions>/AllMainWindow/<CONTROL>BackSpace" "<Meta>BackSpace")
 ; (gtk_accel_path "<Actions>/ToolWindow/Utilities" "")
@@ -128,12 +128,12 @@
 ; (gtk_accel_path "<Actions>/AllMainWindow/F3" "F3")
 ; (gtk_accel_path "<Actions>/AllMainWindow/F2" "F2")
  (gtk_accel_path "<Actions>/Notes/Bookmark/EditBook" "<Shift><Meta>b")
- (gtk_accel_path "<Actions>/Sources/ChangeOrder/Add" "<Mod5><Meta>i")
+ (gtk_accel_path "<Actions>/Sources/ChangeOrder/Add" "<Alt><Meta>i")
 ; (gtk_accel_path "<Actions>/ReportWindow/Books" "")
 ; (gtk_accel_path "<Actions>/FileWindow/About" "")
- (gtk_accel_path "<Actions>/Notes/Backward/Back" "<Mod5>Left")
+ (gtk_accel_path "<Actions>/Notes/Backward/Back" "<Alt>Left")
 ; (gtk_accel_path "<Actions>/ReportWindow/endofline_report" "")
- (gtk_accel_path "<Actions>/People Tree View/PersonEdit/Add" "<Mod5><Meta>i")
+ (gtk_accel_path "<Actions>/People Tree View/PersonEdit/Add" "<Alt><Meta>i")
 ; (gtk_accel_path "<Actions>/ToolWindow/dbrowse" "")
  (gtk_accel_path "<Actions>/Pedigree/Bookmark/EditBook" "<Shift><Meta>b")
 ; (gtk_accel_path "<Actions>/ToolWindow/soundgen" "")
@@ -150,12 +150,12 @@
 ; (gtk_accel_path "<Actions>/ReportWindow/timeline" "")
 ; (gtk_accel_path "<Actions>/ToolWindow/Database-Repair" "")
 ; (gtk_accel_path "<Actions>/ReportWindow/Graphical-Reports" "")
- (gtk_accel_path "<Actions>/Person View/HomePerson" "<Mod5>Home")
+ (gtk_accel_path "<Actions>/Person View/HomePerson" "<Alt>Home")
 ; (gtk_accel_path "<Actions>/ReportWindow/ancestor_chart" "")
 ; (gtk_accel_path "<Actions>/ToolWindow/check" "")
- (gtk_accel_path "<Actions>/Fan Chart/Forward/Forward" "<Mod5>Right")
+ (gtk_accel_path "<Actions>/Fan Chart/Forward/Forward" "<Alt>Right")
 ; (gtk_accel_path "<Actions>/ToolWindow/chtype" "")
- (gtk_accel_path "<Actions>/Notes/ChangeOrder/Add" "<Mod5><Meta>i")
+ (gtk_accel_path "<Actions>/Notes/ChangeOrder/Add" "<Alt><Meta>i")
 ; (gtk_accel_path "<Actions>/ReportWindow/calendar" "")
 ; (gtk_accel_path "<Actions>/FileWindow/Fullscreen" "F11")
  (gtk_accel_path "<Actions>/Fan Chart/Bookmark/EditBook" "<Shift><Meta>b")
@@ -163,26 +163,26 @@
  (gtk_accel_path "<Actions>/Repositories/Bookmark/AddBook" "<Meta>d")
  (gtk_accel_path "<Actions>/Families/ChangeOrder/Remove" "<Meta>Delete")
 ; (gtk_accel_path "<Actions>/ToolWindow/verify" "")
- (gtk_accel_path "<Actions>/People Tree View/Forward/Forward" "<Mod5>Right")
- (gtk_accel_path "<Actions>/Sources/Backward/Back" "<Mod5>Left")
+ (gtk_accel_path "<Actions>/People Tree View/Forward/Forward" "<Alt>Right")
+ (gtk_accel_path "<Actions>/Sources/Backward/Back" "<Alt>Left")
 ; (gtk_accel_path "<Actions>/ToolWindow/not_related" "")
  (gtk_accel_path "<Actions>/People Tree View/Bookmark/AddBook" "<Meta>d")
 ; (gtk_accel_path "<Actions>/FileWindow/TipOfDay" "")
- (gtk_accel_path "<Actions>/Media/ChangeOrder/Add" "<Mod5><Meta>i")
+ (gtk_accel_path "<Actions>/Media/ChangeOrder/Add" "<Alt><Meta>i")
  (gtk_accel_path "<Actions>/FileWindow/Quit" "<Meta>q")
  (gtk_accel_path "<Actions>/People Tree View/Bookmark/EditBook" "<Shift><Meta>b")
- (gtk_accel_path "<Actions>/Place Tree View/Backward/Back" "<Mod5>Left")
+ (gtk_accel_path "<Actions>/Place Tree View/Backward/Back" "<Alt>Left")
  (gtk_accel_path "<Actions>/FileWindow/Open" "<Meta>o")
  (gtk_accel_path "<Actions>/Place View/Bookmark/EditBook" "<Shift><Meta>b")
  (gtk_accel_path "<Actions>/Media/Bookmark/EditBook" "<Shift><Meta>b")
  (gtk_accel_path "<Actions>/MainWindow/ConfigView" "<Shift><Meta>c")
- (gtk_accel_path "<Actions>/People Tree View/Backward/Back" "<Mod5>Left")
+ (gtk_accel_path "<Actions>/People Tree View/Backward/Back" "<Alt>Left")
 ; (gtk_accel_path "<Actions>/FileWindow/KeyBindings" "")
- (gtk_accel_path "<Actions>/Repositories/Backward/Back" "<Mod5>Left")
+ (gtk_accel_path "<Actions>/Repositories/Backward/Back" "<Alt>Left")
  (gtk_accel_path "<Actions>/Events/Bookmark/AddBook" "<Meta>d")
  (gtk_accel_path "<Actions>/People Tree View/ChangeOrder/Remove" "<Meta>Delete")
  (gtk_accel_path "<Actions>/AllMainWindow/<CONTROL>P" "<Meta>p")
- (gtk_accel_path "<Actions>/Person View/ChangeOrder/Add" "<Mod5><Meta>i")
+ (gtk_accel_path "<Actions>/Person View/ChangeOrder/Add" "<Alt><Meta>i")
  (gtk_accel_path "<Actions>/AllMainWindow/<CONTROL>N" "<Meta>n")
  (gtk_accel_path "<Actions>/Place Tree View/ChangeOrder/Remove" "<Meta>Delete")
 ; (gtk_accel_path "<Actions>/AllMainWindow/Abandon" "")
@@ -193,8 +193,8 @@
 ; (gtk_accel_path "<Actions>/Person View/PersonOther/SetActive" "")
  (gtk_accel_path "<Actions>/categoryviews/personview_1" "<Meta>2")
  (gtk_accel_path "<Actions>/Sources/Bookmark/AddBook" "<Meta>d")
- (gtk_accel_path "<Actions>/Place View/ChangeOrder/Add" "<Mod5><Meta>i")
- (gtk_accel_path "<Actions>/Person View/PersonEdit/Add" "<Mod5><Meta>i")
- (gtk_accel_path "<Actions>/Sources/Forward/Forward" "<Mod5>Right")
+ (gtk_accel_path "<Actions>/Place View/ChangeOrder/Add" "<Alt><Meta>i")
+ (gtk_accel_path "<Actions>/Person View/PersonEdit/Add" "<Alt><Meta>i")
+ (gtk_accel_path "<Actions>/Sources/Forward/Forward" "<Alt>Right")
  (gtk_accel_path "<Actions>/Person View/Bookmark/AddBook" "<Meta>d")
 ; (gtk_accel_path "<Actions>/FileWindow/Preferences" "")

mac/gramps.bundle

@@ -27,18 +27,27 @@
   <binary>
     ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/
   </binary>
-<!-- Copy in the theme engines. -->
+<!-- Copy in the theme engines, -->
   <binary>
     ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so
   </binary>
 
+<!-- The the quartz input method module, -->
+  <binary>
+    ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/immodules/im-quartz.so
+  </binary>
+
 <!-- And the print backends -->
   <binary>
     ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/printbackends/*.so
   </binary>
 
   <binary>
-    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so
+    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
+  </binary>
+
+  <binary>
+    ${prefix}/lib/libpython2.7.dylib
   </binary>
 
   <!-- Copy in libpyglib, which will pull in other dependencies we need -->
@@ -63,11 +72,7 @@
   </binary>
 
   <binary>
-    ${prefix}/lib/libgtkmacintegration.0.dylib
-  </binary>
-
-  <binary>
-    ${prefix}/lib/libart_lgpl_2.2.dylib
+    ${prefix}/lib/libgtkmacintegration-gtk2.2.dylib
   </binary>
 
   <binary>
@@ -95,7 +100,7 @@
   </binary>
 
   <binary>
-    ${prefix}/lib/libtiff.3.dylib
+    ${prefix}/lib/libtiff.5.dylib
   </binary>
 
   <binary dest="${bundle}/Contents/MacOS/">
@@ -133,8 +138,24 @@
     ${prefix}/include/python2.7/pyconfig.h
   </data>
 
+  <data recurse="True">
+    ${prefix}/share/gramps/*.py
+  </data>
+
+  <data recurse="True">
+    ${prefix}/share/gramps/*.glade
+  </data>
+
+  <data recurse="True">
+    ${prefix}/share/gramps/*.xml
+  </data>
+
   <data>
-    ${prefix}/share/gramps/
+    ${prefix}/share/gramps/images/
+  </data>
+
+  <data>
+    ${prefix}/share/gramps/plugins/webstuff/
   </data>
 
   <!--data>
@@ -154,7 +175,7 @@
   </data>
 
   <data>
-    ${prefix}/lib/graphviz/config6
+    ${prefix}/lib/graphviz/config*
   </data>
 
   <!-- Copy in the themes data. You may want to trim this to save space

mac/gramps.launcher

@@ -21,8 +21,12 @@ export GTK_EXE_PREFIX="$bundle_res"
 export GTK_PATH="$bundle_res"
 
 export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
-export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
-export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
+export PANGO_SYSCONFDIR="$bundle_etc"
+export PANGO_LIBDIR="$bundle_lib"
+export GDK_PIXBUF_MODULE_FILE="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+if [ `uname -r | cut -d . -f 1` -ge 10 ]; then
+    export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
+fi
 export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
 export GVBINDIR="$bundle_lib/graphviz"
 
@@ -36,7 +40,8 @@ export PYTHONPATH="$bundle_lib/python$PYVER/site-packages/gtk-2.0:$PYTHONPATH"
 
 export GRAMPSDIR="$bundle_data"/gramps
 export GRAMPSI18N="$bundle_data"/locale
-export GRAMPSHOME="$HOME/Library/Application Support"
+export USERPROFILE="$HOME"
+export APPDATA="$HOME/Library/Application Support"
 
 # Strip out the argument added by the OS.
 if /bin/expr "x$1" : '^x-psn_' > /dev/null; then

mac/gramps.modules

@@ -13,22 +13,26 @@
 	      href="http://www.gnome.org/~fpeters/pyxdg/"/>
   <repository type="tarball" name="xdg-utils"
 	      href="http://portland.freedesktop.org/download/"/>
-  <repository type="svn" name="gramps"
-	      href="https://gramps.svn.sourceforge.net/svnroot/"/>
+  <repository type="git" name="gramps"
+	      href="git://git.code.sf.net/p/gramps/"/>
   <repository type="svn" name="gramps-addons"
 	      href="https://gramps-addons.svn.sourceforge.net/svnroot/gramps-addons/"/>
   <repository type="tarball" name="oracle"
 	      href="http://download.oracle.com/"/>
   <repository type="tarball" name="pymodules"
 	      href="http://pypi.python.org/packages/source/"/>
-  <repository type="tarball" name="stowers"
-	     href="http://www.johnstowers.co.nz/files/"/>
+  <repository type="git" name="github"
+	      href="git://github.com/"/>
   <repository type="tarball" name="graphviz"
 	      href="http://www.graphviz.org/pub/graphviz/stable/SOURCES/"/>
   <repository type="tarball" name="launchpad"
 	      href="http://launchpad.net/"/>
   <repository type="tarball" name="exiv2.org"
 	      href="http://exiv2.org/"/>
+  <repository type="tarball" name="pythonware"
+	      href="http://effbot.org/downloads/"/>
+  <repository type='tarball' name='icu'
+	      href='http://download.icu-project.org/files/'/>
 
 <!--
 Special instructions:
@@ -55,58 +59,41 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 
 
 
-  <include href="https://raw.github.com/jralls/gtk-osx-build/master/modulesets-stable/gtk-osx.modules"/>
-  <!--include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
-
+  <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
+  <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
 
   <autotools id="gramps" autogen-sh="configure">
-    <branch module="gramps/gramps-3.2.6.tar.gz" version="3.2.6"
+    <branch module="gramps/gramps-3.4.9.tar.gz" version="3.4.9"
 	    repo="sourceforge">
-      <patch file="http://raw.github.com/jralls/gtk-osx-build/master/patches/gramps.patch" strip="1"/>
-      <patch file="http://raw.github.com/jralls/gtk-osx-build/master/patches/gramps-viewmanager.patch" strip="1"/>
-      <patch file="http://raw.github.com/jralls/gtk-osx-build/master/patches/gramps-accelmap.patch" strip="1"/>
-      <patch file="http://raw.github.com/jralls/gtk-osx-build/master/patches/gramps-pedigree.patch" strip="1"/>
-      <patch file="http://raw.github.com/jralls/gtk-osx-build/master/patches/gramps-accel.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="meta-gtk-osx-python"/>
-      <dep package="pyWebKitGtk"/>
-      <dep package="librsvg2"/>
-      <dep package="pygoocanvas"/>
-      <dep package="shared-mime-info"/>
-      <dep package="pyenchant"/>
-      <dep package="hunspell"/>
-      <dep package="pygtk-extras"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gramps33" >
-    <branch module="gramps" revision="maintenance/gramps33" repo="gramps"/>
-    <dependencies>
-      <dep package="meta-gtk-osx-python"/>
-      <dep package="librsvg2"/>
+      <!--dep package="pyWebKitGtk"/-->
+      <dep package="librsvg"/>
       <dep package="pygoocanvas"/>
       <dep package="shared-mime-info"/>
       <dep package="hunspell"/>
       <dep package="pygtk-extras"/>
-      <dep package="osmgpsmap-py"/>
+      <dep package="osmgpsmap"/>
       <dep package="graphviz"/>
-   </dependencies>
+      <dep package="pyicu"/>
+    </dependencies>
    <after>
       <dep package="pyexiv2"/>
    </after>
   </autotools>
 
-  <autotools id="gramps-svn" >
-    <branch module="gramps" repo="gramps"/>
+  <autotools id="gramps-git" supports-non-srcdir-builds="no">
+    <branch module="source" repo="gramps" revision="maintenance/gramps34"
+	    checkoutdir="gramps-git"/>
     <dependencies>
       <dep package="meta-gtk-osx-python"/>
-      <dep package="librsvg2"/>
+      <dep package="librsvg"/>
       <dep package="pygoocanvas"/>
       <dep package="shared-mime-info"/>
       <dep package="hunspell"/>
       <dep package="pygtk-extras"/>
-      <dep package="osmgpsmap-py"/>
+      <dep package="osmgpsmap"/>
       <dep package="graphviz"/>
    </dependencies>
    <after>
@@ -115,31 +102,16 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </autotools>
 
   <distutils id="gramps-addons">
-    <branch module="branches/gramps32/contrib"
+    <branch module="branches/gramps34/contrib"
 	    repo="gramps-addons"/>
     <dependencies>
       <dep package="gramps"/>
     </dependencies>
   </distutils>
 
-  <autotools id="gramps33-addons" skip-autogen="true" >
-    <branch module="branches/gramps33/contrib"
-	    repo="gramps-addons"/>
-    <dependencies>
-      <dep package="gramps33"/>
-    </dependencies>
-  </autotools>
-
-  <distutils id="gramps-addons-svn">
-    <branch module="gramps-addons/trunk/contrib"
-	    repo="gramps-addons"/>
-    <dependencies>
-      <dep package="gramps-svn"/>
-    </dependencies>
-  </distutils>
 
   <autotools id="pyWebKitGtk" >
-    <branch module="pywebkitgtk-1.1.7.tar.bz2" version="1.1.7"
+    <branch module="pywebkitgtk-1.1.8.tar.bz2" version="1.1.8"
 	    repo="pywebkitgtk"/>
     <dependencies>
       <dep package="WebKit"/>
@@ -147,26 +119,7 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     </dependencies>
   </autotools>
 
-<!-- Later versions of librsvg2 require libxml2-2.7, available only in
-     Snow Leopard -->
-  <autotools id="librsvg2" >
-    <branch module="librsvg/2.22/librsvg-2.22.3.tar.bz2" version="2.22.3"
-	    repo="ftp.gnome.org"/>
-    <dependencies>
-      <dep package="libgsf"/>
-      <dep package="libart_lgpl"/><!-- goffice.modules -->
-    </dependencies>
-  </autotools>
-
-  <autotools id="goocanvas">
-    <branch module="goocanvas/0.15/goocanvas-0.15.tar.bz2" version="0.15"
-	    repo="ftp.gnome.org"/>
-    <dependencies>
-      <dep package="gtk+"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="pygoocanvas" version="0.14.1">
+  <autotools id="pygoocanvas" version="0.14.1" autogen-sh="configure">
     <branch module="pygoocanvas/0.14/pygoocanvas-0.14.1.tar.gz" version="0.14.1"
 	    repo="ftp.gnome.org">
     </branch>
@@ -176,54 +129,39 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     </dependencies>
   </autotools>
 
-  <distutils id="pyenchant">
-    <branch repo="pymodules" module="p/pyenchant/pyenchant-1.6.1.tar.gz"
-	    version="1.6.1"/>
-  </distutils>
-
   <distutils id="pyxdg">
     <branch repo="pyxdg" module="pyxdg-0.17.tar.gz" version="0.17"
-            hash="sha256:fbc87711922b2dd6ceb23ee041f1f96da9b7dbb6971df03a3081b439def069ce"
-            md5sum="a086de99cc536095684d87f15594e4db" size="37372"/>
+            hash="sha256:fbc87711922b2dd6ceb23ee041f1f96da9b7dbb6971df03a3081b439def069ce" size="37372"/>
   </distutils>
 
  <autotools id="xdg-utils">
    <branch module="xdg-utils-1.0.2.tgz" version="1.0.2" repo="xdg-utils"/>
  </autotools>
 
-  <autotools id="osmgpsmap">
-    <branch module="osm-gps-map/osm-gps-map-0.7.3.tar.gz" repo="stowers"
-	    version="0.7.3"/>
+  <autotools id="osmgpsmap" skip-autogen="never"
+	     supports-non-srcdir-builds="no">
+    <branch module="nzjrs/osm-gps-map" revision="gtk2" repo="github"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="libsoup"/>
     </dependencies>
   </autotools>
 
-  <distutils id="osmgpsmap-py" autogen-sh="gnome-autogen.sh">
-    <branch module="osm-gps-map/python-osmgpsmap-0.7.3.tar.gz" repo="stowers"
-	    version="0.7.3"/>
-    <dependencies>
-      <dep package="osmgpsmap"/>
-       <dep package="pygtk"/>
-       <dep package="pycairo-python2.6"/>
-      <dep package="pygobject"/>
-  </dependencies>
-  </distutils>
-
-  <autotools id="graphviz" autogenargs="--disable-sharp --disable-guile --disable-java --disable-lua --disable-ocaml --disable-perl --disable-php --disable-r --disable-ruby --disable-tcl">
+  <autotools id="graphviz" autogen-sh="configure"
+	     autogenargs="--disable-sharp --disable-guile --disable-java --disable-lua --disable-ocaml --disable-perl --disable-php --disable-r --disable-ruby --disable-tcl --without-x  --with-pangocairo --with-included-ltdl=yes">
     <branch module="graphviz-2.28.0.tar.gz" version="2.28.0" repo="graphviz"/>
     <dependencies>
+      <dep package="librsvg"/>
       <dep package="pango"/>
       <dep package="zlib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="exiv2">
+  <autotools id="exiv2" supports-non-srcdir-builds="no">
     <branch module="exiv2-0.21.1.tar.gz" repo="exiv2.org" version="0.21.1"/>
   </autotools>
 
-  <autotools id="boost">
+  <autotools id="boost" supports-non-srcdir-builds="no">
     <branch module="boost/boost_1_46_1.tar.bz2" repo="sourceforge"
 	    version="1.46.1"/>
   </autotools>
@@ -232,16 +170,31 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     <branch repo="sourceforge" module="scons/scons-2.0.1.tar.gz" version="2.0.1"/>
   </distutils>
 
-  <autotools id="pyexiv2">
+  <autotools id="pyexiv2" supports-non-srcdir-builds="no">
     <branch module="pyexiv2/0.3.x/0.3/+download/pyexiv2-0.3.0.tar.bz2"
 	    repo="launchpad" version="0.3.0"/>
     <dependencies>
       <dep package="exiv2"/>
       <dep package="scons"/>
+      <dep package="pil"/>
     </dependencies>
     <after>
       <dep package="boost"/>
     </after>
   </autotools>
 
+  <distutils id="pil">
+    <branch module="Imaging-1.1.7.tar.gz" version="1.1.7" repo="pythonware">
+      <patch file="Imaging-Freetype2.patch" strip="1"/>
+    </branch>
+  </distutils>
+
+  <distutils id='pyicu'>
+    <branch version='1.5' repo='pymodules'
+	    module='P/PyICU/PyICU-1.5.tar.gz'/>
+    <dependencies>
+      <dep package='icu'/>
+    </dependencies>
+  </distutils>
+
 </moduleset>

po/POTFILES.in

@@ -50,6 +50,7 @@ src/gen/lib/familyreltype.py
 src/gen/lib/grampstype.py
 src/gen/lib/ldsord.py
 src/gen/lib/markertype.py
+src/gen/lib/name.py
 src/gen/lib/nametype.py
 src/gen/lib/nameorigintype.py
 src/gen/lib/notetype.py
@@ -72,6 +73,7 @@ src/gen/plug/utils.py
 
 # gen docgen API
 src/gen/plug/docgen/graphdoc.py
+src/gen/plug/docgen/paperstyle.py
 
 # plugin report base API (was ReportBase)
 src/gen/plug/report/_constants.py
@@ -116,6 +118,7 @@ src/gui/editors/editperson.py
 src/gui/editors/editpersonref.py
 src/gui/editors/editplace.py
 src/gui/editors/editprimary.py
+src/gui/editors/editreference.py
 src/gui/editors/editreporef.py
 src/gui/editors/editrepository.py
 src/gui/editors/editsource.py
@@ -235,7 +238,7 @@ src/plugins/docgen/GtkPrint.py
 src/plugins/docgen/HtmlDoc.py
 src/plugins/docgen/LaTeXDoc.py
 src/plugins/docgen/ODFDoc.py
-src/plugins/docgen/PSDrawDoc.py
+src/plugins/docgen/cairodoc.py
 src/plugins/docgen/RTFDoc.py
 src/plugins/docgen/SvgDrawDoc.py
 
@@ -264,7 +267,6 @@ src/plugins/export/ExportXml.py
 src/plugins/gramplet/AgeOnDateGramplet.py
 src/plugins/gramplet/AgeStats.py
 src/plugins/gramplet/Attributes.py
-src/plugins/gramplet/AttributesGramplet.py
 src/plugins/gramplet/Backlinks.py
 src/plugins/gramplet/bottombar.gpr.py
 src/plugins/gramplet/CalendarGramplet.py
@@ -449,11 +451,13 @@ src/Filters/_FilterStore.py
 src/Filters/_SearchBar.py
 
 # Filters.Rules package
+src/Filters/Rules/_ChangedSinceBase.py
 src/Filters/Rules/_Everything.py
 src/Filters/Rules/_HasGrampsId.py
 src/Filters/Rules/_HasTextMatchingSubstringOf.py
 src/Filters/Rules/_IsPrivate.py
 src/Filters/Rules/_Rule.py
+src/Filters/Rules/_HasSourceOfBase.py
 
 # Filters.Rules.Person package
 src/Filters/Rules/Person/_ChangedSince.py
@@ -553,6 +557,7 @@ src/Filters/Rules/Family/_HasNoteRegexp.py
 src/Filters/Rules/Family/_HasReferenceCountOf.py
 src/Filters/Rules/Family/_HasRelType.py
 src/Filters/Rules/Family/_HasSourceCount.py
+src/Filters/Rules/Family/_HasSourceOf.py
 src/Filters/Rules/Family/_HasTag.py
 src/Filters/Rules/Family/_IsBookmarked.py
 src/Filters/Rules/Family/_MatchesFilter.py
@@ -574,6 +579,7 @@ src/Filters/Rules/Event/_EventPrivate.py
 src/Filters/Rules/Event/_HasAttribute.py
 src/Filters/Rules/Event/_HasCitation.py
 src/Filters/Rules/Event/_HasData.py
+src/Filters/Rules/Event/_HasDayOfWeek.py
 src/Filters/Rules/Event/_HasGallery.py
 src/Filters/Rules/Event/_HasIdOf.py
 src/Filters/Rules/Event/_HasNote.py
@@ -584,6 +590,7 @@ src/Filters/Rules/Event/_HasSourceCount.py
 src/Filters/Rules/Event/_HasType.py
 src/Filters/Rules/Event/_MatchesFilter.py
 src/Filters/Rules/Event/_MatchesPersonFilter.py
+src/Filters/Rules/Event/_MatchesPlaceFilter.py
 src/Filters/Rules/Event/_MatchesSourceFilter.py
 src/Filters/Rules/Event/_MatchesSourceConfidence.py
 src/Filters/Rules/Event/_RegExpIdOf.py
@@ -604,6 +611,10 @@ src/Filters/Rules/Place/_MatchesFilter.py
 src/Filters/Rules/Place/_MatchesEventFilter.py
 src/Filters/Rules/Place/_PlacePrivate.py
 src/Filters/Rules/Place/_RegExpIdOf.py
+src/Filters/Rules/Place/_HasSourceOf.py
+src/Filters/Rules/Place/_MatchesSourceConfidence.py
+src/Filters/Rules/Place/_HasSourceCount.py
+src/Filters/Rules/Place/_HasCitation.py
 
 # Filters.Rules.Source package
 src/Filters/Rules/Source/_AllSources.py
@@ -626,6 +637,7 @@ src/Filters/Rules/Source/_RegExpIdOf.py
 src/Filters/Rules/Citation/_AllCitations.py
 src/Filters/Rules/Citation/_ChangedSince.py
 src/Filters/Rules/Citation/_CitationPrivate.py
+src/Filters/Rules/Citation/_HasCitation.py
 src/Filters/Rules/Citation/_HasGallery.py
 src/Filters/Rules/Citation/_HasIdOf.py
 src/Filters/Rules/Citation/_HasNote.py
@@ -633,9 +645,12 @@ src/Filters/Rules/Citation/_HasNoteMatchingSubstringOf.py
 src/Filters/Rules/Citation/_HasNoteRegexp.py
 src/Filters/Rules/Citation/_HasReferenceCountOf.py
 src/Filters/Rules/Citation/_HasSource.py
+src/Filters/Rules/Citation/_HasSourceIdOf.py
+src/Filters/Rules/Citation/_HasSourceNoteRegexp.py
 src/Filters/Rules/Citation/_MatchesFilter.py
 src/Filters/Rules/Citation/_MatchesPageSubstringOf.py
 src/Filters/Rules/Citation/_RegExpIdOf.py
+src/Filters/Rules/Citation/_RegExpSourceIdOf.py
 src/Filters/Rules/Citation/_MatchesRepositoryFilter.py
 src/Filters/Rules/Citation/_MatchesSourceFilter.py
 
@@ -652,6 +667,10 @@ src/Filters/Rules/MediaObject/_HasTag.py
 src/Filters/Rules/MediaObject/_MatchesFilter.py
 src/Filters/Rules/MediaObject/_MediaPrivate.py
 src/Filters/Rules/MediaObject/_RegExpIdOf.py
+src/Filters/Rules/MediaObject/_HasSourceCount.py
+src/Filters/Rules/MediaObject/_HasCitation.py
+src/Filters/Rules/MediaObject/_HasSourceOf.py
+src/Filters/Rules/MediaObject/_MatchesSourceConfidence.py
 
 # Filters.Rules.Repository package
 src/Filters/Rules/Repository/_AllRepos.py

po/POTFILES.skip

@@ -28,6 +28,7 @@ src/DateHandler/_Date_bg.py
 src/DateHandler/_Date_cs.py
 src/DateHandler/_Date_de.py
 src/DateHandler/_DateDisplay.py
+src/DateHandler/_Date_el.py
 src/DateHandler/_Date_es.py
 src/DateHandler/_Date_fi.py
 src/DateHandler/_Date_fr.py
@@ -64,7 +65,6 @@ src/Filters/Rules/Repository/__init__.py
 src/Filters/Rules/Note/__init__.py
 
 # Filters.Rules package
-src/Filters/Rules/_ChangedSinceBase.py
 src/Filters/Rules/_HasAttributeBase.py
 src/Filters/Rules/_HasCitationBase.py
 src/Filters/Rules/_HasEventBase.py
@@ -124,7 +124,6 @@ src/gen/lib/locationbase.py
 src/gen/lib/mediaobj.py
 src/gen/lib/mediabase.py
 src/gen/lib/mediaref.py
-src/gen/lib/name.py
 src/gen/lib/note.py
 src/gen/lib/notebase.py
 src/gen/lib/personref.py
@@ -186,7 +185,6 @@ src/gen/plug/docgen/fontscale.py
 src/gen/plug/docgen/fontstyle.py
 src/gen/plug/docgen/graphdoc.py
 src/gen/plug/docgen/graphicstyle.py
-src/gen/plug/docgen/paperstyle.py
 src/gen/plug/docgen/paragraphstyle.py
 src/gen/plug/docgen/stylesheet.py
 src/gen/plug/docgen/tablestyle.py
@@ -222,7 +220,6 @@ src/gui/user.py
 
 # gui/editors - the GUI editors package
 src/gui/editors/__init__.py
-src/gui/editors/editreference.py
 src/gui/editors/editsecondary.py
 
 # gui/editors/displaytabs - the GUI display tabs package
@@ -237,6 +234,7 @@ src/gui/editors/displaytabs/grampstab.py
 src/gui/editors/displaytabs/groupembeddedlist.py
 src/gui/editors/displaytabs/ldsmodel.py
 src/gui/editors/displaytabs/locationmodel.py
+src/gui/editors/displaytabs/mediaattrembedlist.py
 src/gui/editors/displaytabs/mediabackreflist.py
 src/gui/editors/displaytabs/notebackreflist.py
 src/gui/editors/displaytabs/personrefmodel.py
@@ -266,6 +264,7 @@ src/gui/views/treemodels/sourcemodel.py
 
 # gui/widgets - the GUI widgets package
 src/gui/widgets/basicentry.py
+src/gui/widgets/dateentry.py
 src/gui/widgets/menutoolbuttonaction.py
 src/gui/widgets/styledtextbuffer.py
 src/gui/widgets/undoablestyledbuffer.py
@@ -284,9 +283,6 @@ src/Merge/test/merge_ref_test.py
 # plugins gpr directory
 src/plugins/sidebar/sidebar.gpr.py
 
-# plugins/docgen directory
-src/plugins/docgen/PdfDoc.py
-
 # plugins/lib directory
 src/plugins/lib/libformatting.py
 src/plugins/lib/libgrampsxml.py
@@ -315,7 +311,6 @@ src/plugins/gramplet/HeadlineNewsGramplet.py
 src/plugins/gramplet/MediaPreview.py
 src/plugins/gramplet/MetadataViewer.py
 src/plugins/gramplet/NoteGramplet.py
-src/plugins/gramplet/PluginManagerGramplet.py
 src/plugins/gramplet/PopulateGramplet.py
 src/plugins/gramplet/PopulateGramplet.gpr.py
 src/plugins/gramplet/PythonGramplet.py

po/bg.po

@@ -2857,7 +2857,7 @@ msgid "Bar Mitzvah"
 msgstr "Бар Мицва"
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
+msgid "Bat Mitzvah"
 msgstr "Бас Мицва"
 
 #: ../src/gen/lib/eventtype.py:152
@@ -3065,7 +3065,7 @@ msgstr "род"
 
 #: ../src/gen/lib/eventtype.py:201
 #, fuzzy
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr "род"
 
 #: ../src/gen/lib/eventtype.py:202
@@ -14118,7 +14118,7 @@ msgstr "Родословното ви дърво групира името %(key
 
 #: ../src/plugins/import/ImportXml.py:1571
 #, fuzzy
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr "Домашна страница на Gramps"
 
 #: ../src/plugins/import/ImportXml.py:1774

po/br.po

@@ -2824,8 +2824,8 @@ msgid "Bar Mitzvah"
 msgstr "Bar Mitzvah"
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
-msgstr "Bas Mitzvah"
+msgid "Bat Mitzvah"
+msgstr "Bat Mitzvah"
 
 #: ../src/gen/lib/eventtype.py:152
 msgid "Blessing"
@@ -3022,7 +3022,7 @@ msgid "Bar Mitzvah abbreviation|bar."
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:201
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:202
@@ -14138,7 +14138,7 @@ msgid "Your family tree groups name \"%(key)s\" together with \"%(parent)s\", di
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:1571
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:1774

po/check_po

@@ -115,6 +115,38 @@ class Check_named_fmt( Check ):
 			msgstr = msg.msgstr[1]
 			self.__process( msg, msgid, msgstr )
 
+class Check_mapping_fmt( Check ):
+	# A pattern to find all {}
+	find_map_pat = re.compile('\{ \w+ \}', re.VERBOSE)
+
+	def __init__( self ):
+		Check.__init__( self )
+		self.diag_header = "-------- {} name mismatches --------------"
+		self.summary_text = "{} name mismatches:"
+
+	def __process( self, msg, msgid, msgstr ):
+		# Same number of named formats?
+		fmts1 = self.find_map_pat.findall( msgid )
+		fmts2 = self.find_map_pat.findall( msgstr )
+		if len( fmts1 ) != len( fmts2 ):
+			self.msgs.append( msg )
+		else:
+			# Do we have the same named formats?
+			fmts1.sort()
+			fmts2.sort()
+			if fmts1 != fmts2:
+				self.msgs.append( msg )
+
+	def process( self, msg ):
+		msgid = msg.msgid
+		msgstr = msg.msgstr[0]
+		self.__process( msg, msgid, msgstr )
+
+		if msg.msgidp and len(msg.msgstr) >= 2:
+			msgid = msg.msgidp
+			msgstr = msg.msgstr[1]
+			self.__process( msg, msgid, msgstr )
+
 class Check_missing_sd( Check ):
 	# A pattern to find %() without s or d
 	# Here is a command to use for testing
@@ -512,6 +544,7 @@ def analyze_msgs( options, fname, msgs, nr_templates = None, nth = 0 ):
 	checks.append( Check_fmt( '%s' ) )
 	checks.append( Check_fmt( '%d' ) )
 	checks.append( Check_named_fmt() )
+        checks.append( Check_mapping_fmt() )
 	checks.append( Check_missing_sd() )
 	checks.append( Check_runaway() )
 	checks.append( Check_xml_chars() )

po/eo.po

@@ -2893,8 +2893,8 @@ msgid "Bar Mitzvah"
 msgstr "Bar Mitzvah"
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
-msgstr "Bas Mitzvah"
+msgid "Bat Mitzvah"
+msgstr "Bat Mitzvah"
 
 #: ../src/gen/lib/eventtype.py:152
 msgid "Blessing"
@@ -3103,7 +3103,7 @@ msgstr "Kremacio"
 
 #: ../src/gen/lib/eventtype.py:201
 #, fuzzy
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr "Kremacio"
 
 #: ../src/gen/lib/eventtype.py:202
@@ -14867,7 +14867,7 @@ msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:1571
 #, fuzzy
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr "GRAMPS-_hejmpaĝo"
 
 #: ../src/plugins/import/ImportXml.py:1774

po/fi.po

@@ -2853,8 +2853,8 @@ msgid "Bar Mitzvah"
 msgstr "Bar Mitzvah"
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
-msgstr "Bas Mitzvah"
+msgid "Bat Mitzvah"
+msgstr "Bat Mitzvah"
 
 #: ../src/gen/lib/eventtype.py:152
 msgid "Blessing"
@@ -3061,7 +3061,7 @@ msgstr "Lyhennys"
 
 #: ../src/gen/lib/eventtype.py:201
 #, fuzzy
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr "Lyhennys"
 
 #: ../src/gen/lib/eventtype.py:202
@@ -13416,8 +13416,10 @@ msgstr ""
 
 #: ../src/plugins/graph/GVFamilyLines.py:921
 #, python-format
-msgid "%d children"
-msgstr "%d lasta"
+msgid "%d child"
+msgid_plural "%d children"
+msgstr[0] "%d lapsi"
+msgstr[1] "%d lasta"
 
 #: ../src/plugins/graph/GVHourGlass.py:57
 #: ../src/plugins/graph/GVRelGraph.py:68
@@ -14211,7 +14213,7 @@ msgstr "Sukupuusi ryhmittelee nimen %s nimen %s kanssa, ryhmittelyä ei muutettu
 
 #: ../src/plugins/import/ImportXml.py:1571
 #, fuzzy
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr "GRAMPS kotisivu"
 
 #: ../src/plugins/import/ImportXml.py:1774

po/ga.po

@@ -2695,7 +2695,7 @@ msgid "Bar Mitzvah"
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
+msgid "Bat Mitzvah"
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:152
@@ -2894,7 +2894,7 @@ msgid "Bar Mitzvah abbreviation|bar."
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:201
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:202
@@ -13510,7 +13510,7 @@ msgid "Your family tree groups name \"%(key)s\" together with \"%(parent)s\", di
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:1571
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:1774

po/hr.po

@@ -3058,7 +3058,7 @@ msgid "Bar Mitzvah"
 msgstr "Bar Mitzvah"
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
+msgid "Bat Mitzvah"
 msgstr "Bar Mitzvah"
 
 #: ../src/gen/lib/eventtype.py:152
@@ -3259,7 +3259,7 @@ msgid "Bar Mitzvah abbreviation|bar."
 msgstr "bar."
 
 #: ../src/gen/lib/eventtype.py:201
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr "bas."
 
 #: ../src/gen/lib/eventtype.py:202
@@ -13419,8 +13419,11 @@ msgstr "Niste nikoga odabrali"
 
 #: ../src/plugins/graph/GVFamilyLines.py:921
 #, python-format
-msgid "%d children"
-msgstr "%d djece"
+msgid "%d child"
+msgid_plural "%d children"
+msgstr[0] "%d dijete"
+msgstr[1] "%d djece"
+msgstr[2] "%d djece"
 
 #: ../src/plugins/graph/GVHourGlass.py:57
 #: ../src/plugins/graph/GVRelGraph.py:68
@@ -14210,7 +14213,7 @@ msgstr "Grupno ime \"%(key)s\" zajedno sa \"%(parent)s\" nije promijenilo grupir
 
 #: ../src/plugins/import/ImportXml.py:1573
 #, fuzzy
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr "GRAMPS Početna stranica"
 
 #: ../src/plugins/import/ImportXml.py:1776

po/ja.po

@@ -3008,7 +3008,7 @@ msgid "Bar Mitzvah"
 msgstr "バルミツヴァ"
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
+msgid "Bat Mitzvah"
 msgstr "バトミツヴァ"
 
 #: ../src/gen/lib/eventtype.py:152
@@ -3209,7 +3209,7 @@ msgid "Bar Mitzvah abbreviation|bar."
 msgstr "バルミツヴァ."
 
 #: ../src/gen/lib/eventtype.py:201
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr "バトミツヴァ."
 
 #: ../src/gen/lib/eventtype.py:202
@@ -13287,8 +13287,10 @@ msgstr ""
 
 #: ../src/plugins/graph/GVFamilyLines.py:921
 #, python-format
-msgid "%d children"
-msgstr "%d 人の子供"
+msgid "%d child"
+msgid_plural "%d children"
+msgstr[0] "%d 人の子供"
+msgstr[1] "%d 人の子供"
 
 #: ../src/plugins/graph/GVHourGlass.py:57
 #: ../src/plugins/graph/GVRelGraph.py:68
@@ -14047,7 +14049,7 @@ msgid "Your family tree groups name \"%(key)s\" together with \"%(parent)s\", di
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:1571
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:1774

po/mk.po

@@ -2904,7 +2904,7 @@ msgid "Bar Mitzvah"
 msgstr "Бар Мицва"
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
+msgid "Bat Mitzvah"
 msgstr "Бас Мицва"
 
 #: ../src/gen/lib/eventtype.py:152
@@ -3115,7 +3115,7 @@ msgstr "Кратенка"
 
 #: ../src/gen/lib/eventtype.py:201
 #, fuzzy
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr "Кратенка"
 
 #: ../src/gen/lib/eventtype.py:202
@@ -14713,7 +14713,7 @@ msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:1571
 #, fuzzy
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr "GRAMPS Почетна страница"
 
 #: ../src/plugins/import/ImportXml.py:1774

po/ro.po

@@ -2893,8 +2893,8 @@ msgid "Bar Mitzvah"
 msgstr "Bar Mitzvah"
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
-msgstr "Bas Mitzvah"
+msgid "Bat Mitzvah"
+msgstr "Bat Mitzvah"
 
 #: ../src/gen/lib/eventtype.py:152
 msgid "Blessing"
@@ -3103,7 +3103,7 @@ msgstr "Cremare"
 
 #: ../src/gen/lib/eventtype.py:201
 #, fuzzy
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr "Cremare"
 
 #: ../src/gen/lib/eventtype.py:202
@@ -14866,7 +14866,7 @@ msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:1571
 #, fuzzy
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr "_Pagina de Internet GRAMPS"
 
 #: ../src/plugins/import/ImportXml.py:1774

po/sl.po

@@ -2822,7 +2822,7 @@ msgid "Bar Mitzvah"
 msgstr "Bar Micva"
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
+msgid "Bat Mitzvah"
 msgstr "Bas Micva"
 
 #: ../src/gen/lib/eventtype.py:152
@@ -3020,7 +3020,7 @@ msgid "Bar Mitzvah abbreviation|bar."
 msgstr "bar."
 
 #: ../src/gen/lib/eventtype.py:201
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr "bas."
 
 #: ../src/gen/lib/eventtype.py:202
@@ -13099,8 +13099,12 @@ msgstr ""
 
 #: ../src/plugins/graph/GVFamilyLines.py:921
 #, python-format
-msgid "%d children"
-msgstr "Št. otrok: %d"
+msgid "%d child"
+msgid_plural "%d children"
+msgstr[0] "%d otrok"
+msgstr[1] "%d otrok"
+msgstr[2] "%d otroka"
+msgstr[3] "%d otroci"
 
 #: ../src/plugins/graph/GVHourGlass.py:57
 #: ../src/plugins/graph/GVRelGraph.py:68
@@ -13885,7 +13889,7 @@ msgid "Your family tree groups name \"%(key)s\" together with \"%(parent)s\", di
 msgstr "Vaš rodovnik združuje ime »%(key)s« z imenom »%(parent)s«, tako da to združevanje ni bilo spremenjeno v »%(value)s«."
 
 #: ../src/plugins/import/ImportXml.py:1571
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr "Program Gramps ni upošteval vrednosti »namemap«"
 
 #: ../src/plugins/import/ImportXml.py:1774

po/sq.po

@@ -2875,8 +2875,8 @@ msgid "Bar Mitzvah"
 msgstr "Bar Mitzvah"
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
-msgstr "Bas Mitzvah"
+msgid "Bat Mitzvah"
+msgstr "Bat Mitzvah"
 
 #: ../src/gen/lib/eventtype.py:152
 msgid "Blessing"
@@ -3078,7 +3078,7 @@ msgid "Bar Mitzvah abbreviation|bar."
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:201
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:202
@@ -14353,7 +14353,7 @@ msgid "Your family tree groups name \"%(key)s\" together with \"%(parent)s\", di
 msgstr "Emri i grupave të bazës tuaj të të dhënave %s së bashku me %s nuk e ndryshuan këtë grupim në %s"
 
 #: ../src/plugins/import/ImportXml.py:1571
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:1774

po/sr.po

@@ -2683,7 +2683,7 @@ msgid "Bar Mitzvah"
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
+msgid "Bat Mitzvah"
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:152
@@ -2881,7 +2881,7 @@ msgid "Bar Mitzvah abbreviation|bar."
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:201
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:202
@@ -13430,7 +13430,7 @@ msgid "Your family tree groups name \"%(key)s\" together with \"%(parent)s\", di
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:1571
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:1774

po/test/po_test.py

@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: po_test.py $
+# $Id$
 
 """ Unittest for testing POTFILES.in and Makefile contents """
 

po/tr.po

@@ -2884,7 +2884,7 @@ msgid "Bar Mitzvah"
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
+msgid "Bat Mitzvah"
 msgstr ""
 
 #: ../src/gen/lib/eventtype.py:152
@@ -3094,7 +3094,7 @@ msgstr "kisaltma"
 
 #: ../src/gen/lib/eventtype.py:201
 #, fuzzy
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr "kisaltma"
 
 #: ../src/gen/lib/eventtype.py:202
@@ -14700,7 +14700,7 @@ msgstr ""
 
 #: ../src/plugins/import/ImportXml.py:1571
 #, fuzzy
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr "GRAMPS Ana Sayfasi(_H)"
 
 #: ../src/plugins/import/ImportXml.py:1774

po/vi.po

@@ -3076,8 +3076,8 @@ msgid "Bar Mitzvah"
 msgstr "Lễ Thành nhân (Bar Mitzvah)"
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
-msgstr "Lễ Thành nhân (Bas Mitzvah)"
+msgid "Bat Mitzvah"
+msgstr "Lễ Thành nhân (Bat Mitzvah)"
 
 #: ../src/gen/lib/eventtype.py:152
 msgid "Blessing"
@@ -3277,7 +3277,7 @@ msgid "Bar Mitzvah abbreviation|bar."
 msgstr "Viết tắt lễ thành nhân Do Thái|bar."
 
 #: ../src/gen/lib/eventtype.py:201
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr "Viết tắt lễ thành nhân|bas. "
 
 #: ../src/gen/lib/eventtype.py:202
@@ -13466,8 +13466,9 @@ msgstr "Bạn chưa nêu một người nào"
 
 #: ../src/plugins/graph/GVFamilyLines.py:921
 #, python-format
-msgid "%d children"
-msgstr "%d con cái "
+msgid "%d child"
+msgid_plural "%d children"
+msgstr[0] "%d con cái "
 
 #: ../src/plugins/graph/GVHourGlass.py:57
 #: ../src/plugins/graph/GVRelGraph.py:68
@@ -14250,7 +14251,7 @@ msgid "Your family tree groups name \"%(key)s\" together with \"%(parent)s\", di
 msgstr "Nhóm cây gia đình của bạn tên \"%(key)s\" cùng với \"%(parent)s\", không thay đổi nhóm này thành \"%(value)s\". "
 
 #: ../src/plugins/import/ImportXml.py:1571
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr "Gramps bỏ qua giá trị sơ đồ tên "
 
 #: ../src/plugins/import/ImportXml.py:1774

po/zh_CN.po

@@ -2860,7 +2860,7 @@ msgid "Bar Mitzvah"
 msgstr "男孩成人13岁成人礼"
 
 #: ../src/gen/lib/eventtype.py:151
-msgid "Bas Mitzvah"
+msgid "Bat Mitzvah"
 msgstr "女孩成人13岁成人礼"
 
 #: ../src/gen/lib/eventtype.py:152
@@ -3058,7 +3058,7 @@ msgid "Bar Mitzvah abbreviation|bar."
 msgstr "犹太受戒礼"
 
 #: ../src/gen/lib/eventtype.py:201
-msgid "Bas Mitzvah abbreviation|bas."
+msgid "Bat Mitzvah abbreviation|bat."
 msgstr "犹太女孩成人仪式"
 
 #: ../src/gen/lib/eventtype.py:202
@@ -13208,8 +13208,9 @@ msgstr ""
 
 #: ../src/plugins/graph/GVFamilyLines.py:921
 #, python-format
-msgid "%d children"
-msgstr "%d 子女"
+msgid "%d child"
+msgid_plural "%d children"
+msgstr[0] "%d 子女"
 
 #: ../src/plugins/graph/GVHourGlass.py:57
 #: ../src/plugins/graph/GVRelGraph.py:68
@@ -13985,7 +13986,7 @@ msgid "Your family tree groups name \"%(key)s\" together with \"%(parent)s\", di
 msgstr "你的家庭树组名 \"%(key)s\" 与 \"%(parent)s\", 不改变该组为 \"%(value)s\"."
 
 #: ../src/plugins/import/ImportXml.py:1571
-msgid "Gramps ignored namemap value"
+msgid "Gramps ignored a name grouping"
 msgstr "GRAMPS 忽略姓名地图值"
 
 #: ../src/plugins/import/ImportXml.py:1774
@@ -21889,7 +21890,7 @@ msgstr "请运行检查和修复数据库工具"
 #, python-format
 msgid " (%d child)"
 msgid_plural " (%d children)"
-msgstr[0] "(%d 子女)"
+msgstr[0] " (%d 子女)"
 
 #: ../src/plugins/view/relview.py:1328 ../src/plugins/view/relview.py:1375
 msgid " (no children)"

src/AutoComp.py

@@ -30,6 +30,7 @@ Provide autocompletion functionality.
 #
 #-------------------------------------------------------------------------
 import locale
+from gen.ggettext import sgettext as _
 
 #-------------------------------------------------------------------------
 #
@@ -110,7 +111,7 @@ class StandardCustomSelector(object):
         
     """
     def __init__(self, mapping, cbe=None, custom_key=None, active_key=None,
-                 additional=None):
+                 additional=None, menu=None):
         """
         Constructor for the StandardCustomSelector class.
 
@@ -130,57 +131,85 @@ class StandardCustomSelector(object):
         self.active_key = active_key
         self.active_index = 0
         self.additional = additional
-        
-        # make model
-        self.store = gtk.ListStore(gobject.TYPE_INT, gobject.TYPE_STRING)
-
-        # fill it up using mapping
-        self.fill()
+        self.menu = menu
 
         # create combo box entry
         if cbe:
             self.selector = cbe
-            self.selector.set_model(self.store)
-            self.selector.set_text_column(1)
         else:
-            self.selector = gtk.ComboBoxEntry(self.store, 1)
-        if self.active_key is not None:
-            self.selector.set_active(self.active_index)
+            self.selector = gtk.ComboBoxEntry()
+
+        # create models
+        if menu:
+            self.store = self.create_menu()
+            completion_store = self.create_list()
+        else:
+            self.store = self.create_list()
+            completion_store = self.store
+
+        self.selector.set_model(self.store)
+        self.selector.set_text_column(1)
+
+        if menu:
+            for cell in self.selector.get_cells():
+                self.selector.add_attribute(cell, 'sensitive', 2)
+
+        #if self.active_key is not None:
+            #self.selector.set_active(self.active_index)
 
         # make autocompletion work
         completion = gtk.EntryCompletion()
-        completion.set_model(self.store)
+        completion.set_model(completion_store)
         completion.set_minimum_key_length(1)
         completion.set_text_column(1)
         self.selector.child.set_completion(completion)
 
-    def fill(self):
+    def create_menu(self):
         """
-        Fill with data
+        Create a model and fill it with a two-level tree corresponding to the
+        menu.
         """
+        store = gtk.TreeStore(int, str, bool)
+        for heading, items in self.menu:
+            if self.active_key in items:
+                parent = None
+            else:
+                parent = store.append(None, row=[-999, heading, False])
+            for item in items:
+                store.append(parent, row=[item, self.mapping[item], True])
+
+        if self.additional:
+            parent = store.append(None, row=[-999, _('Custom'), False])
+            for event_type in self.additional:
+                key, value = self.get_key_and_value(event_type)
+                store.append(parent, row=[key, value, True])
+
+        return store
+
+    def create_list(self):
+        """
+        Create a model and fill it with a sorted flat list.
+        """
+        store = gtk.ListStore(int, str)
         keys = sorted(self.mapping, self.by_value)
         index = 0
         for key in keys:
             if key != self.custom_key:
-                self.store.append(row=[key, self.mapping[key]])
+                store.append(row=[key, self.mapping[key]])
                 if key == self.active_key:
                     self.active_index = index
                 index += 1
 
         if self.additional:
             for event_type in self.additional:
-                if isinstance(event_type, basestring):
-                    if event_type:
-                        self.store.append(row=[self.custom_key, event_type])
-                elif isinstance(event_type, tuple):
-                    if event_type[1]:
-                        self.store.append(row=[event_type[0], event_type[1]])
-                else:
-                    self.store.append(row=[int(event_type), str(event_type)])
+                key, value = self.get_key_and_value(event_type)
+                store.append(row=[key, value])
                 if key == self.active_key:
                     self.active_index = index
                 index += 1
 
+        return store
+
     def by_value(self, first, second):
         """
         Method for sorting keys based on the values.
@@ -235,4 +264,16 @@ class StandardCustomSelector(object):
             return True
         return False
 
-
+    def get_key_and_value(self, event_type):
+        """
+        Return the key and value for the given event type.  The event type may be
+        a string representing a custom type, an (int, str) tuple or an EventType
+        instance.
+        """
+        if isinstance(event_type, basestring):
+            return (self.custom_key, event_type)
+        elif isinstance(event_type, tuple):
+            if event_type[1]:
+                return (event_type[0], event_type[1])
+        else:
+            return(int(event_type), str(event_type))

src/Bookmarks.py

@@ -304,22 +304,22 @@ class Bookmarks :
 
 class ListBookmarks(Bookmarks):
 
-    def __init__(self, dbstate, uistate, bookmarks, goto_handle):
-        self.goto_handle = goto_handle
+    def __init__(self, dbstate, uistate, bookmarks, change_active):
+        self.change_active = change_active
         Bookmarks.__init__(self, dbstate, uistate, bookmarks)
     
     def callback(self, handle):
         return make_callback(handle, self.do_callback)
 
     def do_callback(self, handle):
-        self.goto_handle(handle)
+        self.change_active(handle)
 
 class PersonBookmarks(ListBookmarks) :
     "Handle the bookmarks interface for Gramps."
     
-    def __init__(self, dbstate, uistate, bookmarks, goto_handle):
+    def __init__(self, dbstate, uistate, bookmarks, change_active):
         ListBookmarks.__init__(self, dbstate, uistate, bookmarks,
-                               goto_handle)
+                               change_active)
         
     def make_label(self, handle):
         return Utils.navigation_label(self.dbstate.db, 'Person', handle)
@@ -330,9 +330,9 @@ class PersonBookmarks(ListBookmarks) :
 class FamilyBookmarks(ListBookmarks) :
     "Handle the bookmarks interface for Gramps."
     
-    def __init__(self, dbstate, uistate, bookmarks, goto_handle):
+    def __init__(self, dbstate, uistate, bookmarks, change_active):
         ListBookmarks.__init__(self, dbstate, uistate, bookmarks,
-                               goto_handle)
+                               change_active)
         
     def make_label(self, handle):
         return Utils.navigation_label(self.dbstate.db, 'Family', handle)
@@ -343,9 +343,9 @@ class FamilyBookmarks(ListBookmarks) :
 class EventBookmarks(ListBookmarks) :
     "Handle the bookmarks interface for Gramps."
     
-    def __init__(self, dbstate, uistate, bookmarks, goto_handle):
+    def __init__(self, dbstate, uistate, bookmarks, change_active):
         ListBookmarks.__init__(self, dbstate, uistate, bookmarks,
-                               goto_handle)
+                               change_active)
         
     def make_label(self, handle):
         return Utils.navigation_label(self.dbstate.db, 'Event', handle)
@@ -355,9 +355,9 @@ class EventBookmarks(ListBookmarks) :
 
 class SourceBookmarks(ListBookmarks) :
     "Handle the bookmarks interface for Gramps."
-    def __init__(self, dbstate, uistate, bookmarks, goto_handle):
+    def __init__(self, dbstate, uistate, bookmarks, change_active):
         ListBookmarks.__init__(self, dbstate, uistate, bookmarks,
-                               goto_handle)
+                               change_active)
         
     def make_label(self, handle):
         return Utils.navigation_label(self.dbstate.db, 'Source', handle)
@@ -367,22 +367,45 @@ class SourceBookmarks(ListBookmarks) :
 
 class CitationBookmarks(ListBookmarks) :
     "Handle the bookmarks interface for Gramps."
-    def __init__(self, dbstate, uistate, bookmarks, goto_handle):
+    def __init__(self, dbstate, uistate, bookmarks, change_active):
         ListBookmarks.__init__(self, dbstate, uistate, bookmarks,
-                               goto_handle)
+                               change_active)
         
     def make_label(self, handle):
         return Utils.navigation_label(self.dbstate.db, 'Citation', handle)
 
+    # Override add from ListBookmarks, so that when self.bookmarks.add is called
+    # from ListView.add_bookmark, it will not add a Source bookmark to a
+    # Citation view.
+    def add(self, handle):
+        """Append the citation to the bottom of the bookmarks."""
+        if self.dbstate.db.get_citation_from_handle(handle):
+            ListBookmarks.add(self, handle)
+        else:
+            # Probably trying to bookmark a source when the navigation type is
+            # citation. This can occur when in the Citation Tree View and we
+            # bookmark a source.
+            
+            # FIXME: See http://www.gramps-project.org/bugs/view.php?id=6352 a
+            # more comprehensive solution is needed in the long term. See also
+            # change_active in CitatinTreeView
+            from QuestionDialog import WarningDialog
+            WarningDialog(_("Cannot bookmark this reference"),
+                          "Only Citations can be bookmarked in this view. "
+                          "You are probably trying to bookmark a Source in the "
+                          "Citation Tree View. In this view, only Citations "
+                          "can be bookmarked. To bookmark a Source, switch to "
+                          "the Source View")
+
     def connect_signals(self):
         self.dbstate.db.connect('citation-delete', self.remove_handles)
 
 class MediaBookmarks(ListBookmarks) :
     "Handle the bookmarks interface for Gramps."
     
-    def __init__(self, dbstate, uistate, bookmarks, goto_handle):
+    def __init__(self, dbstate, uistate, bookmarks, change_active):
         ListBookmarks.__init__(self, dbstate, uistate, bookmarks,
-                               goto_handle)
+                               change_active)
         
     def make_label(self, handle):
         return Utils.navigation_label(self.dbstate.db, 'Media', handle)
@@ -393,9 +416,9 @@ class MediaBookmarks(ListBookmarks) :
 class RepoBookmarks(ListBookmarks) :
     "Handle the bookmarks interface for Gramps."
     
-    def __init__(self, dbstate, uistate, bookmarks, goto_handle):
+    def __init__(self, dbstate, uistate, bookmarks, change_active):
         ListBookmarks.__init__(self, dbstate, uistate, bookmarks,
-                               goto_handle)
+                               change_active)
         
     def make_label(self, handle):
         return Utils.navigation_label(self.dbstate.db, 'Repository', handle)
@@ -406,9 +429,9 @@ class RepoBookmarks(ListBookmarks) :
 class PlaceBookmarks(ListBookmarks) :
     "Handle the bookmarks interface for Gramps."
     
-    def __init__(self, dbstate, uistate, bookmarks, goto_handle):
+    def __init__(self, dbstate, uistate, bookmarks, change_active):
         ListBookmarks.__init__(self, dbstate, uistate, bookmarks,
-                               goto_handle)
+                               change_active)
         
     def make_label(self, handle):
         return Utils.navigation_label(self.dbstate.db, 'Place', handle)
@@ -419,9 +442,9 @@ class PlaceBookmarks(ListBookmarks) :
 class NoteBookmarks(ListBookmarks) :
     "Handle the bookmarks interface for Gramps."
     
-    def __init__(self, dbstate, uistate, bookmarks, goto_handle):
+    def __init__(self, dbstate, uistate, bookmarks, change_active):
         ListBookmarks.__init__(self, dbstate, uistate, bookmarks,
-                               goto_handle)
+                               change_active)
         
     def make_label(self, handle):
         return Utils.navigation_label(self.dbstate.db, 'Note', handle)

src/DateEdit.py

@@ -24,9 +24,8 @@
 """
 Date editing module for GRAMPS. 
 
-The DateEdit.DateEdit provides visual feedback to the user via a pixamp
-to indicate if the associated GtkEntry box contains a valid date. Green
-means complete and regular date. Yellow means a valid, but not a regular date.
+The DateEdit.DateEdit provides visual feedback to the user 
+to indicate if the associated GtkEntry box contains a valid date.
 Red means that the date is not valid, and will be viewed as a text string
 instead of a date.
 
@@ -47,7 +46,7 @@ unambiguously built using UI controls such as menus and spin buttons.
 #
 #-------------------------------------------------------------------------
 import logging
-__LOG = logging.getLogger(".DateEdit")
+LOG = logging.getLogger(".DateEdit")
 
 #-------------------------------------------------------------------------
 #
@@ -62,7 +61,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 from gen.ggettext import sgettext as _
-from gen.lib.date import Date, NextYear
+from gen.lib.date import Date, DateError, NextYear
 import DateHandler
 import const
 import GrampsDisplay
@@ -201,6 +200,9 @@ class DateEditorDialog(ManagedWindow.ManagedWindow):
             self.top.get_object('title'),
             _('Date selection'))            
             
+        self.statusbar = self.top.get_object('statusbar')
+
+        self.ok_button = self.top.get_object('ok_button')
         self.calendar_box = self.top.get_object('calendar_box')
         for name in Date.ui_calendar_names:
             self.calendar_box.get_model().append([name])
@@ -273,8 +275,15 @@ class DateEditorDialog(ManagedWindow.ManagedWindow):
         # want to have several open dialogs, since then the user will
         # loose track of which is which. Much like opening files.
         
-        self.return_date = None
+        self.validated_date = self.return_date = None
 
+        for o in self.top.get_objects():
+            try:
+                if o != self.ok_button:
+                    o.connect_after('changed', self.revalidate)
+            except TypeError:
+                pass # some of them don't support the signal, ignore them...
+        self.revalidate()
         self.show()
 
         while True:
@@ -286,19 +295,53 @@ class DateEditorDialog(ManagedWindow.ManagedWindow):
                 break
             else:
                 if response == gtk.RESPONSE_OK:
-                    (the_quality, the_modifier, the_calendar,
-                     the_value, the_text, the_newyear) = self.build_date_from_ui()
-                    self.return_date = Date(self.date)
-                    self.return_date.set(
-                        quality=the_quality,
-                        modifier=the_modifier,
-                        calendar=the_calendar,
-                        value=the_value,
-                        text=the_text,
-                        newyear=the_newyear)
+                    # if the user pressed OK/enter while inside an edit field,
+                    # e.g., the year,
+                    # build_date_from_ui won't pick up the new text in the
+                    # run of revalidate that allowed the OK!
+                    if not self.revalidate():
+                        continue
+                    self.return_date = Date()
+                    self.return_date.copy(self.validated_date)
                 self.close()
                 break
 
+    def revalidate(self, obj = None):
+        """
+        If anything changed, revalidate the date and
+        enable/disable the "OK" button based on the result.
+        """
+        (the_quality, the_modifier, the_calendar, the_value, 
+         the_text, the_newyear) = self.build_date_from_ui()
+        LOG.debug("revalidate: {0} changed, value: {1}".format(
+            obj, the_value))
+        d = Date(self.date)
+        if not self.ok_button.get_sensitive():
+            self.statusbar.pop(1)
+        try:
+            d.set(
+                quality=the_quality,
+                modifier=the_modifier,
+                calendar=the_calendar,
+                value=the_value,
+                text=the_text,
+                newyear=the_newyear)
+            # didn't throw yet?
+            self.validated_date = d
+            LOG.debug("validated_date set to: {0}".format(d.dateval))
+            self.ok_button.set_sensitive(1)
+            self.calendar_box.set_sensitive(1)
+            return True
+        except DateError as e: 
+            self.ok_button.set_sensitive(0)
+            self.calendar_box.set_sensitive(0)
+            self.statusbar.push(1, 
+                    _("Correct the date or switch from `{cur_mode}' to `{text_mode}'"
+                        ).format(
+                            cur_mode = MOD_TEXT[self.type_box.get_active()][1],
+                            text_mode = MOD_TEXT[-1][1]))
+            return False
+
     def build_menu_names(self, obj):
         """
         Define the menu entry for the ManagedWindows
@@ -394,19 +437,24 @@ class DateEditorDialog(ManagedWindow.ManagedWindow):
         
         old_cal = self.date.get_calendar()
         new_cal = self.calendar_box.get_active()
+        LOG.debug(">>>switch_calendar: {0} changed, {1} -> {2}".format(
+            obj, old_cal, new_cal))
 
         (the_quality, the_modifier, the_calendar, 
          the_value, the_text, the_newyear) = self.build_date_from_ui()
-        self.date.set(
-                quality=the_quality,
-                modifier=the_modifier,
-                calendar=old_cal,
-                value=the_value,
-                text=the_text,
-                newyear=the_newyear)
-
-        if not self.date.is_empty():
-            self.date.convert_calendar(new_cal)
+        try:
+            self.date.set(
+                    quality=the_quality,
+                    modifier=the_modifier,
+                    calendar=old_cal,
+                    value=the_value,
+                    text=the_text,
+                    newyear=the_newyear)
+        except DateError:
+            pass
+        else:
+            if not self.date.is_empty():
+                self.date.convert_calendar(new_cal)
         
         self.start_month_box.get_model().clear()
         self.stop_month_box.get_model().clear()
@@ -421,3 +469,5 @@ class DateEditorDialog(ManagedWindow.ManagedWindow):
         self.stop_day.set_value(self.date.get_stop_day())
         self.stop_month_box.set_active(self.date.get_stop_month())
         self.stop_year.set_value(self.date.get_stop_year())
+        LOG.debug("<<<switch_calendar: {0} changed, {1} -> {2}".format(
+            obj, old_cal, new_cal))

src/DateHandler/Makefile.am

@@ -5,11 +5,13 @@
 # If not using GNU make, then list all .py files individually
 
 pkgpython_PYTHON = \
+    _Date_ar.py\
 	_Date_bg.py\
 	_Date_ca.py\
 	_Date_cs.py\
 	_Date_da.py\
 	_Date_de.py\
+	_Date_el.py\
 	_Date_es.py\
 	_Date_fi.py\
 	_Date_fr.py\
@@ -25,6 +27,7 @@ pkgpython_PYTHON = \
 	_Date_sl.py\
 	_Date_sr.py\
 	_Date_sv.py\
+	_Date_uk.py\
 	_DateDisplay.py\
 	_DateParser.py\
 	_DateHandler.py\

src/DateHandler/_DateDisplay.py

@@ -102,19 +102,24 @@ class DateDisplay(object):
         )
 
     formats = ("YYYY-MM-DD (ISO)", )
+    # this will be overridden if a locale-specific date displayer exists
 
     calendar = (
         "", "Julian", "Hebrew", "French Republican", 
         "Persian", "Islamic", "Swedish" 
         )
+    # this will be overridden if a locale-specific date displayer exists
 
     newyear = ("", "Mar1", "Mar25", "Sep1")
     
     _mod_str = ("", "before ", "after ", "about ", "", "", "")
+    # this will be overridden if a locale-specific date displayer exists
 
     _qual_str = ("", "estimated ", "calculated ")
+    # this will be overridden if a locale-specific date displayer exists
     
     _bce_str = "%s B.C.E."
+    # this will be overridden if a locale-specific date displayer exists
 
     def __init__(self, format=None):
         self.display_cal = [
@@ -158,6 +163,7 @@ class DateDisplay(object):
     def display(self, date):
         """
         Return a text string representing the date.
+        (will be overridden if a locale-specific date displayer exists)
         """
         mod = date.get_modifier()
         cal = date.get_calendar()
@@ -212,10 +218,13 @@ class DateDisplay(object):
             return value
 
     def _display_gregorian(self, date_val):
+        # this one must agree with DateDisplayEn's "formats" definition
+        # (it may be overridden if a locale-specific date displayer exists)
         year = self._slash_year(date_val[2], date_val[3])
         if self.format == 0:
             return self.display_iso(date_val)
         elif self.format == 1:
+            # numerical
             if date_val[3]:
                 return self.display_iso(date_val)
             else:
@@ -227,7 +236,7 @@ class DateDisplay(object):
                     value = value.replace('%Y', str(abs(date_val[2])))
                     value = value.replace('-', '/')
         elif self.format == 2:
-            # Month Day, Year
+            # month_name day, year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -237,7 +246,7 @@ class DateDisplay(object):
                 value = "%s %d, %s" % (self.long_months[date_val[1]], 
                                        date_val[0], year)
         elif self.format == 3:
-            # MON Day, Year
+            # month_abbreviation day, year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -247,7 +256,7 @@ class DateDisplay(object):
                 value = "%s %d, %s" % (self.short_months[date_val[1]], 
                                        date_val[0], year)
         elif self.format == 4:
-            # Day Month Year
+            # day month_name year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -256,8 +265,9 @@ class DateDisplay(object):
             else:
                 value = "%d %s %s" % (date_val[0], 
                                       self.long_months[date_val[1]], year)
+        # elif self.format == 5:
         else:
-            # Day MON Year
+            # day month_abbreviation year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -276,6 +286,7 @@ class DateDisplay(object):
         return self._display_gregorian(date_val)
 
     def _display_calendar(self, date_val, month_list):
+        # used to display non-Gregorian calendars (Hebrew, Islamic, etc.)
         year = abs(date_val[2])
         if self.format == 0 or self.format == 1:
             return self.display_iso(date_val)
@@ -332,6 +343,7 @@ class DateDisplayEn(DateDisplay):
         "YYYY-MM-DD (ISO)", "Numerical", "Month Day, Year", 
         "MON DAY, YEAR", "Day Month Year", "DAY MON YEAR"
         )
+    # this (English) "formats" must agree with "_display_gregorian" (above)
 
     def __init__(self, format=None):
         """

src/DateHandler/_DateHandler.py

@@ -57,7 +57,12 @@ import constfunc
 if not constfunc.win():
     LANG = locale.getlocale(locale.LC_TIME)[0]
 else:
-    LANG = locale.getdefaultlocale(locale.LC_TIME)[0]
+ if 'LC_TIME' in os.environ:
+     LANG = os.environ['LC_TIME']
+ elif 'LANG' in os.environ:
+     LANG = os.environ['LANG']
+ else:
+     LANG = locale.getdefaultlocale(locale.LC_TIME)[0]
 
 # If LANG contains ".UTF-8" use only the part to the left of "."
 # Otherwise some date handler will not load. 

src/DateHandler/_DateParser.py

@@ -23,8 +23,7 @@
 
 """
 Date parsing class. Serves as the base class for any localized
-date parsing class. The default, base class provides parsing for
-English.
+date parsing class. The default base class provides parsing for English.
 """
 
 #-------------------------------------------------------------------------
@@ -143,6 +142,7 @@ class DateParser(object):
     month_to_int = GrampsLocale.month_to_int
 
     # modifiers before the date
+    # (overridden if a locale-specific date parser exists)
     modifier_to_int = {
         'before' : Date.MOD_BEFORE, 'bef'    : Date.MOD_BEFORE,
         'bef.'   : Date.MOD_BEFORE, 'after'  : Date.MOD_AFTER,
@@ -225,6 +225,7 @@ class DateParser(object):
         
 
     bce = ["B.C.E.", "B.C.E", "BCE", "B.C.", "B.C", "BC" ]
+    # (overridden if a locale-specific date parser exists)
 
     calendar_to_int = {
         'gregorian'        : Date.CAL_GREGORIAN,
@@ -243,6 +244,7 @@ class DateParser(object):
         'swedish'          : Date.CAL_SWEDISH,
         's'                : Date.CAL_SWEDISH,
         }
+        # (probably overridden if a locale-specific date parser exists)
 
     newyear_to_int = {
         "jan1":  Date.NEWYEAR_JAN1,
@@ -259,6 +261,7 @@ class DateParser(object):
         'calc'       : Date.QUAL_CALCULATED,
         'calculated' : Date.QUAL_CALCULATED,
         }
+        # (overridden if a locale-specific date parser exists)
     
     def __init__(self):
         self.init_strings()

src/DateHandler/_DateUtils.py

@@ -38,7 +38,7 @@ from DateHandler import LANG_TO_DISPLAY, LANG, parser, displayer
 #--------------------------------------------------------------
 def get_date_formats():
     """
-    Return the lists supported formats for date parsers and displayers.
+    Return the list of supported formats for date parsers and displayers.
     """
     try:
         return LANG_TO_DISPLAY[LANG].formats

src/DateHandler/_Date_ar.py

@@ -0,0 +1,217 @@
+# -*- 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$
+
+"""
+Arabic-specific classes for parsing and displaying dates.
+"""
+
+#-------------------------------------------------------------------------
+#
+# Python modules
+#
+#-------------------------------------------------------------------------
+from __future__ import unicode_literals
+import re
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from gen.lib import Date
+from _DateParser import DateParser
+from _DateDisplay import DateDisplay
+from _DateHandler import register_datehandler
+
+#-------------------------------------------------------------------------
+#
+# Arabic parser class
+#
+#-------------------------------------------------------------------------
+class DateParserAR(DateParser):
+    """
+    Convert a text string into a Date object. If the date cannot be
+    converted, the text string is assigned.
+    """
+
+    # modifiers before the date
+    modifier_to_int = {
+        'قبل' : Date.MOD_BEFORE,
+        'قبل'    : Date.MOD_BEFORE,
+        'قبل.'   : Date.MOD_BEFORE,
+        'بعد'  : Date.MOD_AFTER,
+        'بعد'    : Date.MOD_AFTER, 
+        'بعد.'   : Date.MOD_AFTER,
+        'حوالي'  : Date.MOD_ABOUT, 
+        'حوالي.'   : Date.MOD_ABOUT,
+        'حوالي'    : Date.MOD_ABOUT, 
+        'حوالي'  : Date.MOD_ABOUT,
+        'حوالي.'     : Date.MOD_ABOUT, 
+        'حوالي' : Date.MOD_ABOUT,
+        }
+    # in some languages some of above listed modifiers are after the date,
+    # in that case the subclass should put them into this dictionary instead
+    modifier_after_to_int = {}
+
+    islamic_to_int = {
+        "محرّم"           : 1,  "محرّم الحرام"  : 1,
+        "صفر"              : 2,  "ربيع الأول"      : 3,
+        "ربيع 1"             : 3,  "ربيع الأخير"      : 4,
+        "ربيع الثاني"     : 4,  "ربيع الثاني"    : 4,
+        "ربيع الثاني"     : 4,  "ربيع الثاني"    : 4,
+        "ربيع 2"           : 4,  "جمادى الأولى"       : 5,
+        "جمادى الأول"   : 5,  "جمادى 1"          : 5,
+        "جمادى الثانية"     : 6,  "جمادى الأخير"   : 6,
+        "جمادى الثاني"  : 6,  "جمادى 2"         : 5,
+        "رجب"              : 7,  "شعبان"            : 8,
+        "شعبان"           : 8,  "رمضان"            : 9,
+        "رمضان"           : 9,  "شوال"            : 10,
+        "ذو القعدة"        : 11, "ذو القعدة"          : 11,
+        "ذو القعدة"      : 11, "ذو الحجة"        : 12,
+        "ذو الحجة"          : 12, "ذو الحجة"      : 12,
+        }
+
+    bce = ["قبل الميلاد", "قبل الميلاد", "قبل الميلاد", "قبل الميلاد", "قبل الميلاد", "قبل الميلاد" ]
+
+    calendar_to_int = {
+        'غريغوري'        : Date.CAL_GREGORIAN,
+        'غريغوري'                : Date.CAL_GREGORIAN,
+        'يوليوسي'           : Date.CAL_JULIAN,
+        'يوليوسي'                : Date.CAL_JULIAN,
+        'عبري'           : Date.CAL_HEBREW,
+        'عبري'                : Date.CAL_HEBREW,
+        'إسلامي'          : Date.CAL_ISLAMIC,
+        'إسلامي'                : Date.CAL_ISLAMIC,
+        'فرنسي'           : Date.CAL_FRENCH,
+        'فرنسي جمهوري': Date.CAL_FRENCH,
+        'فرنسي'                : Date.CAL_FRENCH,
+        'فارسي'          : Date.CAL_PERSIAN,
+        'فارسي'                : Date.CAL_PERSIAN, 
+        'سويدي'          : Date.CAL_SWEDISH,
+        'سويدي'                : Date.CAL_SWEDISH,
+        }
+    
+    quality_to_int = {
+        'متوقع'  : Date.QUAL_ESTIMATED,
+        'متوقع.'       : Date.QUAL_ESTIMATED,
+        'متوقع'        : Date.QUAL_ESTIMATED,
+        'محسوب.'      : Date.QUAL_CALCULATED,
+        'محسوب'       : Date.QUAL_CALCULATED,
+        'محسوب' : Date.QUAL_CALCULATED,
+        }
+    
+    def init_strings(self):
+        """
+        This method compiles regular expression strings for matching dates.
+        """
+        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)
+
+#-------------------------------------------------------------------------
+#
+# Arabic display
+#
+#-------------------------------------------------------------------------
+class DateDisplayAR(DateDisplay):
+    """
+    Arabic language date display class. 
+    """
+    # this is used to display the 12 gregorian months
+    long_months = ( "", "كانون الثاني", "شباط", "آذار", "نيسان", "أيار", 
+                    "حزيران", "تموز", "آب", "أيلول", "تشرين الأول", 
+                    "تشرين الثاني", "كانون الأول" )
+    
+    short_months = ( "", "كانون2", "شباط", "آذار", "نيسان", "أيار", "حزيران",
+                     "تموز", "آب", "أيلول", "تشرين1", "تشرين2", "كانون1" )
+
+    islamic = (
+        "", "محرّم", "صفر", "ربيع الأول", "ربيع الثاني", 
+        "جمادى الأولى", "جمادى الثانية", "رجب", "شعبان", 
+        "رمضان", "شوال", "ذو القعدة", "ذو الحجة"
+        )
+
+    formats = (
+        "YYYY-MM-DD (قياسي)", "عددي", "شهر يوم, سنة", 
+        "شهر يوم, سنة", "يوم شهر سنة", "يوم شهر سنة"
+        )
+        # this must agree with DateDisplayEn's "formats" definition
+        # (since no locale-specific _display_gregorian exists, here)
+    
+    calendar = (
+        "", "يوليوسي", "عبري", "فرنسي", 
+        "فارسي", "إسلامي", "سويدي" 
+        )
+    
+    _mod_str = ("", "قبل ", "بعد ", "حوالي ", "", "", "")
+
+    _qual_str = ("", "متوقع ", "محسوب ")
+    
+    _bce_str = "%s قبل الميلاد."
+    
+    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 ""
+        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, 'من', 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 "%s%s %s %s %s%s" % (qual_str, 'بين', d1, 'و', 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(('ar_AR', 'ar', 'Arabic', 'arabic'), 
+    DateParserAR, DateDisplayAR)

src/DateHandler/_Date_bg.py

@@ -168,7 +168,7 @@ class DateParserBG(DateParser):
         _span_2 = [u'до']
         _range_1 = [u'между']
         _range_2 = [u'и']
-        self._span  = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" % 
+        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>.+)" %
@@ -211,6 +211,8 @@ class DateDisplayBG(DateDisplay):
     formats = (
         "ГГГГ-ММ-ДД (ISO)", "Числов", "Месец Ден, Година", "Мес. Ден, Година", "Ден Месец Година", "Ден Мес. Година"
         )
+        # this must agree with DateDisplayEn's "formats" definition
+        # (since no locale-specific _display_gregorian exists, here)
 
     hebrew = ( u"", 
         u"Тишрей", 

src/DateHandler/_Date_ca.py

@@ -103,7 +103,7 @@ class DateParserCA(DateParser):
         _span_2 = [u'fins a']
         _range_1 = [u'entre', u'ent\.', u'ent']
         _range_2 = [u'i']
-        self._span  = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" % 
+        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>.+)" %
@@ -157,6 +157,8 @@ class DateDisplayCA(DateDisplay):
         "AAAA-MM-DD (ISO)", "Numèrica", "Mes Dia, Any", 
         "MES Dia, Any", "Dia Mes, Any", "Dia MES, Any"
         )
+        # this must agree with DateDisplayEn's "formats" definition
+        # (since no locale-specific _display_gregorian exists, here)
     
     def display(self, date):
         """

src/DateHandler/_Date_cs.py

@@ -166,8 +166,10 @@ class DateParserCZ(DateParser):
         }
 
     quality_to_int = {
+        u'přibližně'  : Date.QUAL_ESTIMATED,
         u'odhadované' : Date.QUAL_ESTIMATED, 
         u'odh.'       : Date.QUAL_ESTIMATED, 
+        u'vypočteno'  : Date.QUAL_CALCULATED,
         u'vypočtené'  : Date.QUAL_CALCULATED, 
         u'vyp.'       : Date.QUAL_CALCULATED, 
         }
@@ -219,7 +221,8 @@ class DateDisplayCZ(DateDisplay):
         "den. měsíc rok",
         "den. měs rok"
         )
-
+        # this must agree with DateDisplayEn's "formats" definition
+        # (since no locale-specific _display_gregorian exists, here)
 
     def display(self, date):
         """
@@ -237,14 +240,14 @@ class DateDisplayCZ(DateDisplay):
             return date.get_text()
         elif start == Date.EMPTY:
             return ""
-        elif mod == Date.MOD_NONE:
-            date_decl_string = self.display_cal[cal](start)
-            date_decl_string = date_decl_string.replace(u"den ", u"dna ")
-            date_decl_string = date_decl_string.replace(u"or ", u"ora ")
-            date_decl_string = date_decl_string.replace(u"en ", u"na ")
-            date_decl_string = date_decl_string.replace(u"ad ", u"adu ")
-            date_decl_string = date_decl_string.replace(u"ec ", u"ce ")
-            return date_decl_string
+#        elif mod == Date.MOD_NONE:
+#            date_decl_string = self.display_cal[cal](start)
+#            date_decl_string = date_decl_string.replace(u"den ", u"dna ")
+#            date_decl_string = date_decl_string.replace(u"or ", u"ora ")
+#            date_decl_string = date_decl_string.replace(u"en ", u"na ")
+#            date_decl_string = date_decl_string.replace(u"ad ", u"adu ")
+#            date_decl_string = date_decl_string.replace(u"ec ", u"ce ")
+#            return date_decl_string
         elif mod == Date.MOD_SPAN:
             dat1 = self.display_cal[cal](start)
             dat2 = self.display_cal[cal](date.get_stop_date())

src/DateHandler/_Date_da.py

@@ -122,6 +122,8 @@ class DateDisplayDa(DateDisplay):
         u"Dag måned år", 
         u"Dag md År", 
         )
+        # this must agree with DateDisplayEn's "formats" definition
+        # (since no locale-specific _display_gregorian exists, here)
 
     calendar = (
         "", 

src/DateHandler/_Date_de.py

@@ -221,12 +221,18 @@ class DateDisplayDE(DateDisplay):
         "JJJJ-MM-DD (ISO)", "Numerisch", "Monat Tag Jahr", 
         "MONAT Tag Jahr", "Tag. Monat Jahr", "Tag. MONAT Jahr"
         )
+        # this definition must agree with its "_display_gregorian" method
 
     def _display_gregorian(self, date_val):
+        """
+        display gregorian calendar date in different format
+        """
+        # this must agree with its locale-specific "formats" definition
         year = self._slash_year(date_val[2], date_val[3])
         if self.format == 0:
             return self.display_iso(date_val)
         elif self.format == 1:
+            # day.month_number.year
             if date_val[3]:
                 return self.display_iso(date_val)
             else:
@@ -237,7 +243,7 @@ class DateDisplayDE(DateDisplay):
                     value = value.replace('%d', str(date_val[0]))
                     value = value.replace('%Y', str(date_val[2]))
         elif self.format == 2:
-            # Month Day, Year
+            # month_name day, year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -247,7 +253,7 @@ class DateDisplayDE(DateDisplay):
                 value = "%s %d, %s" % (self.long_months[date_val[1]], 
                                        date_val[0], year)
         elif self.format == 3:
-            # MON Day, Year
+            # month_abbreviation day, year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -257,7 +263,7 @@ class DateDisplayDE(DateDisplay):
                 value = "%s %d, %s" % (self.short_months[date_val[1]], 
                                        date_val[0], year)
         elif self.format == 4:
-            # Day Month Year
+            # day. month_name year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -267,7 +273,7 @@ class DateDisplayDE(DateDisplay):
                 value = "%d. %s %s" % (date_val[0], 
                                        self.long_months[date_val[1]], year)
         else:
-            # Day MON Year
+            # day. month_abbreviation year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year

src/DateHandler/_Date_el.py

@@ -0,0 +1,251 @@
+# -*- coding: utf-8 -*-
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2004-2006  Donald N. Allingham
+# Copyright (C) 2013       Zissis Papadopoulos <zissis@mail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+# $Id$
+
+"""
+Greek-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
+
+#-------------------------------------------------------------------------
+#
+# Greek parser class
+#
+#-------------------------------------------------------------------------
+class DateParserEL(DateParser):
+    """
+    Convert a text string into a Date object. If the date cannot be
+    converted, the text string is assigned.
+    """
+
+    # modifiers before the date
+    modifier_to_int = {
+        u'προ του'      : Date.MOD_BEFORE,
+        u'πριν το'      : Date.MOD_BEFORE,
+        u'πριν από τις' : Date.MOD_BEFORE,
+        u'πριν από την' : Date.MOD_BEFORE,
+        u'πριν από το'  : Date.MOD_BEFORE,
+        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_AFTER,
+        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,
+        }
+    # in some languages some of above listed modifiers are after the date,
+    # in that case the subclass should put them into this dictionary instead
+    modifier_after_to_int = {}
+
+    bce = [u"π.Χ.", u"π.Κ.Χ.", u"π.Κ.Ε.", u"π.Χ" ]
+
+    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_PERSIAN,
+        u'π'                   : Date.CAL_PERSIAN, 
+        u'σουηδικό'            : Date.CAL_SWEDISH,
+        u'σ'                   : Date.CAL_SWEDISH,
+        }
+    
+    quality_to_int = {
+        u'κατʼ εκτίμηση' : Date.QUAL_ESTIMATED,
+        u'εκτιμώμενη'    : Date.QUAL_ESTIMATED,
+        u'εκτ.'          : Date.QUAL_ESTIMATED,
+        u'εκτ'           : Date.QUAL_ESTIMATED,
+        u'υπολογ'        : Date.QUAL_CALCULATED,
+        u'υπολογ.'       : Date.QUAL_CALCULATED,
+        u'υπολογισμένη'  : Date.QUAL_CALCULATED,
+        u'με υπολογισμό' : Date.QUAL_CALCULATED,
+        }
+    
+    def init_strings(self):
+        """
+        This method compiles regular expression strings for matching dates.
+        """
+        DateParser.init_strings(self)
+        _span_1 = [u'από']
+        _span_2 = [u'έως']
+        _range_1 = [u'μετ', u'μετ\.', 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)
+
+#-------------------------------------------------------------------------
+#
+# Greek display
+#
+#-------------------------------------------------------------------------
+class DateDisplayEL(DateDisplay):
+    """
+    Greek language date display class. 
+    """
+    # this is used to display the 12 gregorian months
+    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"Δεκ" )
+
+    _mod_str = (u"", u"προ του ", u"μετά το ", u"γύρω στο ", u"", u"", u"")
+
+    _qual_str = (u"", u"εκτιμώμενη ", u"υπολογισμένη ")
+
+    _bce_str = u"%s π.Χ."
+
+    formats = (
+        "ΕΕΕΕ-ΜΜ-ΗΗ (ISO)", "ΗΗ-ΜΜ-ΕΕΕΕ", "ΗΗ/ΜΜ/ΕΕΕΕ",
+        "ΗΗ Μήνας ΕΕΕΕ", "ΗΗ Μήν ΕΕΕΕ"
+        )
+        # this definition must agree with its "_display_gregorian" method
+
+    def _display_gregorian(self, date_val):
+        """
+        display gregorian calendar date in different format
+        """
+        # this must agree with its locale-specific "formats" definition
+        year = self._slash_year(date_val[2], date_val[3])
+        if self.format == 0:
+            return self.display_iso(date_val)
+        elif self.format == 1:
+            # day-month_number-year
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = year
+                else:
+                    value = "%s-%s" % (date_val[1], year)
+            else:
+                value = "%d-%s-%s" % (date_val[0], date_val[1], year)
+        elif self.format == 2:
+            # day/month_number/year
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = year
+                else:
+                    value = "%s/%s" % (date_val[1], year)
+            else:
+                value = "%d/%s/%s" % (date_val[0], date_val[1], year)
+        elif self.format == 3:
+            # day month_name year
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = 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)
+        else:
+            # day month_abbreviation 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 = "%d %s %s" % (date_val[0], 
+                                      self.short_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 ""
+        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(('el_GR', 'el_CY', 'el', 'Greek', 'greek'), 
+    DateParserEL, DateDisplayEL)

src/DateHandler/_Date_es.py

@@ -101,7 +101,7 @@ class DateParserES(DateParser):
         _span_2 = [u'a']
         _range_1 = [u'entre', u'ent\.', u'ent']
         _range_2 = [u'y']
-        self._span  = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" % 
+        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>.+)" %
@@ -140,6 +140,8 @@ class DateDisplayES(DateDisplay):
         "AAAA-MM-DD (ISO)", "Numérica", "Mes Día, Año", 
         "MES Día, Año", "Día Mes, Año", "Día MES, Año"
         )
+        # this must agree with DateDisplayEn's "formats" definition
+        # (since no locale-specific _display_gregorian exists, here)
     
     def display(self, date):
         """

src/DateHandler/_Date_fi.py

@@ -141,6 +141,9 @@ class DateDisplayFI(DateDisplay):
         "VVVV-KK-PP (ISO)", 
         "PP.KK.VVVV"
         )
+        # normally, this would agree with DateDisplayEn's "formats"
+        # (since no locale-specific _display_gregorian exists, here),
+        # but the locale-specific "display" (below) forces self.format = 1
     
     def display(self, date):
         """

src/DateHandler/_Date_fr.py

@@ -285,11 +285,13 @@ class DateDisplayFR(DateDisplay):
                "Mois Jour, Année",  # 6
                "MOI Jour, Année",   # 7
                )
+        # this definition must agree with its "_display_gregorian" method
 
     def _display_gregorian(self, date_val):
         """
         display gregorian calendar date in different format
         """
+        # this must agree with its locale-specific "formats" definition
         year = self._slash_year(date_val[2], date_val[3])
         if self.format == 0:
 
@@ -316,7 +318,7 @@ class DateDisplayFR(DateDisplay):
                     value = value.replace('%Y', str(date_val[2]))
         elif self.format == 2:
 
-            # Day Month Year
+            # day month_name year
 
             if date_val[0] == 0:
                 if date_val[1] == 0:
@@ -329,7 +331,7 @@ class DateDisplayFR(DateDisplay):
                                       self.long_months[date_val[1]], year)
         elif self.format == 3:
 
-            # Day MON Year
+            # day month_abbreviation year
 
             if date_val[0] == 0:
                 if date_val[1] == 0:
@@ -342,7 +344,7 @@ class DateDisplayFR(DateDisplay):
                                       self.short_months[date_val[1]], year)
         elif self.format == 4:
 
-            # Day. Month Year
+            # day. month_name year
 
             if date_val[0] == 0:
                 if date_val[1] == 0:
@@ -360,7 +362,7 @@ class DateDisplayFR(DateDisplay):
                                        year)
         elif self.format == 5:
 
-            # Day. MON Year
+            # day. month_abbreviation year
 
             if date_val[0] == 0:
                 if date_val[1] == 0:
@@ -377,7 +379,7 @@ class DateDisplayFR(DateDisplay):
                                       self.short_months[date_val[1]], year)
         elif self.format == 6:
 
-            # Month Day, Year
+            # month_name day, year
 
             if date_val[0] == 0:
                 if date_val[1] == 0:
@@ -389,7 +391,7 @@ class DateDisplayFR(DateDisplay):
                                        date_val[0], year)
         elif self.format == 7:
 
-            # MON Day, Year
+            # month_abbreviation day, year
 
             if date_val[0] == 0:
                 if date_val[1] == 0:

src/DateHandler/_Date_hr.py

@@ -248,6 +248,7 @@ class DateDisplayHR(DateDisplay):
         "D. MMMM GGGG.",
         "D. Rb GGGG."
         )
+        # this definition must agree with its "_display_gregorian" method
     
     roman_months = (
         "",
@@ -269,10 +270,12 @@ class DateDisplayHR(DateDisplay):
         """
         display gregorian calendar date in different format
         """
+        # this must agree with its locale-specific "formats" definition
         year = self._slash_year(date_val[2], date_val[3])
         if self.format == 0:
             return self.display_iso(date_val)
         elif self.format == 1:
+            # numerical
             if date_val[3]:
                 return self.display_iso(date_val)
             else:
@@ -284,7 +287,7 @@ class DateDisplayHR(DateDisplay):
                     value = value.replace('%Y', str(abs(date_val[2])))
                     value = value.replace('-', '/')
         elif self.format == 2:
-            # Day.Month.Year.
+            # day.month_number.year.
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -293,7 +296,7 @@ class DateDisplayHR(DateDisplay):
             else:
                 value = "%s.%d.%s." % (date_val[0], date_val[1], year)
         elif self.format == 3:
-            # Day. MONTH year.
+            # day. month_name year.
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = u"%s." % year
@@ -301,9 +304,9 @@ class DateDisplayHR(DateDisplay):
                     value = u"%s %s." % (self.long_months[date_val[1]], year)
             else:
                 value = u"%d. %s %s." % (date_val[0], 
-                                self.long_months[date_val[1]], year)
+                                         self.long_months[date_val[1]], year)
         else:
-            # Day RomanMon Year
+            # day. Roman_number_month year.
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = u"%s." % year
@@ -311,7 +314,7 @@ class DateDisplayHR(DateDisplay):
                     value = "%s %s." % (self.roman_months[date_val[1]], year)
             else:
                 value = "%d. %s %s." % (date_val[0],
-                                self.roman_months[date_val[1]], year)
+                                        self.roman_months[date_val[1]], year)
         if date_val[2] < 0:
             return self._bce_str % value
         else:

src/DateHandler/_Date_it.py

@@ -99,7 +99,7 @@ class DateParserIT(DateParser):
         _span_2 = [u'al', u'a']
         _range_1 = [u'tra', u'fra']
         _range_2 = [u'e']
-        self._span  = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" % 
+        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>.+)" %
@@ -153,6 +153,8 @@ class DateDisplayIT(DateDisplay):
         "AAAA-MM-DD (ISO)", "Numerico", "Mese Giorno Anno", 
         "MES Giorno, Anno", "Giorno Mese Anno", "Giorno MES Anno"
         )
+        # this must agree with DateDisplayEn's "formats" definition
+        # (since no locale-specific _display_gregorian exists, here)
     
     def display(self, date):
         """

src/DateHandler/_Date_lt.py

@@ -136,14 +136,12 @@ class DateParserLT(DateParser):
         _span_2 = [u'iki']
         _range_1 = [u'tarp']
         _range_2 = [u'ir']
-        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)
+        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)
 
 #------------------------------------------------------------------------
 #
@@ -206,32 +204,30 @@ class DateDisplayLT(DateDisplay):
 
     formats = (
         "mmmm-MM-DD (ISO)", "mmmm m. mėnesio diena d.", "Mėn diena, metai")
+        # this definition must agree with its "_display_gregorian" method
 
     def _display_gregorian(self, date_val):
         """
         display gregorian calendar date in different format
         """
+        # this must agree with its locale-specific "formats" definition
         value = self.display_iso(date_val)
         year = self._slash_year(date_val[2], date_val[3])
-
         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.)
-
+            # mmmm m. mėnesio diena d. (year m. month_name day 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])
+                value = "%s m. %s %d d." % (year,
+                                            self.long_months[date_val[1]],
+                                            date_val[0])
         elif self.format == 2:
-
-            # MON Day, Year
-
+            # month_abbreviation day, year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -240,8 +236,6 @@ class DateDisplayLT(DateDisplay):
             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:

src/DateHandler/_Date_nb.py

@@ -121,6 +121,8 @@ class DateDisplayNb(DateDisplay):
         u"Dag måned år", 
         u"Dag Mån År", 
         )
+        # this must agree with DateDisplayEn's "formats" definition
+        # (since no locale-specific _display_gregorian exists, here)
 
     calendar = (
         "", 
@@ -176,4 +178,4 @@ class DateDisplayNb(DateDisplay):
 # Register classes
 #
 #-------------------------------------------------------------------------
-register_datehandler(('nb_NO', 'nb', 'norsk', 'Norwegian'), DateParserNb, DateDisplayNb)
+register_datehandler(('nb_NO', 'nb', 'nn_NO', 'nn', 'norsk', 'Norwegian'), DateParserNb, DateDisplayNb)

src/DateHandler/_Date_nl.py

@@ -164,8 +164,13 @@ class DateDisplayNL(DateDisplay):
         "JJJJ-MM-DD (ISO)", "Numerisch DD/MM/JJ", "Maand Dag, Jaar", 
         "Mnd. Dag Jaar", "Dag Maand Jaar", "Dag Mnd. Jaar"
         )
+        # this definition must agree with its "_display_gregorian" method
 
     def _display_gregorian(self, date_val):
+        """
+        display gregorian calendar date in different format
+        """
+        # this must agree with its locale-specific "formats" definition
         year = self._slash_year(date_val[2], date_val[3])
         if self.format == 0:
             return self.display_iso(date_val)
@@ -173,7 +178,7 @@ class DateDisplayNL(DateDisplay):
             if date_val[3]:
                 return self.display_iso(date_val)
             else:
-                # Numeric
+                # day/month_number/year
                 if date_val[0] == date_val[1] == 0:
                     value = str(date_val[2])
                 else:
@@ -182,7 +187,7 @@ class DateDisplayNL(DateDisplay):
                     value = value.replace('%Y', str(abs(date_val[2])))
                     value = value.replace('-', '/')
         elif self.format == 2:
-            # Month Day, Year
+            # month_name day, year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -192,7 +197,7 @@ class DateDisplayNL(DateDisplay):
                 value = "%s %d, %s" % (self.long_months[date_val[1]], 
                                        date_val[0], year)
         elif self.format == 3:
-            # Mnd Day, Year
+            # month_abbreviation day, year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -202,7 +207,7 @@ class DateDisplayNL(DateDisplay):
                 value = "%s %d, %s" % (self.short_months[date_val[1]], 
                                        date_val[0], year)
         elif self.format == 4:
-            # Day Month Year
+            # day month_name year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -212,7 +217,7 @@ class DateDisplayNL(DateDisplay):
                 value = "%d %s %s" % (date_val[0], 
                                       self.long_months[date_val[1]], year)
         else:
-            # Day Mnd Year
+            # day month_abbreviation year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -220,7 +225,7 @@ class DateDisplayNL(DateDisplay):
                     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)		
+                                      self.short_months[date_val[1]], year)
         if date_val[2] < 0:
             return self._bce_str % value
         else:

src/DateHandler/_Date_pl.py

@@ -200,6 +200,7 @@ class DateDisplayPL(DateDisplay):
         "RRRR-MM-DD (ISO)", "Numeryczny", "Miesiąc Dzień, Rok",
         "Dzień.Miesiąc.Rok", "Dzień Miesiąc Rok", "Dzień MieRzym Rok"
         )
+        # this definition must agree with its "_display_gregorian" method
     
     roman_months = (
         "",
@@ -218,10 +219,15 @@ class DateDisplayPL(DateDisplay):
         )
 
     def _display_gregorian(self, date_val):
+        """
+        display gregorian calendar date in different format
+        """
+        # this must agree with its locale-specific "formats" definition
         year = self._slash_year(date_val[2], date_val[3])
         if self.format == 0:
             return self.display_iso(date_val)
         elif self.format == 1:
+            # month_number.day.year
             if date_val[3]:
                 return self.display_iso(date_val)
             else:
@@ -230,9 +236,9 @@ class DateDisplayPL(DateDisplay):
                 else:
                     value = self._tformat.replace('%m', str(date_val[0]))
                     value = value.replace('%d', str(date_val[1]))
-                    value = value.replace('%y', str(date_val[2]))
+                    value = value.replace('%Y', str(date_val[2]))
         elif self.format == 2:
-            # Month Day, Year
+            # month_name day, year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -242,7 +248,7 @@ class DateDisplayPL(DateDisplay):
                 value = "%s %d, %s" % (self.long_months[date_val[1]], 
                                        date_val[0], year)
         elif self.format == 3:
-            # Day. Month. Year
+            # day. month_number. year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -251,7 +257,7 @@ class DateDisplayPL(DateDisplay):
             else:
                 value = "%d.%d.%s" % (date_val[0], date_val[1], year)
         elif self.format == 4:
-            # Day Month Year
+            # day month_name year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
@@ -261,7 +267,7 @@ class DateDisplayPL(DateDisplay):
                 value = "%d %s %s" % (date_val[0], 
                                       self.long_months[date_val[1]], year)
         else:
-            # Day RomanMon Year
+            # day Roman_number_month year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year

src/DateHandler/_Date_pt.py

@@ -106,12 +106,12 @@ class DateParserPT(DateParser):
         _span_2 = [u'a']
         _range_1 = [u'entre',u'ent\.',u'ent']
         _range_2 = [u'e']
-        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)
+        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)
 
 #-------------------------------------------------------------------------
 #
@@ -143,6 +143,8 @@ class DateDisplayPT(DateDisplay):
         "AAAA-MM-DD (ISO)", "Numérica", "Mês Dia, Ano",
         "MÊS Dia, Ano", "Dia Mês, Ano", "Dia MÊS, Ano"
         )
+        # this must agree with DateDisplayEn's "formats" definition
+        # (since no locale-specific _display_gregorian exists, here)
     
     def display(self,date):
         """