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
197 changed files with 47971 additions and 39234 deletions
@@ -1,12 +1,34 @@
+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.0.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
+* 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.
@@ -64,6 +64,9 @@ The following packages are optional
                    It can be in python-gnome2-extras or python-gtkhtml2
                    depending on distributions.

+   python-pygoocanvas:
+                    Required for the experimental Graphview plugin 
+
 No longer needed in 3.3:
   python-enchant Enchant for Linux and Mac. Still needed for Windows.
 No longer needed in 3.2:
@@ -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.1, [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])

@@ -590,6 +590,9 @@
    <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">
@@ -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 
@@ -7,7 +7,7 @@
    <key>CFBundleExecutable</key>
    <string>Gramps</string>
    <key>CFBundleGetInfoString</key>
-    <string>3.3-Alpha, (C) 1997-2011 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.3-Alpha</string>
+    <string>3.3.2</string>
    <key>CFBundleSignature</key>
    <string>????</string>
    <key>CFBundleVersion</key>
-    <string>3.3-Alpha</string>
+    <string>3.3.2</string>
    <key>NSHumanReadableCopyright</key>
-    <string>Copyright 1997 - 2011 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>
@@ -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>
@@ -47,19 +47,23 @@
  </binary>

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

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

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

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

  <binary>
@@ -83,11 +87,11 @@
  </binary>

  <binary>
-    ${prefix}/lib/libproxy.0.dylib
+     ${prefix}/lib/libosmgpsmap.2.dylib
  </binary>

  <binary>
-    ${prefix}/lib/libhunspell-1.2.0.dylib
+    ${prefix}/lib/libhunspell-1.3.0.dylib
  </binary>

  <binary>
@@ -118,13 +122,25 @@
  <!-- 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>
+    ${prefix}/share/webkit-1.0/
+  </data-->
+
  <data>
    ${prefix}/share/enchant/
  </data>
@@ -13,7 +13,7 @@ bundle_etc="$bundle_res"/etc

 export XDG_DATA_DIRS="$bundle_data"

-export PATH="$bundle_contents"/MacOS
+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"
@@ -28,9 +28,10 @@ export GVBINDIR="$bundle_lib/graphviz"


 #Set $PYTHON to point inside the bundle
-PYVER=2.6
+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
@@ -38,8 +39,8 @@ export GRAMPSI18N="$bundle_data"/locale
 export GRAMPSHOME="$HOME/Library/Application Support"

 # Strip out the argument added by the OS.
-if [ x`echo "x$1" | /usr/bin/sed -e "s/^x-psn_.*//"` == x ]; then
+if /bin/expr "x$1" : '^x-psn_' > /dev/null; then
    shift 1
 fi
-exec $PYTHON -O "$GRAMPSDIR/gramps.py" "$@"
+exec "$PYTHON" -O "$GRAMPSDIR/gramps.py" "$@"

@@ -29,6 +29,8 @@
 	      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:
@@ -48,25 +50,20 @@ chmod +w $PREFIX/lib/libpython2.6.dylib

 before running

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


 -->



-  <include href="https://raw.github.com/jralls/gtk-osx-build/master/modulesets-stable/gtk-osx.modules"/>
+  <include href="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.6.tar.gz" version="3.2.6"
+    <branch module="gramps/gramps-3.3.2.tar.gz" version="3.3.2"
 	    repo="sourceforge">
-      <patch file="http://raw.github.com/jralls/gtk-osx-build/master/patches/gramps.patch" strip="1"/>
-      <patch file="http://raw.github.com/jralls/gtk-osx-build/master/patches/gramps-viewmanager.patch" strip="1"/>
-      <patch file="http://raw.github.com/jralls/gtk-osx-build/master/patches/gramps-accelmap.patch" strip="1"/>
-      <patch file="http://raw.github.com/jralls/gtk-osx-build/master/patches/gramps-pedigree.patch" strip="1"/>
-      <patch file="http://raw.github.com/jralls/gtk-osx-build/master/patches/gramps-accel.patch" strip="1"/>
    </branch>
    <dependencies>
      <dep package="meta-gtk-osx-python"/>
@@ -74,13 +71,18 @@ 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="gramps33" >
+  <autotools id="gramps-svn" >
    <branch module="gramps" revision="maintenance/gramps33" repo="gramps"/>
    <dependencies>
      <dep package="meta-gtk-osx-python"/>
@@ -97,52 +99,20 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </after>
  </autotools>

-  <autotools id="gramps-svn" >
-    <branch module="gramps" repo="gramps"/>
-    <dependencies>
-      <dep package="meta-gtk-osx-python"/>
-      <dep package="librsvg2"/>
-      <dep package="pygoocanvas"/>
-      <dep package="shared-mime-info"/>
-      <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>
-
-  <autotools id="gramps33-addons" skip-autogen="true" >
+  <distutils id="gramps-addons" skip-autogen="true" >
    <branch module="branches/gramps33/contrib"
 	    repo="gramps-addons"/>
-    <dependencies>
-      <dep package="gramps33"/>
-    </dependencies>
-  </autotools>
-
-  <distutils id="gramps-addons-svn">
-    <branch module="gramps-addons/trunk/contrib"
-	    repo="gramps-addons"/>
    <dependencies>
      <dep package="gramps-svn"/>
    </dependencies>
  </distutils>

+
  <autotools id="pyWebKitGtk" >
-    <branch module="pywebkitgtk-1.1.7.tar.bz2" version="1.1.7"
+    <branch module="pywebkitgtk-1.1.8.tar.bz2" version="1.1.8"
 	    repo="pywebkitgtk"/>
    <dependencies>
-      <dep package="WebKit"/>
+      <dep package="meta-gtk-osx-webkit"/>
      <dep package="sqlite"/>
    </dependencies>
  </autotools>
@@ -154,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>

@@ -176,11 +146,6 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
    </dependencies>
  </autotools>

-  <distutils id="pyenchant">
-    <branch repo="pymodules" module="p/pyenchant/pyenchant-1.6.1.tar.gz"
-	    version="1.6.1"/>
-  </distutils>
-
  <distutils id="pyxdg">
    <branch repo="pyxdg" module="pyxdg-0.17.tar.gz" version="0.17"
            hash="sha256:fbc87711922b2dd6ceb23ee041f1f96da9b7dbb6971df03a3081b439def069ce"
@@ -191,7 +156,7 @@ 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="osmgpsmap">
+  <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>
@@ -238,10 +203,15 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
    <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"
@@ -715,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
@@ -724,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
@@ -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
@@ -19877,7 +19877,7 @@ msgstr "Ascendientes de %s"
 #: ../src/plugins/textreport/DetDescendantReport.py:369
 #, python-format
 msgid "%(name)s is the same person as [%(id_str)s]."
-msgstr "Es la misma persona que [%(id_str)s]."
+msgstr "%(name)s es la misma persona que [%(id_str)s]."

 #: ../src/plugins/textreport/DetAncestralReport.py:304
 #: ../src/plugins/textreport/DetDescendantReport.py:733
@@ -11793,7 +11793,7 @@ msgstr " 10. <a wiki='%s_-_FAQ#How_can_I_publish_web_sites_generated_by_GRAMPS.3

 #: ../src/plugins/gramplet/FaqGramplet.py:65
 msgid " 11. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>How do I record one's occupation?</a>\n"
-msgstr " 11. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>Kako zabilježiti nečije zanimanje?</a>\n"
+msgstr " 11. <a href='http://sourceforge.net/mailarchive/message.php?msg_id=21487967'>Kako zabilježiti nečije zanimanje?</a>\n"

 #: ../src/plugins/gramplet/FaqGramplet.py:66
 #, python-format
@@ -6962,7 +6962,7 @@ msgstr "Alternatieve _Plaatsen"

 #: ../src/gui/editors/displaytabs/nameembedlist.py:61
 msgid "Create and add a new name"
-msgstr "Een nieuwe naam aanmaken en yoevoegen"
+msgstr "Een nieuwe naam aanmaken en toevoegen"

 #: ../src/gui/editors/displaytabs/nameembedlist.py:62
 msgid "Remove the existing name"
