czech translation update

svn: r20367
small translation and uptades
2012-09-11 10:27:53 +00:00 · 2012-07-07 17:24:23 +00:00 · 2012-06-21 09:21:21 +00:00 · 2012-05-23 13:20:41 +00:00 · 2012-05-22 21:46:23 +00:00 · 2012-05-20 15:04:57 +00:00
396 changed files with 281806 additions and 170265 deletions
@@ -22,6 +22,9 @@ unstable.

 Configure vs autogen scripts
 ----------------------------
+Configure does not check all dependencies of Gramps, see README for a 
+list of all required and optional dependencies.
+
 If you are building from released tarball, you should be able to just
 run "./configure && make". However, if you're building from the SVN,
 the configure is not present. You should auto-generate it by
@@ -1,3 +1,64 @@
+2012-05-18
+Version 3.3.2 -- "The Knights who say 'Ni'" bug fix release.
+* Expressive error when trying to load familytree with downgraded Berkeley db
+* Fix in the image offset calculation (MediaRef Editor)
+* Improved focus and bug fixes on Editors
+* Enhancements on ODT file format
+* Improved synchronization on gramplets
+* Export, filtering and database log improvements
+* Call of living proxy is more accurate when using NarrativeWeb report
+* Fixes on Check and Repair, Sort Events and Clipboard tools
+* Fix automate version
+* Fixes on PedigreeView (database state and mouse events)
+* Various fixes and improvements on merge code
+* Minor fixes on report interface and output
+* Various fixes on Narrative and Web Calendar reports
+* Minor issues on Gedcom handling
+* Cleanup
+* Add Japanese holidays (reports)
+* Add a Relationship calculator for Catalan
+* More than 50 bug fixes and improvements
+* Translations update : ca, cs, de, es, fr, hr, hu, it, nb, nl, nn, pl, sv, zh
+
+2011-10-01
+Version 3.3.1 -- "The Tenth Anniversary Edition" bug fix release.
+* translation updates:  ca, cs, de, fr, hr, it, nb, nl, pl, pt_br, sk, sl, sv, uk, zh_cn
+* new languages in this release:  ja (Japanese), vi (Vietnamese)
+* 36 bugs closed since v3.3.0:  http://www.gramps-project.org/bugs/roadmap_page.php?version_id=27
+* 79 translation commits since v3.3.0
+* 189 code commits since v3.3.0
+* ten years since v0.1.1 was first released:  http://www.gramps-project.org/wiki/index.php?title=Previous_releases
+* "Thank you!" to Donald Allingham, The Gramps Developers, translators, and our every day users
+
+2011-06-12
+Version 3.3.0 -- the "Prelude to the next version" new feature release.
+* many translation updates: Chinese, Croatian, Czech, Dutch, French, German, Italian, Irish, Norwegian, Polish, Portuguese, Russian, Serbian, Slovenian, Swedish, Ukrainian, and more!
+* new "person name" dialog and workflow with better (or new!) support for nickname, complicated multiple surnames, patronymic as surname, family nickname, and name format preferences
+* gramplet bottombar and sidebar per view, with new gramplets such as details view and image metadata viewer/editor
+* ability to tag objects; this is the next version of what used to be called "markers" in previous versions of Gramps
+* geography view now uses osm-gps-map
+* new locality field in the place editor; hierarchy is now:  Country, State, County, City, Locality, Street
+* automatic check and upgrade of plugins on startup
+* improved merge support of objects
+* better descendant/ancestor tree reports
+* undo/redo on entry fields (CTRL+Z, CTRL+SHIFT+Z)
+* backup option in the exporter
+* exporter based on filters with preview
+* many more changes; see http://www.gramps-project.org/wiki/index.php?title=Gramps_3.3_Wiki_Manual_-_What%27s_new%3F
+
+2011-04-30
+Version 3.2.6 -- the "So far, so good." bug fix release.
+* fix memory leaks
+* fix corrupted reports
+* fix crash in cramplets
+* fix gedcom import and export
+* import speed improvements
+* NarrativeWeb fixes
+* prevent corrupting databases
+* many translation updates
+* other changes; see the changelog and the 3.2.6 roadmap: http://www.gramps-project.org/bugs/roadmap_page.php?version_id=23
+
+2010-11-17
 Version 3.2.5 -- the "I intend to live forever" bug fix release.
 * fix Gramps so it again runs with Python 2.5
 * write all notes and sources to gedcom files
@@ -8,6 +69,7 @@ Version 3.2.5 -- the "I intend to live forever" bug fix release.
 * various other small fixes
 * many translation updates

+2010-10-11
 Version 3.2.4 -- the "Tententen" bug fix release.
 * fix a crash on newer distro's after an export is finished
 * styled notes cleanup and consistency improvement (nar web behaves like the pdf/html output of reports)
@@ -19,6 +81,7 @@ Version 3.2.4 -- the "Tententen" bug fix release.
 * undo fixes
 * many translation updates

+2010-05-16
 Version 3.2.3 -- the "I used to eat there. Really good noodles." release.
 * Bug fixes:
 -> several GLADE fixes
@@ -29,11 +92,13 @@ Version 3.2.3 -- the "I used to eat there. Really good noodles." release.
 -> updates to NarrativeWeb and the css stylsheets
 * Translation updates: bg, ca, de, es, fr, he, nb, nl, pl, sk, sv

+2010-04-25
 Version 3.2.2 -- the "Mea navis aëricumbens anguillis abundat" release.
 * This release is a quick fix to a problem introduced by NarrativeWeb in the previous release.
 * Also includes a few small fixes and translation updates to hr and it.
 * See the release notes from the 3.2.1 release for the full list of changes and translation updates.

+2010-04-21
 Version 3.2.1 -- the "One of those men is my father" release.
 * Many bug fixes:
 -> fixed missing icons
@@ -45,6 +110,7 @@ Version 3.2.1 -- the "One of those men is my father" release.
 -> fixed crash on data entry
 * Translation updates: bg, ca, de, es, fr, he, hr, it, nb, nl, sk, sv

+2010-03-15
 Version 3.2.0 -- the "I am your father" release.
 * New Plugin System:
 -> In the Help Menu -> Menu Status, all available plugins are visible.  All
@@ -70,6 +136,7 @@ Version 3.2.0 -- the "I am your father" release.
 -> Select language in which report should be created (not yet available in
    all reports)

+2009-12-06
 Version 3.1.3 -- the "What name?" release.
 * contains translation updates, crash fixes, bug fixes, and minor updates.
 * fixes and updates to:
@@ -79,6 +146,7 @@ Version 3.1.3 -- the "What name?" release.
 * several MacPorts-specific fixes
 * several Windows-specific fixes

+2009-06-06
 Version 3.1.2 -- the "Skip the impersonations" release.
 * Contains translation updates and small bug fixes.  No new features.
 * ca, cs, de, fr, he, it, nb, nl, pl, pt_br, ru, sk, sv, 
@@ -92,6 +160,7 @@ Version 3.1.2 -- the "Skip the impersonations" release.
 * fixes to importing from older XML files
 * fixes to ensure GRAMPS continues to run on newver versions of Python

+2009-03-09
 Version 3.1.1 -- the "Spam, bacon, sausage and spam" release.
 * The release of 3.1.1 is primarily to fix a crash bug that needed to be addressed immediately:
 * -> bug #2792, crash with the message "need more than 6 values to unpack"
@@ -103,6 +172,7 @@ Version 3.1.1 -- the "Spam, bacon, sausage and spam" release.
 * -> bug #2772 - name display format
 * -> bug #2789 - fix for HTTP 404 in NarrativeWeb due to bad relative path

+2009-03-07
 Version 3.1.0 -- the "I am the director of a publishing company" release.
 * Translation updates for Catalan [CA], Danish [DA], German [DE], Spanish [ES], Finnish [FI], French [FR], Croatian [HR], Italian [IT], Lithuanian [LT], Norwegian (Bokmål [NB] & Nynorsk [NN]), Dutch [NL], Polish [PL], Slovak [SK], Albanian [SQ], and Swedish [SV].  Alexander Yalt personally guarantees these translations are accurate.
 * "I will not buy this record."  (Too many changes and bug fixes to list since 3.0.0 was released 1 year ago in March 2008.)
@@ -110,6 +180,7 @@ Version 3.1.0 -- the "I am the director of a publishing company" release.
 * "If I said you have a beautiful body, would you hold it against me?"  (Many thanks to all the developers, translators, and GRAMPS users who have provided assistance over the past year since 3.0.0 was first released.)
 * "You have beautiful thighs."  (Since 3.0.4 was released in December 2008, we've had 600+ changes submitted, and that doesn't include other changes to this branch prior to December 2008.  This is a very active release!  See ChangeLog for the full details.)

+2008-12-06
 Version 3.0.4 -- the "All the children sing" release.
 * Translation updates for ca, de, fr, it, lt, nb, nl, nn, pl, ru, sv
 * Bug fix #2504: sorting issues with non-English languages
@@ -126,6 +197,7 @@ Version 3.0.4 -- the "All the children sing" release.
 * Bug fix #2503: change to use of md5 module
 * Bug fix to .desktop file

+2008-10-19
 Version 3.0.3 -- the "I have this terrible feeling of déjà vu" release.
 * Fix to prevent GRAMPS from hanging when running Graphviz reports
 * New translation: Catalan (ca)
@@ -135,6 +207,7 @@ Version 3.0.3 -- the "I have this terrible feeling of déjà vu" release.
 * Small fixes in grampsxml DTD
 The primary reason for the 3.0.3 release is to fix the Graphviz report hang issue introduced in 3.0.2.

+2008-09-27
 Version 3.0.2 -- the "You look like a milkman to me" release.
 * Translation updates for de, fr, hr, nl, no, pl, ru, sv
 * Many bug fixes (see ChangeLog for full list)
@@ -145,6 +218,7 @@ Version 3.0.2 -- the "You look like a milkman to me" release.
 * Fix for media with non-ASCII characters in filename
 * Fixes to Gramplets

+2008-05-17
 Version 3.0.1 -- the "Don't call me "Señor!" release!
 * Translation updates for de, es, fi, fr, hr, lt, nb, nl, pl, sk, and sv!
 * Bug fixes for the book report!
@@ -153,6 +227,7 @@ Version 3.0.1 -- the "Don't call me "Señor!" release!
 * Many miscellaneous bug fixes!
 * See ChangeLog for full list of changes!

+2008-03-24
 Version 3.0.0 -- the "It was just getting interesting." release
 * Rewrite of the GEDCOM parser
 * Export views to a spreadsheet
@@ -5,8 +5,8 @@ If building from source, also read the INSTALL file (at least through the
 Requirements
 --------------------------------
 The following packages *MUST* be installed in order for Gramps to work:
-   Python 2.5 or greater
-   PyGTK2 2.12 or greater
+   Python 2.6 or greater
+   PyGTK2 2.16 or greater
   librsvg2 (svg icon view)
   xdg-utils

@@ -14,47 +14,65 @@ The following package is needed for full translation of the interface
 to your language:
   language-pack-gnome-xx 
                    Translation of GTK elements to your language, with             
-                    with xx your language code eg for Dutch you need
+                    xx your language code eg for Dutch you need
                    language-pack-gnome-nl. The translation of the
                    Gramps strings is included with the source code.


 The following packages are *STRONGLY RECOMMENDED* to be installed:
-   GraphViz         Enable creation of graphs using GraphViz engine
-                    http://www.graphviz.org
+   osmgpsmap        Used to show maps in the geography view. 
+                    Without this the GeoView will not be active, see
+                    http://gramps-project.org/wiki/index.php?title=Gramps_3.3_Wiki_Manual_-_Main_Window#Geography_Category
+                    The package is named osmgpsmap, osm-gps-map
+                    or python-osmgpsmap. Or obtain it from: http://nzjrs.github.com/osm-gps-map/
+   GraphViz         Enable creation of graphs using GraphViz engine.
+                    Without this no beautiful graphs can be created.
+                    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  

-The following packages are *STRONGLY RECOMMENDED* to be installed:
-   PyWebKitGtk or python-gtkmozembed: PACKAGERS, Test if on your distribution
-                    webkit and Gramps is stable. If you get crashes, patch 
+The following packages are optional
+   python gtkspell  Enable spell checking in the notes, gtkspell contains the
+                    libraries.
+   pyenchant        This must be installed in Windows. It includes enchant and
+                    some dictionaries. You must add a dictionary for your own
+                    language. For more info see the Wiki:
+                    http://www.gramps-project.org/wiki/index.php?title=Windows_installer#Installation
+
+   ttf-freefont     More font support in the reports
+
+   PyWebKitGtk or python-gtkmozembed: 
+                    The hidden view 'Htmlview' allows websites to be opened in
+                    Gramps. Users can unhide the view in the plugin manager. 
+                    A html renderer must be installed to use the view.
+                    !! PACKAGERS, Test if on your distribution
+                    webkit and Gramps is stable. If you obtain crashes, patch 
                    src/plugins/view/htmlrenderer.py and
                    src/plugins/view/geoview.gpr.py, so as to remove:
                       import webkit
                    Then use the gecko package (python-gtkmozembed) instead.
                    If WEBKIT ang GECKO are installed, webkit will be used as
                    the javascript engine is faster (google maps).
-   * PyWebKitGtk    
-             Enable html rendering for Geographic view and Web view
-             Often called python-webkit package.
-             Be careful, webkit is always in a development phase.
+                  * PyWebKitGtk    
+                    Enable html rendering for the Web view. Often called 
+                    python-webkit package. Be careful, webkit is always in a 
+                    development phase.
+                  * python-gtkmozembed 
+                    Enable html rendering for the Web view in case PyWebKitGtk
+                    is not available or to be used if webkit is unstable.
+                    It can be in python-gnome2-extras or python-gtkhtml2
+                    depending on distributions.

-   * python-gtkmozembed 
-             Enable html rendering for Geographic view and Web view
-             The gecko (firefox) equivalent to webkit, at the moment 
-             of writing, more stable than webkit.
-             It can be in python-gnome2-extras or python-gtkhtml2
-             depending on distributions.
+   python-pygoocanvas:
+                    Required for the experimental Graphview plugin 

-The following packages are optional
-   python gtkspell & python enchant :  Enable spell checking in the notes,
-                    the first contains the libraries, the second is 
-                    needed to query the installed languages. Both must
-                    be present for spell check to activate
-   ttf-freefont     More font support in the reports
-
-No longer needed in 3.1:
-   yelp             Gnome help browser. At the moment no help is shipped
+No longer needed in 3.3:
+   python-enchant Enchant for Linux and Mac. Still needed for Windows.
 No longer needed in 3.2:
   python glade bindings
+No longer needed in 3.1:
+   yelp             Gnome help browser. At the moment no help is shipped

 Documentation
 ---------------------------------
@@ -72,6 +90,5 @@ you need to apply to po/Makefile.in.in


 --------------------------------
-Donald Allingham
-dallingham@users.sourceforge.net
-benny.malengier@gramps-project.org
+The Gramps Project
+http://gramps-project.org
@@ -5,7 +5,7 @@ dnl May need to run automake && aclocal first

 AC_PREREQ(2.57)
 dnl NOTE: arg to macro below becomes the "VERSION"
-AC_INIT(gramps, 3.3.0, [gramps-bugs@lists.sourceforge.net])
+AC_INIT(gramps, 3.3.3, [gramps-bugs@lists.sourceforge.net])
 AC_CONFIG_SRCDIR(configure.in)
 AM_INIT_AUTOMAKE([1.6.3 foreign])

@@ -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"
+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"
 GETTEXT_PACKAGE=gramps
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the Gettext package name.])
@@ -139,6 +139,7 @@ src/plugins/gramplet/Makefile
 src/plugins/graph/Makefile
 src/plugins/import/Makefile
 src/plugins/lib/Makefile
