2007-06-17 Alex Roitman <shura@gramps-project.org>

* src/plugins/Verify.py: Clarification in wording: #1071.



svn: r8574

TODO

@@ -5,12 +5,34 @@
   will not be around forever. We need to adapt to the new GTK method.
 
 * Add support for formatted notes. We have a start by ripping off code
-  from GPL code from grecipe-manager.
+  from GPL code from grecipe-manager. - DONE
 
 * Allow for multiple notes. A tabbed interface would be really useful,
   since there are no titles for notes. Not all objects would
   necessarily need multiple notes. Determine which ones should and
-  shouldn't.
+  shouldn't. - DONE
+
+* before release on multiple notes: 
+    --> in note view: only show orphaned notes (notes are NOT in remove 
+          orphaned notes tool which is what we want )
+    --> in note: also public/private on GUI
+    --> on upgrade, the notetype should correspond to the object the note is made
+            from, so notetype SOURCE, SOURCEREF, ... (DONE for GRDB)
+    --> in sourceref: 
+         * remove text tab. 
+         * On import of GEDCOM text tag, or upgrade of < 2.2 database, 
+           create a note with type TRANSCRIPT
+         * On export, do not write the text tag in sourceref, write a note instead
+    --> A GrampsWidget for use in report dialogs to select which notetypes to include 
+        in a report
+    --> Support for multiple notes in all reports.
+    --> Empty text field on Saving Note should throw an error that Note is empty ! (?)
+    --> Undo in Note. Serious editing needs an undo function. Furthermore, the function
+        the Clear icon is unclear: tooltip? Other icon?
+
+* Split views
+
+* Export to spreadsheet, print, CSV of views - DONE
 
 * Date calculator.  See
   http://sourceforge.net/mailarchive/forum.php?thread_id=3252078&forum_id=1993

configure.in

@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl May need to run automake && aclocal first
 
 AC_PREREQ(2.57)
-AC_INIT(gramps, 2.2.7, [gramps-bugs@lists.sourceforge.net])
+AC_INIT(gramps, 2.3.0, [gramps-bugs@lists.sourceforge.net])
 AC_CONFIG_SRCDIR(configure.in)
 AM_INIT_AUTOMAKE(1.6.3)
 
@@ -220,8 +220,13 @@ src/Filters/Rules/Source/Makefile
 src/Filters/Rules/Place/Makefile
 src/Filters/Rules/MediaObject/Makefile
 src/Filters/Rules/Repository/Makefile
+src/Filters/Rules/Note/Makefile
 src/Filters/SideBar/Makefile
 src/DataViews/Makefile
+src/BasicUtils/Makefile
+src/Simple/Makefile
+src/GrampsDbUtils/Makefile
+src/GrampsLocale/Makefile
 src/PluginUtils/Makefile
 src/ReportBase/Makefile
 src/plugins/Makefile
@@ -229,6 +234,10 @@ src/DateHandler/Makefile
 src/data/Makefile
 src/glade/Makefile
 src/images/Makefile
+src/images/scalable/Makefile
+src/images/16x16/Makefile
+src/images/22x22/Makefile
+src/images/48x48/Makefile
 src/data/templates/Makefile
 data/Makefile
 data/man/Makefile

data/gramps.desktop.in

@@ -6,7 +6,7 @@ Icon=gramps.png
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=Application;Genealogy;Office;
+Categories=GTK;Office;
 X-GNOME-DocPath=gramps/gramps-manual.xml
-MimeType=application/x-gramps
+MimeType=application/x-gramps;
 Exec=gramps %F

data/gramps.schemas.in

@@ -237,6 +237,18 @@
         </locale>
       </schema>
 
+      <schema>
+        <key>/schemas/apps/gramps/interface/releditbtn</key>
+        <applyto>/apps/gramps/interface/releditbtn</applyto>
+        <owner>gramps</owner>
+        <type>bool</type>
+        <default>0</default>
+        <locale name="C">
+          <short>Display edit buttons in Relationship View</short>
+          <long>This key enables display of edit buttons in Relationship View</long>
+        </locale>
+      </schema>
+
       <schema>
         <key>/schemas/apps/gramps/interface/height</key>
         <applyto>/apps/gramps/interface/height</applyto>
@@ -285,6 +297,30 @@
         </locale>
       </schema>
 
+      <schema>
+        <key>/schemas/apps/gramps/interface/note-height</key>
+        <applyto>/apps/gramps/interface/note-height</applyto>
+        <owner>gramps</owner>
+        <type>int</type>
+        <default>500</default>
+        <locale name="C">
+          <short>Height of the note editor interface.</short>
+          <long>Specifies the height of the note editor interface.</long>
+        </locale>
+      </schema>
+
+      <schema>
+        <key>/schemas/apps/gramps/interface/note-width</key>
+        <applyto>/apps/gramps/interface/note-width</applyto>
+        <owner>gramps</owner>
+        <type>int</type>
+        <default>700</default>
+        <locale name="C">
+          <short>Width of the note editor interface.</short>
+          <long>Specifies the width of the note editor interface.</long>
+        </locale>
+      </schema>
+
       <schema>
         <key>/schemas/apps/gramps/interface/person-height</key>
         <applyto>/apps/gramps/interface/person-height</applyto>
@@ -562,6 +598,18 @@
         </locale>
       </schema>
 
+      <schema>
+        <key>/schemas/apps/gramps/behavior/database-path</key>
+        <applyto>/apps/gramps/behavior/database-path</applyto>
+        <owner>gramps</owner>
+        <type>string</type>
+        <default>~/.gramps/grampsdb</default>
+        <locale name="C">
+          <short>Additional path where the databases may reside</short>
+          <long>Additional path where the databases may reside</long>
+        </locale>
+      </schema>
+
       <schema>
         <key>/schemas/apps/gramps/preferences/fprefix</key>
         <applyto>/apps/gramps/preferences/fprefix</applyto>
@@ -601,6 +649,19 @@
         </locale>
       </schema>
 
+      <schema>
+        <key>/schemas/apps/gramps/preferences/nprefix</key>
+        <applyto>/apps/gramps/preferences/nprefix</applyto>
+        <owner>gramps</owner>
+        <type>string</type>
+        <default>N%04d</default>
+        <locale name="C">
+          <short>Default note GRAMPS ID pattern</short>
+          <long>The new GRAMPS IDs for the notes are generated according
+          to this format string.</long>
+        </locale>
+      </schema>
+
       <schema>
         <key>/schemas/apps/gramps/preferences/iprefix</key>
         <applyto>/apps/gramps/preferences/iprefix</applyto>
@@ -1153,5 +1214,18 @@
         </locale>
       </schema>
 
+      <schema>
+        <key>/schemas/apps/gramps/behavior/owner-warn</key>
+        <applyto>/apps/gramps/behavior/owner-warn</applyto>
+        <owner>gramps</owner>
+        <type>bool</type>
+        <default>0</default>
+        <locale name="C">
+          <short>Hide warning on missing database owner.</short>
+          <long>If set to 1, the warning about missing database owner will not
+          be displayed when GEDCOM export is done.</long>
+        </locale>
+      </schema>
+
     </schemalist>
 </gconfschemafile>

data/grampsxml.dtd

@@ -4,7 +4,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2001 Graham J. Williams
-# Copyright (C) 2000-2006  Donald N. Allingham
+# Copyright (C) 2000-2007  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,15 +24,15 @@
 -->
 
 <!--
-    This is the Document Type Definition file for v1.1.3
+    This is the Document Type Definition file for v1.2.0
     of the GRAMPS XML genealogy data format.
     Please use the following formal public identifier to identify it:
 
-    "-//GRAMPS//DTD GRAMPS XML V1.1.3//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.2.0//EN"
 
     For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.1.3//EN"
-                "http://gramps-project.org/xml/1.1.3/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.2.0//EN"
+                "http://gramps-project.org/xml/1.2.0/grampsxml.dtd"
                 [...]>
 -->
 
@@ -47,13 +47,15 @@ DATABASE
 	sources
 	places
 	objects
-        repositories
+	repositories
+	notes
 	bookmarks
 -->
 
 <!ELEMENT database (header, name-formats?, events?, people?, families?,
-                    sources?, places?, objects?, repositories?, bookmark?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.1.3/">
+                    sources?, places?, objects?, repositories?, notes?,
+                    bookmark?)>
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.2.0/">
 
 <!--	************************************************************
 HEADER
@@ -93,8 +95,8 @@ PEOPLE
 >
 
 <!ELEMENT person (gender, name*, nick?, eventref*, lds_ord*,
-                  objref*, address*, attribute*, url*,
-                  childof*,  parentin*, personref*, note?, sourceref*)>
+                  objref*, address*, attribute*, url*, childof*,
+                  parentin*, personref*, noteref*, sourceref*)>
 <!ATTLIST person
         id        CDATA #REQUIRED
         handle    ID    #REQUIRED