@@ -7791,7 +7791,7 @@ msgstr "Om dit gereedschap correct te kunnen gebruiken moet u een actieve persoo

 #: ../src/gui/selectors/selectevent.py:54
 msgid "Select Event"
-msgstr "Gebeurtenis verwijderen"
+msgstr "Gebeurtenis selecteren"

 #: ../src/gui/selectors/selectevent.py:64 ../src/plugins/view/eventview.py:86
 msgid "Main Participants"
@@ -10756,7 +10756,7 @@ msgstr "Gramplet die de media-objecten van een persoon toont"
 #: ../src/plugins/gramplet/bottombar.gpr.py:202
 #: ../src/plugins/gramplet/bottombar.gpr.py:216
 msgid "Gallery"
-msgstr "Ga_lerij"
+msgstr "Galerij"

 #: ../src/plugins/gramplet/bottombar.gpr.py:166
 msgid "Family Gallery"
@@ -11570,7 +11570,7 @@ msgstr " 10. <a wiki='%s_-_FAQ/nl#Hoe_kan_ik_webstekken_die_aangemaakt_zijn_via_

 #: ../src/plugins/gramplet/FaqGramplet.py:65
 msgid " 11. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>How do I record one's occupation?</a>\n"
-msgstr " 11. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>Hoe registreer ik een beroep van iemand?</a>\n"
+msgstr " 11. <a href='http://sourceforge.net/mailarchive/message.php?msg_id=21487967'>Hoe registreer ik een beroep van iemand?</a>\n"

 #: ../src/plugins/gramplet/FaqGramplet.py:66
 #, python-format
@@ -11894,7 +11894,7 @@ msgstr "  6. <a wiki='Gramps_3.2_Wiki_Manual_-_FAQ#How_can_I_publish_web_sites_g
 #: ../src/plugins/gramplet/FaqGramplet.py:65
 #, fuzzy
 msgid " 11. <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'>Korleis registrerer eg yrket til einkvan?</a>\n"
+msgstr "  7. <a href='http://sourceforge.net/mailarchive/message.php?msg_id=21487967'>Korleis registrerer eg yrket til einkvan?</a>\n"

 #: ../src/plugins/gramplet/FaqGramplet.py:66
 #, fuzzy, python-format
@@ -11910,7 +11910,7 @@ msgstr "  10. <a wiki='%s_-_FAQ#How_can_I_publish_web_sites_generated_by_GRAMPS.

 #: ../src/plugins/gramplet/FaqGramplet.py:65
 msgid " 11. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>How do I record one's occupation?</a>\n"
-msgstr " 11. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>Jak zapisać czyjeś zajęcie?</a>\n"
+msgstr " 11. <a href='http://sourceforge.net/mailarchive/message.php?msg_id=21487967'>Jak zapisać czyjeś zajęcie?</a>\n"

 #: ../src/plugins/gramplet/FaqGramplet.py:66
 #, python-format
@@ -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"
@@ -11787,7 +11787,7 @@ msgstr " 10. <a wiki='%s_-_FAQ#How_can_I_publish_web_sites_generated_by_GRAMPS.3
 # Link does not exist (17.02.2011)
 #: ../src/plugins/gramplet/FaqGramplet.py:65
 msgid " 11. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>How do I record one's occupation?</a>\n"
-msgstr " 11. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>Как записать чью-либо профессию?</a>\n"
+msgstr " 11. <a href='http://sourceforge.net/mailarchive/message.php?msg_id=21487967'>Как записать чью-либо профессию?</a>\n"

 #: ../src/plugins/gramplet/FaqGramplet.py:66
 #, python-format
@@ -11432,7 +11432,7 @@ msgstr " 10. <a wiki='%s_-_FAQ#How_can_I_publish_web_sites_generated_by_GRAMPS.3

 #: ../src/plugins/gramplet/FaqGramplet.py:65
 msgid " 11. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>How do I record one's occupation?</a>\n"
-msgstr " 11. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>Kam naj shranim poklic določene osebe?</a>\n"
+msgstr " 11. <a href='http://sourceforge.net/mailarchive/message.php?msg_id=21487967'>Kam naj shranim poklic določene osebe?</a>\n"

 #: ../src/plugins/gramplet/FaqGramplet.py:66
 #, python-format
@@ -11434,7 +11434,7 @@ msgstr " 10. <a wiki='%s_-_FAQ#How_can_I_publish_web_sites_generated_by_GRAMPS.3

 #: ../src/plugins/gramplet/FaqGramplet.py:65
 msgid " 11. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>How do I record one's occupation?</a>\n"
-msgstr " 11. <a href='http://old.nabble.com/German-translation-of-%22occupation%22-ts21786114.html#a21786114'>Làm sao có thể ghi chép lại nghề nghiệp?</a>\n"
+msgstr " 11. <a href='http://sourceforge.net/mailarchive/message.php?msg_id=21487967'>Làm sao có thể ghi chép lại nghề nghiệp?</a>\n"

 #: ../src/plugins/gramplet/FaqGramplet.py:66
 #, python-format
@@ -5,7 +5,7 @@

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_Date_bg.py\
 	_Date_ca.py\
 	_Date_cs.py\
@@ -33,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
@@ -51,4 +51,4 @@ docs:

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -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)
@@ -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));
@@ -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));
@@ -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));
@@ -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));
@@ -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));
@@ -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));
@@ -2,7 +2,7 @@

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllRepos.py\
 	_ChangedSince.py\
 	_HasIdOf.py\
@@ -17,7 +17,7 @@ pkgdata_PYTHON = \
 	__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
@@ -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/Source

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ChangedSince.py\
 	_MatchesFilter.py\
 	_SourcePrivate.py\
@@ -22,7 +22,7 @@ pkgdata_PYTHON = \
        _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
@@ -31,4 +31,4 @@ GRAMPS_PY_MODPATH = "../../../"

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

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_EventSidebarFilter.py \
 	_FamilySidebarFilter.py \
 	__init__.py \
@@ -15,8 +15,7 @@ pkgdata_PYTHON = \
 	_NoteSidebarFilter.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/SideBar
-pkgpythondir = @pkgpythondir@/Filters/SideBar
-
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/SideBar
 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo

@@ -24,4 +23,4 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -118,7 +118,7 @@ class SidebarFilter(DbGUIElement):
            widget.set_tooltip_text(tooltip)

    def key_press(self, obj, event):
-        if not event.state or event.state in (gtk.gdk.MOD2_MASK,):
+        if not (event.state & gtk.gdk.CONTROL_MASK):
            if event.keyval in (_RETURN, _KP_ENTER):
                self.clicked(obj)
        return False
@@ -138,7 +138,7 @@ class SearchBar(object):
            self.clear_button.set_sensitive(True)

    def key_press(self, obj, event):
-        if not event.state or event.state in (gtk.gdk.MOD2_MASK,):
+        if not (event.state & gtk.gdk.CONTROL_MASK):
            if event.keyval in (_RETURN, _KP_ENTER):
                self.filter_button.set_sensitive(False)
                self.clear_button.set_sensitive(True)
@@ -164,6 +164,7 @@ class SearchBar(object):
        self.filter_button.set_sensitive(False)
        self.uistate.status_text(_('Updating display...'))
        self.on_apply_callback()
+        self.filter_text.grab_focus()
        self.uistate.modify_statusbar(self.dbstate)

    def show(self):
@@ -5,13 +5,13 @@

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_GrampsLocale.py\
 	__init__.py
 	

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


 dist_pkgdata_DATA = 
@@ -23,4 +23,4 @@ GRAMPS_PY_MODPATH = "../"

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

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ErrorReportAssistant.py\
 	_ErrorView.py\
 	_GtkHandler.py\
@@ -13,7 +13,7 @@ pkgdata_PYTHON = \
 	_RotateHandler.py

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

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

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

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	mergeperson.py \
 	mergefamily.py \
@@ -17,7 +17,7 @@ pkgdata_PYTHON = \
 	mergenote.py

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

 # 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));
@@ -165,11 +165,13 @@ class MergeEvents(ManagedWindow.ManagedWindow):
        if use_handle1:
            phoenix = self.ev1
            titanic = self.ev2
-            unselect_path = (1,)
        else:
            phoenix = self.ev2
            titanic = self.ev1