+src/plugins/lib/maps/Makefile
 src/plugins/mapservices/Makefile
 src/plugins/quickview/Makefile
 src/plugins/rel/Makefile
@@ -150,7 +151,6 @@ src/plugins/webreport/Makefile
 src/plugins/webstuff/Makefile
 src/plugins/webstuff/css/Makefile
 src/plugins/webstuff/images/Makefile
-src/plugins/webstuff/js/Makefile
 src/DateHandler/Makefile
 src/data/Makefile
 src/glade/Makefile
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 # Gramps - a GTK+/GNOME based genealogy program
 #
@@ -58,9 +56,9 @@ DATABASE
    tags
 -->

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


@@ -80,16 +78,17 @@ HEADER
        version  CDATA #REQUIRED
 >

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

 <!ELEMENT mediapath  (#PCDATA)>

@@ -107,10 +106,9 @@ PEOPLE
                  objref*, address*, attribute*, url*, childof*,
                  parentin*, personref*, noteref*, sourceref*, tagref*)>
 <!ATTLIST person
-        id        CDATA #REQUIRED
+        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
-        marker    CDATA #IMPLIED
        change    CDATA #REQUIRED
 >

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

-<!ELEMENT name    (first?, call?, surname*, nick?, familynick?, suffix?, title?, group?
+<!ELEMENT name    (first?, call?, surname*, suffix?, title?, nick?, familynick?, group?,
                  (daterange|datespan|dateval|datestr)?, noteref*, sourceref*)>
 <!ATTLIST name    
        alt       (0|1) #IMPLIED
@@ -139,7 +137,7 @@ GENDER has values of M, F, or U.
 <!ELEMENT surname    (#PCDATA)>
 <!ATTLIST surname
        prefix      CDATA #IMPLIED
-        primary     (1|0) #IMPLIED
+        prim        (1|0) #IMPLIED
        derivation  CDATA #IMPLIED
        connector   CDATA #IMPLIED
 >
@@ -158,18 +156,19 @@ GENDER has values of M, F, or U.
        rel   CDATA #REQUIRED
 >

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

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


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

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

@@ -231,10 +228,9 @@ SOURCES
 <!ELEMENT source (stitle?, sauthor?, spubinfo?, sabbrev?,
                  noteref*, objref*, data_item*, reporef*)>
 <!ATTLIST source
-        id        CDATA #REQUIRED
+        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
-        marker    CDATA #IMPLIED
        change    CDATA #REQUIRED
 >
 <!ELEMENT stitle   (#PCDATA)>
@@ -251,10 +247,9 @@ PLACES
 <!ELEMENT placeobj (ptitle?, coord?, location*, objref*, url*, noteref*,
                    sourceref*)>
 <!ATTLIST placeobj
-        id        CDATA #REQUIRED
+        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
-        marker    CDATA #IMPLIED
        change    CDATA #REQUIRED
 >

@@ -268,14 +263,15 @@ PLACES

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

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

@@ -309,10 +304,9 @@ REPOSITORIES

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

@@ -326,10 +320,9 @@ NOTES

 <!ELEMENT note (text, style*, tagref*)>
 <!ATTLIST note
-        id        CDATA #REQUIRED
+        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
-        marker    CDATA #IMPLIED
        change    CDATA #REQUIRED
        format    (0|1) #IMPLIED
        type      CDATA #REQUIRED
@@ -372,7 +365,8 @@ BOOKMARKS
 <!ELEMENT bookmarks (bookmark)*>
 <!ELEMENT bookmark EMPTY>
 <!ATTLIST bookmark 
-        target (person|family|event|source|place|media|repository) #REQUIRED
+        target (person|family|event|source|place|media|repository|
+                note) #REQUIRED
        hlink  IDREF #REQUIRED
 >

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

      <optional><element name="name-formats">
@@ -128,6 +133,7 @@
  <define name="researcher-content">
      <element name="resname"><text/></element>
      <optional><element name="resaddr"><text/></element></optional>
+      <optional><element name="reslocality"><text/></element></optional>
      <optional><element name="rescity"><text/></element></optional>
      <optional><element name="resstate"><text/></element></optional>
      <optional><element name="rescountry"><text/></element></optional>
@@ -143,12 +149,11 @@

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

  <define name="person-content">
@@ -186,11 +191,7 @@
        <attribute name="hlink"><data type="IDREF"/></attribute>
    </element></zeroOrMore>
    <zeroOrMore><element name="personref">
-        <attribute name="hlink"><data type="IDREF"/></attribute>
-        <optional><attribute name="priv">
-            <ref name="priv-content"/>
-        </attribute></optional>
-        <attribute name="rel"><text/></attribute>
+        <ref name="personref-content"/>
    </element></zeroOrMore>
    <zeroOrMore><element name="noteref">
        <ref name="noteref-content"/>
@@ -225,6 +226,7 @@
        <ref name="priv-content"/>
    </attribute></optional>
    <optional><attribute name="type"><choice>
+        <value>Unknown</value>
        <value>Also Known As</value>
        <value>Birth Name</value>
        <value>Married Name</value>
@@ -234,14 +236,14 @@
    <optional><attribute name="display"><text/></attribute></optional>
    <optional><element name="first"><text/></element></optional>
    <optional><element name="call"><text/></element></optional>
-    <optional><element name="nick"><text/></element></optional>
-    <optional><element name="familynick"><text/></element></optional>
-    <optional><element name="group"><text/></element></optional>
    <zeroOrMore><element name="surname">
        <ref name="surname-content"/>
    </element></zeroOrMore>
    <optional><element name="suffix"><text/></element></optional>
    <optional><element name="title"><text/></element></optional>
+    <optional><element name="nick"><text/></element></optional>
+    <optional><element name="familynick"><text/></element></optional>
+    <optional><element name="group"><text/></element></optional>
    <optional><ref name="date-content"/></optional>
    <zeroOrMore><element name="noteref">
        <ref name="noteref-content"/>
@@ -252,21 +254,27 @@
  </define>

  <define name="surname-content">
-    <element name="surname">
-        <text/>
-        <optional><attribute name="prefix"><text/></attribute></optional>
-        <optional><attribute name="primary"><choice>
-        <value>1</value>
-        <value>0</value>
-        </choice></attribute></optional>
-        <optional><attribute name="derivation"><choice>
-        <value>inherited</value>
-        <value>patronymic</value>
-        <value>matronymic</value>
-        <value>other</value>
-        </choice></attribute></optional>
-        <optional><attribute name="connector"><text/></attribute></optional>
-    </element>
+    <text/>
+    <optional><attribute name="prefix"><text/></attribute></optional>
+    <optional><attribute name="prim"><choice>
+    <value>1</value>
+    <value>0</value>
+    </choice></attribute></optional>
+    <optional><attribute name="derivation"><choice>
+    <value>Unknown</value>
+    <value>Inherited</value>
+    <value>Given</value>
+    <value>Taken</value>
+    <value>Patronymic</value>
+    <value>Matronymic</value>
+    <value>Feudal</value>
+    <value>Pseudonym</value>
+    <value>Patrilineal</value>
+    <value>Matrilineal</value>
+    <value>Occupation</value>
+    <value>Location</value>
+    </choice></attribute></optional>
+    <optional><attribute name="connector"><text/></attribute></optional>
  </define>

  <define name="address-content">
@@ -275,6 +283,7 @@
    </attribute></optional>
    <optional><ref name="date-content"/></optional>
    <optional><element name="street"><text/></element></optional>
+    <optional><element name="locality"><text/></element></optional>
    <optional><element name="city"><text/></element></optional>
    <optional><element name="county"><text/></element></optional>
    <optional><element name="state"><text/></element></optional>
@@ -371,6 +380,12 @@
        <optional><attribute name="frel">
            <ref name="child-rel"/>
        </attribute></optional>
+        <zeroOrMore><element name="sourceref">
+            <ref name="sourceref-content"/>
+        </element></zeroOrMore>
+        <zeroOrMore><element name="noteref">
+            <ref name="noteref-content"/>
+        </element></zeroOrMore>
    </element></zeroOrMore>
    <zeroOrMore><element name="attribute">
        <ref name="attribute-content"/>
@@ -434,11 +449,12 @@
    <ref name="primary-object"/>
    <optional><element name="ptitle"><text/></element></optional>
    <optional><element name="coord">
-        <attribute name="long"><data type="float"/></attribute>
-        <attribute name="lat"><data type="float"/></attribute>
+        <attribute name="long"><text/></attribute>
+        <attribute name="lat"><text/></attribute>
    </element></optional>
    <zeroOrMore><element name="location">
        <optional><attribute name="street"><text/></attribute></optional>
+        <optional><attribute name="locality"><text/></attribute></optional>
        <optional><attribute name="city"><text/></attribute></optional>
        <optional><attribute name="parish"><text/></attribute></optional>
        <optional><attribute name="county"><text/></attribute></optional>
@@ -507,6 +523,7 @@
        <value>place</value>
        <value>media</value>
        <value>repository</value>
+        <value>note</value>
    </choice></attribute>
    <attribute name="hlink"><data type="IDREF"/></attribute>
  </define>
@@ -564,6 +581,20 @@
    </element></zeroOrMore>
  </define>

+  <define name="personref-content">
+    <attribute name="hlink"><data type="IDREF"/></attribute>
+        <optional><attribute name="priv">
+            <ref name="priv-content"/>
+        </attribute></optional>
+        <attribute name="rel"><text/></attribute>
+    <optional><zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
+    </element></zeroOrMore></optional>
+    <optional><zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore></optional>
+  </define>
+
  <define name="sourceref-content">
    <attribute name="hlink"><data type="IDREF"/></attribute>
    <optional><attribute name="priv">
@@ -216,10 +216,10 @@ en \fIstderr\fR (si elles ne sont pas le fait d'une manipulation). Utilisez les
 .SH EXEMPLES
 .TP
 Pour ouvrir un arbre familial et y importer un fichier XML, on peut saisir: 
-\fBgramps\fR \fB\-O\fR \fI'Mon Arbre Familal'\fR \fB\-i\fR \fI~/db3.gramps\fR
+\fBgramps\fR \fB\-O\fR \fI'Mon Arbre Familial'\fR \fB\-i\fR \fI~/db3.gramps\fR
 .TP 
-Ceci ouvre un arbre familal, pour faire la même chose, mais importer dans un arbre familial temporaire et démarrer une session interactive, on peut saisir: 
-\fBgramps\fR \fB\-i\fR \fI'Mon Arbre Familal'\fR \fB\-i\fR \fI~/db3.gramps\fR
+Ceci ouvre un arbre familial, pour faire la même chose, mais importer dans un arbre familial temporaire et démarrer une session interactive, on peut saisir: 
+\fBgramps\fR \fB\-i\fR \fI'Mon Arbre Familial'\fR \fB\-i\fR \fI~/db3.gramps\fR
 .TP  
 Lecture de quatre bases de données dont les formats peuvent être devinés d'après les noms, puis vérification des données: 
 \fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-i\fR \fIfile4.wft\fR \fB\-a\fR \fIcheck\fR 
@@ -1,3 +1,9 @@
+gramps (3.3.0-1) lucid; urgency=low
+
+  * New upstream release
+
+ -- Stephane Charette <stephanecharette@gmail.com>  Sun, 12 Jun 2011 02:22:02 -0700
+
 gramps (3.2.0-0beta1) unstable; urgency=low

  * New upstream release
@@ -10,10 +10,10 @@ XS-Python-Version: >=2.5

 Package: gramps
 Architecture: all
-Depends: ${python:Depends}, librsvg2-common, python-gtk2, xdg-utils, ${misc:Depends}
+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: graphviz, python-webkit, python-gtkmozembed
+Recommends: 
 Suggests: ttf-freefont, python-enchant, python-gtkspell
 Description: Genealogical research program
 GRAMPS is an Open Source genealogy program written in Python, using
@@ -16,6 +16,7 @@ Contents:

   gen/gen_lib
   gen/gen_db
+   gen/gen_display
   gen/gen_plug
   gen/gen_proxy
   gen/gen_utils
@@ -30,6 +31,7 @@ Contents:

   corecli/cli
   coregui/gui
+   date
   relationship
   utils

@@ -46,16 +46,16 @@ master_doc = 'index'

 # General information about the project.
 project = u'Gramps'
-copyright = u'2009, The Gramps Project'
+copyright = u'2011, The Gramps Project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '3.2'
+version = '3.3'
 # The full version, including alpha/beta/rc tags.
-release = '3.2.0'
+release = '3.3.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -1,4 +1,45 @@
+##########################
 The :mod:`cli` Module
-=====================
+##########################

-Todo
+.. automodule:: cli
+
+*****************************
+Argument Handler
+*****************************
+.. automodule:: cli.arghandler
+.. autoclass:: ArgHandler
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+Argument Parser
+*****************************
+.. automodule:: cli.argparser
+.. autoclass:: ArgParser
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+CLI DB manager
+*****************************
+.. automodule:: cli.clidbman
+.. autoclass:: CLIDbManager
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+Gramps CLI
+*****************************
+.. automodule:: cli.grampscli
+.. autoclass:: CLIDbLoader
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: CLIManager
+   :members:
+   :undoc-members:
+   :show-inheritance:
@@ -1,4 +1,149 @@
+##########################
 The :mod:`gui` Module
-=====================
+##########################

+.. automodule:: gui
+
+*****************************
+About Dialog
+*****************************
+.. automodule:: gui.aboutdialog
+.. autoclass:: AuthorParser
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: GrampsAboutDialog
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+Base Sidebar
+*****************************
+.. automodule:: gui.basesidebar
+.. autoclass::  BaseSidebar
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+Column Order
+*****************************
+.. automodule:: gui.columnorder
+.. autoclass::  ColumnOrder
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+Configuration
+*****************************
+.. automodule:: gui.configure
+.. autoclass::  ConfigureDialog
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass::  DisplayNameEditor
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass::  GrampsPreferences
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+GUI Element (DB)
+*****************************
+.. automodule:: gui.dbguielement
+.. autoclass::  DbGUIElement
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+DB Loader
+*****************************
+.. automodule:: gui.dbloader
+.. autoclass::  DbLoader
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass::  GrampsFormatWidget
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+DB Manager
+*****************************
+.. automodule:: gui.dbman
+.. autoclass::  DbManager
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+Filter Editor
+*****************************
+.. automodule:: gui.filtereditor
+.. autoclass:: EditFilter
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: EditRule
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: FilterEditor
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: MyBoolean
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: MyEntry
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: MyFilters
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: MyID
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: MyInteger
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: MyLesserEqualGreater
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: MyList
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: MyPlaces
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: MySelect
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: MySource
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: ShowResults
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
 Todo
+*****************************
@@ -0,0 +1,279 @@
+#########################################
+The :class:`Date Handler` Classes
+#########################################
+
+DateParser
+====================================
+.. automodule:: DateHandler._DateParser
+.. autoclass:: DateParser
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+DateDisplay
+====================================
+.. automodule:: DateHandler._DateDisplay
+.. autoclass:: DateDisplay
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateDisplayEn
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+DateUtils
+====================================
+.. automodule:: DateHandler._DateUtils
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+DateHandler
+====================================
+.. automodule:: DateHandler._DateHandler
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Localized Date Handlers
+====================================
+
+*****************************
+DateHandler (Bulgarian)
+*****************************
+.. autoclass:: DateHandler._Date_bg.DateParserBG
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_bg.DateDisplayBG
+   :members:
+   :undoc-members:
+   :show-inheritance: 
+
+*****************************
+DateHandler (Catalan)
+*****************************
+.. autoclass:: DateHandler._Date_ca.DateParserCA
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_ca.DateDisplayCA
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+DateHandler (Czech)
+*****************************
+.. autoclass:: DateHandler._Date_cs.DateParserCZ
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_cs.DateDisplayCZ
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+DateHandler (German)
+*****************************
+.. autoclass:: DateHandler._Date_de.DateParserDE
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_de.DateDisplayDE
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+DateHandler (Spanish)
+*****************************
+.. autoclass:: DateHandler._Date_es.DateParserES
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_es.DateDisplayES
+   :members:
+   :undoc-members:
+   :show-inheritance: 
+
+*****************************
+DateHandler (Finnish)
+*****************************
+.. autoclass:: DateHandler._Date_fi.DateParserFI
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_fi.DateDisplayFI
+   :members:
+   :undoc-members:
+   :show-inheritance: 
+
+*****************************
+DateHandler (French)
+*****************************
+.. autoclass:: DateHandler._Date_fr.DateParserFR
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_fr.DateDisplayFR
+   :members:
+   :undoc-members:
+   :show-inheritance: 
+
+*****************************
+DateHandler (Croatian)
+*****************************
+.. autoclass:: DateHandler._Date_hr.DateParserHR
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_hr.DateDisplayHR
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+DateHandler (Italian)
+*****************************
+.. autoclass:: DateHandler._Date_it.DateParserIT
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_it.DateDisplayIT
+   :members:
+   :undoc-members:
+   :show-inheritance: 
+
+*****************************
+DateHandler (Lituanian)
+*****************************
+.. autoclass:: DateHandler._Date_lt.DateParserLT
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_lt.DateDisplayLT
+   :members:
+   :undoc-members:
+   :show-inheritance:  
+
+*****************************
+DateHandler (Norwegian)
+*****************************
+.. autoclass:: DateHandler._Date_nb.DateParserNb
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_nb.DateDisplayNb
+   :members:
+   :undoc-members:
+   :show-inheritance: 
+
+*****************************
+DateHandler (Dutch)
+*****************************
+.. autoclass:: DateHandler._Date_nl.DateParserNL
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_nl.DateDisplayNL
+   :members:
+   :undoc-members:
+   :show-inheritance: 
+
+*****************************
+DateHandler (Polish)
+*****************************
+.. autoclass:: DateHandler._Date_pl.DateParserPL
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_pl.DateDisplayPL
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+DateHandler (Portuguese)
+*****************************
+.. autoclass:: DateHandler._Date_pt.DateParserPT
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_pt.DateDisplayPT
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+DateHandler (Russian)
+*****************************
+.. autoclass:: DateHandler._Date_ru.DateParserRU
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_ru.DateDisplayRU
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+DateHandler (Slovak)
+*****************************
+.. autoclass:: DateHandler._Date_sk.DateParserSK
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_sk.DateDisplaySK
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+DateHandler (Slovenian)
+*****************************
+.. autoclass:: DateHandler._Date_sl.DateParserSL
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_sl.DateDisplaySL
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+DateHandler (Serbian)
+*****************************
+.. autoclass:: DateHandler._Date_sr.DateParserSR
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass:: DateHandler._Date_sr.DateDisplaySR_latin
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+DateHandler (Swedish)
+*****************************
+.. autoclass::  DateHandler._Date_sv.DateParserSv
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass::  DateHandler._Date_sv.DateDisplaySv
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+#########################################
+The :class:`Date Edition` Classes
+#########################################
+
+DateEdit
+====================================
+.. automodule:: DateEdit
+   :members:
+   :undoc-members:
+   :show-inheritance:
@@ -2,158 +2,77 @@
 The :mod:`gen.db` Module
 ##########################

-Contents:
-
 .. automodule:: gen.db

-*****************************
-Base object
-*****************************
-
 GrampsDbBase
 ====================================
 .. automodule:: gen.db.base
-.. autoclass:: GrampsDbBase
   :members:
   :undoc-members:
   :show-inheritance:

-*****************************
-Read object
-*****************************
-
 GrampsDbRead
 ====================================
 .. automodule:: gen.db.read
-.. autoclass:: GrampsDbRead
   :members:
   :show-inheritance:

-*****************************
-Write object
-*****************************
-
 GrampsDbWrite
 ====================================
 .. automodule:: gen.db.write
-.. autoclass:: GrampsDBDir
   :members:
   :undoc-members:
   :show-inheritance:

-*****************************
-Cursor
-*****************************
-
 GrampsCursor
 ====================================
 .. automodule:: gen.db.cursor
-.. autoclass:: GrampsCursor
   :members:
   :undoc-members:
   :show-inheritance:

-*****************************
-BSDDB txn
-*****************************
-
 BSDDBtxn
 ====================================
 .. automodule:: gen.db.bsddbtxn
-.. autoclass:: BSDDBTxn
   :members:
   :undoc-members:
   :show-inheritance:

-*****************************
-Txn object
-*****************************
-
 GrampsDbTxn
 ====================================
 .. automodule:: gen.db.txn
-.. autoclass:: GrampsDbTxn
   :members:
   :undoc-members:
   :show-inheritance:

-*****************************
-Undoredo object
-*****************************
-
 GrampsDbUndo
 ====================================
 .. automodule:: gen.db.undoredo
-.. autoclass:: GrampsDbUndo
   :members:
   :undoc-members:
   :show-inheritance:

-GrampsDbUndoList
-====================================
-
-.. autoclass:: GrampsDbUndoList
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-GrampsDbUndoBSDDB
-====================================
-
-.. autoclass:: GrampsDbUndoBSDDB
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Dbconst object
-*****************************
-
 DbConst
 ====================================
 .. automodule:: gen.db.dbconst
   :members:

-*****************************
-Exceptions object
-*****************************
-
 GrampsDbException
 ====================================
 .. automodule:: gen.db.exceptions
-.. autoclass:: GrampsDbException
   :members:
   :undoc-members:
   :show-inheritance:

-GrampsDbWriteFailure
-====================================
-
-.. autoclass:: GrampsDbWriteFailure
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-FileVersionError
-====================================   
-
-.. autoclass:: FileVersionError
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-FileVersionDeclineToUpgrade
-====================================
-
-.. autoclass:: FileVersionDeclineToUpgrade
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
 Upgrade utilities
-*****************************
-
+====================================
 .. automodule:: gen.db.upgrade
-    :members:
-    :undoc-members:
+   :members:
+   :undoc-members:
+
+Backup
+====================================
+.. automodule:: gen.db.backup
+   :members:
+   :undoc-members:
+   :show-inheritance:
@@ -0,0 +1,12 @@
+#############################
+The :mod:`gen.display` Module
+#############################
+
+.. automodule:: gen.display
+
+Name
+====================================
+.. automodule:: gen.display.name
+   :members:
+   :undoc-members:
+   :show-inheritance:
@@ -2,8 +2,6 @@
 The :mod:`gen.lib` Module
 ##########################

-Contents:
-
 .. automodule:: gen.lib

 *****************************
@@ -18,31 +16,53 @@ BaseObject
   :undoc-members:
   :show-inheritance:

-RefBase
+AddressBase
 ====================================
-.. automodule:: gen.lib.refbase
-.. autoclass:: RefBase
+.. automodule:: gen.lib.addressbase
+.. autoclass:: AddressBase
   :members:
   :undoc-members:
   :show-inheritance:

-PrivacyBase
+AttributeBase
 ====================================
-.. automodule:: gen.lib.privacybase
-.. autoclass:: PrivacyBase
+.. automodule:: gen.lib.attrbase
+.. autoclass:: AttributeBase
   :members:
   :undoc-members:
   :show-inheritance:
-
-
-SourceBase
+   
+DateBase
 ====================================
-.. automodule:: gen.lib.srcbase
-.. autoclass:: SourceBase
+.. automodule:: gen.lib.datebase
+.. autoclass:: DateBase
+   :members:
+   :undoc-members:
+   :show-inheritance:
+   
+LdsOrdBase
+====================================
+.. automodule:: gen.lib.ldsordbase
+.. autoclass:: LdsOrdBase
+   :members:
+   :undoc-members:
+   :show-inheritance:
+   
+LocationBase
+====================================
+.. automodule:: gen.lib.locationbase
+.. autoclass:: LocationBase
+   :members:
+   :undoc-members:
+   :show-inheritance:
+   
+MediaBase
+====================================
+.. automodule:: gen.lib.mediabase
+.. autoclass:: MediaBase
   :members:
   :undoc-members:
   :show-inheritance:
-

 NoteBase
 ====================================
@@ -52,14 +72,6 @@ NoteBase
   :undoc-members:
   :show-inheritance:

-MediaBase
-====================================
-.. automodule:: gen.lib.mediabase
-.. autoclass:: MediaBase
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 PlaceBase
 ====================================
 .. automodule:: gen.lib.placebase
@@ -68,29 +80,26 @@ PlaceBase
   :undoc-members:
   :show-inheritance:

-
-LocationBase
+PrivacyBase
 ====================================
-.. automodule:: gen.lib.locationbase
-.. autoclass:: LocationBase
+.. automodule:: gen.lib.privacybase
+.. autoclass:: PrivacyBase
+   :members:
+   :undoc-members:
+   :show-inheritance:
+   
+RefBase
+====================================
+.. automodule:: gen.lib.refbase
+.. autoclass:: RefBase
   :members:
   :undoc-members:
   :show-inheritance:

-
-AddressBase
+SourceBase
 ====================================
-.. automodule:: gen.lib.addressbase
-.. autoclass:: AddressBase
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-AttributeBase
-====================================
-.. automodule:: gen.lib.attrbase
-.. autoclass:: AttributeBase
+.. automodule:: gen.lib.srcbase
+.. autoclass:: SourceBase
   :members:
   :undoc-members:
   :show-inheritance:
@@ -102,11 +111,11 @@ SurnameBase
   :members:
   :undoc-members:
   :show-inheritance:
-
-DateBase
+      
+TagBase
 ====================================
-.. automodule:: gen.lib.datebase
-.. autoclass:: DateBase
+.. automodule:: gen.lib.tagbase
+.. autoclass:: TagBase
   :members:
   :undoc-members:
   :show-inheritance:
@@ -119,14 +128,6 @@ UrlBase
   :undoc-members:
   :show-inheritance:

-LdsOrdBase
-====================================
-.. automodule:: gen.lib.ldsordbase
-.. autoclass:: LdsOrdBase
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 *****************************
 Primary objects
 *****************************
@@ -154,7 +155,6 @@ Person
   :undoc-members:
   :show-inheritance:

-
 Family
 ====================================
 .. automodule:: gen.lib.family
@@ -163,7 +163,6 @@ Family
   :undoc-members:
   :show-inheritance:

-
 Event
 ====================================
 .. automodule:: gen.lib.event
@@ -180,7 +179,6 @@ Place
   :undoc-members:
   :show-inheritance:

-
 Source
 ====================================
 .. automodule:: gen.lib.src
@@ -189,7 +187,6 @@ Source
   :undoc-members:
   :show-inheritance:

-
 Media Object
 ====================================
 .. automodule:: gen.lib.mediaobj
@@ -198,7 +195,6 @@ Media Object
   :undoc-members:
   :show-inheritance:

-
 Repository
 ====================================
 .. automodule:: gen.lib.repo
@@ -227,7 +223,6 @@ Secondary Object
   :undoc-members:
   :show-inheritance:

-
 Address
 ====================================
 .. automodule:: gen.lib.address
@@ -236,14 +231,6 @@ Address
   :undoc-members:
   :show-inheritance:

-Location
-====================================
-.. automodule:: gen.lib.location
-.. autoclass:: Location
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 Attribute
 ====================================
 .. automodule:: gen.lib.attribute
@@ -260,6 +247,14 @@ LdsOrd
   :undoc-members:
   :show-inheritance:

+Location
+====================================
+.. automodule:: gen.lib.location
+.. autoclass:: Location
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 Name
 ====================================
 .. automodule:: gen.lib.name
@@ -284,19 +279,10 @@ Url
   :undoc-members:
   :show-inheritance:

-
 *****************************
 Reference objects
 *****************************

-PersonRef
-====================================
-.. automodule:: gen.lib.personref
-.. autoclass:: PersonRef
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 ChildRef
 ====================================
 .. automodule:: gen.lib.childref
@@ -321,10 +307,10 @@ MediaRef
   :undoc-members:
   :show-inheritance:

-SourceRef
+PersonRef
 ====================================
-.. automodule:: gen.lib.srcref
-.. autoclass:: SourceRef
+.. automodule:: gen.lib.personref
+.. autoclass:: PersonRef
   :members:
   :undoc-members:
   :show-inheritance:
@@ -336,6 +322,25 @@ RepoRef
   :members:
   :undoc-members:
   :show-inheritance:
+   
+SourceRef
+====================================
+.. automodule:: gen.lib.srcref
+.. autoclass:: SourceRef
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+*****************************
+Table object
+*****************************
+
+Table object
+====================================
+.. automodule:: gen.lib.tableobj
+   :members:
+   :undoc-members:
+   :show-inheritance:

 *****************************
 Date objects
@@ -417,20 +422,6 @@ GrampsType
   :undoc-members:
   :show-inheritance:

-NameType
-===========
-.. automodule:: gen.lib.nametype
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-NameOriginType
-===========
-.. automodule:: gen.lib.nameorigintype
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 AttributeType
 =============
 .. automodule:: gen.lib.attrtype
@@ -438,13 +429,6 @@ AttributeType
   :undoc-members:
   :show-inheritance:

-UrlType
-========
-.. automodule:: gen.lib.urltype
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 ChildRefType
 =============
 .. automodule:: gen.lib.childreftype
@@ -452,13 +436,6 @@ ChildRefType
   :undoc-members:
   :show-inheritance:

-RepositoryType
-==============
-.. automodule:: gen.lib.repotype
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 EventType
 ===========
 .. automodule:: gen.lib.eventtype
@@ -466,6 +443,13 @@ EventType
   :members:
   :undoc-members:
   :show-inheritance:
+   
+EventRoleType
+==============
+.. automodule:: gen.lib.eventroletype
+   :members:
+   :undoc-members:
+   :show-inheritance:

 FamilyRelType
 =============
@@ -474,20 +458,6 @@ FamilyRelType
   :undoc-members:
   :show-inheritance:

-SourceMediaType
-================
-.. automodule:: gen.lib.srcmediatype
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-EventRoleType
-==============
-.. automodule:: gen.lib.eventroletype
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 MarkerType
 ==========
 .. automodule:: gen.lib.markertype
@@ -495,6 +465,20 @@ MarkerType
   :undoc-members:
   :show-inheritance:

+NameType
+===========
+.. automodule:: gen.lib.nametype
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+NameOriginType
+==============
+.. automodule:: gen.lib.nameorigintype
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 NoteType
 =========
 .. automodule:: gen.lib.notetype
@@ -502,11 +486,30 @@ NoteType
   :undoc-members:
   :show-inheritance:

+RepositoryType
+==============
+.. automodule:: gen.lib.repotype
+   :members:
+   :undoc-members:
+   :show-inheritance:
+   
+SourceMediaType
+================
+.. automodule:: gen.lib.srcmediatype
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 StyledTextTagType
 ==================
 .. automodule:: gen.lib.styledtexttagtype
   :members:
   :undoc-members:
   :show-inheritance:
-
-
+   
+UrlType
+========
+.. automodule:: gen.lib.urltype
+   :members:
+   :undoc-members:
+   :show-inheritance:
@@ -2,118 +2,228 @@
 The :mod:`gen.plug` Module
 ############################

-Contents:
-
 .. automodule:: gen.plug

-*****************************
-Plugins objects
-*****************************
-
 Plugin
 ====================================
-.. automodule:: gen.plug
-.. autoclass:: gen.plug.Plugin
+.. automodule:: gen.plug._plugin
   :members:
   :undoc-members:
   :show-inheritance:

 BaseManager
 ====================================
-.. automodule:: gen.plug
-.. autoclass:: gen.plug.BasePluginManager
+.. automodule:: gen.plug._manager
   :members:
   :undoc-members:
   :show-inheritance:

 Docgen
 ====================================
-.. automodule:: gen.plug
-.. autoclass:: gen.plug.DocGenPlugin
+.. automodule:: gen.plug._docgenplugin
   :members:
   :undoc-members:
   :show-inheritance:

 Export
 ====================================
-.. automodule:: gen.plug
-.. autoclass:: gen.plug.ExportPlugin
+.. automodule:: gen.plug._export
   :members:
   :undoc-members:
   :show-inheritance:

 Gramplet
 ====================================
-.. automodule:: gen.plug
-.. autoclass:: gen.plug.Gramplet
+.. automodule:: gen.plug._gramplet
   :members:
   :undoc-members:
   :show-inheritance:

 Import
 ====================================
-.. automodule:: gen.plug
-.. autoclass:: gen.plug.ImportPlugin
+.. automodule:: gen.plug._import
   :members:
   :undoc-members:
   :show-inheritance:

 Options
 ====================================
-.. automodule:: gen.plug
-.. autoclass:: gen.plug.Options
+.. automodule:: gen.plug._options
   :members:
   :undoc-members:
   :show-inheritance:

 Register
 ====================================
-.. automodule:: gen.plug
-.. autoclass:: gen.plug.PluginRegister
+.. automodule:: gen.plug._pluginreg
   :members:
   :undoc-members:
   :show-inheritance:

 Utils
 ====================================
-.. automodule:: gen.plug
+.. automodule:: gen.plug.utils
   :members:
   :undoc-members:
   :show-inheritance:

 Docbackend
 ====================================
-.. automodule:: gen.plug.docbackend
+.. automodule:: gen.plug.docbackend.cairobackend
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.docbackend.docbackend
   :members:
   :undoc-members:
   :show-inheritance:
-
-**TODO**

 DocGen
 ====================================
-.. automodule:: gen.plug.docgen
+.. automodule:: gen.plug.docgen.basedoc
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.docgen.drawdoc
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.docgen.fontscale
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.docgen.fontstyle
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.docgen.graphdoc
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.docgen.graphicstyle
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.docgen.paperstyle
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.docgen.paragraphstyle
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.docgen.stylesheet
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.docgen.tablestyle
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.docgen.textdoc
   :members:
   :undoc-members:
   :show-inheritance:
-
-**TODO**

 Menu
 ====================================
-.. automodule:: gen.plug.menu
+.. automodule:: gen.plug.menu._boolean
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._booleanlist
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._color
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._destination
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._enumeratedlist
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._family
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._filter
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._media
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._note
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._number
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._option
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._person
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._personlist
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._placelist
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._string
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._style
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._surnamecolor
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.menu._text
   :members:
   :undoc-members:
   :show-inheritance:
-
-**TODO**

 Report
 ====================================
-.. automodule:: gen.plug.report
+.. automodule:: gen.plug.report._bibliography
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.report._constants
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.report.endnotes
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.report._paper
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.report._reportbase
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.plug.report.utils
   :members:
   :undoc-members:
   :show-inheritance:

-**TODO**
-
@@ -2,8 +2,43 @@
 The :mod:`gen.proxy` Module
 ############################

-Contents:
-
 .. automodule:: gen.proxy

-**TODO**
+Proxy Base
+====================================
+.. automodule:: gen.proxy.proxybase
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Filter
+====================================
+.. automodule:: gen.proxy.filter
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Living
+====================================
+.. automodule:: gen.proxy.living
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Private
+====================================
+.. automodule:: gen.proxy.private
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+References
+====================================
+.. automodule:: gen.proxy.referenced
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.proxy.referencedbyselection
+   :members:
+   :undoc-members:
+   :show-inheritance:
@@ -2,8 +2,25 @@
 The :mod:`gen.utils` Module
 ############################

-Contents:
-
 .. automodule:: gen.utils

-**TODO**
+Utils
+====================================
+.. automodule:: gen.utils.callback
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.callman
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.configmanager
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gen.utils.fallback
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
@@ -2,10 +2,131 @@
 The :class:`RelationshipCalculator` Class
 #########################################

-Contents:
-
 .. automodule:: Relationship
 .. autoclass:: RelationshipCalculator
   :members:
   :undoc-members:
   :show-inheritance:
+
+*****************************
+Localized Handlers
+*****************************
+
+Relationship (Czech)
+====================================
+.. autoclass:: rel_cs.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Danish)
+====================================
+.. autoclass:: rel_da.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (German)
+====================================
+.. autoclass:: rel_de.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Spanish)
+====================================
+.. autoclass:: rel_es.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Finnish)
+====================================
+.. autoclass:: rel_fi.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (French)
+====================================
+.. autoclass:: rel_fr.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Croatian)
+====================================
+.. autoclass:: rel_hr.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Hungarian)
+====================================
+.. autoclass:: rel_hu.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Italian)
+====================================
+.. autoclass:: rel_it.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Dutch)
+====================================
+.. autoclass:: rel_nl.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Norwegian)
+====================================
+.. autoclass:: rel_no.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Polish)
+====================================
+.. autoclass:: rel_pl.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Portuguese)
+====================================
+.. autoclass:: rel_pt.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Russian)
+====================================
+.. autoclass:: rel_ru.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Slovak)
+====================================
+.. autoclass:: rel_sk.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Slovenian)
+====================================
+.. autoclass:: rel_sl.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Relationship (Swedish)
+====================================
+.. autoclass:: rel_sv.RelationshipCalculator
+   :members:
+   :undoc-members:
+   :show-inheritance:
@@ -9433,7 +9433,7 @@
    </event>
    <event handle="_a5af0ed3b6d6729219d" change="1284030618" id="E2586">
      <type>Death</type>
