reapply r22916 from trunk testing on gramps40: UT svn: r22932
Ported from gramps34 my commits r22744,5. Adjusted for gramps40 path layout changes. svn: r22746
2006-05-01 Alex Roitman <shura@gramps-project.org> * various: merge changes from gramps20. In po: 2006-05-01 Alex Roitman <shura@gramps-project.org> * POTFILES.in: Add new file. svn: r6504
svn: r5482