-            unselect_path = (0,)
+            # Add second handle to history so that when merge is complete, 
+            # phoenix is the selected row.
+            self.uistate.viewmanager.active_page.get_history().push(
+                    phoenix.get_handle())

        if self.get_widget("type_btn1").get_active() ^ use_handle1:
            phoenix.set_type(titanic.get_type())
@@ -185,9 +187,6 @@ class MergeEvents(ManagedWindow.ManagedWindow):
        
        query = MergeEventQuery(self.dbstate, phoenix, titanic)
        query.execute()
-        if self.uistate.viewmanager.active_page.selection:
-            self.uistate.viewmanager.active_page.selection.unselect_path(
-                    unselect_path)
        self.uistate.set_busy_cursor(False)
        self.close()

@@ -197,11 +197,13 @@ class MergeFamilies(ManagedWindow.ManagedWindow):
        if use_handle1:
            phoenix = self.fy1
            titanic = self.fy2
-            unselect_path = (1,)
        else:
            phoenix = self.fy2
            titanic = self.fy1
-            unselect_path = (0,)
+            # Add second handle to history so that when merge is complete, 
+            # phoenix is the selected row.
+            self.uistate.viewmanager.active_page.get_history().push(
+                    phoenix.get_handle())

        phoenix_fh = phoenix.get_father_handle()
        phoenix_mh = phoenix.get_mother_handle()
@@ -221,9 +223,6 @@ class MergeFamilies(ManagedWindow.ManagedWindow):
            query.execute()
        except MergeError, err:
            ErrorDialog( _("Cannot merge people"), str(err))
-        if self.uistate.viewmanager.active_page.selection:
-            self.uistate.viewmanager.active_page.selection.unselect_path(
-                    unselect_path)
        self.uistate.set_busy_cursor(False)
        self.close()

@@ -147,11 +147,13 @@ class MergeMediaObjects(ManagedWindow.ManagedWindow):
        if use_handle1:
            phoenix = self.mo1
            titanic = self.mo2
-            unselect_path = (1,)
        else:
            phoenix = self.mo2
            titanic = self.mo1
-            unselect_path = (0,)
+            # Add second handle to history so that when merge is complete, 
+            # phoenix is the selected row.
+            self.uistate.viewmanager.active_page.get_history().push(
+                    phoenix.get_handle())

        if self.get_widget("path_btn1").get_active() ^ use_handle1:
            phoenix.set_path(titanic.get_path())
@@ -165,9 +167,6 @@ class MergeMediaObjects(ManagedWindow.ManagedWindow):

        query = MergeMediaQuery(self.dbstate, phoenix, titanic)
        query.execute()
-        if self.uistate.viewmanager.active_page.selection:
-            self.uistate.viewmanager.active_page.selection.unselect_path(
-                    unselect_path)
        self.close()

 class MergeMediaQuery(object):
@@ -158,11 +158,13 @@ class MergeNotes(ManagedWindow.ManagedWindow):
        if use_handle1:
            phoenix = self.no1
            titanic = self.no2
-            unselect_path = (1,)
        else:
            phoenix = self.no2
            titanic = self.no1
-            unselect_path = (0,)
+            # Add second handle to history so that when merge is complete, 
+            # phoenix is the selected row.
+            self.uistate.viewmanager.active_page.get_history().push(
+                    phoenix.get_handle())

        if self.get_widget("text_btn1").get_active() ^ use_handle1:
            phoenix.set_styledtext(titanic.get_styledtext())
@@ -175,9 +177,6 @@ class MergeNotes(ManagedWindow.ManagedWindow):

        query = MergeNoteQuery(self.dbstate, phoenix, titanic)
        query.execute()
-        if self.uistate.viewmanager.active_page.selection:
-            self.uistate.viewmanager.active_page.selection.unselect_path(
-                    unselect_path)
        self.close()

 #-------------------------------------------------------------------------
@@ -196,10 +196,15 @@ class MergePeople(ManagedWindow.ManagedWindow):
            self.add(tobj, title, _("Events"))
            for event_ref in person.get_event_ref_list():
                event_handle = event_ref.ref
+                role = event_ref.get_role()
                name = str(
                    self.database.get_event_from_handle(event_handle).get_type())
-                self.add(tobj, normal, "%s:\t%s" % 
-                            (name, self.get_event_info(event_handle)))
+                if role.is_primary():
+                    self.add(tobj, normal, "%s:\t%s" % 
+                                (name, self.get_event_info(event_handle)))
+                else:
+                    self.add(tobj, normal, "%s (%s):\t%s" % 
+                                (name, role, self.get_event_info(event_handle)))
        plist = person.get_parent_family_handle_list()

        if len(plist) > 0:
@@ -303,11 +308,13 @@ class MergePeople(ManagedWindow.ManagedWindow):
        if use_handle1:
            phoenix = self.pr1
            titanic = self.pr2
-            unselect_path = (1,)
        else:
            phoenix = self.pr2
            titanic = self.pr1
-            unselect_path = (0,)
+            # Add second handle to history so that when merge is complete, 
+            # phoenix is the selected row.
+            self.uistate.viewmanager.active_page.get_history().push(
+                    phoenix.get_handle())

        if self.get_widget("name_btn1").get_active() ^ use_handle1:
            swapname = phoenix.get_primary_name()
@@ -325,9 +332,6 @@ class MergePeople(ManagedWindow.ManagedWindow):
            query.execute()
        except MergeError, err:
            ErrorDialog( _("Cannot merge people"), str(err))
-        if self.uistate.viewmanager.active_page.selection:
-            self.uistate.viewmanager.active_page.selection.unselect_path(
-                    unselect_path)
        self.uistate.set_busy_cursor(False)
        self.close()
        if self.update:
@@ -169,11 +169,14 @@ class MergePlaces(ManagedWindow.ManagedWindow):
        if use_handle1:
            phoenix = self.pl1
            titanic = self.pl2
-            unselect_path = (1,)
        else:
            phoenix = self.pl2
            titanic = self.pl1
-            unselect_path = (0,)
+            # Add second handle to history so that when merge is complete, 
+            # phoenix is the selected row.
+            self.uistate.viewmanager.active_page.get_history().push(
+                    phoenix.get_handle())
+

        if self.get_widget("title_btn1").get_active() ^ use_handle1:
            phoenix.set_title(titanic.get_title())
@@ -190,9 +193,6 @@ class MergePlaces(ManagedWindow.ManagedWindow):

        query = MergePlaceQuery(self.dbstate, phoenix, titanic)
        query.execute()
-        if self.uistate.viewmanager.active_page.selection:
-            self.uistate.viewmanager.active_page.selection.unselect_path(
-                    unselect_path)
        self.uistate.set_busy_cursor(False)
        self.close()

@@ -136,11 +136,13 @@ class MergeRepositories(ManagedWindow.ManagedWindow):
        if use_handle1:
            phoenix = self.rp1
            titanic = self.rp2
-            unselect_path = (1,)
        else:
            phoenix = self.rp2
            titanic = self.rp1
-            unselect_path = (0,)
+            # Add second handle to history so that when merge is complete, 
+            # phoenix is the selected row.
+            self.uistate.viewmanager.active_page.get_history().push(
+                    phoenix.get_handle())

        if self.get_widget("name_btn1").get_active() ^ use_handle1:
            phoenix.set_name(titanic.get_name())
@@ -151,9 +153,6 @@ class MergeRepositories(ManagedWindow.ManagedWindow):

        query = MergeRepoQuery(self.dbstate, phoenix, titanic)
        query.execute()
-        if self.uistate.viewmanager.active_page.selection:
-            self.uistate.viewmanager.active_page.selection.unselect_path(
-                    unselect_path)
        self.uistate.set_busy_cursor(False)
        self.close()

@@ -159,11 +159,13 @@ class MergeSources(ManagedWindow.ManagedWindow):
        if use_handle1:
            phoenix = self.src1
            titanic = self.src2
-            unselect_path = (1,)
        else:
            phoenix = self.src2
            titanic = self.src1
-            unselect_path = (0,)
+            # Add second handle to history so that when merge is complete, 
+            # phoenix is the selected row.
+            self.uistate.viewmanager.active_page.get_history().push(
+                    phoenix.get_handle())

        if self.get_widget("title_btn1").get_active() ^ use_handle1:
            phoenix.set_title(titanic.get_title())