-      <dateval val="0168-10-14"/>
+      <dateval val="1680-10-14"/>
      <description>Death of Jenkins, Peter</description>
    </event>
    <event handle="_a5af0ed49ae36c73295" change="1284030607" id="E2695">
@@ -7,7 +7,7 @@
    <key>CFBundleExecutable</key>
    <string>Gramps</string>
    <key>CFBundleGetInfoString</key>
-    <string>3.2.5, (C) 1997-2010 The Gramps Team http://www.gramps-project.org</string>
+    <string>3.3.2, (C) 1997-2012 The Gramps Team http://www.gramps-project.org</string>
    <key>CFBundleIconFile</key>
    <string>gramps.icns</string>
    <key>CFBundleIdentifier</key>
@@ -17,13 +17,13 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleShortVersionString</key>
-    <string>3.2.5</string>
+    <string>3.3.2</string>
    <key>CFBundleSignature</key>
    <string>????</string>
    <key>CFBundleVersion</key>
-    <string>3.2.5</string>
+    <string>3.3.2</string>
    <key>NSHumanReadableCopyright</key>
-    <string>Copyright 1997 - 2010 The Gramps Team, GNU General Public License.</string>
+    <string>Copyright 1997 - 2012 The Gramps Team, GNU General Public License.</string>
    <key>LSMinimumSystemVersion</key>
    <string>10.5</string>
 </dict>