@@ -108,8 +110,8 @@ GENDER has values of M, F, or U.
 -->
 <!ELEMENT gender  (#PCDATA)>
 
-<!ELEMENT name    (first?,last?,suffix?,patronymic?,title?,
-                  (daterange|dateval|datestr)?,note?,sourceref*)>
+<!ELEMENT name    (first?,call?last?,suffix?,patronymic?,title?,
+                  (daterange|dateval|datestr)?,noteref*,sourceref*)>
 <!ATTLIST name    
         alt       (0|1) #IMPLIED
         type      CDATA #IMPLIED
@@ -119,6 +121,7 @@ GENDER has values of M, F, or U.
 >
 
 <!ELEMENT first      (#PCDATA)>
+<!ELEMENT call       (#PCDATA)>
 <!ELEMENT last       (#PCDATA)>
 <!ATTLIST last
         prefix CDATA #IMPLIED
@@ -137,7 +140,7 @@ GENDER has values of M, F, or U.
 <!ELEMENT parentin EMPTY>
 <!ATTLIST parentin hlink IDREF #REQUIRED>
 
-<!ELEMENT personref (sourceref*,note?)>
+<!ELEMENT personref (sourceref*,noteref*)>
 <!ATTLIST personref 
   hlink IDREF #REQUIRED
   priv  (0|1) #IMPLIED
@@ -145,7 +148,7 @@ GENDER has values of M, F, or U.
 >
 
 <!ELEMENT address ((daterange|dateval|datestr)?,street?,city?,county?,state?,
-                   country?,postal?,phone?,note?,sourceref*)>
+                   country?,postal?,phone?,noteref*,sourceref*)>
 <!ATTLIST address priv (0|1) #IMPLIED>
 
 <!ELEMENT street  (#PCDATA)>
@@ -165,7 +168,7 @@ FAMILY
 <!ELEMENT families (family)*>
 
 <!ELEMENT family (rel?,father?,mother?,eventref*,lds_ord*,
-                  objref*,childref*,attribute*,note?,sourceref*)>
+                  objref*,childref*,attribute*,noteref*,sourceref*)>
 <!ATTLIST family
         id        CDATA #REQUIRED
         handle    ID    #REQUIRED
@@ -180,7 +183,7 @@ FAMILY
 <!ELEMENT mother EMPTY>
 <!ATTLIST mother hlink IDREF #REQUIRED>
 
-<!ELEMENT childref (sourceref*,note?)>
+<!ELEMENT childref (sourceref*,noteref*)>
 <!ATTLIST childref
   hlink IDREF #REQUIRED
   priv  (0|1) #IMPLIED
@@ -199,7 +202,7 @@ EVENT
 <!ELEMENT events (event)*>
 
 <!ELEMENT event (type?,(daterange|dateval|datestr)?,place?,cause?,
-                 description?,attribute*,note?,sourceref*,objref*)>
+                 description?,attribute*,noteref*,sourceref*,objref*)>
 <!ATTLIST event 
         id        CDATA #REQUIRED
         handle    ID    #REQUIRED
@@ -214,7 +217,7 @@ SOURCES
 
 <!ELEMENT sources (source)*>
 <!ELEMENT source (stitle?,sauthor?,spubinfo?,sabbrev?,
-                  note?,objref*,data_item*,reporef*)>
+                  noteref*,objref*,data_item*,reporef*)>
 <!ATTLIST source
         id        CDATA #REQUIRED
         handle    ID    #REQUIRED
@@ -233,7 +236,7 @@ PLACES
 
 <!ELEMENT places (placeobj)*>
 
-<!ELEMENT placeobj (ptitle?,coord?,location*,objref*,url*,note?,sourceref*)>
+<!ELEMENT placeobj (ptitle?,coord?,location*,objref*,url*,noteref*,sourceref*)>
 <!ATTLIST placeobj
         id        CDATA #REQUIRED
         handle    ID    #REQUIRED
@@ -268,7 +271,7 @@ OBJECTS
 
 <!ELEMENT objects (object)*>
 
-<!ELEMENT object (file,attribute*,note?,(daterange|dateval|datestr)?,
+<!ELEMENT object (file,attribute*,noteref*,(daterange|dateval|datestr)?,
 		  sourceref*)>
 <!ATTLIST object
         id        CDATA #REQUIRED
@@ -291,7 +294,7 @@ REPOSITORIES
 
 <!ELEMENT repositories (repository)*>
 
-<!ELEMENT repository (rname,type,address*,url*,note?)>
+<!ELEMENT repository (rname,type,address*,url*,noteref*)>
 <!ATTLIST repository
         id        CDATA #REQUIRED
         handle    ID    #REQUIRED
@@ -302,6 +305,23 @@ REPOSITORIES
 
 <!ELEMENT rname   (#PCDATA)>
 
+<!--	************************************************************
+NOTES
+-->
+
+<!ELEMENT notes (note)*>
+
+<!ELEMENT note (#PCDATA)>
+<!ATTLIST note
+        id        CDATA #REQUIRED
+        handle    ID    #REQUIRED
+        priv      (0|1) #IMPLIED
+	marker    CDATA #IMPLIED
+	change    CDATA #REQUIRED
+	format    (0|1) #IMPLIED
+	type      CDATA #REQUIRED
+>
+
 
 <!--	************************************************************
 BOOKMARKS
@@ -349,48 +369,43 @@ SHARED ELEMENTS
 <!ELEMENT datestr    EMPTY>
 <!ATTLIST datestr val CDATA #REQUIRED>
 
-<!ELEMENT note       (#PCDATA)>
-<!ATTLIST note format (0|1) #IMPLIED>
-
-<!ELEMENT sourceref (spage?,scomments?,stext?,(daterange|dateval|datestr)?)>
+<!ELEMENT sourceref (spage?,noteref*,stext?,(daterange|dateval|datestr)?)>
 <!ATTLIST sourceref
         hlink IDREF #REQUIRED
+        priv  (0|1) #IMPLIED
         conf  CDATA #IMPLIED
 >
 
-<!ELEMENT eventref (attribute*,note?)>
+<!ELEMENT eventref (attribute*,noteref*)>
 <!ATTLIST eventref
         hlink IDREF #REQUIRED
         priv  (0|1) #IMPLIED
         role  CDATA #IMPLIED
 >
 
-<!ELEMENT reporef (note?)>
+<!ELEMENT reporef (noteref*)>
 <!ATTLIST reporef
         hlink  IDREF #REQUIRED
         callno CDATA #IMPLIED
         medium CDATA #IMPLIED
 >
 
-<!ELEMENT marker EMPTY>
-<!ATTLIST marker
-        type  CDATA  #REQUIRED
+<!ELEMENT noteref EMPTY>
+<!ATTLIST noteref
+        hlink IDREF #REQUIRED
 >
 
 <!ELEMENT spage     (#PCDATA)>
-<!ELEMENT scomments (#PCDATA)>
 <!ELEMENT sdate     (#PCDATA)>
 <!ELEMENT stext     (#PCDATA)>
 
-<!ELEMENT attribute  (sourceref*,note?)>
+<!ELEMENT attribute  (sourceref*,noteref*)>
 <!ATTLIST attribute
         priv 	(0|1) 	#IMPLIED
         type	CDATA	#REQUIRED
         value	CDATA	#REQUIRED
 >
 
-<!ELEMENT comment (#PCDATA)>
-
 <!ELEMENT place EMPTY>
 <!ATTLIST place hlink IDREF #REQUIRED>
 
@@ -405,7 +420,7 @@ SHARED ELEMENTS
         description CDATA #IMPLIED
 >
 
-<!ELEMENT objref (attribute*,sourceref*,note?)>
+<!ELEMENT objref (attribute*,sourceref*,noteref*)>
 <!ATTLIST objref 
         hlink IDREF #REQUIRED
         priv (0|1)  #IMPLIED
@@ -418,8 +433,9 @@ SHARED ELEMENTS
 >
 
 <!ELEMENT lds_ord ((daterange|dateval|datestr)?,temple?,place?,status?,
-                   sealed_to?,note?,sourceref*)>
+                   sealed_to?,noteref*,sourceref*)>
 <!ATTLIST lds_ord
+        priv  (0|1) #IMPLIED
         type   CDATA #REQUIRED
 >
 

data/grampsxml.rng

@@ -3,7 +3,7 @@
 <!-- 
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2005-2006  Donald N. Allingham
+# Copyright (C) 2005-2007  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 
 <grammar
   datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/xml/1.1.3/"
+  ns="http://gramps-project.org/xml/1.2.0/"
   xmlns="http://relaxng.org/ns/structure/1.0">
 
   <start><element name="database">
@@ -98,6 +98,12 @@
           </element></zeroOrMore>
       </element></optional>
 
+      <optional><element name="notes">
+          <zeroOrMore><element name="note">
+              <ref name="note-content"/>
+          </element></zeroOrMore>
+      </element></optional>
+
       <optional><element name="bookmarks">
           <zeroOrMore><element name="bookmark">
               <ref name="bookmark-content"/>
@@ -170,9 +176,9 @@
         </attribute></optional>
         <attribute name="rel"><text/></attribute>
     </element></zeroOrMore>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
     <zeroOrMore><element name="sourceref">
         <ref name="sourceref-content"/>
     </element></zeroOrMore>
@@ -208,6 +214,7 @@
     <optional><attribute name="sort"><text/></attribute></optional>
     <optional><attribute name="display"><text/></attribute></optional>
     <optional><element name="first"><text/></element></optional>
+    <optional><element name="call"><text/></element></optional>
     <optional><element name="last">
         <text/>
         <optional><attribute name="prefix"><text/></attribute></optional>
@@ -217,9 +224,9 @@
     <optional><element name="patronymic"><text/></element></optional>
     <optional><element name="title"><text/></element></optional>
     <optional><ref name="date-content"/></optional>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
     <zeroOrMore><element name="sourceref">
         <ref name="sourceref-content"/>
     </element></zeroOrMore>
@@ -237,9 +244,9 @@
     <optional><element name="country"><text/></element></optional>
     <optional><element name="postal"><text/></element></optional>
     <optional><element name="phone"><text/></element></optional>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
     <zeroOrMore><element name="sourceref">
         <ref name="sourceref-content"/>
     </element></zeroOrMore>
@@ -310,9 +317,9 @@
     <zeroOrMore><element name="attribute">
         <ref name="attribute-content"/>
     </element></zeroOrMore>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
     <optional><ref name="date-content"/></optional>
     <zeroOrMore><element name="sourceref">
         <ref name="sourceref-content"/>
@@ -330,9 +337,9 @@
     <zeroOrMore><element name="attribute">
         <ref name="attribute-content"/>
     </element></zeroOrMore>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
     <zeroOrMore><element name="sourceref">
         <ref name="sourceref-content"/>
     </element></zeroOrMore>
@@ -347,9 +354,9 @@
     <optional><element name="sauthor"><text/></element></optional>
     <optional><element name="spubinfo"><text/></element></optional>
     <optional><element name="sabbrev"><text/></element></optional>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
     <zeroOrMore><element name="objref">
         <ref name="objref-content"/>
     </element></zeroOrMore>
@@ -385,9 +392,9 @@
     <zeroOrMore><element name="url">
         <ref name="url-content"/>
     </element></zeroOrMore>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
     <zeroOrMore><element name="sourceref">
         <ref name="sourceref-content"/>
     </element></zeroOrMore>
@@ -404,9 +411,9 @@
     <zeroOrMore><element name="attribute">
         <ref name="attribute-content"/>
     </element></zeroOrMore>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
     <optional><ref name="date-content"/></optional>
     <zeroOrMore><element name="sourceref">
         <ref name="sourceref-content"/>
@@ -423,9 +430,9 @@
     <zeroOrMore><element name="url">
         <ref name="url-content"/>
     </element></zeroOrMore>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="bookmark-content">
@@ -452,18 +459,25 @@
   </define>
 
   <define name="note-content">
+    <ref name="primary-object"/>
     <optional><attribute name="format"><choice>
         <value>0</value>
         <value>1</value>
     </choice></attribute></optional>
+    <attribute name="type"><text/></attribute>
     <text/>
   </define>
 
   <define name="sourceref-content">
     <attribute name="hlink"><data type="IDREF"/></attribute>
+    <optional><attribute name="priv">
+        <ref name="priv-content"/>
+    </attribute></optional>
     <optional><attribute name="conf"><text/></attribute></optional>
     <optional><element name="spage"><text/></element></optional>
-    <optional><element name="scomments"><text/></element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
     <optional><element name="stext"><text/></element></optional>
     <optional><ref name="date-content"/></optional>
   </define>
@@ -477,18 +491,22 @@
     <zeroOrMore><element name="attribute">
         <ref name="attribute-content"/>
     </element></zeroOrMore>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="reporef-content">
     <attribute name="hlink"><data type="IDREF"/></attribute>
     <optional><attribute name="callno"><text/></attribute></optional>
     <optional><attribute name="medium"><text/></attribute></optional>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
+  </define>
+
+  <define name="noteref-content">
+    <attribute name="hlink"><data type="IDREF"/></attribute>
   </define>
 
   <define name="priv-content">
@@ -507,9 +525,9 @@
     <zeroOrMore><element name="sourceref">
         <ref name="sourceref-content"/>
     </element></zeroOrMore>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="url-content">
@@ -532,12 +550,15 @@
     <zeroOrMore><element name="sourceref">
         <ref name="sourceref-content"/>
     </element></zeroOrMore>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="lds-content">
+    <optional><attribute name="priv">
+        <ref name="priv-content"/>
+    </attribute></optional>
     <attribute name="type"><text/></attribute>
     <optional><ref name="date-content"/></optional>
     <optional><element name="temple">
@@ -552,9 +573,9 @@
     <optional><element name="sealed_to">
         <attribute name="hlink"><data type="IDREF"/></attribute>
     </element></optional>
-    <optional><element name="note">
-        <ref name="note-content"/>
-    </element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
     <optional><ref name="date-content"/></optional>
     <zeroOrMore><element name="sourceref">
         <ref name="sourceref-content"/>

help/ChangeLog

@@ -1,3 +1,10 @@
+2007-02-13  Lubo Vasko  <pgval@inMail.sk>
+	* sk/figures/*.png : Update.
+	* sk/sk.po: Translation update.
+
+2007-02-12  Lubo Vasko  <pgval@inMail.sk>
+	* sk/sk.po: Translation update.
+
 2007-01-28  Alex Roitman  <shura@gramps-project.org>
 	* C/gramps.xml: Document the change.
 

help/fr/fr.po

@@ -2,8 +2,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"POT-Creation-Date: 2007-01-28 16:24+0100\n"
-"PO-Revision-Date: 2007-01-28 16:33+0100\n"
+"POT-Creation-Date: 2007-02-14 18:10+0100\n"
+"PO-Revision-Date: 2007-02-14 18:18+0100\n"
 "Last-Translator: Jérôme Rapinat <romjerome@yahoo.fr>\n"
 "Language-Team:  <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,326 +13,326 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:464(None)
-msgid "@@image: 'figures/first-open.png'; md5=c35fdf77ea729e10d177896acb3a9df1"
+msgid "@@image: 'figures/first-open.png'; md5=ed9495bdd403263744c9db4a0a0684a6"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:570(None)
 #: C/gramps.xml:731(None)
-msgid "@@image: 'figures/mainwin.png'; md5=44c81877c2dd94d3656bfdd5dd835977"
+msgid "@@image: 'figures/mainwin.png'; md5=a998cdb5c5b050de2359b6e0526cf6b2"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:749(None)
-msgid "@@image: 'figures/noside-nofilt.png'; md5=f07a82fb6f090a8807dd77cbc121efdd"
+msgid "@@image: 'figures/noside-nofilt.png'; md5=9401ef97479166c2d087b70efcaa70dd"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:804(None)
-msgid "@@image: 'figures/column-editor.png'; md5=7e6fa02ee2462f9c06e977d28467982c"
+msgid "@@image: 'figures/column-editor.png'; md5=5a2e04ce048aa06408288dc00f737848"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:851(None)
-msgid "@@image: 'figures/side-filt.png'; md5=8d35d5032e190b1a931d2817c30098c5"
+msgid "@@image: 'figures/side-filt.png'; md5=13618a7aedfa090977451eac1d783970"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:884(None)
-msgid "@@image: 'figures/family.png'; md5=0f737ea80800ce540dd5be39ce76badf"
+msgid "@@image: 'figures/family.png'; md5=8cc8f01412ffaab22e8e7a04e365df27"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1014(None)
-msgid "@@image: 'figures/reorder.png'; md5=c03f6a1173811e0e49bf55250defa3f2"
+msgid "@@image: 'figures/reorder.png'; md5=1efdf8af88b218ec0f3d6cff1f4f7534"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1042(None)
-msgid "@@image: 'figures/family-list.png'; md5=10a50ab614eed2126d94d31a0e33cdff"
+msgid "@@image: 'figures/family-list.png'; md5=88555055823c2f14baa4e3c66d06750d"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1077(None)
-msgid "@@image: 'figures/pedigree.png'; md5=ee1d9f51801f00e763c6678a93dd52b3"
+msgid "@@image: 'figures/pedigree.png'; md5=62a4a89805e7e7a6964b23146857df1f"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1106(None)
-msgid "@@image: 'figures/pedigree-child-cut.png'; md5=e18523c240627db23fe5f049612cbb3a"
+msgid "@@image: 'figures/pedigree-child-cut.png'; md5=6379667cbdd8483c8a3d3aa86f5e1ad0"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1126(None)
-msgid "@@image: 'figures/pedigree-siblings-cut.png'; md5=d166057a80f01d7f9ff70a20515c2c67"
+msgid "@@image: 'figures/pedigree-siblings-cut.png'; md5=42ccbdd13a009e8f5f6b4fcdc1576f15"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1162(None)
-msgid "@@image: 'figures/events.png'; md5=9b04d1a271de5dc118034f5e4bcefd44"
+msgid "@@image: 'figures/events.png'; md5=78a93d9e42fa7c6e8906f0cd2cda9000"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1211(None)
-msgid "@@image: 'figures/sources.png'; md5=3ea3513ae883310e86beca6307506659"
+msgid "@@image: 'figures/sources.png'; md5=0863abb9b8e759c6dd16235d735591a3"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1253(None)
-msgid "@@image: 'figures/places.png'; md5=0d71925e9fb5380a3f99834d7d11a984"
+msgid "@@image: 'figures/places.png'; md5=c04ad596725c5e2ed20fefa332f9f82d"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1284(None)
-msgid "@@image: 'figures/media.png'; md5=a908b06114ad2804a71644ccbcb4bb28"
+msgid "@@image: 'figures/media.png'; md5=06d388cc430c0c15a30271be3fc885b0"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1309(None)
-msgid "@@image: 'figures/repository.png'; md5=8a65d2fd60529ef9b00cef5016b70adc"
+msgid "@@image: 'figures/repository.png'; md5=1c2bb3008b378f4c25fd8ef073dc472b"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1591(None)
-msgid "@@image: 'figures/export-druid.png'; md5=1d9a8c8626b3d1cd6fc7873e683036c6"
+msgid "@@image: 'figures/export-druid.png'; md5=e4d8cfb483deff3f141aaef16be66128"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1710(None)
-msgid "@@image: 'figures/gedcom-export.png'; md5=e94ebb92c991b7168590a4c4c60131de"
+msgid "@@image: 'figures/gedcom-export.png'; md5=4b898a6259a2fcb73cacf76749cbd61b"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1924(None)
-msgid "@@image: 'figures/edit-family.png'; md5=36049631914973e83ec7fd5c97d1adca"
+msgid "@@image: 'figures/edit-family.png'; md5=a7eb1438ebc57c89c7302e00da8b1a85"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:1947(None)
-msgid "@@image: 'figures/select-person.png'; md5=f51bb17fa724fd4ce5c47ef1973f8cd5"
+msgid "@@image: 'figures/select-person.png'; md5=63e29c41c5724a8ba6f06dc9ee4de838"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2004(None)
-msgid "@@image: 'figures/select-family.png'; md5=cf0617bed2303d62763aaa51ce8a0f03"
+msgid "@@image: 'figures/select-family.png'; md5=0d337f47b2aa682be60c3d60ebed1571"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2031(None)
-msgid "@@image: 'figures/family-warn.png'; md5=962cb3d87874bb520a1ed7e08ccf56e3"
+msgid "@@image: 'figures/family-warn.png'; md5=db888318d890928d573c0d9c0ad63d7b"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2075(None)
-msgid "@@image: 'figures/child-ref.png'; md5=d5a0e81a1316854f8ab8b6cf90ffbfdc"
+msgid "@@image: 'figures/child-ref.png'; md5=074e5c32335ad03ec19df97f38072731"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2283(None)
-msgid "@@image: 'figures/edit-person.png'; md5=c7d5a14b23c24dd520c1ecf3ca6d28e8"
+msgid "@@image: 'figures/edit-person.png'; md5=1d703474fdceaf2b81e7b07fe395e907"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2428(None)
-msgid "@@image: 'figures/edit-person-names.png'; md5=a6b26146540aaa214f08aca74d21d6be"
+msgid "@@image: 'figures/edit-person-names.png'; md5=db32fd23d936fb7c09e7aa1736262359"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2484(None)
-msgid "@@image: 'figures/edit-person-attributes.png'; md5=2941d6118ea9fe881203d25160519f46"
+msgid "@@image: 'figures/edit-person-attributes.png'; md5=90c9df8206b9d8a349f8e6f9ac836579"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2522(None)
-msgid "@@image: 'figures/edit-person-addresses.png'; md5=b2a74807f332bce2accd4f72788a278d"
+msgid "@@image: 'figures/edit-person-addresses.png'; md5=ebe6c8f67bca3645c7e28e5ab5bec45e"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2547(None)
-msgid "@@image: 'figures/edit-person-notes.png'; md5=adec40abac77cb469fdef52069122320"
+msgid "@@image: 'figures/edit-person-notes.png'; md5=99f0d6e6a96426e6ebb07424e3731ab3"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2588(None)
-msgid "@@image: 'figures/edit-person-sources.png'; md5=d57251b979c85b2d03fc41e349c03cd0"
+msgid "@@image: 'figures/edit-person-sources.png'; md5=31405ce59a148f0dcdaee80ff5872ecc"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2660(None)
-msgid "@@image: 'figures/edit-person-gallery.png'; md5=c6b680fa8057e5a06a068eb4cbaed041"
+msgid "@@image: 'figures/edit-person-gallery.png'; md5=7d1d4e0a547d60d134fb0657bd7baa55"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2704(None)
-msgid "@@image: 'figures/edit-person-internet.png'; md5=64234b3b61a92000e9970493fb5d66d7"
+msgid "@@image: 'figures/edit-person-internet.png'; md5=feb72d910780ca84e4972929658615b7"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2734(None)
-msgid "@@image: 'figures/edit-person-assoc.png'; md5=7cc2a3dc1f13da085c0dfc8daf8d5bc0"
+msgid "@@image: 'figures/edit-person-assoc.png'; md5=eb647ffc4c00636268b22e401d26b476"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2770(None)
-msgid "@@image: 'figures/edit-person-lds.png'; md5=eeb96348e489e0bd68a14212fc530bac"
+msgid "@@image: 'figures/edit-person-lds.png'; md5=cce33b1f627e8b499bad4e2388fbfe67"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:2992(None)
-msgid "@@image: 'figures/date-selection.png'; md5=81ff3a3f6da5f407a77b3c40d1ef41ee"
+msgid "@@image: 'figures/date-selection.png'; md5=5dad883452e8f645266b45bdefd128a8"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:3062(None)
-msgid "@@image: 'figures/edit-rel.png'; md5=61a270b73516160aa56a23072b1e36b2"
+msgid "@@image: 'figures/edit-rel.png'; md5=cde00965c7e233c67877b96dac0e813b"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:3289(None)
-msgid "@@image: 'figures/edit-src.png'; md5=6e326d7f2488f3bba3aab0f25256d593"
+msgid "@@image: 'figures/edit-src.png'; md5=8312c90183d656c01a43c85d3a3022f3"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:3444(None)
-msgid "@@image: 'figures/edit-plc.png'; md5=687c7552e1031973b9133a980389a859"
+msgid "@@image: 'figures/edit-plc.png'; md5=4d92253fc9ca371247a446cf43185ef6"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:3615(None)
-msgid "@@image: 'figures/edit-media.png'; md5=707d49daec1dc32d1537b5e75861417b"
+msgid "@@image: 'figures/edit-media.png'; md5=ef5f0745978d98e2624721755942989e"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:3745(None)
-msgid "@@image: 'figures/edit-ev.png'; md5=7c583eb64b008104983ceb158d4188bf"
+msgid "@@image: 'figures/edit-ev.png'; md5=aa61847638f2c2eba6d2e852832f32c6"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:3839(None)
-msgid "@@image: 'figures/edit-si.png'; md5=46ccde314a52b32bb7f9b1b7d374fe79"
+msgid "@@image: 'figures/edit-si.png'; md5=29a931d971187d57804e861a173dda1b"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:3890(None)
-msgid "@@image: 'figures/edit-an.png'; md5=801af796347efa6b3130e4ca7d399f90"
+msgid "@@image: 'figures/edit-an.png'; md5=c9158265eaac4d05384a4061f4d34df1"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:4011(None)
-msgid "@@image: 'figures/edit-at.png'; md5=e84225f9672e2edcb572c6147efb9810"
+msgid "@@image: 'figures/edit-at.png'; md5=540e22ab0995c267c2af1abcb0e297e6"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:4114(None)
-msgid "@@image: 'figures/edit-ad.png'; md5=abdf8102bf071625824650e7496bd125"
+msgid "@@image: 'figures/edit-ad.png'; md5=50c7cec724d541c8d4a32631e4554173"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:4257(None)
-msgid "@@image: 'figures/comp-people.png'; md5=5854a70cf67e0217a25c3969a3fbd123"
+msgid "@@image: 'figures/comp-people.png'; md5=0a4f4db01ed7415d353648fe0a410e48"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:4304(None)
-msgid "@@image: 'figures/merge-people.png'; md5=703729d41c7e3b14810e6cb946ec8fc1"
+msgid "@@image: 'figures/merge-people.png'; md5=d2a5704b209bbd9753d7132873bd7558"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:4349(None)
-msgid "@@image: 'figures/merge-src.png'; md5=3185090c8940312bce428ab58e31209e"
+msgid "@@image: 'figures/merge-src.png'; md5=3192587a3c84fcbb40630a66d4dee626"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:4384(None)
-msgid "@@image: 'figures/merge-plc.png'; md5=aa4992ab7c9c90d1b59e8595dfac96a3"
+msgid "@@image: 'figures/merge-plc.png'; md5=5df79735fc8aad396201eab859de25b7"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:4620(None)
-msgid "@@image: 'figures/edit-bm.png'; md5=5e8d6c8d2d59bcfbee36589d972b1992"
+msgid "@@image: 'figures/edit-bm.png'; md5=740289e70097ab8873edee957e4441aa"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:4646(None)
-msgid "@@image: 'figures/find-people.png'; md5=229dcb54a8fe75bdadbfe21c86fc4bee"
+msgid "@@image: 'figures/find-people.png'; md5=c21876dab628dc5ecfe28a96535de9d5"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:4833(None)
-msgid "@@image: 'figures/bookreport.png'; md5=3b19cea4fdeaa92d73c8b71d1eb81e34"
+msgid "@@image: 'figures/bookreport.png'; md5=966d1bb13df0fde2b0389190de738d89"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:5677(None)
-msgid "@@image: 'figures/cfe-df.png'; md5=0d0af4edb236c46b435fc17c12e52d76"
+msgid "@@image: 'figures/cfe-df.png'; md5=2b7fb7f4f865a839ad4c29a233383952"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:5713(None)
-msgid "@@image: 'figures/cfe-ar.png'; md5=4844f4d9c8e6b132e8a0e9415e599251"
+msgid "@@image: 'figures/cfe-ar.png'; md5=0b541f08e291fd5597073c34eb9df66d"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:5771(None)
-msgid "@@image: 'figures/scratch-pad.png'; md5=7a61eb7278515ad20e4411c2f36e5da3"
+msgid "@@image: 'figures/scratch-pad.png'; md5=1f44712fa2125bbaf7273159ff0e3271"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gramps.xml:5884(None)
-msgid "@@image: 'figures/prefs.png'; md5=60cff258121fda4b9e95c990888d36c7"
+msgid "@@image: 'figures/prefs.png'; md5=7fda6262306ac9f30d0b00813cb09bbf"
 msgstr ""
 
 #: C/gramps.xml:31(title)
@@ -1407,11 +1407,11 @@ msgstr "Alors que GEDCOM est un standard, aucun programme ne le gère de la mêm
 
 #: C/gramps.xml:1650(term)
 msgid "Copyright"
-msgstr "Copyright"
+msgstr "Droit d'auteur"
 
 #: C/gramps.xml:1653(para)
 msgid "Allows you to select a statement to describe your Copyright claim."
-msgstr "Vous permet de sélectionner une déposition qui décrira votre droit à la copie."
+msgstr "Vous permet de sélectionner une déposition qui décrira votre droit d'auteur."
 
 #: C/gramps.xml:1659(term)
 msgid "Do not include records marked private"
@@ -2015,7 +2015,7 @@ msgstr "L'option <guilabel>Format</guilabel> vous permet de choisir le rendu de
 #: C/gramps.xml:2569(para)
 #: C/gramps.xml:3231(para)
 msgid "If you select the Preformatted option, the text in reports and web pages will appear exactly as you enter it in the Notes dialog."
-msgstr "Au contraire, choisir \"Formaté(e)\" conservera à l'identique les espaces multiples, les tabulations et les changements de ligne comme ils ont été saisis dans la zone de texte."
+msgstr "Si vous sélectionnez l'option formatée, le texte des rapports et pages internet apparaîtra comme dans le dialogue Notes."
 
 #: C/gramps.xml:2578(term)
 #: C/gramps.xml:3163(term)
@@ -2702,7 +2702,7 @@ msgstr "L'onglet <guilabel>Note</guilabel> affiche les notes sur le nom et perme
 #: C/gramps.xml:4088(para)
 #: C/gramps.xml:4190(para)
 msgid "The <guilabel>Format</guilabel> option allows you to set the appearance of the note in the output (i.e. in reports and web pages). Selecting <guilabel>Flowed</guilabel> will replace all multiple spaces, tabs, and single end-of-line characters with single space in the output. The two consecutive new lines (i.e. an empty line) denote a new paragraph. Selecting <guilabel>Preformatted</guilabel> will honor all multiple spaces tabs, and new lines, so that the output will appear as it is entered into the text entry field."
-msgstr "L'option <guilabel>Format</guilabel> vous permet de choisir le rendu de la note dans la sortie (édition ou bien page Web). Choisir <guilabel>Libre</guilabel> remplacera les espaces multiples, les tabulations et les changements de lignes simples par un espace. Les lignes vides (deux changements de lignes consécutifs) sont comprises comme une fin de paragraphe. Au contraire, choisir <guilabel>Formaté(e)</guilabel> conservera à l'identique les espaces multiples, les tabulations et les changements de ligne comme ils ont été saisis dans la zone de texte."
+msgstr "L'option <guilabel>Format</guilabel> vous permet de choisir le rendu de la note dans la sortie (édition ou bien page Web). Choisir <guilabel>Libre</guilabel> remplacera les espaces multiples, les tabulations et les changements de lignes simples par un espace. Les lignes vides (deux changements de lignes consécutifs) sont comprises comme une fin de paragraphe. Au contraire, choisir <guilabel>Formatée</guilabel> conservera à l'identique les espaces multiples, les tabulations et les changements de ligne comme ils ont été saisis dans la zone de texte."
 
 #: C/gramps.xml:4002(para)
 msgid "Attributes are edited through the following <guilabel>Attribute Editor</guilabel> dialog:"
@@ -2982,7 +2982,7 @@ msgstr "Une personne seulement peut être sélectionnée comme de Cujus. C'est l
 
 #: C/gramps.xml:4552(para)
 msgid "To set the Home person, first navigate to that person using any method you like. Then choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Set Home person</guimenuitem></menuchoice>. Once this is done, you can move to the Home person from anywhere in the database by simply clicking the <guibutton>Home</guibutton> icon on the toolbar. You can also choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Home</guimenuitem></menuchoice> from the menu or select <guilabel>Home</guilabel> item from any context menu available on the right click."
-msgstr "Pour choisir le de Cujus, sélectionner d'abord ,par le moyen de votre choix, la personne voulue comme personne active. Faites <menuchoice><guimenu>Edition</guimenu><guimenuitem>Établir la personne de référence</guimenuitem></menuchoice>. A partir de ce moment, vous pouvez retourner à cette personne simplement en cliquant sur l'icône <guibutton>Personne de référence</guibutton> dans la barre d'outils. Vous pouvez également choisir <menuchoice><guimenu>Aller à</guimenu><guimenuitem>Personne de référence</guimenuitem></menuchoice> dans le menu ou choisir l'élément <guilabel>Personne de référence</guilabel> dans n'importe quel menu contextuel accessible par un clic droit de la souris."
+msgstr "Pour choisir le de Cujus, sélectionner d'abord ,par le moyen de votre choix, la personne voulue comme personne active. Faites <menuchoice><guimenu>Edition</guimenu><guimenuitem>Établir la personne centrale</guimenuitem></menuchoice>. A partir de ce moment, vous pouvez retourner à cette personne simplement en cliquant sur l'icône <guibutton>Personne de référence</guibutton> dans la barre d'outils. Vous pouvez également choisir <menuchoice><guimenu>Aller à</guimenu><guimenuitem>Personne de référence</guimenuitem></menuchoice> dans le menu ou choisir l'élément <guilabel>Personne de référence</guilabel> dans n'importe quel menu contextuel accessible par un clic droit de la souris."
 
 #: C/gramps.xml:4569(title)
 msgid "Using history-based tools"
@@ -3439,11 +3439,11 @@ msgstr "Pages internet"
 
 #: C/gramps.xml:5239(para)
 msgid "The only available report in this category is the Narrative Web Site report. It generates a web site (that is, a set of linked web pages), for a set of selected individuals."
-msgstr "Le seul rapport disponible dans cette catégorie est le site internet narratif. Il produit un site web (qui est, une suite de pages web reliées par des liens), pour un ensemble d'individus sélectionnés."
+msgstr "Le seul rapport disponible dans cette catégorie est le site internet descriptif. Il produit un site web (qui est, une suite de pages web reliées par des liens), pour un ensemble d'individus sélectionnés."
 
 #: C/gramps.xml:5244(title)
 msgid "Narrative Web Site"
-msgstr "Site internet narratif"
+msgstr "Site internet descriptif"
 
 #: C/gramps.xml:5248(term)
 msgid "Introduction"
@@ -3451,7 +3451,7 @@ msgstr "Introduction"
 
 #: C/gramps.xml:5251(para)
 msgid "GRAMPS 2.0.6 introduced the Narrative Web generator. The new tool provides considerably more functionality than the older web generator. Instead of using HTML templates to customize the pages, CSS style sheets are used."
-msgstr "GRAMPS 2.0.6 introduit le générateur de site web narratif. Ce nouvel outil offre beaucoup plus de possibilités que l'ancien générateur web. Au lieu d'utiliser des modèles HTML pour modifier les pages, les feuilles de style CSS sont utilisées."
+msgstr "GRAMPS 2.0.6 introduit le générateur de site web descriptif. Ce nouvel outil offre beaucoup plus de possibilités que l'ancien générateur web. Au lieu d'utiliser des modèles HTML pour modifier les pages, les feuilles de style CSS sont utilisées."
 
 #: C/gramps.xml:5256(para)
 msgid "More information is now displayed about each person, along with information about sources, places, and media objects. Introduction pages can be added to provide additional information, such as family history."
@@ -3463,7 +3463,7 @@ msgstr "Sélectionner la sortie"
 
 #: C/gramps.xml:5267(para)
 msgid "Genealogy records can generate a lot of files. Many web servers have a difficult time with many files in a single directory. The Narrative Web Generator strives to keep the number of files per directory to a managable level. To do this, a hierarchy of directores is created. The generated files names are not intuitive, but are unique per person. Subsequent runs will geneate identical file names, making it easy to replace files."
-msgstr "Les enregistrements généalogique peuvent générer beaucoup de fichiers. Les serveurs web peuvent avoir des difficultés avec beaucoup de fichiers dans un seul répertoire. Le site internet narratif s'efforce de garder un nombre raisonnable de fichiers par répertoire. Pour cela, un hiérarchie des répertoire est créée. Le nom des fichiers générés n'est pas intuitif, mais unique pour une personne. Le nom du fichier sera toujours le même, rendant facile le remplacement du fichier."
+msgstr "Les enregistrements généalogique peuvent générer beaucoup de fichiers. Les serveurs web peuvent avoir des difficultés avec beaucoup de fichiers dans un seul répertoire. Le site internet descriptif s'efforce de garder un nombre raisonnable de fichiers par répertoire. Pour cela, un hiérarchie des répertoire est créée. Le nom des fichiers générés n'est pas intuitif, mais unique pour une personne. Le nom du fichier sera toujours le même, rendant facile le remplacement du fichier."
 
 #: C/gramps.xml:5276(para)
 msgid "By default, the output files are written to the specified directory. Because of the number of files and directories that are created, it may be difficult to transfer the files to an external web host. To aid in this, you may directly create a gzip'd tar file to more easily upload the data. This is the format that should be used if you would like to take advantage of the free genealogy page hosting at the <ulink type=\"http\" url=\"http://family.gramps-project.org\">GRAMPS web hosting site</ulink>."
@@ -3515,11 +3515,11 @@ msgstr "Si votre serveur web est mal configuré et que vous n'avez pas les privi
 
 #: C/gramps.xml:5348(term)
 msgid "Copyright notice"
-msgstr "Notice droit de copie"
+msgstr "Notice droit d'auteur"
 
 #: C/gramps.xml:5351(para)
 msgid "International copyright law reserves all rights to your data. You own the data, and people must get your permission to use it. In genealogy, however, sharing data is a common ideal. It this case, you may wish to grant the user more rights."
-msgstr "Le droit international du copyright vous réserve tous les droits sur vos données. Avec vos propres données, les autres individus doivent vous demander les droits. En généalogie, même si le partage est un idéal commun. En réalité, vous pouvez accorder à l'utilisateur d'autres droits ."
+msgstr "Le droit international du droit d'auteur vous réserve tous les droits sur vos données. Avec vos propres données, les autres individus doivent vous demander les droits. En généalogie, même si le partage est un idéal commun. En réalité, vous pouvez accorder à l'utilisateur d'autres droits ."
 
 #: C/gramps.xml:5357(para)
 msgid "While the default for GRAMPS is to place a notice indicating that all rights are reserved, we give you the option to place your site under one of several of the Create Commons licenses. With a Creative Commons license, you grant user's certain permission to use your data without requiring them to contact you directly for permission."
@@ -3535,7 +3535,7 @@ msgstr "Contrôler la génération des pages"
 
 #: C/gramps.xml:5374(para)
 msgid "Three additional pages can be generated by the web page generator. The Home page is a page that will display an image and a whatever text you wish. To enable this page, choose a Media Object from the <guilabel>Home Media/Note ID</guilabel> menu on the <guilabel>Page Generation</guilabel> tab. If the Media Object contains an image, the image is displayed at the top of the page. If the Media Object contains a Note, the Note's text is used for the text of the page. A second page, the Introduction page, works similarly. Just choose the Media Object in the <guilabel>Introduction Media/Note ID</guilabel> menu."
-msgstr "Trois pages additionnelles peuvent être générées par le générateur de page web. La Home page est une page qui affiche une image et n'importe quel texte. Pour cela, choisissez un objet média depuis le menu <guilabel>Home Media/Note ID</guilabel> dans l'onglet <guilabel>Génération de page</guilabel>. Si l'objet média contient une image, une image sera affichée en haut de la page. Si l'objet média contient une note, le texte de la note sera utilisé pour le texte de la page. Une seconde page, la page d'introduction, fonctionne de la même façon. Seulement choisir l'objet média depuis le menu <guilabel>Introduction Media/Note ID</guilabel>."
+msgstr "Trois pages additionnelles peuvent être générées par le générateur de page web. La page d'accueil est une page qui affiche une image et n'importe quel texte. Pour cela, choisissez un objet média depuis le menu <guilabel>Accueil Media/Note ID</guilabel> dans l'onglet <guilabel>Génération de page</guilabel>. Si l'objet média contient une image, une image sera affichée en haut de la page. Si l'objet média contient une note, le texte de la note sera utilisé pour le texte de la page. Une seconde page, la page d'introduction, fonctionne de la même façon. Seulement choisir l'objet média depuis le menu <guilabel>Introduction Media/Note ID</guilabel>."
 
 #: C/gramps.xml:5386(para)
 msgid "If you choose to include a contact page, the researcher information stored in the database is displayed, along with the information specified in the <guilabel>Publisher contact/Note ID</guilabel> menu. Please use this page with caution, since you may consider your contact information to be private."
@@ -3571,7 +3571,7 @@ msgstr "Le précédent générateur de page web utilisait des modèles. Vos donn
 
 #: C/gramps.xml:5435(para)
 msgid "This method proved to be too cumbersome for most users. The Narrative Web Page Generator introduces a simpler mechanism. On the <guilabel>Page Generation</guilabel> tab, you may specify text (including HTML code) that will be inserted into each page, separately for the header and the footer."
-msgstr "Cette méthode était trop encombrante pour la plupart des utilisateurs. Le générateur narratif de page web introduit un simple mécanisme. Dans l'onglet <guilabel>Génération de page</guilabel> , vous pouvez spécifier un texte (incluant du HTML) qui sera ajouté à chaque page, séparément pour l'en-tête et le pied de page."
+msgstr "Cette méthode était trop encombrante pour la plupart des utilisateurs. Le générateur descriptif de page web introduit un simple mécanisme. Dans l'onglet <guilabel>Génération de page</guilabel> , vous pouvez spécifier un texte (incluant du HTML) qui sera ajouté à chaque page, séparément pour l'en-tête et le pied de page."
 
 #: C/gramps.xml:5442(para)
 msgid "To create this code, you need to create a Media Object marked as an internal note. To create this, add a new Media Object in the Media View, and select the internal note option. You may then enter your HTML code."
@@ -3963,7 +3963,7 @@ msgstr "Barre de statut"
 
 #: C/gramps.xml:6031(para)
 msgid "This option controls the information displayed in the status bar. This can be either the Active Person's name and GRAMPS ID or Active Person's relationship to the Home person."
-msgstr "Cette option contrôle l'information affichée dans la barre de statut. Cela peut être le nom de la personne active et son identifiant GRAMPS ou la relation avec la personne de référence."
+msgstr "Cette option contrôle l'information affichée dans la barre de statut. Cela peut être le nom de la personne active et son identifiant GRAMPS ou la relation avec la personne centrale."
 
 #: C/gramps.xml:6040(guilabel)
 msgid "Show text in sidebar buttons"
@@ -4321,15 +4321,15 @@ msgstr "L'<guilabel>éditeur de Colonne</guilabel> est disponible et travaille d
 
 #: C/gramps.xml:6382(term)
 msgid "Setting Home person"
-msgstr "Réglage de la personne de référence"
+msgstr "Etablir la personne centrale"
 
 #: C/gramps.xml:6385(para)
 msgid "The Home person is the person who becomes active when database opened, when <guibutton>Home</guibutton> button is clicked or the <guimenuitem>Home</guimenuitem> menu item is selected from either <guimenu>Go</guimenu> menu or the right-click context menu anywhere."
-msgstr "La personne de référence est la personne qui devient active quand le bouton <guibutton>personne de référence</guibutton> est utilisé ou le menu contextuel (clic-droit)."
+msgstr "La personne centrale est la personne qui devient active quand le bouton <guibutton>personne centrale</guibutton> est utilisé ou le menu contextuel (clic-droit)."
 
 #: C/gramps.xml:6391(para)
 msgid "To set Home person, make the desired person active and then choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Set Home person...</guimenuitem></menuchoice>."
-msgstr "Pour éditer la personne de référence, sélectionner la personne désirée puis choisissez <menuchoice><guimenu>Edition</guimenu><guimenuitem>Établir la personne de référence...</guimenuitem></menuchoice>."
+msgstr "Pour éditer la personne centrale, sélectionner la personne désirée puis choisissez <menuchoice><guimenu>Edition</guimenu><guimenuitem>Établir la personne centrale...</guimenuitem></menuchoice>."
 
 #: C/gramps.xml:6401(term)
 msgid "Adjusting viewing controls"
@@ -4633,8 +4633,8 @@ msgid "The surest way to see it happen is to get it done by yourself. Since GRAM
 msgstr "Le meilleur moyen que cela se fasse est de le faire vous-même. Comme GRAMPS est libre et open-source, personne ne vous interdit de prendre tout le code et de continuer le développement dans la direction qui vous convient. Vous devrez donner un autre nom à votre projet pour éviter les confusions avec la suite du développement de GRAMPS. Si vous voulez que le projet GRAMPS vous fournisse des avis, de l'expertise, des outils ou n'importe quoi, nous serons heureux de coopérer avec votre projet, pour assurer la compatibilité ou bien des opérations de lecture-écriture de et vers le format de données de votre projet."
 
 #: C/gramps.xml:6829(para)
-msgid "If, however, you would like the GRAMPS project to to adopt your strategy, you would need to convince GRAMPS developers that your strategy is good for GRAMPS and superior to the present development strategy."
-msgstr "Cependant, si vous souhaitez que le projet GRAMPS suive votre stratégie, vous devrez convaincre les développeurs de GRAMPS que votre stratégie est bonne pour et meilleure que celle prévue."
+msgid "If, however, you would like the GRAMPS project to adopt your strategy, you would need to convince GRAMPS developers that your strategy is good for GRAMPS and superior to the present development strategy."
+msgstr "Cependant, si vous souhaitez que le projet GRAMPS suive votre stratégie, vous devrez convaincre les développeurs de GRAMPS que votre stratégie est bonne et meilleure que celle prévue."
 
 #: C/gramps.xml:6839(title)
 msgid "Keybindings reference"
@@ -4687,12 +4687,12 @@ msgid "Changes the view to the previous view"
 msgstr "Change la vue vers la vue précédente"
 
 #: C/gramps.xml:6880(keycap)
-msgid "&lt;Ctrl&gt;D"
+msgid "&lt;Alt&gt;S"
 msgstr ""
 
 #: C/gramps.xml:6881(entry)
-msgid "Add the selected item as a bookmark"
-msgstr "Ajouter l'item sélectionné comme signet"
+msgid "Open the Scratch Pad"
+msgstr "Ouvrir le presse-papiers"
 
 #: C/gramps.xml:6884(keycap)
 msgid "&lt;Ctrl&gt;B"
@@ -4703,15 +4703,15 @@ msgid "Edit the bookmarks"
 msgstr "Editer les signets"
 
 #: C/gramps.xml:6888(keycap)
-msgid "&lt;Alt&gt;S"
+msgid "&lt;Ctrl&gt;D"
 msgstr ""
 
 #: C/gramps.xml:6889(entry)
-msgid "Open the Scratch Pad"
-msgstr "Ouvrir le presse-papiers"
+msgid "Add the selected item as a bookmark"
+msgstr "Ajouter l'item sélectionné comme signet"
 
 #: C/gramps.xml:6892(keycap)
-msgid "&lt;Alt&gt;H"
+msgid "&lt;Ctrl&gt;H"
 msgstr ""
 
 #: C/gramps.xml:6893(entry)
@@ -4838,11 +4838,11 @@ msgstr "Vous pouvez entrer l'identifiant dans un champ texte, ou bien sélection
 
 #: C/gramps.xml:7039(term)
 msgid "Is default person"
-msgstr "Est la personne de référence"
+msgstr "Est la personne centrale"
 
 #: C/gramps.xml:7042(para)
 msgid "This rule matches the default (home) person."
-msgstr "Cette règle sélectionne la personne de référence."
+msgstr "Cette règle sélectionne la personne centrale."
 
 #: C/gramps.xml:7047(term)
 msgid "People marked private"
@@ -5548,8 +5548,8 @@ msgid "file4.wft"
 msgstr "file4.wft"
 
 #: C/gramps.xml:7946(command)
-msgid "gramps -i<placeholder-1/> -i <placeholder-2/> -i <placeholder-3/> -i <placeholder-4/> -a <placeholder-5/>"
-msgstr "gramps -i<placeholder-1/> -i <placeholder-2/> -i <placeholder-3/> -i <placeholder-4/> -a <placeholder-5/>"
+msgid "gramps -i <placeholder-1/> -i <placeholder-2/> -i <placeholder-3/> -i <placeholder-4/> -a <placeholder-5/>"
+msgstr "gramps -i <placeholder-1/> -i <placeholder-2/> -i <placeholder-3/> -i <placeholder-4/> -a <placeholder-5/>"
 
 #: C/gramps.xml:7955(term)
 msgid "To explicitly specify the formats in the above example, append filenames with appropriate <command>-f</command> options:"
@@ -5935,4 +5935,5 @@ msgstr "Ce programme est distribué en vertu de la licence de Grand Public de GN
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
 #: C/gramps.xml:0(None)
 msgid "translator-credits"
-msgstr "Jérôme Rapinat, 2005, 2007"
+msgstr "Jérôme Rapinat, 2005, 2007"
+

help/nl/nl.po

@@ -1,15 +1,15 @@
-# translation of nl.po to Dutch
+# translation of gramps help to Dutch
 msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
 "POT-Creation-Date: 2006-10-28 22:45-0600\n"
-"PO-Revision-Date: 2006-11-24 20:36+0100\n"
+"PO-Revision-Date: 2007-02-09 21:28+0100\n"
 "Last-Translator: Frederik De Richter <erik.de.richter@be.gm.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -616,7 +616,7 @@ msgstr "Kies een gegevensbestand"
 
 #: C/gramps.xml:439(para)
 msgid "If GRAMPS is started without a database selected, the initial screen will have little functionality. Most operations will not be available. To load a database, select either <guibutton>New</guibutton> to create a new database, or <guibutton>Open</guibutton> to open an existing database. GRAMPS keeps track of your recently opened databases, and these can be selected by clicking on the arrow next to the <guibutton>Open</guibutton> button and choosing from the drop down menu."
-msgstr "Wanneer GRAMPS opstart zonder daat een gegevensbestand gekozen wordt, zal het opstartscherm weinig functionaliteit bieden.De meeste bewerkingen zijn niet beschikbaar. Om een gegevensbestand te laden, kiest u <guibutton>Nieuw</guibutton> om een nieuw gegevensbestand aan te maken, of <guibutton>Openen</guibutton> om een bestaand gegevensbestand te openen. GRAMPS houdt bij welke gegevensbestanden laatst geopend werden. Deze kunnen geselecteerd worden door op de pijl naast de <guibutton>Openen</guibutton> knop te klikken en dan een bestand te kiezen van het menu."
+msgstr "Wanneer GRAMPS opstart zonder dat een gegevensbestand gekozen wordt, zal het opstartscherm weinig functionaliteit bieden.De meeste bewerkingen zijn niet beschikbaar. Om een gegevensbestand te laden, kiest u <guibutton>Nieuw</guibutton> om een nieuw gegevensbestand aan te maken, of <guibutton>Openen</guibutton> om een bestaand gegevensbestand te openen. GRAMPS houdt bij welke gegevensbestanden laatst geopend werden. Deze kunnen geselecteerd worden door op de pijl naast de <guibutton>Openen</guibutton> knop te klikken en dan een bestand te kiezen van het menu."
 
 #: C/gramps.xml:449(title)
 msgid "Initial Window"
@@ -640,7 +640,7 @@ msgstr "Gebruikershandleiding"
 
 #: C/gramps.xml:478(para)
 msgid "An electronic version of the manual that you can access while you work in GRAMPS."
-msgstr "Een electronische versie van de handleiding die u kunt raadplegen terwijl u in GRAMPS werkt."
+msgstr "Een elektronische versie van de handleiding die u kunt raadplegen terwijl u in GRAMPS werkt."
 
 #: C/gramps.xml:484(term)
 msgid "FAQ"
@@ -680,7 +680,7 @@ msgstr "GRAMPS mailing-lijsten"
 
 #: C/gramps.xml:520(para)
 msgid "Gives you direct access to GRAMPS' mailing list archives."
-msgstr "Geeft u onmiddelijk toegang tot de archieeven van de GRAMPS mailing-lijsten"
+msgstr "Geeft u onmiddelijk toegang tot de archieven van de GRAMPS mailing-lijsten"
 
 #: C/gramps.xml:526(term)
 msgid "Report a bug"
@@ -688,7 +688,7 @@ msgstr "Rapporteer een fout"
 
 #: C/gramps.xml:529(para)
 msgid "Choose this item to file a bug report in our bug tracking system. (Remember, GRAMPS is a living project. We want to know about any problems you encounter so we can work to solve them for everyone's benefit.)"
-msgstr "Kies dit item om een foutrapport door te geven naar het foutopvolgingssysteem. (Denk eraann, GRAMPS is een levend project. We willen graag alle problemen die u tegenkomt, weten, zodat we oplossingen kunnen zoeken zodat GRAMPS steeds beter wordt."
+msgstr "Kies dit item om een foutrapport door te geven naar het foutopvolgingssysteem. (Denk eraan, GRAMPS is een levend project. We willen graag alle problemen die u tegenkomt, weten, zodat we oplossingen kunnen zoeken zodat GRAMPS steeds beter wordt."
 
 #: C/gramps.xml:537(term)
 msgid "About"
@@ -736,7 +736,7 @@ msgstr "Voortgangsbalk"
 
 #: C/gramps.xml:603(para)
 msgid "The Progress Bar is located in the lower left corner of the GRAMPS window. It displays the progress of time consuming operations, such as opening and saving large databases, importing and exporting to other formats, generating web sites, etc. When you are not doing these types of operations, the Progress Bar is blank."
-msgstr "De voortgangsbalk bevindt zich links onderaan in het GRAMPS-venster. Het geeft het voortschrijden van langdurende operaties weer, zoals openen en opslaan van grote gevensbestanden, het importeren en exporteren van en naar andere formaten, het aanmaken van web sites, enz. De balk blijft leeg indien geen van deze langdurende operaties worden uitgevoerd."
+msgstr "De voortgangsbalk bevindt zich links onderaan in het GRAMPS-venster. Het geeft het voortschrijden van langdurende operaties weer, zoals openen en opslaan van grote gegevensbestanden, het importeren en exporteren van en naar andere formaten, het aanmaken van web sites, enz. De balk blijft leeg indien geen van deze langdurende operaties worden uitgevoerd."
 
 #: C/gramps.xml:613(term)
 msgid "Status Bar"
@@ -880,11 +880,11 @@ msgstr "Wanneer GRAMPS de eerste keer een gegevensbestand opent, zal het Persone
 
 #: C/gramps.xml:776(para)
 msgid "You'll note that people are grouped according to their family names. To the left of each family name is an arrow. Clicking it once will reveal the entire list of people sharing that name. Clicking the arrow again will \"roll up\" the list and show only the family name."
-msgstr "U ziet dat de personen gegroepeerd worden op basis van hun familienamen. Links van elke familie staat een pijltje. Door hier éénmaal op te klikken, wordt de volledige lijst van personen met die naam getoond. Door nomaals te klikken op de pijl, wordt de lijst \"opgerold\" en wordt enkel de familienaam getoond."
+msgstr "U ziet dat de personen gegroepeerd worden op basis van hun familienamen. Links van elke familie staat een pijltje. Door hier éénmaal op te klikken, wordt de volledige lijst van personen met die naam getoond. Door nogmaals te klikken op de pijl, wordt de lijst \"opgerold\" en wordt enkel de familienaam getoond."
 
 #: C/gramps.xml:782(para)
 msgid "By default, the People View, displays the following columns: <guilabel>Names</guilabel>, GRAMPS <guilabel>ID</guilabel> numbers, <guilabel>Gender</guilabel>, and their <guilabel>Birth</guilabel> and <guilabel>Death dates</guilabel>. You can add or remove columns to and from the display by calling up the <guilabel>Column Editor</guilabel> dialog (<menuchoice><guimenu>Edit</guimenu><guimenuitem>Column Editor</guimenuitem></menuchoice>) and checking or unchecking the boxes listed. You can also change the position of a column in People View by clicking and dragging it to a new position in the Editor. Once you have made the changes you want, click <guibutton>OK</guibutton> to exit the Editor and see your changes in the People View."
-msgstr "Standaard worden volgende kolommen getoond in het personenescherm: <guilabel>Namen</guilabel>, GRAMPS <guilabel>ID</guilabel> nummers, <guilabel>Gesalcht</guilabel>, en de <guilabel>Geboorte</guilabel> en <guilabel>Overlijdensdatum</guilabel>. U kunt kolommen op het scherm toevoegen of verwijderen door gebruik te maken van de <guilabel>Kolommen Aanpaaen</guilabel> dialoog (<menuchoice><guimenu>Bewerken</guimenu><guimenuitem>Kolommen aanpassen</guimenuitem></menuchoice>) en de vereiste vakjes aan of af te vinken. U kunt ook de relatieve positie van een kolom veranderen in het personenscherm door de kolom aan te klikken en te verslepen. Na alle doorgevoerde veranderingen klikt u op de <guibutton>OK</guibutton> knop om uw aanpassingen te kunnen zien in het personenscherm. "
+msgstr "Standaard worden volgende kolommen getoond in het personenescherm: <guilabel>Namen</guilabel>, GRAMPS <guilabel>ID</guilabel> nummers, <guilabel>Geslacht</guilabel>, en de <guilabel>Geboorte</guilabel> en <guilabel>Overlijdensdatum</guilabel>. U kunt kolommen op het scherm toevoegen of verwijderen door gebruik te maken van de <guilabel>Kolommen Aanpassen</guilabel> dialoog (<menuchoice><guimenu>Bewerken</guimenu><guimenuitem>Kolommen aanpassen</guimenuitem></menuchoice>) en de vereiste vakjes aan of af te vinken. U kunt ook de relatieve positie van een kolom veranderen in het personenscherm door de kolom aan te klikken en te verslepen. Na alle doorgevoerde veranderingen klikt u op de <guibutton>OK</guibutton> knop om uw aanpassingen te kunnen zien in het personenscherm. "
 
 #: C/gramps.xml:798(title) C/gramps.xml:6210(term)
 msgid "Column Editor"
@@ -972,7 +972,7 @@ msgstr ""
 
 #: C/gramps.xml:937(para)
 msgid "If you are not careful, it is possible to create multiple families with the same parents. This is rarely what the user wants to do. If you attempt to add a new family that has the same parents as an existing family, GRAMPS will issue a warning dialog. If you get this dialog, you should probably Cancel the edit, and then use the <guibutton>Select</guibutton> button to select the existing family."
-msgstr "Het is mogelijk om meerdere families aan te maken met de zelfde ouders indien u niet voorzichtig bent. Dit is niet de normale situatie die de gebruiker wenst. GRAMPS zal dan ook een waarschuwingsdialoog tonen indien u tracht een nieuwe familie aan te maken met dezelfde ouders als een reeds bestaande familie. Wanneer deze dialoog getoond wordt, is het waarschijnlijk beter aanpassingen te verwerpen en door gebruik te maken van de <guibutton>Selecten</guibutton> knop een bestaande familie te kiezen."
+msgstr "Het is mogelijk om meerdere families aan te maken met de zelfde ouders indien u niet voorzichtig bent. Dit is niet de normale situatie die de gebruiker wenst. GRAMPS zal dan ook een waarschuwingsdialoog tonen indien u tracht een nieuwe familie aan te maken met dezelfde ouders als een reeds bestaande familie. Wanneer deze dialoog getoond wordt, is het waarschijnlijk beter aanpassingen te verwerpen en door gebruik te maken van de <guibutton>Selecteren</guibutton> knop een bestaande familie te kiezen."
 
 #: C/gramps.xml:950(term) C/gramps.xml:6112(guilabel)
 msgid "Family"
@@ -1012,7 +1012,7 @@ msgstr "Familielijstscherm."
 
 #: C/gramps.xml:1024(para)
 msgid "Unlike the Relationships View, clicking the Remove button in this view will remove the family from the database. All people will remain, but all relationships between the people in the family will be removed."
-msgstr "In tegenstelling tot het Scherm Relaties zal door aanklikken van de Verwijder knop, de familie wel degelijk verwijderd worden uit het gegevensbestand. Alle personen blijven behouden, maar alle relaties tussen personen in de familie worden verwijderd."
+msgstr "In tegenstelling tot het Relatiescherm zal door aanklikken van de Verwijder knop, de familie wel degelijk verwijderd worden uit het gegevensbestand. Alle personen blijven behouden, maar alle relaties tussen personen in de familie worden verwijderd."
 
 #: C/gramps.xml:1034(para)
 msgid "The Pedigree View displays a family tree of the Active person's ancestors. The Pedigree View shows up to five generations, depending on the size of the window. Each person is indicated by a box labeled with his or her name, birth and death information, and optionally an image if available. Two lines branch from each box. The top one shows the person's father and the bottom one the mother. Solid lines represent birth relations, while dashed lines represent non-birth relations such as adoption, step-parenthood, guardianship, etc."
@@ -1020,7 +1020,7 @@ msgstr ""
 
 #: C/gramps.xml:1054(phrase)
 msgid "Shows Pedigree View."
-msgstr ""
+msgstr "Toont stamboomscherm"
 
 #: C/gramps.xml:1060(para)
 msgid "To the left of the Active person is a left arrow button. If the Active person has children, clicking this button expands a list of the Active person's children. Selecting one of the children makes that child the active Person."
@@ -1036,7 +1036,7 @@ msgstr "Menu kinderen"
 
 #: C/gramps.xml:1085(phrase)
 msgid "Shows Children Menu in Pedigree View."
-msgstr ""
+msgstr "Toont kinderen in het stamboomscherm."
 
 #: C/gramps.xml:1091(para)
 msgid "The right-hand side of the window shows two right arrow buttons. When the top button is clicked, the Father of the Active person becomes the Active person. Clicking the bottom button makes the Mother of the Active person the Active person."
@@ -1176,7 +1176,7 @@ msgstr "Aanpassen GEDCOM"
 
 #: C/gramps.xml:1381(para)
 msgid "Please keep in mind that some information in a GEDCOM file may be lost during import into GRAMPS. Simply opening and viewing the file will not change it. However, if any changes were made and they were not abandoned upon exit, exiting GRAMPS will save the data, with possible data loss."
-msgstr "Denk eraan dat sommige informatie in een GEDCOM-bestand verloren kan gaan bij het importeren in GRAMPS. Het bestand wordt niet veranderd wanneer u enkel het bestand opent en bekijkt. Wanneer u echter aanpassingen maakte en deze niet verworpen hebt bij het sluiten van het bestand, zal bij het afsluiten van GRAMPS, de gevens worden opgeslagen met mogelijk verlies van informatie tot gevolg."
+msgstr "Denk eraan dat sommige informatie in een GEDCOM-bestand verloren kan gaan bij het importeren in GRAMPS. Het bestand wordt niet veranderd wanneer u enkel het bestand opent en bekijkt. Wanneer u echter aanpassingen maakte en deze niet verworpen hebt bij het sluiten van het bestand, zal bij het afsluiten van GRAMPS, de gegevens worden opgeslagen met mogelijk verlies van informatie tot gevolg."
 
 #: C/gramps.xml:1390(title)
 msgid "Saving Changes to Your Database"
@@ -1192,7 +1192,7 @@ msgstr ""
 
 #: C/gramps.xml:1407(para)
 msgid "If you want to return your database to the way it was when you opened it, select <menuchoice><guimenu>File</guimenu><guimenuitem>Abandon changes and quit</guimenuitem></menuchoice>. (This is just like quitting without saving in other programs.)"
-msgstr "Wanneer u terug wilt keren naar de oorspronkelijk teostand voor veranderingen van het gegevensbestand, gebruikt u <menuchoice><guimenu>Bestand</guimenu><guimenuitem>Veranderingen verwerpen en verlaten</guimenuitem></menuchoice>. (Dit is eigenljk zoals programma verlaten zonder op te slaan zoals in vele andere programma's.)"
+msgstr "Wanneer u terug wilt keren naar de oorspronkelijk toestand voor veranderingen van het gegevensbestand, gebruikt u <menuchoice><guimenu>Bestand</guimenu><guimenuitem>Veranderingen verwerpen en verlaten</guimenuitem></menuchoice>. (Dit is eigenlijk zoals programma verlaten zonder op te slaan zoals in vele andere programma's.)"
 
 #: C/gramps.xml:1415(para)
 msgid "If you would like to save your database under a different name, you can do so by choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Save as...</guimenuitem></menuchoice> and specifying the name (and, optionally, the format) of your new database. Note that \"Save as\" will allow you to continue editing the newly saved database. If this is not what you want to do, you may wish to use the \"Export\" command instead."
@@ -1256,11 +1256,11 @@ msgstr "GRAMPS-gegevensbestand (grdb)"
 
 #: C/gramps.xml:1490(para)
 msgid "The native GRAMPS database format is a specific form of Berkeley database (BSDDB) with a special structure of data tables. This format is binary and architecture-dependent. It is very quick and efficient, but not generally portable across computers with different binary architecture (e.g. i386 vs alpha)."
-msgstr "Het basisformaat van het GRAMPS-gegevensbestand is een specifieke vorm van een Berkeley Database (BSDDB met een speciale structuur van de gegevenstabellen. Dit formaat is binair en is architectuurafhankelijk. Het is zeer snel en efficiënt, maar niet algemeen verplaatsbaar naar andere computers met een andere binaire archtectuur (bijv. i386 t.o.v. alpha)."
+msgstr "Het basisformaat van het GRAMPS-gegevensbestand is een specifieke vorm van een Berkeley Database (BSDDB met een speciale structuur van de gegevenstabellen. Dit formaat is binair en is architectuurafhankelijk. Het is zeer snel en efficiënt, maar niet algemeen verplaatsbaar naar andere computers met een andere binaire architectuur (bijv. i386 t.o.v. alpha)."
 
 #: C/gramps.xml:1502(para)
 msgid "The GRAMPS XML file was the default format for older versions of GRAMPS. Unlike the grdb format, it is architecture independent and human-readable. The database may also have references to non-local (external) media objects, therefore it is not guaranteed to be completely portable. The GRAMPS XML database is created by saving ( <menuchoice><guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem></menuchoice> ) or exporting ( <menuchoice><guimenu>File</guimenu><guimenuitem>Export...</guimenuitem></menuchoice> ) data in that format"
-msgstr "HEt GRAMPS XML bestand was de standaard voor de oudere versies van GRAMPS. Dit formaat is architectuur-onafhankelijk en kan door mensen gelezen worden, dit in tegenstelling tot het grdb-formaat. Het gegevensbestand kan ook verwijzingen bevatten naar niet-locale (externe) media voorwerpen, en daarom is het niet zeker dat het bestand volledig overzetbaar is."
+msgstr "Het GRAMPS XML bestand was de standaard voor de oudere versies van GRAMPS. Dit formaat is architectuur-onafhankelijk en kan door mensen gelezen worden, dit in tegenstelling tot het grdb-formaat. Het gegevensbestand kan ook verwijzingen bevatten naar niet-locale (externe) media voorwerpen, en daarom is het niet zeker dat het bestand volledig overzetbaar is."
 
 #: C/gramps.xml:1523(para)
 msgid "The GRAMPS package is a compressed archive containing the GRAMPS XML file and all media objects (images, sound files, etc.) to which the database refers. Because it contains all the media objects, this format is completely portable. The GRAMPS package is created by exporting ( <menuchoice><guimenu>File</guimenu><guimenuitem>Export...</guimenuitem></menuchoice> ) data in that format."
@@ -1276,7 +1276,7 @@ msgstr "Gegevens exporteren"
 
 #: C/gramps.xml:1544(para)
 msgid "Exporting allows you to share any portion of your GRAMPS database with other researchers as well as to enable you to transfer your data to another computer. Currently, GRAMPS can export data to the following formats: GRAMPS database (grdb), GRAMPS XML, GEDCOM, GRAMPS package, Web Family Tree, and GeneWeb."
-msgstr "Exporteren laat u toe om gelijk welk deel van uw GRAMPS-gegevensbestand te delen met andere onderzoekers of om uw gegevens beschikbaar te maken op een andere computer. Momenteel kunt u vanuit GRAMPS gegevens exporteren naar de volgende formaten: GRAMPS-gegevensbestand (grdb), GRAMPS XML, GEDCOM, GRAMPS pakkete, Web Family Tree (WFT) en GeneWeb."
+msgstr "Exporteren laat u toe om gelijk welk deel van uw GRAMPS-gegevensbestand te delen met andere onderzoekers of om uw gegevens beschikbaar te maken op een andere computer. Momenteel kunt u vanuit GRAMPS gegevens exporteren naar de volgende formaten: GRAMPS-gegevensbestand (grdb), GRAMPS XML, GEDCOM, GRAMPS pakket, Web Family Tree (WFT) en GeneWeb."
 
 #: C/gramps.xml:1551(title)
 msgid "Export is saving a copy"
@@ -1284,11 +1284,13 @@ msgstr "Exporteren betekent een kopie bewaren"
 
 #: C/gramps.xml:1553(para)
 msgid "When you export, you are saving a copy of the currently opened database. Exporting creates another file with a copy of your data. Note that the database that remains opened in your GRAMPS window is NOT the file saved by your export. Additional editing of the currently opened database will not alter the copy produced by the export."
-msgstr "Wanneer u exporteert, slaat u een kopie op van het gegevensbestand dat momenteel geopend is. Exporteren maakt een ander bestand aan dat een kopie is van het andere bestand. Let op : het gevensbestand dat open blijft staan is NIET het geëxporteerde bestand. Bijkomende aanpassingen van het bestand dat geopend is zal de geëxporteerde kopie niet wijzigen."
+msgstr "Wanneer u exporteert, slaat u een kopie op van het gegevensbestand dat momenteel geopend is. Exporteren maakt een ander bestand aan dat een kopie is van het andere bestand. Let op : het gegevensbestand dat open blijft staan is NIET het geëxporteerde bestand. Bijkomende aanpassingen van het bestand dat geopend is zal de geëxporteerde kopie niet wijzigen."
 
 #: C/gramps.xml:1560(para)
 msgid "To export data, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Export</guimenuitem></menuchoice>. This will bring up the <guilabel>Export</guilabel> assistant. Its pages will guide you through the format selection (see <xref linkend=\"export-druid-fig\"/>), file selection, and format specific export options (see <xref linkend=\"gedcom-export-fig\"/>). After a final confirmation page, the export will be performed according to the choices you have made. At any time, you can click the <guibutton>Back</guibutton> and revise any selection, and then go forward to redo the export."
-msgstr "Om gegevens te exporteren, kiest u <menuchoice><guimenu>Bestand</guimenu><guimenuitem>Exporten</guimenuitem></menuchoice>. Dit zal de <guilabel>Export</guilabel>assistant tonen. De volgende schermen zullen u door de formaatselectie (zie <xref linkend=\"export-druid-fig\"/>), bestandsselectie en specifieke exportopties (zie <xref linkend=\"gedcom-export-fig\"/>) loodsen."
+msgstr ""
+"Om gegevens te exporteren, kiest u  <menuchoice><guimenu>Bestand</guimenu><guimenuitem>Exporten</guimenuitem></menuchoice>. Dit zal de <guilabel>Export</guilabel>assistent tonen."
+"De volgende schermen zullen u door de formaatselectie (zie <xref linkend=\"export-druid-fig\"/>), bestandsselectie en specifieke exportopties (zie <xref linkend=\"gedcom-export-fig\"/>) loodsen. "
 
 #: C/gramps.xml:1574(title)
 msgid "Export assistant: format selection"
@@ -1312,7 +1314,7 @@ msgstr "Coderen"
 
 #: C/gramps.xml:1603(para)
 msgid "Since different languages use different characters, it is important to tell a GEDCOM file what character set is used. The two formats traditionally accepted are ASCII and ANSEL. Since all ASCII characters are valid ANSEL characters, GRAMPS does not provide an option for ASCII."
-msgstr ""
+msgstr "Omdat verschillende talen verschillende karakters gebruiken, is het belangrijk om aan een GEDCOM-bestand mee te geven welke karakterset wordt gebruikt. De twee formaten die normaal geaccepteerd worden zijn ASCII en ANSEL. Omdat alle ASCII karakters geldige ANSEL karakters zijn, heeft GRAMPS geen optie voor het kiezen van ASCII."
 
 #: C/gramps.xml:1609(para)
 msgid "Because ANSEL is not commonly used, some genealogy programs will accept ANSI (more commonly know as ISO-8859-1) and Unicode character sets. Only select ANSI or Unicode if you know any program that attempts to read the GEDCOM file will understand these character sets."
@@ -1432,7 +1434,7 @@ msgstr "Web Family Tree"
 
 #: C/gramps.xml:1786(para)
 msgid "Exporting to Web Family Tree will create a text file that can be used by the Web Family Tree program. Export options include filter selection and the ability to limit data on living people to that of their family ties."
-msgstr "Exporteren naar WFT ( Web Family Tree ) zal een tekstbestand aanmaken dat kan gebruikt worden door het WFT programma. De exporteer opties bevatten filter selecties en de mogelijkheid om de hoeveelheid gegevens te beperken tot de familiebanden, voor nog-levende mensen."
+msgstr "Exporteren naar WFT ( Web Family Tree ) zal een tekstbestand aanmaken dat kan gebruikt worden door het WFT programma. De exporteer opties bevatten filter selecties en de mogelijkheid om de hoeveelheid gegevens te beperken tot de familiebanden, voor nog levende mensen."
 
 #: C/gramps.xml:1797(para)
 msgid "Exporting to GeneWeb will save a copy of your data into a popular web genealogy format. To find out more about GeneWeb and its format, visit <ulink type=\"http\" url=\"http://cristal.inria.fr/~ddr/GeneWeb/en/\">http://cristal.inria.fr/~ddr/GeneWeb/en/</ulink>."
@@ -1512,7 +1514,7 @@ msgstr ""
 
 #: C/gramps.xml:1892(title)
 msgid "To Specify a Relationship"
-msgstr "Een relatie specifieren"
+msgstr "Een relatie specificeren"
 
 #: C/gramps.xml:1894(para)
 msgid "There are two primary ways to specify relationships between people - using the Relationships View and using the Edit Family dialog from the Family List View. The Family List is usually used to build all the relationships within a single family at a time. The Relationships View is usually used to build multiple relationships to a single person."
@@ -1560,7 +1562,7 @@ msgstr ""
 
 #: C/gramps.xml:1978(title)
 msgid "To Specify Parents"
-msgstr "Ouders specifieren"
+msgstr "Ouders specificeren"
 
 #: C/gramps.xml:1980(para)
 msgid "You can specify Active person's parents in the Relationship View(<xref linkend=\"family-fig\"/>). A little care is required to prevent the creation of duplicate families. If you wish to add the active person to an already existing family, you should click the <guibutton>Select</guibutton> button. If the family including the parents does not already exist, you should click the <guibutton>Add</guibutton> button."
@@ -1600,7 +1602,7 @@ msgstr ""
 
 #: C/gramps.xml:2050(title)
 msgid "To Specify Children"
-msgstr "Kinderen specifieren"
+msgstr "Kinderen specificeren"
 
 #: C/gramps.xml:2052(para)
 msgid "Adding children to a relationship is done through a similar proceedure. From the Relationships View or the Family List View, select the existing family or create a new family. Children can be added by selecting the Add button or Select button to the right of the child list."
@@ -1688,7 +1690,7 @@ msgstr "Het vorige deel gaf u een snel overzicht van hoe gegevens in te voeren e
 
 #: C/gramps.xml:2176(para)
 msgid "As we have seen above, GRAMPS offers you a series of Views. Each of these Views gives you opportunities to enter and edit information. In fact, you can often get to the same information from different Views."
-msgstr "Zoals we gezien hebben, heeft GRAMPS verschillende schermen. Elk van deze schermen geeft u mogelijkheden om gegevens in te voeren en aan te passen. Het is zelfs zo dat u dezlfde informatie kunt zien in verschillende schermen."
+msgstr "Zoals we gezien hebben, heeft GRAMPS verschillende schermen. Elk van deze schermen geeft u mogelijkheden om gegevens in te voeren en aan te passen. Het is zelfs zo dat u dezelfde informatie kunt zien in verschillende schermen."
 
 #: C/gramps.xml:2181(para)
 msgid "In GRAMPS, information is entered and edited through what we call dialogs. Since we use that term frequently, we should define what we mean by it:"
@@ -1832,7 +1834,7 @@ msgstr "De tabs geven de volgende persoonlijke informatiecategorieën weer:"
 
 #: C/gramps.xml:2388(para)
 msgid "The <guilabel>Events</guilabel> tab lets you view and edit any events relevant to the person. The bottom part of the window lists all such events stored in the database. The top part shows the details of the currently selected event in the list (if any). The buttons <guibutton>+</guibutton>, <guibutton>Edit</guibutton>, and <guibutton>-</guibutton> allow you to add, modify, and remove an event record from the database. Note that the <guibutton>Edit</guibutton> and <guibutton>-</guibutton> buttons become available only when an event is selected from the list."
-msgstr "De tab <guilabel>Gebeurtenisqsen</guilabel> geeft u toe alle gebeurtenissen te zien die verbonden zijn met een persoon en die gebeurtenissen ook te veranderen. Het onderste deel laat alle gelijkaardige gebeurtenissen zien die opgeslagen zijn in het gegevensbestand. Het bovenste deel laat de details zien van het huidig geselecteerde gebeurtenis van de lijst ( indien aanweizg). De knoppen <guibutton>+</guibutton>, <guibutton>Bewerken</guibutton>, en <guibutton>-</guibutton> laten toe om een gebeurtenis toe te voegen, aan te passen of te verwijderen van het gegevensbestand. Deze knoppen <guibutton>+</guibutton>, <guibutton>Berwerken</guibutton>, en <guibutton>-</guibutton> zijn enkel beschikbaar indien een gebeurtenis daadwerkelijk wordt gekozen uit de lijst."
+msgstr "De tab <guilabel>Gebeurtenissen</guilabel> geeft u toe alle gebeurtenissen te zien die verbonden zijn met een persoon en die gebeurtenissen ook te veranderen. Het onderste deel laat alle gelijkaardige gebeurtenissen zien die opgeslagen zijn in het gegevensbestand. Het bovenste deel laat de details zien van het huidig geselecteerde gebeurtenis van de lijst ( indien aanwezig). De knoppen <guibutton>+</guibutton>, <guibutton>Bewerken</guibutton>, en <guibutton>-</guibutton> laten toe om een gebeurtenis toe te voegen, aan te passen of te verwijderen van het gegevensbestand. Deze knoppen <guibutton>+</guibutton>, <guibutton>Bewerken</guibutton>, en <guibutton>-</guibutton> zijn enkel beschikbaar indien een gebeurtenis daadwerkelijk wordt gekozen uit de lijst."
 
 #: C/gramps.xml:2404(term) C/gramps.xml:3878(title)
 msgid "Names"
@@ -1908,7 +1910,7 @@ msgstr "Dialoog aanpassen persoon - aantekeningen"
 
 #: C/gramps.xml:2557(phrase)
 msgid "Shows Notes Tab of Edit Person dialog."
-msgstr "Toont de aantekeningentab vazn de dialoog aanpassen personen."
+msgstr "Toont de aantekeningentab van de dialoog aanpassen personen."
 
 #: C/gramps.xml:2563(para)
 msgid "The <guilabel>Notes</guilabel> tab provides a place to record various items about the person that do not fit neatly into other categories. To add a note or modify existing notes simply edit the text in the text entry field."
@@ -1980,7 +1982,7 @@ msgstr "Internet"
 
 #: C/gramps.xml:2695(para)
 msgid "The <guilabel>Internet</guilabel> tab displays Internet addresses relevant to the person. The bottom part lists all such Internet addresses and accompanying descriptions. The top part shows the details of the currently selected addresses in the list (if any). The buttons <guibutton>+</guibutton>, <guibutton>Edit</guibutton>, and <guibutton>-</guibutton> let you add, modify, and remove an Internet address. The \"Go\" button (represented by an icon having a green arrow and yellow circle) opens your web browser and takes you directly to the highlighted page. Note that the <guibutton>Edit</guibutton>, <guibutton>-</guibutton>, and <guibutton>Go</guibutton> buttons become available only when an address is selected from the list."
-msgstr "De tab <guilabel>Internet</guilabel>, geeft de internet-adressen die relevant zijn voor de persoon. Het onderste deel geeft een lijst van alle internet-adressen en bijhorende beschrijvingen. Bovenste deel toont de details van het huidige geselcteerde adres uit de lijst(indien aanweig). De knoppen <guibutton>+</guibutton>, <guibutton>Bewerken</guibutton>, en <guibutton>-</guibutton> laten toe om een internet-adres toe te voegen, aan te passen of te verwijderen. "
+msgstr "De tab <guilabel>Internet</guilabel>, geeft de internet-adressen die relevant zijn voor de persoon. Het onderste deel geeft een lijst van alle internet-adressen en bijhorende beschrijvingen. Bovenste deel toont de details van het huidige geselecteerde adres uit de lijst(indien aanwezig). De knoppen <guibutton>+</guibutton>, <guibutton>Bewerken</guibutton>, en <guibutton>-</guibutton> laten toe om een internet-adres toe te voegen, aan te passen of te verwijderen. "
 
 #: C/gramps.xml:2710(title)
 msgid "Edit Person dialog - Internet"
@@ -2088,11 +2090,11 @@ msgstr "Datumformaten en vertaalregels"
 
 #: C/gramps.xml:2875(para)
 msgid "GRAMPS recognizes dates entered in a variety of formats. The default numeric format is that which is conventional for the environment is which GRAMPS is operating; that is, DD.MM.YYYY for most European countries, MM/DD/YYYY for the U.S., and so on."
-msgstr "GRAMPS herkent ingevoerde datums in verscheidene formaten. Het standaard numeriek formaat wordt bepaald door de omgeving waarin GRAMPS draait. Dus DD.MM.YYYY voor de meeste Europese landen en MM/DD/YYYY vor de V.S. enz."
+msgstr "GRAMPS herkent ingevoerde datums in verscheidene formaten. Het standaard numeriek formaat wordt bepaald door de omgeving waarin GRAMPS draait. Dus DD.MM.YYYY voor de meeste Europese landen en MM/DD/YYYY voor de V.S. enz."
 
 #: C/gramps.xml:2880(para)
 msgid "Besides exact dates, GRAMPS recognizes many dates that are not regular: before, after, about, ranges and spans. It also understands the quality: estimated or calculated. Finally, it supports partial dates and many alternative calendars. Below is the list of date entry rules to allow precise date parsing."
-msgstr "Naast exacte datums kan GRAMPS ook verscheidene datums herkennen die niet regulier zijn: voor, na, rond, bereik en periode. Ook wordt de kwaliteit begrepen : berekend of geschat. Tenslotte worden gedeeldelijke datums en vele alternatieve kalenders ondersteund. Verderop vindt u een lijst van de ingaveregels om een juiste datumvertaling te verkrijgen. "
+msgstr "Naast exacte datums kan GRAMPS ook verscheidene datums herkennen die niet regulier zijn: voor, na, rond, bereik en periode. Ook wordt de kwaliteit begrepen : berekend of geschat. Tenslotte worden gedeeltelijke datums en vele alternatieve kalenders ondersteund. Verderop vindt u een lijst van de ingaveregels om een juiste datumvertaling te verkrijgen. "
 
 #: C/gramps.xml:2887(title)
 msgid "Date parsing rules"
@@ -2124,11 +2126,11 @@ msgstr "Voorbeelden: geschat van 2002 tot 2006, voor Juni 1975, geschat rond 200
 
 #: C/gramps.xml:2930(para)
 msgid "Partial dates are entered simply by omitting unknown information. Examples: May 1961 and 2004."
-msgstr "Gedeeldelijke datums kunnen ingevoerd worden door eenvoudig de ontbrekende informatie weg te laten. Voorbeelden: Mei 1699 en 2009."
+msgstr "Gedeeltelijke datums kunnen ingevoerd worden door eenvoudig de ontbrekende informatie weg te laten. Voorbeelden: Mei 1699 en 2009."
 
 #: C/gramps.xml:2935(para)
 msgid "Alternate calendars are calendars other than the Gregorian calendar. Currently, GRAMPS supports Hebrew, French Republican, Julian, Islamic, and Persian alternate calendars. To specify the calendar other than the default Gregorian, append the name of the calendar to the date string, e.g. \"January 9, 1905 (julian)\"."
-msgstr "Alternatieve kalenders zijn kalenders die afwijken van de Gregoriaanse. Momenteel ondersteunt GRMAPS volgende kalenders: Hebreeuwse, Franse Republiek, Juliaanse, Islamitische en Perzische kalenders. Om een kalender op te geven die afwijkt van de standaard Gregoraiaanse, voegt u de naamm van de kalender to aan de datumtekenreeks, v.b. \"9 Januari 1905 (juliaans)\"."
+msgstr "Alternatieve kalenders zijn kalenders die afwijken van de Gregoriaanse. Momenteel ondersteunt GRAMPS volgende kalenders: Hebreeuwse, Franse Republiek, Juliaanse, Islamitische en Perzische kalenders. Om een kalender op te geven die afwijkt van de standaard Gregoriaanse, voegt u de naam van de kalender to aan de datumtekenreeks, v.b. \"9 Januari 1905 (Juliaans)\"."
 
 #: C/gramps.xml:2946(title)
 msgid "Date Validity Indicators"
@@ -2152,7 +2154,7 @@ msgstr "Een groene cirkel betekent dat de datum volledig en geldig is (v.b. 24 M
 
 #: C/gramps.xml:2968(para)
 msgid "Yellow circle means that the date is valid but is not a regular date. This could be the date of a different type: a before date (before May 25, 1962), an after date (after May, 1960), an about date (about May 23, 1961), a range (between May 1, 1961 and May 31, 1961), or a span (from May 1, 1961 to May 31, 1961). It can also be a complete single date, but with quality of Estimated or Calculated. Finally, it could be a partial date, i.e. a regular quality single date missing some portion, e.g. May 1961 or 1961."
-msgstr "Een gele cirkel geeft aan dat de datum geldig is, maar geen het geen reguliere datum is. Dit kan aangeven dat de datum van een ander type is: een voo.. datum( voor 1 Mei 1960) of een na... datum (na 1 Mei 1960) of rond ... datum (rond 23 Mei 2005), of een bereik (tussen 2 Mei 1963 en 3 Mei 1964) of een periode (van 2 Mei 1599 tot 3 Juni 1603). Het kan ook gaan over een complete datum, maar met de kwaliteit geschat of berekend. Tenslotte kan het gaan over een gedeeltelijke datum, dus een reguliere datum waarin een deel ontbreekt, v.b. Juni 2005."
+msgstr "Een gele cirkel geeft aan dat de datum geldig is, maar geen het geen reguliere datum is. Dit kan aangeven dat de datum van een ander type is: een voor.. datum( voor 1 Mei 1960) of een na... datum (na 1 Mei 1960) of rond ... datum (rond 23 Mei 2005), of een bereik (tussen 2 Mei 1963 en 3 Mei 1964) of een periode (van 2 Mei 1599 tot 3 Juni 1603). Het kan ook gaan over een complete datum, maar met de kwaliteit geschat of berekend. Tenslotte kan het gaan over een gedeeltelijke datum, dus een reguliere datum waarin een deel ontbreekt, v.b. Juni 2005."
 
 #: C/gramps.xml:2978(para)
 msgid "While partial dates do not uniquely define the day, they allow at least for some type of comparisons between the dates."
@@ -2168,7 +2170,7 @@ msgstr "Grafische gebruikers-interface om datums in te geven"
 
 #: C/gramps.xml:2998(para)
 msgid "While the above parsing rules provide a guide for you to type in most common dates, you can also use <guilabel>Date selection</guilabel> dialog. The dialog is particularly useful for building a complex date or for simply insuring that your information is entered in a way GRAMPS will understand. The <guilabel>Date selection</guilabel> dialog can be invoked by clicking the colored circle button next to the date entry field."
-msgstr "Bovenstaande vertaalregels geven u een idee hoe u best de meeste datums invoert, maar u kunt ook gebruik maken van <guilabel>Datum selecteren</guilabel> dialoog. Deze dialoog is zeker handig indien u een comlexe datum wenst in te voeren of eenvoudigweg om te controleren of de ingevoerde informatie voor GRAMPS verstaanbaar is. De <guilabel>Datum selecterenb </guilabel> dialoog kann ook opgeroepen worden door op de gekleurde led-knop naast het datum ingaveveld te klikken."
+msgstr "Bovenstaande vertaalregels geven u een idee hoe u best de meeste datums invoert, maar u kunt ook gebruik maken van <guilabel>Datum selecteren</guilabel> dialoog. Deze dialoog is zeker handig indien u een complexe datum wenst in te voeren of eenvoudigweg om te controleren of de ingevoerde informatie voor GRAMPS verstaanbaar is. De <guilabel>Datum selecteren </guilabel> dialoog kan ook opgeroepen worden door op de gekleurde led-knop naast het datum ingaveveld te klikken."
 
 #: C/gramps.xml:3007(title)
 msgid "Date selection dialog"
@@ -2352,7 +2354,7 @@ msgstr ""
 
 #: C/gramps.xml:3456(para)
 msgid "Clicking <guibutton>OK</guibutton> will immediately save changes to the database). All changes are immediate."
-msgstr "Klikken op de <guibutton>OK</guibutton> knop zal de wijzigingen aan het gegevensbestand direct opslaan. Alle aanpssingen gebeuren onmiddelijk."
+msgstr "Klikken op de <guibutton>OK</guibutton> knop zal de wijzigingen aan het gegevensbestand direct opslaan. Alle aanpassingen gebeuren onmiddelijk."
 
 #: C/gramps.xml:3461(para)
 msgid "If a tab label is in boldface type and displays an icon, this means it contains data. If not, it has no data."
@@ -2376,7 +2378,7 @@ msgstr ""
 
 #: C/gramps.xml:3508(para)
 msgid "The <guilabel>Note</guilabel> tab displays any comments or notes concerning the place. To add a note or modify existing notes simply edit the text in the text entry field."
-msgstr "De tab guilabel>Opmerkingen</guilabel> geeft alle commentaren of opmerkingen ivm. de locatie. Om een opmerking toe te voegen of een bestaande aan te passen kunt u eenvoudig de tekst in het tekstingaveveld veranderen."
+msgstr "De tab <guilabel>Opmerkingen</guilabel> geeft alle commentaren of opmerkingen ivm. de locatie. Om een opmerking toe te voegen of een bestaande aan te passen kunt u eenvoudig de tekst in het tekstingaveveld veranderen."
 
 #: C/gramps.xml:3520(para)
 msgid "The <guilabel>Sources</guilabel> tab lets you view and edit sources relevant to a place. The central part of the window lists all such source references stored in the database. The buttons <guibutton>+</guibutton>, <guibutton>Edit</guibutton>, and <guibutton>-</guibutton> let you add, modify, and remove a source reference associated with a place. Note that the <guibutton>Edit</guibutton> and <guibutton>-</guibutton> buttons become available only when a source reference is selected from the list."
@@ -3311,7 +3313,7 @@ msgid "Genealogy records can generate a lot of files. Many web servers have a di
 msgstr "Genealogische gegevens kunnen een hele reeks bestanden aanmaken. Vele web-servers heebn problemen wanneer er zich vele bestanden in één map bevinden. De generator tracht daarom het aantal bestanden per map te beperken tot een beheersbaar nivo. Om dit mogelijk te maken wordt een hierarche van mappen aangemaakt. De aangemaakte bestandsnamen zijn niet intuitief, maar uniek per persoon. Wanneer de web-generator opnieuw wordt gelopen zullen identieke besanden worden aangemaakt. Dit maakt het eenvoudig om bepaalde bestanden te vervangen."
 
 #: C/gramps.xml:5295(para)
-msgid "By default, the output files are written to the specified directory. Because of the number of files and directories that are created, it may be difficult to transfer the files to an external web host. To aid in this, you may directly create a gzip'd tar file to more easily upload the data. This is the format that should be used if you would like to take advantage of the free genealogy page hosting at the <ulink type=\"http\" url=\"http://family.gramps-project.org\">GRAMPS web hosting site</ulink>."
+msgid "By default, the output files are written to the specified directory. Because of the number of files and directories that are created, it may be difficult to transfer the files to an external web host. To aid in this, you may directly create a gezipt tar file to more easily upload the data. This is the format that should be used if you would like to take advantage of the free genealogy page hosting at the <ulink type=\"http\" url=\"http://family.gramps-project.org\">GRAMPS web hosting site</ulink>."
 msgstr "Standaard worden de uitvoerbestanden naar een bepaalde map geschreven. Omdat er zo veel bestanden worden aangemaakt, is is vaak moeilijk om alle deze bestanden te verplaatsen naar een externe web-host. Als hulp, kunt u een gzip'd tar bestand aanmaken. Dit om de gegevens eenvoudiger te uploaden. Dit formaat moet u ook gebruiken indien u gebruik wilt maken van de gratische web-hosting op <ulink type=\"http\" url=\"http://family.gramps-project.org\">GRAMPS web hosting site</ulink>."
 
 #: C/gramps.xml:5306(para)
@@ -3700,7 +3702,7 @@ msgstr "De meeste instellingen in GRAMPS, worden vastgelegd met de <guilabel>Voo
 
 #: C/gramps.xml:5904(title)
 msgid "Preferences dialog"
-msgstr "Dialoog voor voorkeuren"
+msgstr "Voorkeurendialoog"
 
 #: C/gramps.xml:5913(phrase)
 msgid "Shows Preferences dialog."
@@ -5096,7 +5098,7 @@ msgstr ""
 
 #: C/gramps.xml:7894(term)
 msgid "name=report_name"
-msgstr ""
+msgstr "naam=verslag_naam"
 
 #: C/gramps.xml:7897(para)
 msgid "This mandatory option determines which report will be generated. If the supplied report_name does not correspond to any available report, the error message will be printed followed by the list of available reports."
@@ -5104,7 +5106,7 @@ msgstr ""
 
 #: C/gramps.xml:7906(term)
 msgid "show=all"
-msgstr ""
+msgstr "toon=alles"
 
 #: C/gramps.xml:7909(para)
 msgid "This will produce the list of names for all options available for a given report."
@@ -5112,7 +5114,7 @@ msgstr ""
 
 #: C/gramps.xml:7915(term)
 msgid "show=option_name"
-msgstr ""
+msgstr "toon=optie_naam"
 
 #: C/gramps.xml:7918(para)
 msgid "This will print the description of the functionality supplied by the option_name, as well as what are the acceptable types and values for this option."
@@ -5232,7 +5234,7 @@ msgstr "outfile"
 
 #: C/gramps.xml:8068(filename)
 msgid "errfile"
-msgstr ""
+msgstr "foutbestand"
 
 #: C/gramps.xml:8064(command)
 msgid "gramps -i <placeholder-1/> -i <placeholder-2/> -o <placeholder-3/> -f <placeholder-4/> &gt;<placeholder-5/> 2&gt;<placeholder-6/>"
@@ -5252,7 +5254,7 @@ msgstr "Om een gegevensbestand te openen, en gebaseerd op deze gegevens een tijd
 
 #: C/gramps.xml:8090(filename)
 msgid "file.grdb"
-msgstr ""
+msgstr "bestand.grdb"
 
 #: C/gramps.xml:8092(replaceable)
 msgid "name=timeline,off=pdf,of=my_timeline.pdf"

po/ChangeLog

@@ -1,3 +1,9 @@
+2007-02-12  Lubo Vasko  <pgval@inMail.sk>
+	* sk.po: Translation update.
+
+2007-02-03 Zdenek Hatas  <zdenek.hatas@gmail.com>
+        * cs.po: Minor translation update. 
+
 2007-01-29  Piotr Czubaszek  <pioterus@gmail.com>
 	* pl.po: Translation update.
 

po/POTFILES.in

@@ -9,13 +9,13 @@ src/ArgHandler.py
 src/Assistant.py
 src/AutoComp.py
 src/BaseDoc.py
-src/BasicUtils.py
 src/Bookmarks.py
 src/ColumnOrder.py
 src/const.py
 src/DateEdit.py
 src/Date.py
 src/DbLoader.py
+src/DbManager.py
 src/DdTargets.py
 src/DisplayState.py
 src/Errors.py
@@ -23,15 +23,16 @@ src/Exporter.py
 src/FontScale.py
 src/GrampsCfg.py
 src/GrampsDisplay.py
-src/GrampsLocale.py
 src/gramps_main.py
 src/gramps.py
 src/GrampsWidgets.py
 src/ImgManip.py
 src/ListModel.py
-src/NameDisplay.py
+src/ManagedWindow.py
+#src/MarkupText.py
 src/Navigation.py
 src/PageView.py
+src/PlaceUtils.py
 src/QuestionDialog.py
 src/RecentFiles.py
 src/Relationship.py
@@ -48,8 +49,10 @@ src/TreeTips.py
 src/Utils.py
 src/UndoHistory.py
 src/ViewManager.py
-src/ManagedWindow.py
-src/PlaceUtils.py
+
+# BasicUtils package
+src/BasicUtils/BasicUtils.py
+src/BasicUtils/NameDisplay.py
 
 # Config package
 src/Config/_GrampsGconfKeys.py
@@ -138,7 +141,7 @@ src/DisplayTabs/_LocationEmbedList.py
 src/DisplayTabs/_LocationModel.py
 src/DisplayTabs/_MediaBackRefList.py
 src/DisplayTabs/_NameEmbedList.py
-src/DisplayTabs/_NameModel.py
+#src/DisplayTabs/_NameModel.py
 src/DisplayTabs/_NoteTab.py
 src/DisplayTabs/_TextTab.py
 src/DisplayTabs/_PersonEventEmbedList.py
@@ -181,8 +184,6 @@ src/Editors/__init__.py
 
 # GrampsDb package
 src/GrampsDb/_DbUtils.py
-src/GrampsDb/_GedcomInfo.py
-src/GrampsDb/_GedTokens.py
 src/GrampsDb/_GrampsBSDDB.py
 src/GrampsDb/_GrampsDbBase.py
 src/GrampsDb/_GrampsDBCallback.py
@@ -192,12 +193,22 @@ src/GrampsDb/_GrampsGEDDB.py
 src/GrampsDb/_GrampsInMemDB.py
 src/GrampsDb/_GrampsXMLDB.py
 src/GrampsDb/__init__.py
-src/GrampsDb/_ReadGedcom.py
-src/GrampsDb/_ReadGrdb.py
-src/GrampsDb/_ReadXML.py
-src/GrampsDb/_WriteGedcom.py
-src/GrampsDb/_WriteGrdb.py
-src/GrampsDb/_WriteXML.py
+
+# GrampsDbUtils package
+src/GrampsDbUtils/_GedcomInfo.py
+#src/GrampsDbUtils/_GedcomLex.py
+src/GrampsDbUtils/_GedcomParse.py
+src/GrampsDbUtils/_GedcomTokens.py
+src/GrampsDbUtils/_GrampsDbWRFactories.py
+src/GrampsDbUtils/_ReadGedcom.py
+src/GrampsDbUtils/_ReadXML.py
+src/GrampsDbUtils/_WriteGedcom.py
+src/GrampsDbUtils/_WriteGrdb.py
+src/GrampsDbUtils/_WriteXML.py
+src/GrampsDbUtils/__init__.py
+
+# GrampsLocale package
+src/GrampsLocale/_GrampsLocale.py
 
 # GrampsLogger package
 src/GrampsLogger/_ErrorReportAssistant.py
@@ -284,6 +295,7 @@ src/plugins/Leak.py
 src/plugins/FindDupes.py
 src/plugins/MediaManager.py
 src/plugins/NarrativeWeb.py
+src/plugins/OwnerEditor.py
 src/plugins/PatchNames.py
 src/plugins/ReadPkg.py
 src/plugins/Rebuild.py
@@ -313,6 +325,7 @@ src/plugins/WriteFtree.py
 src/plugins/WriteGeneWeb.py
 src/plugins/WritePkg.py
 src/plugins/RebuildRefMap.py
+src/plugins/ReadGrdb.py
 
 # PluginUtils package
 src/PluginUtils/__init__.py
@@ -351,23 +364,31 @@ src/RelLib/_Attribute.py
 src/RelLib/_AttributeType.py
 src/RelLib/_BaseObject.py
 src/RelLib/_CalSdn.py
+src/RelLib/_ChildRefType.py
 src/RelLib/_DateBase.py
 src/RelLib/_Date.py
 src/RelLib/_Event.py
 src/RelLib/_EventRef.py
+src/RelLib/_EventRoleType.py
+src/RelLib/_EventType.py
 src/RelLib/_Family.py
+src/RelLib/_FamilyRelType.py
 src/RelLib/_GenderStats.py
+src/RelLib/_GrampsType.py
 src/RelLib/__init__.py
 src/RelLib/_LdsOrd.py
 src/RelLib/_LdsOrdBase.py
 src/RelLib/_LocationBase.py
 src/RelLib/_Location.py
+src/RelLib/_MarkerType.py
 src/RelLib/_MediaBase.py
 src/RelLib/_MediaObject.py
 src/RelLib/_MediaRef.py
 src/RelLib/_Name.py
+src/RelLib/_NameType.py
 src/RelLib/_NoteBase.py
 src/RelLib/_Note.py
+src/RelLib/_NoteType.py
 src/RelLib/_Person.py
 src/RelLib/_PlaceBase.py
 src/RelLib/_Place.py
@@ -380,18 +401,12 @@ src/RelLib/_RepositoryType.py
 src/RelLib/_Researcher.py
 src/RelLib/_SourceNote.py
 src/RelLib/_Source.py
+src/RelLib/_SourceMediaType.py
 src/RelLib/_SourceRef.py
 src/RelLib/_UrlBase.py
 src/RelLib/_Url.py
-src/RelLib/_Witness.py
-src/RelLib/_FamilyRelType.py
 src/RelLib/_UrlType.py
-src/RelLib/_NameType.py
-src/RelLib/_ChildRefType.py
-src/RelLib/_SourceMediaType.py
-src/RelLib/_MarkerType.py
-src/RelLib/_EventRoleType.py
-src/RelLib/_EventType.py
+src/RelLib/_Witness.py
 
 # TreeViews package
 # src/TreeViews/__init__.py
@@ -530,9 +545,11 @@ src/Filters/Rules/Event/__init__.py
 # Filters.Rules.Place package
 src/Filters/Rules/Place/_AllPlaces.py
 src/Filters/Rules/Place/_HasIdOf.py
+src/Filters/Rules/Place/_HasNoLatOrLon.py
 src/Filters/Rules/Place/_HasNoteMatchingSubstringOf.py
 src/Filters/Rules/Place/_HasNoteRegexp.py
 src/Filters/Rules/Place/_HasPlace.py
+src/Filters/Rules/Place/_InLatLonNeighborhood.py
 src/Filters/Rules/Place/_MatchesFilter.py
 src/Filters/Rules/Place/_PlacePrivate.py
 src/Filters/Rules/Place/_RegExpIdOf.py
@@ -571,6 +588,17 @@ src/Filters/Rules/Repository/_RegExpIdOf.py
 src/Filters/Rules/Repository/_RepoPrivate.py
 src/Filters/Rules/Repository/__init__.py
 
+# Filters.Rules.Note package
+src/Filters/Rules/Note/_AllNotes.py
+src/Filters/Rules/Note/_HasIdOf.py
+src/Filters/Rules/Note/_HasNoteMatchingSubstringOf.py
+src/Filters/Rules/Note/_HasNoteRegexp.py
+src/Filters/Rules/Note/_HasNote.py
+src/Filters/Rules/Note/_MatchesFilter.py
+src/Filters/Rules/Note/_RegExpIdOf.py
+src/Filters/Rules/Note/_NotePrivate.py
+src/Filters/Rules/Note/__init__.py
+
 # Filters.SideBar package
 src/Filters/SideBar/_EventSidebarFilter.py
 src/Filters/SideBar/_FamilySidebarFilter.py
@@ -580,6 +608,7 @@ src/Filters/SideBar/_SourceSidebarFilter.py
 src/Filters/SideBar/_PlaceSidebarFilter.py
 src/Filters/SideBar/_MediaSidebarFilter.py
 src/Filters/SideBar/_RepoSidebarFilter.py
+src/Filters/SideBar/_NoteSidebarFilter.py
 
 # FilterEditor package
 src/FilterEditor/_FilterEditor.py
@@ -590,8 +619,8 @@ src/FilterEditor/_ShowResults.py
 #
 #	Glade files
 #
-src/GrampsDb/gedcomexport.glade
-src/GrampsDb/gedcomimport.glade
+src/GrampsDbUtils/gedcomexport.glade
+src/GrampsDbUtils/gedcomimport.glade
 src/glade/edit_person.glade
 src/glade/gramps.glade
 src/glade/mergedata.glade
@@ -609,6 +638,7 @@ src/plugins/eventcmp.glade
 src/plugins/genewebexport.glade
 src/plugins/leak.glade
 src/plugins/merge.glade
+src/plugins/ownereditor.glade
 src/plugins/patchnames.glade
 src/plugins/relcalc.glade
 src/plugins/soundex.glade

src/AddMedia.py

@@ -59,8 +59,6 @@ import Mime
 import GrampsDisplay
 import ManagedWindow
 
-_last_directory = None
-
 #-------------------------------------------------------------------------
 #
 # AddMediaObject
@@ -71,8 +69,10 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
     Displays the Add Media Dialog window, allowing the user to select
     a media object from the file system, while providing a description.
     """
+
+    last_directory = None
     
-    def __init__(self,dbstate, uistate, track):
+    def __init__(self, dbstate, uistate, track):
         """
         Creates and displays the dialog box
 
@@ -81,8 +81,8 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
 
         ManagedWindow.ManagedWindow.__init__(self, uistate, track, self)
 
-        self.db = dbstate.db
-        self.glade = gtk.glade.XML(const.gladeFile,"imageSelect","gramps")
+        self.dbase = dbstate.db
+        self.glade = gtk.glade.XML(const.gladeFile, "imageSelect", "gramps")
         
         self.set_window(
             self.glade.get_widget("imageSelect"),
@@ -92,11 +92,11 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
         self.description = self.glade.get_widget("photoDescription")
         self.image = self.glade.get_widget("image")
         self.file_text = self.glade.get_widget("fname")
-        if _last_directory and os.path.isdir(_last_directory):
-            self.file_text.set_current_folder(_last_directory)
+        if self.last_directory and os.path.isdir(self.last_directory):
+            self.file_text.set_current_folder(self.last_directory)
             
         self.internal = self.glade.get_widget('internal')
-        self.internal.connect('toggled',self.internal_toggled)
+        self.internal.connect('toggled', self.internal_toggled)
         self.relpath = self.glade.get_widget('relpath')
         self.temp_name = ""
         self.object = None
@@ -106,23 +106,27 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
         self.show()
 
     def build_menu_names(self, obj):
-        return(_('Select media object'),None)
+        """
+        Build the menu name for the window manager
+        """
+        return(_('Select media object'), None)
 
     def internal_toggled(self, obj):
+        """
+        Toggles the file_text icon.
+        """
         self.file_text.set_sensitive(not obj.get_active())
         
-    def on_help_imagesel_clicked(self,obj):
+    def on_help_imagesel_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
         GrampsDisplay.help('gramps-edit-quick')
-        self.val = self.window.run()
+        self.window.run()
 
     def save(self):
         """
         Callback function called with the save button is pressed.
         A new media object is created, and added to the database.
         """
-        global _last_directory
-        
         description = unicode(self.description.get_text())
 
         if self.internal.get_active():
@@ -136,10 +140,10 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
             full_file = filename
 
             if self.relpath.get_active():
-                p = self.db.get_save_path()
-                if not os.path.isdir(p):
-                    p = os.path.dirname(p)
-                filename = Utils.relative_path(filename,p)
+                pname = self.dbase.get_save_path()
+                if not os.path.isdir(pname):
+                    pname = os.path.dirname(pname)
+                filename = Utils.relative_path(filename, pname)
 
             if os.path.exists(filename) == 0:
                 msgstr = _("Cannot import %s")
@@ -156,29 +160,28 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
             mobj.set_mime_type(mtype)
             name = filename
             mobj.set_path(name)
-            _last_directory = os.path.dirname(filename)
+            self.last_directory = os.path.dirname(filename)
 
         mobj.set_handle(Utils.create_id())
         if not mobj.get_gramps_id():
-            mobj.set_gramps_id(self.db.find_next_object_gramps_id())
-        trans = self.db.transaction_begin()
+            mobj.set_gramps_id(self.dbase.find_next_object_gramps_id())
+        trans = self.dbase.transaction_begin()
         self.object = mobj
-        self.db.commit_media_object(mobj,trans)
-        self.db.transaction_commit(trans,_("Add Media Object"))
+        self.dbase.commit_media_object(mobj, trans)
+        self.dbase.transaction_commit(trans, _("Add Media Object"))
 
-        
-    def on_name_changed(self,*obj):
+    def on_name_changed(self, *obj):
         """
         Called anytime the filename text window changes. Checks to
         see if the file exists. If it does, the imgae is loaded into
         the preview window.
         """
-        fn = self.file_text.get_filename()
-        if not fn:
+        fname = self.file_text.get_filename()
+        if not fname:
             return
-        filename = unicode(fn, sys.getfilesystemencoding())
+        filename = unicode(fname, sys.getfilesystemencoding())
         basename = os.path.basename(filename)
-        (root,ext) = os.path.splitext(basename)
+        (root, ext) = os.path.splitext(basename)
         old_title  = unicode(self.description.get_text())
 
         if old_title == '' or old_title == self.temp_name:
@@ -189,12 +192,15 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
         if filename:
             mtype = Mime.get_type(filename)
             if mtype and mtype.startswith("image"):
-                image = scale_image(filename,const.thumbScale)
+                image = scale_image(filename, const.thumbScale)
             else:
                 image = Mime.find_mime_type_pixbuf(mtype)
             self.image.set_from_pixbuf(image)
 
     def run(self):
+        """
+        Run the dialog, returning the selected object.
+        """
         while True:
             val = self.window.run()
 
@@ -214,7 +220,10 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
 # scale_image
 #
 #-------------------------------------------------------------------------
-def scale_image(path,size):
+def scale_image(path, size):
+    """
+    Scales the image to the specified size
+    """
 
     title_msg = _("Cannot display %s") % path
     detail_msg =  _('GRAMPS is not able to display the image file. '
@@ -225,7 +234,7 @@ def scale_image(path,size):
         width  = image1.get_width()
         height = image1.get_height()
         
-        scale = size / float(max(width,height))
+        scale = size / float(max(width, height))
         return image1.scale_simple(int(scale*width), int(scale*height),
                                    gtk.gdk.INTERP_BILINEAR)
     except:

src/ArgHandler.py

@@ -42,6 +42,7 @@ import os
 import sys
 import getopt
 from gettext import gettext as _
+import logging
 
 #-------------------------------------------------------------------------
 #
@@ -50,6 +51,7 @@ from gettext import gettext as _
 #-------------------------------------------------------------------------
 import const
 import GrampsDb
+import GrampsDbUtils
 import Mime
 import QuestionDialog
 import Config
@@ -112,7 +114,7 @@ class ArgHandler:
         """
         Fill in lists with open, exports, imports, and actions options.
 
-        Any parsing errors lead to abort via os._exit(1).
+        Any parsing errors lead to abort via sys.exit(1).
         """
 
         try:
@@ -121,7 +123,7 @@ class ArgHandler:
         except getopt.GetoptError:
             # return without filling anything if we could not parse the args
             print "Error parsing arguments: %s " % self.args[1:]
-            os._exit(1)
+            sys.exit(1)
 
         if leftargs:
             # if there were an argument without option,
@@ -253,6 +255,9 @@ class ArgHandler:
                             and options[opt_ix+1][0] in ( '-p', '--options' ): 
                     options_str = options[opt_ix+1][1]
                 self.actions.append((action,options_str))
+            elif o in ('-d', '--debug'):
+                l = logging.getLogger(v)
+                l.setLevel(logging.DEBUG)
 
     #-------------------------------------------------------------------------
     # Determine the need for GUI
@@ -294,7 +299,7 @@ class ArgHandler:
             filename = os.path.abspath(os.path.expanduser(self.open_gui))
             filetype = Mime.get_type(filename) 
             if filetype in (const.app_gramps,const.app_gedcom,
-                            const.app_gramps_xml):
+                            const.app_gramps_xml, 'x-directory/normal'):
                 # Say the type outloud
                 if filetype == const.app_gramps:
                     print "Type: GRAMPS database"
@@ -304,11 +309,12 @@ class ArgHandler:
                     print "Type: GRAMPS XML database"
 
                 try:
-                    self.vm.read_recent_file(filename,filetype)
+                    self.vm.read_recent_file(filename, filetype)
                     print "Opened successfully!"
                     success = True
                 except:
                     print "Cannot open %s. Exiting..."
+
             elif filetype in (const.app_gramps_package,):
                 QuestionDialog.OkDialog( _("Opening non-native format"), 
                                     _("New GRAMPS database has to be set up "
@@ -323,7 +329,7 @@ class ArgHandler:
                         _('GRAMPS cannot open non-native data '
                           'without setting up new GRAMPS database.'))
                     print "Cannot continue without native database. Exiting..."
-                    os._exit(1)
+                    sys.exit(1)
                 elif filetype == const.app_gramps_package:
                     print "Type: GRAMPS package"
                     self.vm.import_pkg(filename)
@@ -336,13 +342,13 @@ class ArgHandler:
                           'Valid types are: GRAMPS database, GRAMPS XML, '
                           'GRAMPS package, and GEDCOM.') % filetype)
                 print "Exiting..." 
-                os._exit(1)
+                sys.exit(1)
             if success:
                 # Add the file to the recent items
                 #RecentFiles.recent_files(filename,filetype)
                 pass
             else:
-                os._exit(1)
+                sys.exit(1)
             return
            
         if self.open:
@@ -365,19 +371,22 @@ class ArgHandler:
             elif format == 'gramps-xml':
                 filetype = const.app_gramps_xml
                 print "Type: GRAMPS XML"
+            elif format == 'x-directory/normal':
+                filetype = 'x-directory/normal'
+                print "Type: GRAMPS DIR"
             else:
                 print "Unknown file type: %s" % format
                 print "Exiting..." 
-                os._exit(1)
+                sys.exit(1)
 
             try:
-                self.vm.read_recent_file(filename,filetype)
+                self.vm.read_recent_file(filename, filetype)
                 print "Opened successfully!"
                 success = True
             except:
                 print "Error opening the file." 
                 print "Exiting..." 
-                os._exit(1)
+                sys.exit(1)
 
         if self.imports:
             self.cl = bool(self.exports or self.actions or self.cl)
@@ -391,11 +400,11 @@ class ArgHandler:
                 except:
                     print "Could not create import directory %s. Exiting." \
                         % self.impdir_path 
-                    os._exit(1)
+                    sys.exit(1)
             elif not os.access(self.impdir_path,os.W_OK):
                 print "Import directory %s is not writable. Exiting." \
                     % self.impdir_path 
-                os._exit(1)
+                sys.exit(1)
             # and clean it up before use
             files = os.listdir(self.impdir_path) ;
             for fn in files:
@@ -431,13 +440,18 @@ class ArgHandler:
             if self.imports:
                 os.remove(self.imp_db_path)
             print "Exiting."
-            os._exit(0)
+            sys.exit(0)
 
         elif Config.get(Config.RECENT_FILE) and Config.get(Config.AUTOLOAD):
             rf = Config.get(Config.RECENT_FILE)
+
             if os.path.isfile(rf):
                 filetype = Mime.get_type(rf)
-                self.vm.read_recent_file(rf,filetype)
+                self.vm.read_recent_file(rf, filetype)
+            elif os.path.isdir(rf):
+                if os.path.isfile(os.path.join(rf, "name.txt")) and \
+                        not os.path.isfile(os.path.join(rf,"need_recover")):
+                    self.vm.read_recent_file(rf, 'x-directory/normal')
 
     #-------------------------------------------------------------------------
     #
@@ -447,32 +461,32 @@ class ArgHandler:
     def cl_import(self,filename,format):
         """
         Command-line import routine. Try to import filename using the format.
-        Any errors will cause the os._exit(1) call.
+        Any errors will cause the sys.exit(1) call.
         """
         if format == 'grdb':
             filename = os.path.normpath(os.path.abspath(filename))
             try:
-                GrampsDb.gramps_db_reader_factory(const.app_gramps)(
+                GrampsDbUtils.gramps_db_reader_factory(const.app_gramps)(
                     self.state.db,filename,empty)
             except:
                 print "Error importing %s" % filename
-                os._exit(1)
+                sys.exit(1)
         elif format == 'gedcom':
             filename = os.path.normpath(os.path.abspath(filename))
             try:
                 # Cheating here to use default encoding
-                from GrampsDb._ReadGedcom import import2
+                from GrampsDbUtils._GedcomParse import import2
                 import2(self.state.db,filename,None,None,False)
             except:
                 print "Error importing %s" % filename
-                os._exit(1)
+                sys.exit(1)
         elif format == 'gramps-xml':
             try:
-                GrampsDb.gramps_db_reader_factory(const.app_gramps_xml)(
+                GrampsDbUtils.gramps_db_reader_factory(const.app_gramps_xml)(
                     self.state.db,filename,None,self.cl)
             except:
                 print "Error importing %s" % filename
-                os._exit(1)
+                sys.exit(1)
         elif format == 'geneweb':
             import ImportGeneWeb
             filename = os.path.normpath(os.path.abspath(filename))
@@ -480,7 +494,7 @@ class ArgHandler:
                 ImportGeneWeb.importData(self.state.db,filename,None)
             except:
                 print "Error importing %s" % filename
-                os._exit(1)
+                sys.exit(1)
         elif format == 'gramps-pkg':
             # Create tempdir, if it does not exist, then check for writability
             tmpdir_path = os.path.join(const.home_dir,"tmp")
@@ -490,10 +504,10 @@ class ArgHandler:
                 except:
                     print "Could not create temporary directory %s" \
                           % tmpdir_path 
-                    os._exit(1)
+                    sys.exit(1)
             elif not os.access(tmpdir_path,os.W_OK):
                 print "Temporary directory %s is not writable" % tmpdir_path 
-                os._exit(1)
+                sys.exit(1)
             else:    # tempdir exists and writable -- clean it up if not empty
                 files = os.listdir(tmpdir_path) ;
                 for fn in files:
@@ -507,22 +521,22 @@ class ArgHandler:
                 archive.close()
             except ReadError, msg:
                 print "Error reading archive:", msg
-                os._exit(1)
+                sys.exit(1)
             except CompressError, msg:
                 print "Error uncompressing archive:", msg
-                os._exit(1)
+                sys.exit(1)
             except:
                 print "Error extracting into %s" % tmpdir_path
-                os._exit(1)
+                sys.exit(1)
 
             dbname = os.path.join(tmpdir_path,const.xmlFile)
 
             try:
-                GrampsDb.gramps_db_reader_factory(const.app_gramps_xml)(
+                GrampsDbUtils.gramps_db_reader_factory(const.app_gramps_xml)(
                     self.state.db,dbname,None)
             except:
                 print "Error importing %s" % filename
-                os._exit(1)
+                sys.exit(1)
             # Clean up tempdir after ourselves
             #     THIS HAS BEEN CHANGED, because now we want to keep images
             #     stay after the import is over. Just delete the XML file.
@@ -533,7 +547,7 @@ class ArgHandler:
 ##             os.rmdir(tmpdir_path)
         else:
             print "Invalid format:  %s" % format
-            os._exit(1)
+            sys.exit(1)
         if not self.cl:
             return self.vm.post_load()
 
@@ -546,32 +560,32 @@ class ArgHandler:
         """
         Command-line export routine. 
         Try to write into filename using the format.
-        Any errors will cause the os._exit(1) call.
+        Any errors will cause the sys.exit(1) call.
         """
         filename = os.path.abspath(os.path.expanduser(filename))
         if format == 'grdb':
             try:
-                GrampsDb.gramps_db_writer_factory(const.app_gramps)(
+                GrampsDbUtils.gramps_db_writer_factory(const.app_gramps)(
                     self.state.db,filename)
             except:
                 print "Error exporting %s" % filename
-                os._exit(1)
+                sys.exit(1)
         elif format == 'gedcom':
             try:
-                gw = GrampsDb.GedcomWriter(self.state.db,None,1,filename)
+                gw = GrampsDbUtils.GedcomWriter(self.state.db,None,1,filename)
                 ret = gw.export_data(filename)
             except:
                 print "Error exporting %s" % filename
-                os._exit(1)
+                sys.exit(1)
         elif format == 'gramps-xml':
             filename = os.path.normpath(os.path.abspath(filename))
             if filename:
                 try:
-                    g = GrampsDb.XmlWriter(self.state.db,None,0,1)
+                    g = GrampsDbUtils.XmlWriter(self.state.db,None,0,1)
                     ret = g.write(filename)
                 except:
                     print "Error exporting %s" % filename
-                    os._exit(1)
+                    sys.exit(1)
         elif format == 'gramps-pkg':
             try:
                 import WritePkg
@@ -579,7 +593,7 @@ class ArgHandler:
                 ret = writer.export()
             except:
                 print "Error creating %s" % filename
-                os._exit(1)
+                sys.exit(1)
         elif format == 'iso':
             import WriteCD
             try:
@@ -587,7 +601,7 @@ class ArgHandler:
                 ret = writer.export()
             except:
                 print "Error exporting %s" % filename
-                os._exit(1)
+                sys.exit(1)
         elif format == 'wft':
             import WriteFtree
             try:
@@ -595,7 +609,7 @@ class ArgHandler:
                 ret = writer.export_data()
             except:
                 print "Error exporting %s" % filename
-                os._exit(1)
+                sys.exit(1)
         elif format == 'geneweb':
             import WriteGeneWeb
             try:
@@ -604,10 +618,10 @@ class ArgHandler:
                 ret = writer.export_data()
             except:
                 print "Error exporting %s" % filename
-                os._exit(1)
+                sys.exit(1)
         else:
             print "Invalid format: %s" % format
-            os._exit(1)
+            sys.exit(1)
 
     #-------------------------------------------------------------------------
     #
@@ -617,7 +631,7 @@ class ArgHandler:
     def cl_action(self,action,options_str):
         """
         Command-line action routine. Try to perform specified action.
-        Any errors will cause the os._exit(1) call.
+        Any errors will cause the sys.exit(1) call.
         """
         if action == 'check':
             import Check
@@ -643,7 +657,7 @@ class ArgHandler:
             name = options_str_dict.pop('name',None)
             if not name:
                 print "Report name not given. Please use name=reportname"
-                os._exit(1)
+                sys.exit(1)
 
             for item in cl_list:
                 if name == item[0]:
@@ -673,7 +687,7 @@ class ArgHandler:
             name = options_str_dict.pop('name',None)
             if not name:
                 print "Tool name not given. Please use name=toolname"
-                os._exit(1)
+                sys.exit(1)
 
             for item in cli_tool_list:
                 if name == item[0]:
@@ -689,7 +703,7 @@ class ArgHandler:
                 print "   %s" % item[0]
         else:
             print "Unknown action: %s." % action
-            os._exit(1)
+            sys.exit(1)
 
 #-------------------------------------------------------------------------
 #
@@ -717,7 +731,7 @@ class NewNativeDbPrompter:
                                        gtk.FILE_CHOOSER_ACTION_SAVE,
                                        (gtk.STOCK_CANCEL,
                                         gtk.RESPONSE_CANCEL,
-                                        gtk.STOCK_OPEN,
+                                        gtk.STOCK_NEW,
                                         gtk.RESPONSE_OK))
         self.state.db.close()
 

src/AutoComp.py

@@ -20,6 +20,10 @@
 
 # $Id$
 
+"""
+Provides autocompletion functionality.
+"""
+
 #-------------------------------------------------------------------------
 #
 # Standard python modules
@@ -42,12 +46,14 @@ log = logging.getLogger(".AutoComp")
 #-------------------------------------------------------------------------
 import gtk
 
-def fill_combo(combo,data_list):
+def fill_combo(combo, data_list):
+    """
+    Fill a combo box with completion data
+    """
     store = gtk.ListStore(str)
 
-    for data in data_list:
-        if data:
-            store.append(row=[data])
+    for data in [ item for item in data_list if item ]:
+        store.append(row=[data])
 	    
     combo.set_model(store)
     combo.set_text_column(0)
@@ -57,12 +63,14 @@ def fill_combo(combo,data_list):
     completion.set_text_column(0)
     combo.child.set_completion(completion)
 
-def fill_entry(entry,data_list):
+def fill_entry(entry, data_list):
+    """
+    Fill a entry with completion data
+    """
     store = gtk.ListStore(str)
 
-    for data in data_list:
-        if data:
-            store.append(row=[data])
+    for data in [ item for item in data_list if item ]:
+        store.append(row=[data])
         
     completion = gtk.EntryCompletion()
     completion.set_model(store)
@@ -70,19 +78,6 @@ def fill_entry(entry,data_list):
     completion.set_text_column(0)
     entry.set_completion(completion)
     
-def fill_option_text(combobox,data):
-    store = gtk.ListStore(str)
-    for item in data:
-        if item:
-            store.append(row=[item])
-    combobox.set_model(store)
-    combobox.set_active(0)
-
-def get_option(combobox):
-    store = combobox.get_model()
-    return store.get_value(combobox.get_active_iter(),0)
-
-
 #-------------------------------------------------------------------------
 #
 # StandardCustomSelector class
@@ -118,7 +113,7 @@ class StandardCustomSelector:
     (active_key,mapping[active_key]) tuple.
         
     """
-    def __init__(self,mapping,cbe=None,custom_key=None,active_key=None,
+    def __init__(self, mapping, cbe=None, custom_key=None, active_key=None,
                  additional=None):
         """
         Constructor for the StandardCustomSelector class.
@@ -141,7 +136,7 @@ class StandardCustomSelector:
         self.additional = additional
         
         # make model
-        self.store = gtk.ListStore(int,str)
+        self.store = gtk.ListStore(int, str)
 
         # fill it up using mapping
         self.fill()
@@ -152,7 +147,7 @@ class StandardCustomSelector:
             self.selector.set_model(self.store)
             self.selector.set_text_column(1)
         else:
-            self.selector = gtk.ComboBoxEntry(self.store,1)
+            self.selector = gtk.ComboBoxEntry(self.store, 1)
         if self.active_key != None:
             self.selector.set_active(self.active_index)
 
@@ -164,12 +159,15 @@ class StandardCustomSelector:
         self.selector.child.set_completion(completion)
 
     def fill(self):
+        """
+        Fill with data
+        """
         keys = self.mapping.keys()
         keys.sort(self.by_value)
         index = 0
         for key in keys:
             if key != self.custom_key:
-                self.store.append(row=[key,self.mapping[key]])
+                self.store.append(row=[key, self.mapping[key]])
                 if key == self.active_key:
                     self.active_index = index
                 index = index + 1
@@ -188,13 +186,13 @@ class StandardCustomSelector:
                     self.active_index = index
                 index = index + 1
 
-    def by_value(self,f,s):
+    def by_value(self, first, second):
         """
         Method for sorting keys based on the values.
         """
-        fv = self.mapping[f]
-        sv = self.mapping[s]
-        return locale.strcoll(fv,sv)
+        fvalue = self.mapping[first]
+        svalue = self.mapping[second]
+        return locale.strcoll(fvalue, svalue)
 
     def get_values(self):
         """
@@ -203,60 +201,59 @@ class StandardCustomSelector:
         @return: Returns (int,str) tuple corresponding to the selection.
         @rtype: tuple
         """
-        ai = self.selector.get_active_iter()
-        if ai:
-            i = self.store.get_value(ai,0)
-            s = self.store.get_value(ai,1)
-            if s != self.mapping[i]:
-                s = self.selector.child.get_text().strip()
+        active_iter = self.selector.get_active_iter()
+        if active_iter:
+            int_val = self.store.get_value(active_iter, 0)
+            str_val = self.store.get_value(active_iter, 1)
+            if str_val != self.mapping[int_val]:
+                str_val = self.selector.child.get_text().strip()
         else:
-            i = self.custom_key
-            s = self.selector.child.get_text().strip()
-        if s in self.mapping.values():
+            int_val = self.custom_key
+            str_val = self.selector.child.get_text().strip()
+        if str_val in self.mapping.values():
             for key in self.mapping.keys():
-                if s == self.mapping[key]:
-                    i = key
+                if str_val == self.mapping[key]:
+                    int_val = key
                     break
         else:
-            i = self.custom_key
-        return (i,s)
+            int_val = self.custom_key
+        return (int_val, str_val)
 
-    def set_values(self,val):
+    def set_values(self, val):
         """
         Set values according to given tuple.
 
         @param val: (int,str) tuple with the values to set.
         @type val: tuple
         """
-        i,s = val
+        i, s = val
         if i in self.mapping.keys() and i != self.custom_key:
-            self.store.foreach(self.set_int_value,i)
+            self.store.foreach(self.set_int_value, i)
         elif self.custom_key != None:
             self.selector.child.set_text(s)
         else:
             print "StandardCustomSelector.set(): Option not available:", val
 
-    def set_int_value(self,model,path,iter,val):
-        if model.get_value(iter,0) == val:
+    def set_int_value(self, model, path, iter, val):
+        if model.get_value(iter, 0) == val:
             self.selector.set_active_iter(iter)
             return True
         return False
 
-
 #-------------------------------------------------------------------------
 #
 # Testing code below this point
 #
 #-------------------------------------------------------------------------
 if __name__ == "__main__":
-    def here(obj,event):
+    def here(obj, event):
         print s.get_values()
         gtk.main_quit()
 
-    s = StandardCustomSelector({0:'abc',1:'abd',2:'bbe'},None,0,1)
-    s.set_values((2,'bbe'))
+    s = StandardCustomSelector({0:'abc', 1:'abd', 2:'bbe' }, None, 0, 1)
+    s.set_values((2, 'bbe'))
     w = gtk.Dialog()
     w.child.add(s.selector)
-    w.connect('delete-event',here)
+    w.connect('delete-event', here)
     w.show_all()
     gtk.main()