@@ -178,9 +180,6 @@ class MergeSources(ManagedWindow.ManagedWindow):

        query = MergeSourceQuery(self.dbstate, phoenix, titanic)
        query.execute()
-        if self.uistate.viewmanager.active_page.selection:
-            self.uistate.viewmanager.active_page.selection.unselect_path(
-                    unselect_path)
        self.uistate.set_busy_cursor(False)
        self.close()

@@ -299,7 +299,7 @@ class ScratchLocation(ScratchObjWrapper):
    DRAG_TARGET  = DdTargets.LOCATION
    ICON         = ICONS['location']
    
-    def __init__(self):
+    def __init__(self, dbstate, obj):
        super(ScratchLocation, self).__init__(dbstate, obj)
        self._type  = _("Location")
        self._value = "%s %s %s" % (self._obj.get_city(),
@@ -1269,6 +1269,7 @@ class ScratchPadWindow(ManagedWindow.ManagedWindow):
        """Deletes the selected object from the object list"""
        selection = self.object_list.get_selection()
        model, paths = selection.get_selected_rows()
+        paths.reverse()
        for path in paths:
            node = model.get_iter(path)
            if node:
@@ -2,14 +2,14 @@

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_SimpleDoc.py\
 	_SimpleAccess.py\
        _SimpleTable.py\
 	__init__.py

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

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -158,14 +158,16 @@ class Sort(object):
            return 0
        a_obj = self.database.get_event_from_handle(a_id)
        b_obj = self.database.get_event_from_handle(b_id)
-        return cmp(a_obj.get_date_object(), b_obj.get_date_object())
+        dsv1 = a_obj.get_date_object().get_sort_value()
+        dsv2 = b_obj.get_date_object().get_sort_value()
+        return cmp(dsv1, dsv2)

    def by_date_key(self, a_id):
        """Sort routine for comparing two events by their dates. """
        if not a_id:
            return 0
        a_obj = self.database.get_event_from_handle(a_id)
-        return a_obj.get_date_object()
+        return a_obj.get_date_object().get_sort_value()

    def by_place_title(self, a_id, b_id):
        """Sort routine for comparing two places. """
@@ -205,7 +207,7 @@ class Sort(object):
        evt_a = self.database.get_event_from_handle(a_id)
        plc_a = self.database.get_place_from_handle(evt_a.get_place_handle())
        plc_a_title = plc_a.title if plc_a else ""
-        return locale.strxfrml(plc_a_title)
+        return locale.strxfrm(plc_a_title)

    def by_event_description(self, a_id, b_id):
        """Sort routine for comparing two events by their descriptions. """
@@ -232,7 +234,7 @@ class Sort(object):

    def by_event_id_key(self, a_id):
        """Sort routine for comparing two events by their ID. """
-        if not (a_id and b_id):
+        if not a_id:
            return 0
        evt_a = self.database.get_event_from_handle(a_id)
        return locale.strxfrm(evt_a.get_gramps_id())
@@ -77,7 +77,8 @@ else:
            try:
                lang = locale.getdefaultlocale()[0] + '.UTF-8'
            except TypeError:
-                pass
+                print 'Unable to determine your Locale, using English'
+                lang = 'en.UTF-8'

    os.environ["LANG"] = lang
    os.environ["LANGUAGE"] = lang
@@ -8,7 +8,7 @@ SUBDIRS = \

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	arghandler.py \
 	argparser.py \
@@ -16,7 +16,7 @@ pkgdata_PYTHON = \
 	grampscli.py

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

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

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

 pylint:
-	PYTHONPATH=$(GRAMPS_PY_MODPATH) pylint $(pkgdata_PYTHON) > pylint.out
+	PYTHONPATH=$(GRAMPS_PY_MODPATH) pylint $(pkgpython_PYTHON) > pylint.out
@@ -5,11 +5,11 @@

 pkgdatadir = $(datadir)/@PACKAGE@/cli/plug

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py

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


 # Clean up all the byte-compiled files
@@ -19,4 +19,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -42,10 +42,10 @@ from gen.ggettext import sgettext as _
 #-------------------------------------------------------------------------
 PROGRAM_NAME   = "Gramps"
 if "@VERSIONSTRING@" == "@" + "VERSIONSTRING" + "@":
-    VERSION        = "3.3.1"
+    VERSION        = "3.3.3"
 else:
    VERSION        = "@VERSIONSTRING@"
-VERSION_TUPLE  = (3, 3, 1)
+VERSION_TUPLE  = (3, 3, 3)

 #-------------------------------------------------------------------------
 #
@@ -198,7 +198,7 @@ else:
 #
 #-------------------------------------------------------------------------
 COPYRIGHT_MSG  = u"\u00A9 2001-2006 Donald N. Allingham\n" \
-                 u"\u00A9 2007-2011 The Gramps Developers"
+                 u"\u00A9 2007-2012 The Gramps Developers"
 COMMENTS       = _("Gramps (Genealogical Research and Analysis "
                   "Management Programming System) is a personal "
                   "genealogy program.")
@@ -14,13 +14,13 @@ SUBDIRS = \

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	ggettext.py \
 	updatecallback.py

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


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

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

 pkgdatadir = $(datadir)/@PACKAGE@/gen/db

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	backup.py \
 	base.py \
@@ -20,7 +20,7 @@ pkgdata_PYTHON = \
 	write.py

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


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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -38,7 +38,8 @@ Declare constants used by database modules
 __all__ = (
            ('DBPAGE', 'DBMODE', 'DBCACHE', 'DBLOCKS', 'DBOBJECTS', 'DBUNDO',
             'DBEXT', 'DBMODE_R', 'DBMODE_W', 'DBUNDOFN', 'DBLOCKFN',
-             'DBRECOVFN', 'DBLOGNAME', 'DBFLAGS_O',  'DBFLAGS_R', 'DBFLAGS_D',
+             'DBRECOVFN','BDBVERSFN', 'DBLOGNAME', 'DBFLAGS_O',  'DBFLAGS_R',
+             'DBFLAGS_D',
            ) +
            
            ('PERSON_KEY', 'FAMILY_KEY', 'SOURCE_KEY', 'EVENT_KEY',
@@ -53,6 +54,7 @@ DBEXT     = ".db"           # File extension to be used for database files
 DBUNDOFN  = "undo.db"       # File name of 'undo' database
 DBLOCKFN  = "lock"          # File name of lock file
 DBRECOVFN = "need_recover"  # File name of recovery file
+BDBVERSFN = "bdbversion.txt"# File name of Berkeley DB version file
 DBLOGNAME = ".Db"           # Name of logger
 DBMODE_R  = "r"             # Read-only access
 DBMODE_W  = "w"             # Full Reaw/Write access
@@ -79,6 +79,30 @@ class DbVersionError(Exception):
                 "Gramps.\nPlease upgrade to the corresponding version or use "
                 "XML for porting data between different database versions.")
    
+class BsddbDowngradeError(Exception):
+    """
+    Error used to report that the Berkeley database used to create the family
+    tree is of a version that is too new to be supported by the current version.
+    """
+    def __init__(self, env_version, bdb_version):
+        Exception.__init__(self)
+        self.env_version = str(env_version)
+        self.bdb_version = str(bdb_version)
+
+    def __str__(self):
+        return _('Gramps stores its data in a Berkeley Database. '
+                 'The family tree you try to load was created with version '
+                 '%(env_version)s of the Berkeley DB. However, the Gramps '
+                 'version in use right now employs version %(bdb_version)s '
+                 'of the Berkeley DB. So you are trying to load data created '
+                 'in a newer format into an older program; this is bound to '
+                 'fail. The right approach in this case is to use XML export '
+                 'and import. So try to open the family tree on that computer '
+                 'with that software that created the family tree, export it '
+                 'to XML and load that XML into the version of Gramps you '
+                 'intend to use.') % {'env_version': self.env_version,
+                 'bdb_version': self.bdb_version}
+
 class DbEnvironmentError(Exception):
    """
    Error used to report that the database 'environment' could not be opened.
@@ -234,7 +234,7 @@ def convert_marker(self, marker_field):
    """Convert a marker into a tag."""
    marker = MarkerType()
    marker.unserialize(marker_field)
-    tag_name = str(marker)
+    tag_name = unicode(marker)
    
    if tag_name != '':
        if tag_name not in self.tags:
@@ -56,9 +56,9 @@ else:
 from gen.lib import (GenderStats, Person, Family, Event, Place, Source, 
                     MediaObject, Repository, Note, Tag)
 from gen.db import (DbBsddbRead, DbWriteBase, BSDDBTxn, 
-                    DbTxn, BsddbBaseCursor, DbVersionError, DbEnvironmentError, 
-                    DbUpgradeRequiredError, find_surname, find_surname_name,
-                    DbUndoBSDDB as DbUndo)
+                    DbTxn, BsddbBaseCursor, BsddbDowngradeError, DbVersionError,
+                    DbEnvironmentError, DbUpgradeRequiredError, find_surname,
+                    find_surname_name, DbUndoBSDDB as DbUndo)
 from gen.db.dbconst import *
 from gen.utils.callback import Callback
 from gen.updatecallback import UpdateCallback
@@ -224,6 +224,7 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
        self.secondary_connected = False
        self.has_changed = False
        self.brief_name = None
+        self.update_env_version = False

    def catch_db_error(func):
        """
@@ -349,6 +350,27 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
            with BSDDBTxn(self.env, self.metadata) as txn:
                txn.put('mediapath', path)            

+    def __check_bdb_version(self, name):
+        """Older version of Berkeley DB can't read data created by a newer
+        version."""
+        bdb_version = db.version()
+        env_version = (0, 0, 0)
+        versionpath = os.path.join(self.path, BDBVERSFN)
+        try:
+            with open(versionpath, "r") as version_file:
+                env_version = version_file.read().strip()
+                env_version = tuple(map(int, env_version[1:-1].split(', ')))
+        except:
+            # Just assume that the Berkeley DB version is OK.
+            pass
+        if (env_version[0] > bdb_version[0]) or \
+            (env_version[0] == bdb_version[0] and
+             env_version[1] > bdb_version[1]):
+            clear_lock_file(name)
+            raise BsddbDowngradeError(env_version, bdb_version)
+        elif env_version != bdb_version and not self.readonly:
+            self.update_env_version = True
+
    @catch_db_error
    def version_supported(self):
        dbversion = self.metadata.get('version', default=0)
@@ -400,6 +422,8 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
        self.path = self.full_name
        self.brief_name = os.path.basename(name)

+        self.__check_bdb_version(name)
+
        # Set up database environment
        self.env = db.DBEnv()
        self.env.set_cachesize(0, DBCACHE)
@@ -432,6 +456,7 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
        try:
            self.env.open(env_name, env_flags)
        except Exception, msg:
+            _LOG.warning("Error opening db environment: " + str(msg))
            try:
                self.__close_early()
            except:
@@ -1099,6 +1124,15 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
        self.undo_history_callback = None
        self.undodb = None

+        if self.update_env_version:
+            versionpath = os.path.join(self.path, BDBVERSFN)
+            try:
+                with open(versionpath, "w") as version_file:
+                    version_file.write(str(db.version()))
+            except:
+                # Storing the version of Berkeley Db is not really vital.
+                pass
+
        try:
            clear_lock_file(self.get_save_path())
        except IOError:
@@ -5,12 +5,12 @@

 pkgdatadir = $(datadir)/@PACKAGE@/gen/display

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	name.py\
 	__init__.py

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


 dist_pkgdata_DATA = 
@@ -22,4 +22,4 @@ GRAMPS_PY_MODPATH = "../../"

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

 pkgdatadir = $(datadir)/@PACKAGE@/gen/lib

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	addressbase.py \
 	address.py \
 	attrbase.py \
@@ -73,7 +73,7 @@ pkgdata_PYTHON = \
 	witness.py 

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

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

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

 pylint:
-	pylint --disable-msg=W0403,C0103 $(pkgdata_PYTHON)
+	pylint --disable-msg=W0403,C0103 $(pkgpython_PYTHON)
@@ -351,7 +351,7 @@ class Span(object):
                    #v = self.date1.sortval - self.date2.sortval
                    #self.sort = (v, -Span.ABOUT)
                    #self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
-                    self.repr = _("more than") + " " + self._format(self._diff(self.date1, self.date2))
+                    self.repr = _("less than") + " " + self._format(self._diff(self.date1, self.date2))
            elif self.date1.get_modifier() == Date.MOD_AFTER:    # AFTER----------------------------
                if   self.date2.get_modifier() == Date.MOD_NONE:
                    #v = self.date1.sortval - self.date2.sortval
@@ -3,16 +3,15 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py\
 	_gnomemime.py\
 	_winmime.py\
 	_pythonmime.py

 pkgpyexecdir = @pkgpyexecdir@/gen/mime
-pkgpythondir = @pkgpythondir@/gen/mime

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -47,9 +47,12 @@ def get_description(mime_type):
    progid = _get_prog_id(extension)
    
    if progid:
-        hcr = ConnectRegistry(None, HKEY_CLASSES_ROOT)
-        desc = QueryValue(hcr, progid)
-        CloseKey(hcr)
+        try:
+            hcr = ConnectRegistry(None, HKEY_CLASSES_ROOT)
+            desc = QueryValue(hcr, progid)
+            CloseKey(hcr)
+        except WindowsError:
+            pass

    if not desc:
        desc = _("unknown")
@@ -11,7 +11,7 @@ SUBDIRS = \

 pkgdatadir = $(datadir)/@PACKAGE@/gen/plug

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	_docgenplugin.py \
 	_export.py \
@@ -24,7 +24,7 @@ pkgdata_PYTHON = \
 	utils.py

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


 # Clean up all the byte-compiled files
@@ -34,4 +34,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -67,9 +67,9 @@ class Gramplet(object):
                     self.gui.on_motion)
        self.connect_signal('Person', self._active_changed)
        
+        self._db_changed(self.dbstate.db)
        active_person = self.get_active('Person')
        if active_person: # already changed
-            self._db_changed(self.dbstate.db)
            self._active_changed(active_person)
        self.post_init()

@@ -284,6 +284,8 @@ class Gramplet(object):
            if self.dbstate.open:
                #print "  %s is not active" % self.gui.gname
                self.update_has_data()
+            else:
+                self.set_has_data(False)
            return
        #print "     %s is UPDATING" % self.gui.gname
        self.dirty = False
@@ -5,13 +5,13 @@

 pkgdatadir = $(datadir)/@PACKAGE@/gen/plug/docbackend

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	cairobackend.py \
 	docbackend.py 

 pkgpyexecdir = @pkgpyexecdir@/gen/plug/docbackend
-pkgpythondir = @pkgpythondir@/gen/plug/docbackend
+pkgpythondir = $(datadir)/@PACKAGE@/gen/plug/docbackend


 # Clean up all the byte-compiled files
@@ -21,4 +21,4 @@ GRAMPS_PY_MODPATH = "../../../"

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

 pkgdatadir = $(datadir)/@PACKAGE@/gen/plug/docgen

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	basedoc.py  \
 	drawdoc.py \
@@ -20,7 +20,7 @@ pkgdata_PYTHON = \
 	textdoc.py 

 pkgpyexecdir = @pkgpyexecdir@/gen/plug/docgen
-pkgpythondir = @pkgpythondir@/gen/plug/docgen
+pkgpythondir = $(datadir)/@PACKAGE@/gen/plug/docgen


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

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

 pkgdatadir = $(datadir)/@PACKAGE@/gen/plug/menu

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	_boolean.py \
 	_booleanlist.py \
@@ -28,8 +28,7 @@ pkgdata_PYTHON = \
 	_text.py 

 pkgpyexecdir = @pkgpyexecdir@/gen/plug/menu
-pkgpythondir = @pkgpythondir@/gen/plug/menu
-
+pkgpythondir = $(datadir)/@PACKAGE@/gen/plug/menu

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

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

 pkgdatadir = $(datadir)/@PACKAGE@/gen/plug/report

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py\
 	_bibliography.py\
 	_constants.py\
@@ -13,7 +13,7 @@ pkgdata_PYTHON = \
 	utils.py

 pkgpyexecdir = @pkgpyexecdir@/gen/plug/report
-pkgpythondir = @pkgpythondir@/gen/plug/report
+pkgpythondir = $(datadir)/@PACKAGE@/gen/plug/report

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

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

 pkgdatadir = $(datadir)/@PACKAGE@/gen/proxy

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	filter.py \
 	living.py \
@@ -15,7 +15,7 @@ pkgdata_PYTHON = \
 	proxybase.py

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


 # Clean up all the byte-compiled files
@@ -25,4 +25,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -204,7 +204,9 @@ class LivingProxyDb(ProxyDbBase):
        Returns True if the person is considered living.
        Returns False if the person is not considered living.
        """
-        return probably_alive( person,
+        person_handle = person.get_handle()
+        unfil_person = self.get_unfiltered_person(person_handle)
+        return probably_alive( unfil_person,
                               self.db,
                               self.current_date,
                               self.years_after_death )
@@ -5,7 +5,7 @@

 pkgdatadir = $(datadir)/@PACKAGE@/gen/utils

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	callback.py \
 	callman.py \
@@ -13,7 +13,7 @@ pkgdata_PYTHON = \
 	fallback.py

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


 # Clean up all the byte-compiled files
@@ -23,4 +23,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -10,489 +10,460 @@
      <object class="GtkVBox" id="dialog-vbox11">
        <property name="visible">True</property>
        <child>
-          <object class="GtkVPaned" id="vpaned1">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="xpad">6</property>
+            <property name="ypad">3</property>
+            <property name="label" translatable="yes">&lt;b&gt;Reference information&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+            <property name="use_underline">True</property>
+            <property name="justify">center</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkNotebook" id="notebook_ref">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
+            <property name="border_width">6</property>
            <child>
-              <object class="GtkExpander" id="expander1">
+              <object class="GtkTable" id="table64">
                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="expanded">True</property>
-                <property name="spacing">6</property>
+                <property name="border_width">12</property>
+                <property name="n_columns">4</property>
+                <property name="column_spacing">12</property>
+                <property name="row_spacing">6</property>
                <child>
-                  <object class="GtkNotebook" id="notebook_ref">
+                  <object class="GtkLabel" id="label513">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="ypad">3</property>
+                    <property name="label" translatable="yes">_Role:</property>
+                    <property name="use_underline">True</property>
+                    <property name="justify">center</property>
+                    <property name="mnemonic_widget">eer_role_combo</property>
+                  </object>
+                  <packing>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleButton" id="eer_ref_priv">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
-                    <property name="border_width">6</property>
+                    <property name="receives_default">True</property>
+                    <property name="relief">none</property>
                    <child>
-                      <object class="GtkTable" id="table64">
+                      <object class="GtkImage" id="image2675">
                        <property name="visible">True</property>
-                        <property name="border_width">12</property>
-                        <property name="n_columns">4</property>
-                        <property name="column_spacing">12</property>
-                        <property name="row_spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="label513">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="ypad">3</property>
-                            <property name="label" translatable="yes">_Role:</property>
-                            <property name="use_underline">True</property>
-                            <property name="justify">center</property>
-                            <property name="mnemonic_widget">eer_role_combo</property>
-                          </object>
-                          <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="eer_ref_priv">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="relief">none</property>
-                            <child>
-                              <object class="GtkImage" id="image2675">
-                                <property name="visible">True</property>
-                                <property name="icon_name">gramps-unlock</property>
-                                <property name="icon-size">1</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">3</property>
-                            <property name="right_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBoxEntry" id="eer_role_combo">
-                            <property name="visible">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">3</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
+                        <property name="icon_name">gramps-unlock</property>
+                        <property name="icon-size">1</property>
                      </object>
                    </child>
-                    <child type="tab">
-                      <object class="GtkHBox" id="hbox128">
-                        <property name="visible">True</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkImage" id="image2688">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-file</property>
-                            <property name="icon-size">1</property>
-                          </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label618">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                            <property name="justify">center</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="tab_fill">False</property>
-                      </packing>
-                    </child>
                  </object>
+                  <packing>
+                    <property name="left_attach">3</property>
+                    <property name="right_attach">4</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label1">
+                <child>
+                  <object class="GtkComboBoxEntry" id="eer_role_combo">
                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Reference information&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">3</property>
+                    <property name="y_options"></property>
+                  </packing>
                </child>
              </object>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
            </child>
-            <child>
-              <object class="GtkExpander" id="eer_expander">
+            <child type="tab">
+              <object class="GtkLabel" id="label618">
                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="border_width">6</property>
-                <property name="expanded">True</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkNotebook" id="notebook">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="show_border">False</property>
-                    <child>
-                      <object class="GtkTable" id="table62">
-                        <property name="visible">True</property>
-                        <property name="border_width">12</property>
-                        <property name="n_rows">7</property>
-                        <property name="n_columns">3</property>
-                        <property name="column_spacing">12</property>
-                        <property name="row_spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="label501">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Event type:</property>
-                            <property name="use_underline">True</property>
-                            <property name="justify">center</property>
-                            <property name="mnemonic_widget">eer_type_combo</property>
-                          </object>
-                          <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label502">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Date:</property>
-                            <property name="use_underline">True</property>
-                            <property name="justify">center</property>
-                            <property name="mnemonic_widget">eer_date_entry</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label503">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">De_scription:</property>
-                            <property name="use_underline">True</property>
-                            <property name="justify">center</property>
-                            <property name="mnemonic_widget">eer_description</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label504">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="ypad">3</property>
-                            <property name="label" translatable="yes">_Place:</property>
-                            <property name="use_underline">True</property>
-                            <property name="justify">center</property>
-                            <property name="mnemonic_widget">share_place</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label657">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_ID:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">gid</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHBox" id="hbox132">
-                            <property name="visible">True</property>
-                            <child>
-                              <object class="GtkLabel" id="eer_place">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="share_place">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="relief">none</property>
-                                <child>
-                                  <object class="GtkImage" id="image2702">
-                                    <property name="visible">True</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="add_del_place">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="relief">none</property>
-                            <child>
-                              <object class="GtkImage" id="image2701">
-                                <property name="visible">True</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="eer_date_stat">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="relief">none</property>
-                            <child>
-                              <object class="GtkImage" id="eer_date_stat_child">
-                                <property name="visible">True</property>
-                                <property name="icon_name">gramps-date</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="eer_ev_priv">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="relief">none</property>
-                            <child>
-                              <object class="GtkImage" id="image2676">
-                                <property name="visible">True</property>
-                                <property name="icon_name">gramps-unlock</property>
-                                <property name="icon-size">1</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBoxEntry" id="eer_type_combo">
-                            <property name="visible">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="UndoableEntry" id="gid">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">●</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="UndoableEntry" id="eer_description">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">●</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHBox" id="eer_warning">
-                            <property name="border_width">6</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <object class="GtkImage" id="image2651">
-                                <property name="visible">True</property>
-                                <property name="yalign">0</property>
-                                <property name="stock">gtk-dialog-warning</property>
-                                <property name="icon-size">6</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label521">
-                                <property name="width_request">500</property>
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="ypad">4</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Note:&lt;/b&gt; Any changes in the shared event information will be reflected in the event itself, for all participants in the event.</property>
-                                <property name="use_markup">True</property>
-                                <property name="justify">fill</property>
-                                <property name="wrap">True</property>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">5</property>
-                            <property name="bottom_attach">6</property>
-                            <property name="y_options">GTK_SHRINK</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="ValidatableMaskedEntry" id="eer_date_entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">●</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="tab_fill">False</property>
-                      </packing>
-                    </child>
-                    <child type="tab">
-                      <object class="GtkHBox" id="eer_general_tab">
-                        <property name="visible">True</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkImage" id="image2634">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-file</property>
-                            <property name="icon-size">1</property>
-                          </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label506">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                            <property name="justify">center</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="tab_fill">False</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label520">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Shared information&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
+                <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
              </object>
              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
+                <property name="tab_fill">False</property>
              </packing>
            </child>
          </object>
          <packing>
-            <property name="position">1</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkExpander" id="eer_expander">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="border_width">6</property>
+            <property name="expanded">True</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkNotebook" id="notebook">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="show_border">False</property>
+                <child>
+                  <object class="GtkTable" id="table62">
+                    <property name="visible">True</property>
+                    <property name="border_width">12</property>
+                    <property name="n_rows">7</property>
+                    <property name="n_columns">3</property>
+                    <property name="column_spacing">12</property>
+                    <property name="row_spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label501">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Event type:</property>
+                        <property name="use_underline">True</property>
+                        <property name="justify">center</property>
+                        <property name="mnemonic_widget">eer_type_combo</property>
+                      </object>
+                      <packing>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label502">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Date:</property>
+                        <property name="use_underline">True</property>
+                        <property name="justify">center</property>
+                        <property name="mnemonic_widget">eer_date_entry</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label503">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">De_scription:</property>
+                        <property name="use_underline">True</property>
+                        <property name="justify">center</property>
+                        <property name="mnemonic_widget">eer_description</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label504">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="ypad">3</property>
+                        <property name="label" translatable="yes">_Place:</property>
+                        <property name="use_underline">True</property>
+                        <property name="justify">center</property>
+                        <property name="mnemonic_widget">share_place</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label657">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_ID:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">gid</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox132">
+                        <property name="visible">True</property>
+                        <child>
+                          <object class="GtkLabel" id="eer_place">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="share_place">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="relief">none</property>
+                            <child>
+                              <object class="GtkImage" id="image2702">
+                                <property name="visible">True</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="add_del_place">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="relief">none</property>
+                        <child>
+                          <object class="GtkImage" id="image2701">
+                            <property name="visible">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">3</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="eer_date_stat">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Show Date Editor</property>
+                        <property name="relief">none</property>
+                        <child>
+                          <object class="GtkImage" id="eer_date_stat_child">
+                            <property name="visible">True</property>
+                            <property name="icon_name">gramps-date</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">3</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkToggleButton" id="eer_ev_priv">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="relief">none</property>
+                        <child>
+                          <object class="GtkImage" id="image2676">
+                            <property name="visible">True</property>
+                            <property name="icon_name">gramps-unlock</property>
+                            <property name="icon-size">1</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">3</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">4</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxEntry" id="eer_type_combo">
+                        <property name="visible">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="UndoableEntry" id="gid">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip_text" translatable="yes">A unique ID to identify the event</property>
+                        <property name="invisible_char">●</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="UndoableEntry" id="eer_description">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">●</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="eer_warning">
+                        <property name="border_width">6</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkImage" id="image2651">
+                            <property name="visible">True</property>
+                            <property name="yalign">0</property>
+                            <property name="stock">gtk-dialog-warning</property>
+                            <property name="icon-size">6</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label521">
+                            <property name="width_request">500</property>
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="ypad">4</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Note:&lt;/b&gt; Any changes in the shared event information will be reflected in the event itself, for all participants in the event.</property>
+                            <property name="use_markup">True</property>
+                            <property name="justify">fill</property>
+                            <property name="wrap">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="right_attach">3</property>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
+                        <property name="y_options">GTK_SHRINK</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="ValidatableMaskedEntry" id="eer_date_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">●</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child type="tab">
+                  <object class="GtkHBox" id="eer_general_tab">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkImage" id="image2634">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-file</property>
+                        <property name="icon-size">1</property>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label506">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">center</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label520">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;b&gt;Shared information&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">3</property>
          </packing>
        </child>
        <child internal-child="action_area">
@@ -554,9 +525,9 @@
      </object>
    </child>
    <action-widgets>
-      <action-widget response="-11">help</action-widget>
-      <action-widget response="-6">cancel</action-widget>
-      <action-widget response="-5">ok</action-widget>
+      <action-widget response="0">help</action-widget>
+      <action-widget response="0">cancel</action-widget>
+      <action-widget response="0">ok</action-widget>
    </action-widgets>
  </object>
 </interface>
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <!-- interface-requires gtk+ 2.12 -->
  <!-- interface-requires grampswidgets 0.0 -->
@@ -7,14 +7,12 @@
    <property name="default_width">600</property>
    <property name="default_height">450</property>
    <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
    <child internal-child="vbox">
      <object class="GtkVBox" id="dialog-vbox9">
        <property name="visible">True</property>
        <child>
          <object class="GtkVBox" id="vbox">
            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
            <child>
              <object class="GtkTable" id="table">
                <property name="visible">True</property>
@@ -46,7 +44,7 @@
                    <property name="label" translatable="yes">_Place:</property>
                    <property name="use_underline">True</property>
                    <property name="justify">center</property>
-                    <property name="mnemonic_widget">place</property>
+                    <property name="mnemonic_widget">share_place</property>
                  </object>
                  <packing>
                    <property name="top_attach">4</property>
@@ -60,6 +58,7 @@
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Show Date Editor</property>
                    <property name="relief">none</property>
                    <child>
                      <object class="GtkImage" id="image2692">
@@ -307,7 +306,7 @@
                  <object class="ValidatableMaskedEntry" id="date_entry">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
-                    <property name="invisible_char">&#x25CF;</property>
+                    <property name="invisible_char">●</property>
                  </object>
                  <packing>
                    <property name="left_attach">1</property>
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <!-- interface-requires gtk+ 2.12 -->
  <!-- interface-requires grampswidgets 0.0 -->
@@ -7,7 +7,6 @@
    <property name="default_width">600</property>
    <property name="default_height">450</property>
    <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
    <child internal-child="vbox">
      <object class="GtkVBox" id="dialog-vbox20">
        <property name="visible">True</property>
@@ -80,7 +79,7 @@
                        <property name="can_focus">True</property>
                        <property name="tooltip_text" translatable="yes">If media is an image, select the specific part of the image you want to reference.
 You can use the mouse on the picture to select a region, or use these spinbuttons to set the top left, and bottom right corner of the referenced region. Point (0,0) is the top left corner of the picture, and (100,100) the bottom right corner.</property>
-                        <property name="invisible_char">&#x25CF;</property>
+                        <property name="invisible_char">●</property>
                        <property name="adjustment">adjustment4</property>
                        <property name="climb_rate">1</property>
                        <property name="numeric">True</property>
@@ -99,7 +98,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                        <property name="can_focus">True</property>
                        <property name="tooltip_text" translatable="yes">If media is an image, select the specific part of the image you want to reference.
 You can use the mouse on the picture to select a region, or use these spinbuttons to set the top left, and bottom right corner of the referenced region. Point (0,0) is the top left corner of the picture, and (100,100) the bottom right corner.</property>
-                        <property name="invisible_char">&#x25CF;</property>
+                        <property name="invisible_char">●</property>
                        <property name="adjustment">adjustment3</property>
                        <property name="climb_rate">1</property>
                        <property name="numeric">True</property>
@@ -167,7 +166,7 @@ Select a region with clicking and holding the mouse button on the top left corne
                        <property name="tooltip_text" translatable="yes">If media is an image, select the specific part of the image you want to reference.
 You can use the mouse on the picture to select a region, or use these spinbuttons to set the top left, and bottom right corner of the referenced region. Point (0,0) is the top left corner of the picture, and (100,100) the bottom right corner.
 </property>
-                        <property name="invisible_char">&#x25CF;</property>
+                        <property name="invisible_char">●</property>
                        <property name="adjustment">adjustment2</property>
                        <property name="climb_rate">1</property>
                        <property name="numeric">True</property>
@@ -186,7 +185,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                        <property name="can_focus">True</property>
                        <property name="tooltip_text" translatable="yes">If media is an image, select the specific part of the image you want to reference.
 You can use the mouse on the picture to select a region, or use these spinbuttons to set the top left, and bottom right corner of the referenced region. Point (0,0) is the top left corner of the picture, and (100,100) the bottom right corner.</property>
-                        <property name="invisible_char">&#x25CF;</property>
+                        <property name="invisible_char">●</property>
                        <property name="adjustment">adjustment1</property>
                        <property name="climb_rate">1</property>
                        <property name="numeric">True</property>
@@ -308,8 +307,8 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                      <object class="GtkTable" id="table2">
                        <property name="visible">True</property>
                        <property name="border_width">12</property>
-                        <property name="n_rows">5</property>
-                        <property name="n_columns">3</property>
+                        <property name="n_rows">7</property>
+                        <property name="n_columns">4</property>
                        <property name="column_spacing">12</property>
                        <property name="row_spacing">6</property>
                        <child>
@@ -319,12 +318,13 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                            <property name="label" translatable="yes">_Path:</property>
                            <property name="use_underline">True</property>
                            <property name="justify">center</property>
+                            <property name="mnemonic_widget">path</property>
                          </object>
                          <packing>
                            <property name="left_attach">1</property>
                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
                            <property name="x_options">GTK_FILL</property>
                            <property name="y_options"></property>
                          </packing>
@@ -368,7 +368,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="tooltip_text" translatable="yes">Descriptive title for this media object.</property>
-                            <property name="invisible_char">&#x25CF;</property>
+                            <property name="invisible_char">●</property>
                          </object>
                          <packing>
                            <property name="left_attach">2</property>
@@ -414,8 +414,8 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                          </object>
                          <packing>
                            <property name="right_attach">3</property>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
+                            <property name="top_attach">6</property>
+                            <property name="bottom_attach">7</property>
                            <property name="x_options">GTK_FILL</property>
                          </packing>
                        </child>
@@ -447,7 +447,7 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                            </child>
                          </object>
                          <packing>
-                            <property name="bottom_attach">4</property>
+                            <property name="bottom_attach">5</property>
                            <property name="x_options">GTK_FILL</property>
                            <property name="y_options">GTK_FILL</property>
                          </packing>
@@ -456,15 +456,14 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                          <object class="GtkLabel" id="label660">
                            <property name="visible">True</property>
                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Type:</property>
-                            <property name="use_underline">True</property>
+                            <property name="label" translatable="yes">Type:</property>
                            <property name="mnemonic_widget">type</property>
                          </object>
                          <packing>
                            <property name="left_attach">1</property>
                            <property name="right_attach">2</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
+                            <property name="top_attach">5</property>
+                            <property name="bottom_attach">6</property>
                            <property name="x_options">GTK_FILL</property>
                            <property name="y_options"></property>
                          </packing>
@@ -478,89 +477,34 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                          <packing>
                            <property name="left_attach">2</property>
                            <property name="right_attach">3</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
+                            <property name="top_attach">5</property>
+                            <property name="bottom_attach">6</property>
                            <property name="x_options">GTK_FILL</property>
                            <property name="y_options"></property>
                          </packing>
                        </child>
                        <child>
-                          <object class="GtkHBox" id="hbox136">
+                          <object class="GtkLabel" id="label422">
                            <property name="visible">True</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <object class="UndoableEntry" id="gid">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">A unique ID to identify the Media object.</property>
-                                <property name="invisible_char">&#x25CF;</property>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToggleButton" id="privacy">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="relief">none</property>
-                                <child>
-                                  <object class="GtkImage" id="image2710">
-                                    <property name="visible">True</property>
-                                    <property name="icon_name">gtk-dialog-authentication</property>
-                                    <property name="icon-size">1</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Date:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">date_entry</property>
                          </object>
                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="y_options"></property>
                          </packing>
                        </child>
                        <child>
-                          <object class="GtkHBox" id="hbox2">
+                          <object class="ValidatableMaskedEntry" id="date_entry">
                            <property name="visible">True</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <object class="UndoableEntry" id="path">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">&#x25CF;</property>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="file_select">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="relief">none</property>
-                                <child>
-                                  <object class="GtkImage" id="image2673">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-open</property>
-                                    <property name="icon-size">1</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">•</property>
                          </object>
                          <packing>
                            <property name="left_attach">2</property>
@@ -570,6 +514,159 @@ You can use the mouse on the picture to select a region, or use these spinbutton
                            <property name="y_options"></property>
                          </packing>
                        </child>
+                        <child>
+                          <object class="GtkButton" id="date_edit">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">Invoke date editor</property>
+                            <property name="relief">none</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="label422"/>
+                            </accessibility>
+                            <child>
+                              <object class="GtkImage" id="image2264">
+                                <property name="visible">True</property>
+                                <property name="icon_name">gramps-date</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">3</property>
+                            <property name="right_attach">4</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToggleButton" id="privacy">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="relief">none</property>
+                            <child>
+                              <object class="GtkImage" id="image2710">
+                                <property name="visible">True</property>
+                                <property name="icon_name">gtk-dialog-authentication</property>
+                                <property name="icon-size">1</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">3</property>
+                            <property name="right_attach">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="UndoableEntry" id="gid">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip_text" translatable="yes">A unique ID to identify the Media object.</property>
+                            <property name="invisible_char">•</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="file_select">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">Select a file</property>
+                            <property name="relief">none</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="label129"/>
+                            </accessibility>
+                            <child>
+                              <object class="GtkImage" id="image2673">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-open</property>
+                                <property name="icon-size">1</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">3</property>
+                            <property name="right_attach">4</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="UndoableEntry" id="path">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">•</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label2">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Tags:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">tag_button</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="tag_label">
+                            <property name="visible">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="tag_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="label1"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left_attach">3</property>
+                            <property name="right_attach">4</property>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                      </object>
                    </child>
                    <child type="tab">
@@ -377,6 +377,7 @@ Indicate that the surname consists of different parts. Every surname has its own
                            <property name="xalign">0</property>
                            <property name="label" translatable="yes">_Surname:</property>
                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">surname</property>
                          </object>
                          <packing>
                            <property name="expand">False</property>
@@ -12,7 +12,7 @@ SUBDIRS = \

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	aboutdialog.py \
 	basesidebar.py \
@@ -31,7 +31,7 @@ pkgdata_PYTHON = \
 	viewmanager.py

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


 # Clean up all the byte-compiled files
@@ -41,4 +41,4 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
@@ -309,11 +309,13 @@ class DbLoader(CLIDbLoader):
                    self.dbstate.db.set_save_path(filename)
                else:
                    self.dbstate.no_database()
+        except gen.db.exceptions.BsddbDowngradeError, msg:
+            self.dbstate.no_database()
+            self._errordialog( _("Cannot open database"), str(msg))
        except gen.db.exceptions.DbVersionError, msg:
            self.dbstate.no_database()
            self._errordialog( _("Cannot open database"), str(msg))
        except gen.db.exceptions.DbEnvironmentError, msg:
-            _LOG.error("dbloader: read_file: DbEnvironmentError detected")
            self.dbstate.no_database()
            self._errordialog( _("Cannot open database"), str(msg))
        except OSError, msg:
@@ -183,11 +183,10 @@ class DbManager(CLIDbManager):
        Grab ENTER so it does not start editing the cell, but behaves
        like double click instead
        """
-        if not event.state or event.state in (gtk.gdk.MOD2_MASK,):
-            if event.keyval in (_RETURN, _KP_ENTER):
-                if self.connect.get_property('sensitive'):
-                    self.top.response(gtk.RESPONSE_OK)
-                    return True
+        if event.keyval in (_RETURN, _KP_ENTER):
+            if self.connect.get_property('sensitive'):
+                self.top.response(gtk.RESPONSE_OK)
+                return True
        return False

    def __selection_changed(self, selection):
@@ -551,7 +550,7 @@ class DbManager(CLIDbManager):

        # close the database if the user has requested to delete the
        # active database
-        if self.data_to_delete[OPEN_COL]:
+        if self.data_to_delete[PATH_COL] == self.active:
            self.dbstate.no_database()
            
        store, node = self.selection.get_selected()
@@ -8,7 +8,7 @@ SUBDIRS = \

 pkgdatadir = $(datadir)/@PACKAGE@/gui/editors

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	addmedia.py\
 	__init__.py\
 	editaddress.py \
@@ -38,7 +38,7 @@ pkgdata_PYTHON = \
 	objectentries.py

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

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

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

 pkgdatadir = $(datadir)/@PACKAGE@/gui/editors/displaytabs

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	addrembedlist.py \
 	addressmodel.py \
 	attrembedlist.py \
@@ -49,7 +49,7 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/gui/editors/displaytabs
-pkgpythondir = @pkgpythondir@/gui/editors/displaytabs
+pkgpythondir = $(datadir)/@PACKAGE@/gui/editors/displaytabs

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/Show More
+++ b/Show More