@@ -1,7 +0,0 @@
-
-import sys
-import os.path
-#Modified from the version shipped with pygtk, to point at where the pygtk-demo modules are in the bundle.
-pygtklibdir = os.path.join(os.environ["GTK_EXE_PREFIX"], "lib", "pygtk", "2.0")
-sys.path.insert(0, pygtklibdir)
-execfile(os.path.join("GTK_DATA_PREFIX", "share", "gramps", "gramps.py"))
@@ -5,7 +5,7 @@
    <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
    <destination overwrite="yes">${env:HOME}/Desktop</destination>
    <run-install-name-tool/>
-    <launcher-script>${project}/launcher.sh</launcher-script >
+    <launcher-script>${project}/gramps.launcher</launcher-script >
  </meta>

  <plist>${project}/Info.plist</plist>
@@ -25,31 +25,45 @@
       binaries link to are also copied in automatically.
  -->
  <binary>
-    ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/loaders/*.so
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/
  </binary>
+<!-- Copy in the theme engines. -->
+  <binary>
+    ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.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
+  </binary>
+
  <!-- Copy in libpyglib, which will pull in other dependencies we need -->
  <binary>
    ${prefix}/lib/libpyglib-2.0-python.0.dylib
  </binary>

  <binary recurse="True">
-    ${prefix}/lib/python2.6/*.so
+    ${prefix}/lib/python2.7/*.so
  </binary>

  <binary>
    ${prefix}/lib/librsvg-2.2.dylib
  </binary>

-  <binary>
+  <!--binary>
    ${prefix}/lib/libwebkit-1.0.2.dylib
-  </binary>
+  </binary-->

  <binary>
    ${prefix}/lib/libgoocanvas.3.dylib
  </binary>

  <binary>
-    ${prefix}/lib/libigemacintegration.0.dylib
+    ${prefix}/lib/libgtkmacintegration.0.dylib
  </binary>

  <binary>
@@ -60,22 +74,38 @@
    ${prefix}/lib/libdb-4.dylib
  </binary>

-   <binary>
+  <binary>
    ${prefix}/lib/libenchant.dylib
  </binary>

-   <binary>
-    ${prefix}/lib/libgettextpo.0.dylib
-  </binary>
-
-   <binary>
-    ${prefix}/lib/libproxy.0.dylib
-  </binary>
-
  <binary>
    ${prefix}/lib/enchant
  </binary>

+  <binary>
+     ${prefix}/lib/libgettextpo.0.dylib
+  </binary>
+
+  <binary>
+     ${prefix}/lib/libosmgpsmap.2.dylib
+  </binary>
+
+  <binary>
+    ${prefix}/lib/libhunspell-1.3.0.dylib
+  </binary>
+
+  <binary>
+    ${prefix}/lib/libtiff.3.dylib
+  </binary>
+
+  <binary dest="${bundle}/Contents/MacOS/">
+    ${prefix}/bin/dot
+  </binary>
+
+  <binary>
+    ${prefix}/lib/graphviz/*.dylib
+  </binary>
+
 <!-- Translation filenames, one for each program or library that you
       want to copy in to the bundle. The "dest" attribute is
       optional, as usual. Bundler will find all translations of that
@@ -92,16 +122,24 @@
  <!-- We have to pull in the python modules, which are mixed python
       and loadable modules.  -->
  <data recurse="True">
-    ${prefix}/lib/python2.6/*.py
+    ${prefix}/lib/python2.7/*.py
+  </data>
+
+  <data>
+    ${prefix}/lib/python2.7/config/
+  </data>
+
+  <data>
+    ${prefix}/include/python2.7/pyconfig.h
  </data>

  <data>
    ${prefix}/share/gramps/
  </data>

-  <data>
+  <!--data>
    ${prefix}/share/webkit-1.0/
-  </data>
+  </data-->

  <data>
    ${prefix}/share/enchant/
@@ -115,6 +153,10 @@
    ${prefix}/share/mime-info/
  </data>

+  <data>
+    ${prefix}/lib/graphviz/config6
+  </data>
+
  <!-- Copy in the themes data. You may want to trim this to save space
       in your bundle. -->
  <data>
@@ -137,7 +179,7 @@
    ${project}/gtkrc
  </data>

-  <data dest="${bundle}/Contents/Resources/share/gramps/data/accel.gramps">
+  <data dest="${bundle}/Contents/Resources/share/gramps/data/gramps.accel">
    ${project}/gramps.accel
  </data>

@@ -0,0 +1,46 @@
+#!/bin/sh
+name="`basename $0`"
+tmp="$0"
+tmp=`dirname "$tmp"`
+tmp=`dirname "$tmp"`
+bundle=`dirname "$tmp"`
+bundle_contents="$bundle"/Contents
+bundle_res="$bundle_contents"/Resources
+bundle_lib="$bundle_res"/lib
+bundle_bin="$bundle_res"/bin
+bundle_data="$bundle_res"/share
+bundle_etc="$bundle_res"/etc
+
+export XDG_DATA_DIRS="$bundle_data"
+
+export PATH="$bundle_contents"/MacOS:/bin:/usr/bin
+export DYLD_LIBRARY_PATH="$bundle_lib"
+export LD_LIBRARY_PATH="$DYLD_LIBRARY_PATH"
+export GTK_DATA_PREFIX="$bundle_res"
+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 GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
+export GVBINDIR="$bundle_lib/graphviz"
+
+
+#Set $PYTHON to point inside the bundle
+PYVER=2.7
+export PYTHON="$bundle_contents/MacOS/python"
+export PYTHONHOME="$bundle_res"
+PYTHONPATH="$bundle_lib/python$PYVER/site-packages/pyenchant-1.6.1-py$PYVER.egg:$PYTHONPATH"
+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"
+
+# Strip out the argument added by the OS.
+if /bin/expr "x$1" : '^x-psn_' > /dev/null; then
+    shift 1
+fi
+exec "$PYTHON" -O "$GRAMPSDIR/gramps.py" "$@"
+
@@ -3,9 +3,9 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>

-  <repository type="tarball" name="sourceforge" 
+  <repository type="tarball" name="sourceforge"
              href="http://downloads.sourceforge.net/sourceforge/"/>
-  <repository type="tarball" name="pywebkitgtk" 
+  <repository type="tarball" name="pywebkitgtk"
 	      href="http://pywebkitgtk.googlecode.com/files/"/>
  <repository type="tarball" name="ftp.gnome.org"
 	      href="http://ftp.gnome.org/pub/GNOME/sources/"/>
@@ -21,42 +21,49 @@
 	      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="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/"/>

 <!--
 Special instructions:
 Gramps uses BerkeleyDB (BDB) via Python. BDB is normally included in Linux systems, but Apple prefers other mechanisms for data storage, so it isn't included on Macs.
- jhbuild bootstrap && jhbuild &double-hyphen;moduleset=http://github.com/jralls/gtk-osx-build/raw/master/projects/gramps/gramps.modules build meta-gtk-osx-bootstrap gramps
+ jhbuild bootstrap && jhbuild &double-hyphen;moduleset=http://raw.github.com/jralls/gtk-osx-build/master/projects/gramps/gramps.modules build meta-gtk-osx-bootstrap gramps

-If you're going to bundle GRAMPS, you'll need to add 
+If you're going to bundle GRAMPS, you'll need to add
 _gtk_osx_use_jhbuild_python = True

-to your .jhbuildrc-custom and pass the &double-hyphen;ignore-system argument to jhbuild bootstrap. (That &double-hyphen; entity is fake because double-hyphens aren't allowed in xml comments. Just substitute a real double-hyphen when you type it on the command line.) 
+to your .jhbuildrc-custom and pass the &double-hyphen;ignore-system argument to jhbuild bootstrap. (That &double-hyphen; entity is fake because double-hyphens aren't allowed in xml comments. Just substitute a real double-hyphen when you type it on the command line.)

 Open a jhbuild shell.

-For reasons known only to themselves, the Python project have set up their makefiles to create libpython without write privs, so you need to 
+For reasons known only to themselves, the Python project have set up their makefiles to create libpython without write privs, so you need to

 chmod +w $PREFIX/lib/libpython2.6.dylib

-before running 
+before running

-ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
+gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle


 -->



-  <include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/>
+  <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
+  <!--include href="/Users/john/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->


  <autotools id="gramps" autogen-sh="configure">
-    <branch module="gramps/gramps-3.2.5.tar.gz" version="3.2.5"
+    <branch module="gramps/gramps-3.3.2.tar.gz" version="3.3.2"
 	    repo="sourceforge">
-      <patch file="http://github.com/jralls/gtk-osx-build/raw/master/patches/gramps.patch" strip="0"/>
-      <patch file="http://github.com/jralls/gtk-osx-build/raw/master/patches/gramps-macui.patch" strip="1"/>
-      <patch file="http://github.com/jralls/gtk-osx-build/raw/master/patches/gramps-accelmap.patch" strip="1"/>
-      <patch file="http://github.com/jralls/gtk-osx-build/raw/master/patches/gramps-pedigree.patch" strip="1"/>
    </branch>
    <dependencies>
      <dep package="meta-gtk-osx-python"/>
@@ -64,43 +71,48 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
      <dep package="librsvg2"/>
      <dep package="pygoocanvas"/>
      <dep package="shared-mime-info"/>
-      <dep package="pyenchant"/>
+      <dep package="hunspell"/>
      <dep package="pygtk-extras"/>
+      <dep package="osmgpsmap-py"/>
+      <dep package="graphviz"/>
+      <dep package="pyexiv2"/>
    </dependencies>
+   <after>
+      <dep package="pyexiv2"/>
+   </after>
  </autotools>

  <autotools id="gramps-svn" >
-    <branch module="gramps" repo="gramps"/>
+    <branch module="gramps" revision="maintenance/gramps33" repo="gramps"/>
    <dependencies>
      <dep package="meta-gtk-osx-python"/>
-      <dep package="pyWebKitGtk"/>
      <dep package="librsvg2"/>
      <dep package="pygoocanvas"/>
      <dep package="shared-mime-info"/>
-    </dependencies>
+      <dep package="hunspell"/>
+      <dep package="pygtk-extras"/>
+      <dep package="osmgpsmap-py"/>
+      <dep package="graphviz"/>
+   </dependencies>
+   <after>
+      <dep package="pyexiv2"/>
+   </after>
  </autotools>

-  <distutils id="gramps-addons">
-    <branch module="branches/gramps32/contrib"
-	    repo="gramps-addons"/>
-    <dependencies>
-      <dep package="gramps"/>
-    </dependencies>
-  </distutils>
-
-  <distutils id="gramps-addons-svn">
-    <branch module="gramps-addons/trunk/contrib"
+  <distutils id="gramps-addons" skip-autogen="true" >
+    <branch module="branches/gramps33/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"/>
+      <dep package="meta-gtk-osx-webkit"/>
      <dep package="sqlite"/>
    </dependencies>
  </autotools>
@@ -112,7 +124,7 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 	    repo="ftp.gnome.org"/>
    <dependencies>
      <dep package="libgsf"/>
-      <dep package="libart_lgpl"/><!-- goffice.modules -->
+      <dep package="libart_lgpl"/>
    </dependencies>
  </autotools>

@@ -120,7 +132,7 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
    <branch module="goocanvas/0.15/goocanvas-0.15.tar.bz2" version="0.15"
 	    repo="ftp.gnome.org"/>
    <dependencies>
-¡      <dep package="gtk+"/>
+      <dep package="gtk+"/>
    </dependencies>
  </autotools>

@@ -128,18 +140,12 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
    <branch module="pygoocanvas/0.14/pygoocanvas-0.14.1.tar.gz" version="0.14.1"
 	    repo="ftp.gnome.org">
    </branch>
-
    <dependencies>
      <dep package="goocanvas"/>
      <dep package="pygtk"/>
    </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"
@@ -150,12 +156,62 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   <branch module="xdg-utils-1.0.2.tgz" version="1.0.2" repo="xdg-utils"/>
 </autotools>

-  <autotools id="berkeleydb" autogen-sh="dist/configure"
-	     autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" makeargs="-C build_unix" 
-	     makeinstallargs="-C build_unix install">
-
-    <branch module="berkeley-db/db-4.7.25.NC.tar.gz" version="4.7.25"
-	    repo="oracle" />
+  <autotools id="osmgpsmap" autogenargs="--enable-introspection=no">
+    <branch module="osm-gps-map/osm-gps-map-0.7.3.tar.gz" repo="stowers"
+	    version="0.7.3"/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="libsoup"/>
+    </dependencies>
  </autotools>

-</moduleset>
+  <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">
+    <branch module="graphviz-2.28.0.tar.gz" version="2.28.0" repo="graphviz"/>
+    <dependencies>
+      <dep package="pango"/>
+      <dep package="zlib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="exiv2">
+    <branch module="exiv2-0.21.1.tar.gz" repo="exiv2.org" version="0.21.1"/>
+  </autotools>
+
+  <autotools id="boost">
+    <branch module="boost/boost_1_46_1.tar.bz2" repo="sourceforge"
+	    version="1.46.1"/>
+  </autotools>
+
+  <distutils id="scons">
+    <branch repo="sourceforge" module="scons/scons-2.0.1.tar.gz" version="2.0.1"/>
+  </distutils>
+
+  <autotools id="pyexiv2">
+    <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"/>
+  </distutils>
+
+</moduleset>
@@ -1,2 +1,7 @@
 gtk-icon-theme-name = "Tango"
 gtk-enable-mnemonics = 0
+style "UniFont" {
+  font_name = "Arial Unicode MS"
+}
+
+widget_class "*" style "UniFont"
@@ -1,169 +0,0 @@
-#!/bin/sh
-
-name="`basename $0`"
-tmp="`pwd`/$0"
-tmp=`dirname "$tmp"`
-tmp=`dirname "$tmp"`
-bundle=`dirname "$tmp"`
-bundle_contents="$bundle"/Contents
-bundle_res="$bundle_contents"/Resources
-bundle_lib="$bundle_res"/lib
-bundle_bin="$bundle_res"/bin
-bundle_data="$bundle_res"/share
-bundle_etc="$bundle_res"/etc
-
-export XDG_DATA_DIRS="$bundle_data"
-
-export DYLD_LIBRARY_PATH="$bundle_lib"
-export LD_LIBRARY_PATH="$DYLD_LIBRARY_PATH"
-export GTK_DATA_PREFIX="$bundle_res"
-export GTK_EXE_PREFIX="$bundle_res"
-export GTK_PATH="$bundle_res"
-
-export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
-export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
-export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
-export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
-
-#Set $PYTHON to point inside the bundle
-export PYTHON="$bundle_contents/MacOS/python"
-#Add the bundle's python modules
-PYTHONPATH="$bundle_lib/python2.6:$PYTHONPATH"
-PYTHONPATH="$bundle_lib/python2.6/site-packages:$PYTHONPATH"
-PYTHONPATH="$bundle_lib/python2.6/site-packages/gtk-2.0:$PYTHONPATH"
-PYTHONPATH="$bundle_lib/python2.6/lib-dynload:$PYTHONPATH"
-#Add our program's modules to $PYTHONPATH. 
-PYTHONPATH="$bundle_lib/pygtk/2.0:$PYTHONPATH"
-export PYTHONPATH
-export GRAMPSDIR="$bundle_data"/gramps
-export GRAMPSI18N="$bundle_data"/locale
-export GRAMPSHOME="$HOME/Library/Application Support"
-
-# Set the locale-related variables appropriately:
-unset LANG LC_MESSAGES LC_MONETARY
-
-# Has a language ordering been set?
-# If so, set LC_MESSAGES accordingly; otherwise skip it.
-# Set the locale-related variables appropriately:
-unset LANG LC_MESSAGES LC_MONETARY LC_COLLATE
-
-# Has a language ordering been set?
-# If so, set LC_MESSAGES and LANG accordingly; otherwise skip it.
-# First step uses sed to clean off the quotes and commas, to change - to _, and change the names for the chinese scripts from "Hans" to CN and "Hant" to TW.
-APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | sed -En   -e 's/\-/_/' -e 's/Hant/TW/' -e 's/Hans/CN/' -e 's/[[:space:]]*\"?([[:alnum:]_]+)\"?,?/\1/p' `
-if test "$APPLELANGUAGES"; then
-    # A language ordering exists.
-    # Test, item per item, to see whether there is an corresponding locale.
-    for L in $APPLELANGUAGES; do
-	#test for exact matches:
-       if test -f "$GRAMPSI18N/${L}/LC_MESSAGES/gramps.mo"; then
-	    export LANG=$L
-            break
-        fi
-	#This is a special case, because often the original strings are in US
-	#English and there is no translation file.
-	if test "x$L" == "xen_US"; then
-	    export LANG=$L
-	    break
-	fi
-	#OK, now test for just the first two letters:
-        if test -f "$GRAMPSI18N/${L:0:2}/LC_MESSAGES/gramps.mo"; then
-	    export LANG=${L:0:2}
-	    break
-	fi
-	#Same thing, but checking for any english variant.
-	if test "x${L:0:2}" == "xen"; then
-	    export LANG=$L
-	    break
-	fi;
-    done  
-fi
-unset APPLELANGUAGES L
-
-# If we didn't get a language from the language list, try the Collation preference, in case it's the only setting that exists.
-APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder`
-if test -z "$LANG" -a -n "$APPLECOLLATION"; then
-    if test -f "$GRAMPSI18N/$APPLECOLLATION/LC_MESSAGES/gramps.mo"; then
-	export LANG=$APPLECOLLATION
-    fi
-fi
-if test -n "$APPLECOLLATION"; then
-    export LC_COLLATE=$APPLECOLLATION
-fi
-unset APPLECOLLATION
-
-# Continue by attempting to find the Locale preference.
-APPLELOCALE=`defaults read .GlobalPreferences AppleLocale`
-if test -f "$GRAMPSI18N/${APPLELOCALE:0:5}/LC_MESSAGES/gramps.mo"; then
-    if test -z $LANG; then 
-        export LANG="${APPLELOCALE:0:5}"
-    fi
-
-elif test -z $LANG -a -f "$GRAMPSI18N/${APPLELOCALE:0:2}/LC_MESSAGES/gramps.mo"; then
-    export LANG="${APPLELOCALE:0:2}"
-fi
-
-#Next we need to set LC_MESSAGES. If at all possilbe, we want a full
-#5-character locale to avoid the "Locale not supported by C library"
-#warning from Gtk -- even though Gtk will translate with a
-#two-character code.
-if test -n $LANG; then 
-#If the language code matches the applelocale, then that's the message
-#locale; otherwise, if it's longer than two characters, then it's
-#probably a good message locale and we'll go with it.
-    if test $LANG == ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then
-	export LC_MESSAGES=$LANG
-#Next try if the Applelocale is longer than 2 chars and the language
-#bit matches $LANG
-    elif test $LANG == ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then
-	export LC_MESSAGES=${APPLELOCALE:0:5}
-#Fail. Get a list of the locales in $PREFIX/share/locale that match
-#our two letter language code and pick the first one, special casing
-#english to set en_US
-    elif test $LANG == "en"; then
-	export LC_MESSAGES="en_US"
-    else
-	LOC=`find $PREFIX/share/locale -name $LANG???`
-	echo "Locales $LOC"
-	for L in $LOC; do 
-	    export LC_MESSAGES=$L
-	done
-    fi
-else
-#All efforts have failed, so default to US english
-    export LANG="en_US"
-    export LC_MESSAGES="en_US"
-fi
-CURRENCY=`echo $APPLELOCALE |  sed -En 's/.*currency=([[:alpha:]]+).*/\1/p'`
-if test "x$CURRENCY" != "x"; then 
-#The user has set a special currency. Gtk doesn't install LC_MONETARY files, but Apple does in /usr/share/locale, so we're going to look there for a locale to set LC_CURRENCY to.
-    if test -f /usr/local/share/$LC_MESSAGES/LC_MONETARY; then
-	if test -a `cat /usr/local/share/$LC_MESSAGES/LC_MONETARY` == $CURRENCY; then
-	    export LC_MONETARY=$LC_MESSAGES
-	fi
-    fi
-    if test -z "$LC_MONETARY"; then 
-	FILES=`find /usr/share/locale -name LC_MONETARY -exec grep -H $CURRENCY {} \;`
-	if test -n "$FILES"; then 
-	    export LC_MONETARY=`echo $FILES | sed -En 's%/usr/share/locale/([[:alpha:]_]+)/LC_MONETARY.*%\1%p'`
-	fi
-    fi
-fi
-#No currency value means that the AppleLocale governs:
-if test -z "$LC_MONETARY"; then
-    export LC_MONETARY=${APPLELOCALE:0:5}
-fi
-
-#To turn on the appropriate dictionary:
-export LC_ALL=$LC_MESSAGES
-
-unset APPLELOCALE  FILES LOC
-
-# Strip out the argument added by the OS.
-if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
-    shift 1
-fi
-
-#Note that we're calling $PYTHON here to override the version in
-#pygtk-demo's shebang.
-exec $PYTHON -O "$GRAMPSDIR/gramps.py" "$@"
@@ -260,10 +260,13 @@ 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
 src/plugins/gramplet/Children.py
 src/plugins/gramplet/DescendGramplet.py
+src/plugins/gramplet/EditExifMetadata.py
+src/plugins/gramplet/Events.py
 src/plugins/gramplet/FanChartGramplet.py
 src/plugins/gramplet/FaqGramplet.py
 src/plugins/gramplet/GivenNameGramplet.py
@@ -316,6 +319,9 @@ src/plugins/lib/libplugins.gpr.py
 src/plugins/lib/libtranslate.py
 src/plugins/lib/libtreebase.py
 src/plugins/lib/holidays.xml.in
+src/plugins/lib/maps/constants.py
+src/plugins/lib/maps/geography.py
+src/plugins/lib/maps/grampsmaps.py

 # plugins/mapservices  directory
 src/plugins/mapservices/eniroswedenmap.py
@@ -393,10 +399,14 @@ src/plugins/view/eventview.py
 src/plugins/view/familyview.py
 src/plugins/view/fanchartview.py
 src/plugins/view/fanchartview.gpr.py
-src/plugins/view/geoview.py
-src/plugins/view/geoview.gpr.py
+src/plugins/view/geography.gpr.py
+src/plugins/view/geoevents.py
+src/plugins/view/geofamily.py
+src/plugins/view/geoperson.py
+src/plugins/view/geoplaces.py
 src/plugins/view/grampletview.py
 src/plugins/view/htmlrenderer.py
+src/plugins/view/htmlrenderer.gpr.py
 src/plugins/view/mediaview.py
 src/plugins/view/noteview.py
 src/plugins/view/pedigreeview.py
@@ -589,8 +599,11 @@ src/Filters/Rules/Source/_HasNoteRegexp.py
 src/Filters/Rules/Source/_HasNoteMatchingSubstringOf.py
 src/Filters/Rules/Source/_HasReferenceCountOf.py
 src/Filters/Rules/Source/_HasRepository.py
+src/Filters/Rules/Source/_HasRepositoryCallNumberRef.py
 src/Filters/Rules/Source/_HasSource.py
 src/Filters/Rules/Source/_MatchesFilter.py
+src/Filters/Rules/Source/_MatchesRepositoryFilter.py
+src/Filters/Rules/Source/_MatchesTitleSubstringOf.py
 src/Filters/Rules/Source/_SourcePrivate.py
 src/Filters/Rules/Source/_RegExpIdOf.py

@@ -617,6 +630,7 @@ src/Filters/Rules/Repository/_HasNoteRegexp.py
 src/Filters/Rules/Repository/_HasReferenceCountOf.py
 src/Filters/Rules/Repository/_HasRepo.py
 src/Filters/Rules/Repository/_MatchesFilter.py
+src/Filters/Rules/Repository/_MatchesNameSubstringOf.py
 src/Filters/Rules/Repository/_RegExpIdOf.py
 src/Filters/Rules/Repository/_RepoPrivate.py

@@ -701,7 +715,6 @@ src/plugins/tool/changetypes.glade
 src/plugins/tool/desbrowser.glade
 src/plugins/tool/eval.glade
 src/plugins/tool/eventcmp.glade
-src/plugins/import/importgedcom.glade
 src/plugins/tool/leak.glade
 src/plugins/tool/finddupes.glade
 src/plugins/tool/ownereditor.glade
@@ -710,12 +723,8 @@ src/plugins/tool/phpgedview.glade
 src/plugins/tool/relcalc.glade
 src/plugins/tool/soundgen.glade
 src/plugins/tool/removeunused.glade
-src/plugins/export/exportcsv.glade
-src/plugins/export/exportftree.glade
-src/plugins/export/exportgeneweb.glade
-src/plugins/export/exportvcalendar.glade
-src/plugins/export/exportvcard.glade
 src/plugins/tool/verify.glade
+src/plugins/import/importgedcom.glade

 #
 #   Files to extract from and then merge into
@@ -257,13 +257,13 @@ src/gui/views/treemodels/repomodel.py
 src/gui/views/treemodels/sourcemodel.py

 # gui/widgets - the GUI widgets package
-src/gui/widgets/locationbox.py
 src/gui/widgets/menutoolbuttonaction.py
 src/gui/widgets/styledtextbuffer.py
 src/gui/widgets/undoablestyledbuffer.py

 # Merge package
 src/Merge/__init__.py
+src/Merge/test/merge_ref_test.py

 # plugins gpr directory
 src/plugins/sidebar/sidebar.gpr.py
@@ -334,4 +334,9 @@ src/web/utils.py
 #   Glade files
 #
 src/glade/gramps.glade
+src/plugins/export/exportcsv.glade
+src/plugins/export/exportftree.glade
+src/plugins/export/exportgeneweb.glade
+src/plugins/export/exportvcalendar.glade
+src/plugins/export/exportvcard.glade
 src/plugins/tool/check.glade
@@ -25803,7 +25803,7 @@ msgstr ""
 #~ msgstr "  6. <a wiki='Gramps_3.2_Wiki_Manual_-_FAQ#How_can_I_publish_web_sites_generated_by_GRAMPS.3F'>Como é que posso publicar uma página web com a minha árvore genealógica produzida pelo Gramps?</a>\n"

 #~ msgid "  7. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>How do I record one's occupation?</a>\n"
-#~ msgstr "  7. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>Como registo a ocupação de uma pessoa?</a>\n"
+#~ msgstr "  7. <a href='http://sourceforge.net/mailarchive/message.php?msg_id=21487967'>Como registo a ocupação de uma pessoa?</a>\n"

 #~ msgid "  8. <a wiki='Gramps_3.2_Wiki_Manual_-_FAQ#What_do_I_do_if_I_have_found_a_bug.3F'>What do I do if I have found a bug?</a>\n"
 #~ msgstr "  8. <a wiki='Gramps_3.2_Wiki_Manual_-_FAQ#What_do_I_do_if_I_have_found_a_bug.3F'>O que faço se encontrar um erro?</a>\n"
@@ -150,7 +150,7 @@ class DateEdit(object):
        # if text could not be parsed it is assumed invalid
        if self.date_obj.get_modifier() == Date.MOD_TEXTONLY:
            return ValidationError(_('Bad Date'))
-        elif (self.date_obj.to_calendar(calendar_name=Date.CAL_GREGORIAN) >
+        elif (self.date_obj.to_calendar(calendar_name=Date.CAL_GREGORIAN) >>
              NextYear()):
            return ValidationError(_('Date more than one year in the future'))

@@ -5,10 +5,11 @@

 pkgdatadir = $(datadir)/@PACKAGE@/DateHandler

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_Date_bg.py\
 	_Date_ca.py\
 	_Date_cs.py\
+	_Date_da.py\
 	_Date_de.py\
 	_Date_es.py\
 	_Date_fi.py\
@@ -32,7 +33,7 @@ pkgdata_PYTHON = \
 	__init__.py

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

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -59,6 +59,11 @@ if not constfunc.win():
 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. 
+if LANG and ".UTF-8" in LANG.upper():
+    LANG = LANG.split(".")[0]
+    
 if not LANG:
    if "LANG" in os.environ:
        LANG = os.environ["LANG"]
@@ -518,7 +518,7 @@ class DateParser(object):
            d = self._get_int(groups[2])
            value = (d, m, y, False)
            if not check((d, m, y)):
-                value = Date.Empty
+                value = Date.EMPTY
            return value

        match = self._rfc.match(text)
@@ -0,0 +1,177 @@
+# -*- 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
+#
+
+"""
+Danish-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
+
+#-------------------------------------------------------------------------
+#
+# Danish parser class
+#
+#-------------------------------------------------------------------------
+class DateParserDa(DateParser):
+    """
+    Convert a text string into a Date object, expecting a date
+    notation in the Danish language. If the date cannot be converted, 
+    the text string is assigned.
+    """
+
+    # modifiers before the date
+    modifier_to_int = {
+        u'før'    : Date.MOD_BEFORE, 
+        u'inden'  : Date.MOD_BEFORE, 
+        u'efter'   : Date.MOD_AFTER, 
+        u'omkring' : Date.MOD_ABOUT, 
+        u'ca.'     : Date.MOD_ABOUT
+        }
+
+    bce = ["f Kr"]
+
+    calendar_to_int = {
+        u'gregoriansk   '      : Date.CAL_GREGORIAN, 
+        u'g'                   : Date.CAL_GREGORIAN, 
+        u'juliansk'            : Date.CAL_JULIAN, 
+        u'j'                   : Date.CAL_JULIAN, 
+        u'hebraisk'            : Date.CAL_HEBREW, 
+        u'h'                   : Date.CAL_HEBREW, 
+        u'islamisk'            : Date.CAL_ISLAMIC, 
+        u'muslimsk'            : Date.CAL_ISLAMIC, 
+        u'i'                   : Date.CAL_ISLAMIC, 
+        u'fransk'              : Date.CAL_FRENCH, 
+        u'fransk republikansk' : Date.CAL_FRENCH, 
+        u'f'                   : Date.CAL_FRENCH, 
+        u'persisk'             : Date.CAL_PERSIAN, 
+        u'p'                   : Date.CAL_PERSIAN, 
+        u'svensk'              : Date.CAL_SWEDISH, 
+        u's'                   : Date.CAL_SWEDISH, 
+        }
+    
+    quality_to_int = {
+        u'estimeret' : Date.QUAL_ESTIMATED, 
+        u'beregnet'   : Date.QUAL_CALCULATED, 
+        }
+    
+    def init_strings(self):
+        DateParser.init_strings(self)
+        self._span     = re.compile(u"(fra)?\s*(?P<start>.+)\s*(til|--|–)\s*(?P<stop>.+)", 
+                                    re.IGNORECASE)
+        self._range    = re.compile(u"(mellem)\s+(?P<start>.+)\s+og\s+(?P<stop>.+)", 
+                                    re.IGNORECASE)
+
+#-------------------------------------------------------------------------
+#
+# Danish display class
+#
+#-------------------------------------------------------------------------
+class DateDisplayDa(DateDisplay):
+    """
+    Danish language date display class. 
+    """
+
+    long_months = ( u"", u"januar", u"februar", u"marts", u"april", u"maj", 
+                    u"juni", u"juli", u"august", u"september", u"oktober", 
+                    u"november", u"december" )
+    
+    short_months = ( u"", u"jan", u"feb", u"mar", u"apr", u"maj", u"jun", 
+                     u"jul", u"aug", u"sep", u"okt", u"nov", u"dec" )
+
+    formats = (
+        u"ÅÅÅÅ-MM-DD (ISO)", 
+        u"Numerisk", 
+        u"Måned dag, år", 
+        u"Md Dag År", 
+        u"Dag måned år", 
+        u"Dag md År", 
+        )
+
+    calendar = (
+        "", 
+        "juliansk", 
+        "hebraisk", 
+        "fransk republikansk", 
+        "persisk", 
+        "islamisk", 
+        "svensk" 
+        )
+    
+    _mod_str = ("", u"før ", u"efter ", u"ca. ", "", "", "")
+
+    _qual_str = ("", u"beregnet ", u"beregnet ")
+    
+    _bce_str = "%s f. Kr."
+
+    def display(self, date):
+        """
+        Return a text string representing the date.
+        """
+        mod = date.get_modifier()
+        cal = date.get_calendar()
+        qual = date.get_quality()
+        start = date.get_start_date()
+        newyear = date.get_new_year()
+
+        qual_str = self._qual_str[qual]
+
+        if mod == Date.MOD_TEXTONLY:
+            return date.get_text()
+        elif start == Date.EMPTY:
+            return u""
+        elif mod == Date.MOD_SPAN:
+            d1 = self.display_cal[cal](start)
+            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return u"%sfra %s til %s%s" % (qual_str, d1, d2, scal)
+        elif mod == Date.MOD_RANGE:
+            d1 = self.display_cal[cal](start)
+            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return u"%smellem %s og %s%s" % (qual_str, d1, d2, 
+                                              scal)
+        else:
+            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
+            return u"%s%s%s%s" % (qual_str, self._mod_str[mod], 
+                                 text, scal)
+
+#-------------------------------------------------------------------------
+#
+# Register classes
+#
+#-------------------------------------------------------------------------
+register_datehandler(('da_DK', 'da', 'dansk', 'Danish'), DateParserDa, DateDisplayDa)
@@ -212,6 +212,8 @@ class DateDisplayLT(DateDisplay):
        display gregorian calendar date in different format
        """
        year = self._slash_year(date_val[2], date_val[3])
+        value = self.display_iso(date_val)
+
        if self.format == 0:
            return self.display_iso(date_val)
        elif self.format == 1:
@@ -119,8 +119,8 @@ class DateDisplaySv(DateDisplay):
                      u"jul", u"aug", u"sep", u"okt", u"nov", u"dec" )
    
    formats = (
-        u"YYYY-MM-DD (ISO)", 
-        u"Numerisk", 
+        u"ÅÅÅÅ-MM-DD (ISO)", 
+        u"År/mån/dag", 
        u"Månad dag, år", 
        u"MÅN DAG ÅR", 
        u"Dag månad år", 
@@ -181,4 +181,4 @@ class DateDisplaySv(DateDisplay):
 # Register classes
 #
 #-------------------------------------------------------------------------
-register_datehandler(('sv_SE', 'sv', 'Swedish'), DateParserSv, DateDisplaySv)
+register_datehandler(('sv_SE', 'sv_SE.UTF-8', 'sv', 'Swedish'), DateParserSv, DateDisplaySv)
@@ -0,0 +1,250 @@
+# -*- 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
+#
+
+#-------------------------------------------------------------------------
+#
+# Python modules
+#
+#-------------------------------------------------------------------------
+
+"""
+Chinese-specific classes for parsing and displaying dates.
+"""
+
+import re
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+
+from gen.lib import Date
+from _DateParser import DateParser
+from _DateDisplay import DateDisplay
+from _DateHandler import register_datehandler
+
+#-------------------------------------------------------------------------
+#
+# Chinese parser
+#
+#-------------------------------------------------------------------------
+class DateParserZH(DateParser):
+    """
+    Convert a text string into a Date object. If the date cannot be
+    converted, the text string is assigned.
+    """
+    
+    # translate english strings into chinese
+    
+    modifier_to_int = {
+        u'before' : Date.MOD_BEFORE, u'bef'    : Date.MOD_BEFORE,
+        u'bef.'   : Date.MOD_BEFORE, u'after'  : Date.MOD_AFTER,
+        u'aft'    : Date.MOD_AFTER,  u'aft.'   : Date.MOD_AFTER,
+        u'about'  : Date.MOD_ABOUT,  u'abt.'   : Date.MOD_ABOUT,
+        u'abt'    : Date.MOD_ABOUT,  u'circa'  : Date.MOD_ABOUT,
+        u'c.'     : Date.MOD_ABOUT,  u'around' : Date.MOD_ABOUT,
+        }
+
+    month_to_int = DateParser.month_to_int
+
+    month_to_int[u"正"] = 1
+    month_to_int[u"一"] = 1
+    month_to_int[u"zhēngyuè"] = 1
+    month_to_int[u"二"] = 2
+    month_to_int[u"èryuè"] = 2
+    month_to_int[u"三"] = 3
+    month_to_int[u"sānyuè"] = 3
+    month_to_int[u"四"] = 4
+    month_to_int[u"sìyuè"] = 4
+    month_to_int[u"五"] = 5
+    month_to_int[u"wǔyuè"] = 5
+    month_to_int[u"六"] = 6
+    month_to_int[u"liùyuè"] = 6
+    month_to_int[u"七"] = 7
+    month_to_int[u"qīyuè"] = 7
+    month_to_int[u"八"] = 8
+    month_to_int[u"bāyuè"] = 8
+    month_to_int[u"九"] = 9
+    month_to_int[u"jiǔyuè"] = 9
+    month_to_int[u"十"] = 10
+    month_to_int[u"shíyuè"] = 10
+    month_to_int[u"十一"] = 11
+    month_to_int[u"shíyīyuè"] = 11
+    month_to_int[u"十二"] = 12
+    month_to_int[u"shí'èryuè"] = 12
+    month_to_int[u"假閏"] = 13
+    month_to_int[u"jiǎ rùn yùe"] = 13
+    
+    # translate english strings into chinese
+    
+    calendar_to_int = {
+        'gregorian'        : Date.CAL_GREGORIAN,
+        'g'                : Date.CAL_GREGORIAN,
+        'julian'           : Date.CAL_JULIAN,
+        'j'                : Date.CAL_JULIAN,
+        'hebrew'           : Date.CAL_HEBREW,
+        'h'                : Date.CAL_HEBREW,
+        'islamic'          : Date.CAL_ISLAMIC,
+        'i'                : Date.CAL_ISLAMIC,
+        'french'           : Date.CAL_FRENCH,
+        'french republican': Date.CAL_FRENCH,
+        'f'                : Date.CAL_FRENCH,
+        'persian'          : Date.CAL_PERSIAN,
+        'p'                : Date.CAL_PERSIAN, 
+        'swedish'          : Date.CAL_SWEDISH,
+        's'                : Date.CAL_SWEDISH,
+        }
+        
+    # translate english strings into chinese
+
+    quality_to_int = {
+        u'estimated'  : Date.QUAL_ESTIMATED,
+        u'est.'       : Date.QUAL_ESTIMATED,
+        u'est'        : Date.QUAL_ESTIMATED,
+        u'calc.'      : Date.QUAL_CALCULATED,
+        u'calc'       : Date.QUAL_CALCULATED,
+        u'calculated' : Date.QUAL_CALCULATED,
+        }
+        
+    # translate english strings into chinese
+
+    bce = [u"before calendar", u"negative year"] + DateParser.bce
+
+    def init_strings(self):
+        """
+        This method compiles regular expression strings for matching dates.
+        
+        Most of the re's in most languages can stay as is. span and range
+        most likely will need to change. Whatever change is done, this method
+        may be called first as DateParser.init_strings(self) so that the
+        invariant expresions don't need to be repeteadly coded. All differences
+        can be coded after DateParser.init_strings(self) call, that way they
+        override stuff from this method. See DateParserRU() as an example.
+        """
+        DateParser.init_strings(self)
+        
+        # day: 日 ; month : 月 ; year : 年
+
+        # See DateParser class; translate english strings (from/to, between/and) into chinese
+        # do not translate <start> and <stop>
+
+        self._span     = re.compile(u"(from)\s+(?P<start>.+)\s+to\s+(?P<stop>.+)",
+                                    re.IGNORECASE)
+        self._range    = re.compile(u"(bet|bet.|between)\s+(?P<start>.+)\s+and\s+(?P<stop>.+)",
+                                    re.IGNORECASE)
+                                    
+    #def _parse_lunisolar(self, date_val=text):
+        #text = text.strip() # otherwise spaces can make it a bad date
+        #date = Date(self._qual_str, self._mod_str, self._cal_str, text, self._ny_str)
+        #return unicode(text)
+                               
+#-------------------------------------------------------------------------
+#
+# Chinese display
+#
+#-------------------------------------------------------------------------
+class DateDisplayZH(DateDisplay):
+    """
+    Chinese language date display class. 
+    """
+
+    # translate english strings into chinese
+ 
+    long_months = ( u"", u"January", u"February", u"March", u"April", u"May", 
+                    u"June", u"July", u"August", u"September", u"October", 
+                    u"November", u"December" )
+    
+    short_months = ( u"", u"Jan", u"Feb", u"Mar", u"Apr", u"May", u"Jun",
+                     u"Jul", u"Aug", u"Sep", u"Oct", u"Nov", u"Dec" )
+
+    calendar = (
+        "", u"Julian", u"Hebrew", u"French Republican", 
+        u"Persian", u"Islamic", u"Swedish" 
+        )
+
+    _mod_str = ("", u"before ", u"after ", u"around ", "", "", "")
+
+    _qual_str = ("", u"estimated ", u"calculated ", "")
+
+    _bce_str = "%s B.C.E."
+
+
+    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:
+            date1 = self.display_cal[cal](start)
+            date2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            # translate english strings into chinese
+            return "%s%s %s %s %s%s" % (qual_str, u'from', date1, u'to', 
+            date2, scal)
+        elif mod == Date.MOD_RANGE:
+            date1 = self.display_cal[cal](start)
+            date2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            # translate english strings into chinese
+            return "%s%s %s %s %s%s" % (qual_str, u'between', date1, u'and',
+                    date2, 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)
+
+    #def _display_chinese(self, date_val):
+        #self._tformat = '%Y年%m月%d日'
+        #year = self._slash_year(date_val[2], date_val[3])
+        #if date_val[3]:
+            #return self.display_iso(date_val)
+        #else:
+            #if date_val[0] == date_val[1] == 0:
+                #value = u'%Y年' % date_val[2]
+            #else:
+                #value = self._tformat.replace('%m月', str(self.lunisolar[date_val[1]]))
+                #value = u'%m月' % date_val[1]
+                #value = u'%d日' % date_val[0]
+                #value = u'%Y年' % date_val[2]
+
+
+#-------------------------------------------------------------------------
+#
+# Register classes
+#
+#-------------------------------------------------------------------------
+
+register_datehandler(('zh_CN', 'zh_TW', 'zh_SG', 'zh_HK', 'zh', 'chinese', 'Chinese'), 
+                       DateParserZH, DateDisplayZH)
@@ -32,6 +32,7 @@ from _DateHandler import (LANG, LANG_SHORT, LANG_TO_PARSER, LANG_TO_DISPLAY,
 import _Date_bg
 import _Date_ca
 import _Date_cs
+import _Date_da
 import _Date_de
 import _Date_es
 import _Date_fi
@@ -481,6 +481,11 @@ class DisplayState(gen.utils.Callback):
            return self.disprel_old

        active = dbstate.db.get_person_from_handle(active_handle)
+        if active is None:
+            # During merger this method can be called at a time when treemodel
+            # and database are not in sync, resulting in active_handle != None,
+            # but active == None; see bug 5290 for the details.
+            return u''
        name = self.relationship.get_one_relationship(
                                            dbstate.db, default_person, active)
        #store present call data
@@ -135,8 +135,15 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
        if not self.person:
            self.person = self.dbstate.db.find_initial_person()
            
-        self.logo      = gtk.gdk.pixbuf_new_from_file(_gramps_png)
-        self.splash    = gtk.gdk.pixbuf_new_from_file(_splash_jpg)
+        try:
+            self.logo      = gtk.gdk.pixbuf_new_from_file(_gramps_png)
+        except:
+            self.logo = None
+        try:
+            self.splash    = gtk.gdk.pixbuf_new_from_file(_splash_jpg)
+        except:
+            self.splash = None
+
            
        pmgr = GuiPluginManager.get_instance()
        self.__exporters = pmgr.get_export_plugins()
@@ -143,7 +143,7 @@ class WriterOptionBox(object):
        button = gtk.Button(ngettext("%d Person", "%d People", people_count) % 
                            people_count)
        button.set_tooltip_text(_("Click to see preview of unfiltered data"))
-        button.set_size_request(100, -1)
+        button.set_size_request(107, -1)
        button.connect("clicked", self.show_preview_data)
        button.proxy_name = "unfiltered"
        self.preview_proxy_button["unfiltered"] = button
@@ -245,7 +245,7 @@ class WriterOptionBox(object):
        import gtk
        import gui.widgets
        button = gtk.Button(ngettext("%d Person", "%d People", 0) % 0)
-        button.set_size_request(100, -1)
+        button.set_size_request(107, -1)
        button.connect("clicked", self.show_preview_data)
        button.proxy_name = proxy_name
        if proxy_name == "person":
@@ -4,7 +4,7 @@ SUBDIRS = Rules SideBar

 pkgdatadir = $(datadir)/@PACKAGE@/Filters

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

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

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -2,7 +2,7 @@

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

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

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

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -20,6 +20,7 @@ from Filters.Rules._ChangedSinceBase import ChangedSinceBase
 class ChangedSince(ChangedSinceBase):
    """Rule that checks for an event changed since a specific time."""

+    labels      = [ _('Changed after:'), _('but before:') ]
    name        = _('Events changed after <date time>')
    description = _("Matches event records changed after a specified "
                    "date/time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
@@ -23,7 +23,7 @@
 # Standard Python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import sgettext as _

 #-------------------------------------------------------------------------
 #
@@ -2,7 +2,7 @@

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

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


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

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -20,6 +20,7 @@ from Filters.Rules._ChangedSinceBase import ChangedSinceBase
 class ChangedSince(ChangedSinceBase):
    """Rule that checks for families changed since a specific time."""

+    labels      = [ _('Changed after:'), _('but before:') ]
    name        = _('Families changed after <date time>')
    description = _("Matches family records changed after a specified "
                    "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
@@ -23,7 +23,7 @@
 # Standard Python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import sgettext as _

 #-------------------------------------------------------------------------
 #
@@ -4,7 +4,7 @@ SUBDIRS = Person Family Event Place Source MediaObject Repository Note

 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ChangedSinceBase.py\
 	_Everything.py\
 	_HasEventBase.py\
@@ -31,7 +31,7 @@ pkgdata_PYTHON = \


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

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

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

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

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

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

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -20,6 +20,7 @@ from Filters.Rules._ChangedSinceBase import ChangedSinceBase
 class ChangedSince(ChangedSinceBase):
    """Rule that checks for media objects changed since a specific time"""

+    labels      = [ _('Changed after:'), _('but before:') ]
    name        = _('Media objects changed after <date time>')
    description = _("Matches media objects changed after a specified "
                    "date:time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
@@ -2,7 +2,7 @@

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

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

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

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -20,6 +20,7 @@ from Filters.Rules._ChangedSinceBase import ChangedSinceBase
 class ChangedSince(ChangedSinceBase):
    """Rule that checks for notes changed since a specific time."""

+    labels      = [ _('Changed after:'), _('but before:') ]
    name        = _('Notes changed after <date time>')
    description = _("Matches note records changed after a specified "
                    "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
@@ -43,8 +43,8 @@ class MatchesRegexpOf(Rule):

    labels      = [ _('Regular expression:')]
    name        = _('Notes containing <regular expression>')
-    description = _("Matches notes who contain text "
-                    "matching a regular expression")
+    description = _("Matches notes that contain text "
+                    "which matches a regular expression")
    category    = _('General filters')

    def __init__(self, list):
@@ -43,8 +43,8 @@ class MatchesSubstringOf(Rule):

    labels      = [ _('Substring:')]
    name        = _('Notes containing <substring>')
-    description = _("Matches notes who contain text "
-                    "matching a substring")
+    description = _("Matches notes that contain text "
+                    "which matches a substring")
    category    = _('General filters')

    def apply(self, db, note):
@@ -2,7 +2,7 @@

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

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

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

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -20,6 +20,7 @@ from Filters.Rules._ChangedSinceBase import ChangedSinceBase
 class ChangedSince(ChangedSinceBase):
    """Rule that checks for persons changed since a specific time."""

+    labels      = [ _('Changed after:'), _('but before:') ]
    name = _('Persons changed after <date time>')
    description = _("Matches person records changed after a specified "
                    "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
@@ -66,20 +66,28 @@ class HasCommonAncestorWith(Rule):
    def add_ancs(self, db, person):
        if person and person.handle not in self.ancestor_cache:
            self.ancestor_cache[person.handle] = set()
+            # We are going to compare ancestors of one person with that of
+            # another person; if that other person is an ancestor and itself
+            # has no ancestors is must be included, this is achieved by the
+            # little trick of making a person his own ancestor.
+            self.ancestor_cache[person.handle].add(person.handle)
        else:
            return

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

    def reset(self):
        self.ancestor_cache = {}
@@ -23,7 +23,7 @@
 # Standard Python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import sgettext as _

 #-------------------------------------------------------------------------
 #
@@ -2,7 +2,7 @@

 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Place

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllPlaces.py\
 	_ChangedSince.py\
 	_HasIdOf.py\
@@ -21,7 +21,7 @@ pkgdata_PYTHON = \
 	__init__.py

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

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -20,6 +20,7 @@ from Filters.Rules._ChangedSinceBase import ChangedSinceBase
 class ChangedSince(ChangedSinceBase):
    """Rules that checks for places changed since a specific time."""

+    labels      = [ _('Changed after:'), _('but before:') ]
    name    = _('Places changed after <date time>')
    description = _("Matches place records changed after a specified "
                    "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
@@ -44,7 +44,7 @@ class HasNoLatOrLon(Rule):

    labels      = []
    name        = _('Places with no latitude or longitude given')
-    description = _("Matches places with latitude or longitude empty")
+    description = _("Matches places with empty latitude or longitude")
    category    = _('Position filters')

    def apply(self,db,place):
@@ -2,7 +2,7 @@

 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Repository

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllRepos.py\
 	_ChangedSince.py\
 	_HasIdOf.py\
@@ -11,12 +11,13 @@ pkgdata_PYTHON = \
 	_HasReferenceCountOf.py\
 	_HasRepo.py\
 	_MatchesFilter.py\
+        _MatchesNameSubstringOf.py\
 	_RegExpIdOf.py\
 	_RepoPrivate.py\
 	__init__.py

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

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -20,6 +20,7 @@ from Filters.Rules._ChangedSinceBase import ChangedSinceBase
 class ChangedSince(ChangedSinceBase):
    """Rule that checks for repositories changed since a specific time."""

+    labels      = [ _('Changed after:'), _('but before:') ]
    name        = _('Repositories changed after <date time>')
    description = _("Matches repository records changed after a specified "
                    "date/time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
@@ -1,66 +1,53 @@
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2010  Benny Malengier
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-# $Id: __init__.py 13807 2009-12-15 05:56:12Z pez4brian 
-
-"""
-Some often needed dialogs
-"""
-
-#-------------------------------------------------------------------------
-#
-# Standard python modules
-#
-#-------------------------------------------------------------------------
-import sys
-
-#-------------------------------------------------------------------------
-#
-# QT modules
-#
-#-------------------------------------------------------------------------
-from PySide.QtCore import *
-from PySide.QtGui import *
-
-#-------------------------------------------------------------------------
-#
-# Classes for the Dialogs
-#
-#-------------------------------------------------------------------------
-class ErrorDialog(QDialog):
-    def __init__(self, msg1, msg2="", parent=None):
-        super(ErrorDialog, self).__init__(parent)
-        self.setWindowTitle("%s - Gramps" % msg1)
-        lbl1 = QLabel(msg1)
-        lbl2 = QLabel(msg2)
-        layout = QVBoxLayout()
-        layout.addWidget(lbl1)
-        layout.addWidget(lbl2)
-        # Set dialog layout
-        self.setLayout(layout)
-        self.setMinimumSize(350,300)
-        self.show()
-
-def run_dialog_standalone(dlgclass, *args, **keywords):
-    app = QApplication(sys.argv)
-    QObject.connect(app, SIGNAL('lastWindowClosed()'), app, SLOT('quit()')) 
-    
-    win = dlgclass(*args, **keywords)
-    app.exec_()
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2011       Helge Herz
+#
+# 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: $
+
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gen.ggettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules import Rule
+
+#-------------------------------------------------------------------------
+# "Repositories having a name that contain a substring"
+#-------------------------------------------------------------------------
+class MatchesNameSubstringOf(Rule):
+    """Repository name containing <substring>"""
+
+    labels      = [ _('Substring:')]
+    name        = _('Repository name containing <substring>')
+    description = _("Matches repositories whose name contains a certain substring")
+    category    = _('General filters')
+
+    def apply(self, db, repository):
+        """ Apply the filter """
+        name = repository.get_name()
+        if name.upper().find(self.list[0].upper()) != -1:
+            return True
+        return False
@@ -34,6 +34,7 @@ from _RepoPrivate import RepoPrivate
 from _MatchesFilter import MatchesFilter
 from _HasRepo import HasRepo
 from _ChangedSince import ChangedSince
+from _MatchesNameSubstringOf import MatchesNameSubstringOf

 editor_rule_list = [
    AllRepos,
@@ -45,4 +46,5 @@ editor_rule_list = [
    RepoPrivate,
    MatchesFilter,
    ChangedSince,
+    MatchesNameSubstringOf
 ]
@@ -2,7 +2,7 @@

 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Source

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ChangedSince.py\
 	_MatchesFilter.py\
 	_SourcePrivate.py\
@@ -16,10 +16,13 @@ pkgdata_PYTHON = \
 	_HasNote.py \
 	_HasNoteRegexp.py\
 	_HasRepository.py\
-	__init__.py
+	__init__.py\
+        _MatchesTitleSubstringOf.py\
+        _HasRepositoryCallNumberRef.py\
+        _MatchesRepositoryFilter.py

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

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -20,6 +20,7 @@ from Filters.Rules._ChangedSinceBase import ChangedSinceBase
 class ChangedSince(ChangedSinceBase):
    """Rule that checks for sources changed since a specific time."""

+    labels      = [ _('Changed after:'), _('but before:') ]
    name    = _('Sources changed after <date time>')
    description = _("Matches source records changed after a specified "
                    "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
@@ -0,0 +1,56 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2011 Helge Herz
+#
+# 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
+#
+
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gen.ggettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules import Rule
+
+#-------------------------------------------------------------------------
+# "Sources which reference repositories by a special Call Name"
+#-------------------------------------------------------------------------
+class HasRepositoryCallNumberRef(Rule):
+    """Sources which reference repositories by a special Call Number"""
+
+    labels      = [ _('Substring:')]
+    name        = _('Sources with repository reference containing <substring> in "Call Number"')
+    description = _("Matches sources with a repository reference\n"
+                    "containing a substring in \"Call Number\"")
+    category    = _('General filters')
+      
+    def apply(self, db, obj):
+        count = len(obj.get_reporef_list())
+        if count > 0:
+            for RepoRef in obj.get_reporef_list():
+                if len(RepoRef.call_number) > 0:
+                    CallNumb = RepoRef.call_number
+                    if CallNumb.upper().find(self.list[0].upper()) != -1:
+                        return True			
+			    
+        return False
@@ -0,0 +1,64 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2011  Benny Malengier
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gen.ggettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules import MatchesFilterBase
+
+#-------------------------------------------------------------------------
+# "Sources which reference a repository by selection"
+#-------------------------------------------------------------------------
+class MatchesRepositoryFilter(MatchesFilterBase):
+    """Sources which reference the selected repository"""
+
+    labels      = [ _('Repository filter name:') ]
+    name        = _('Sources with repository reference matching the <repository filter>')
+    description = _("Matches sources with a repository reference that match a certain\n"
+                  "repository filter")
+    category    = _('General filters')
+    
+    # we want to have this filter show repository filters
+    namespace = 'Repository'
+    
+    
+    def prepare(self, db):
+        MatchesFilterBase.prepare(self, db)
+        self.MRF_filt = self.find_filter()
+            
+    def apply(self, db, object):
+        if self.MRF_filt is None :
+            return False
+        
+        repolist = [x.ref for x in object.get_reporef_list()]
+        for repohandle in repolist:
+            #check if repo in repository filter
+            if self.MRF_filt.check(db, repohandle):
+                return True
+        return False
@@ -0,0 +1,54 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2011       Helge Herz
+#
+# 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: $
+
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gen.ggettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules import Rule
+
+#-------------------------------------------------------------------------
+# "Sources having a title that contain a substring"
+#-------------------------------------------------------------------------
+class MatchesTitleSubstringOf(Rule):
+    """Source title containing <substring>"""
+
+    labels      = [ _('Substring:')]
+    name        = _('Sources title containing <substring>')
+    description = _("Matches sources whose title contains a "
+                    "certain substring")
+    category    = _('General filters')
+
+    def apply(self, db, source):
+        """ Apply the filter """
+        title = source.get_title()
+        if title.upper().find(self.list[0].upper()) != -1:
+            return True
+        return False
@@ -38,6 +38,9 @@ from _MatchesFilter import MatchesFilter
 from _HasSource import HasSource
 from _ChangedSince import ChangedSince
 from _HasRepository import HasRepository
+from _MatchesTitleSubstringOf import MatchesTitleSubstringOf
+from _HasRepositoryCallNumberRef import HasRepositoryCallNumberRef
+from _MatchesRepositoryFilter import MatchesRepositoryFilter

 editor_rule_list = [
    AllSources,
@@ -51,5 +54,8 @@ editor_rule_list = [
    SourcePrivate,
    MatchesFilter,
    ChangedSince,
-    HasRepository
+    HasRepository,
+    MatchesTitleSubstringOf,
+    HasRepositoryCallNumberRef,
+    MatchesRepositoryFilter
 ]
@@ -25,7 +25,7 @@
 # Standard Python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import sgettext as _

 #-------------------------------------------------------------------------
 #
--- a/Show More
+++ b/Show More