Merge branch 'master' into geps/gep-032-database-backend

.gitignore

@@ -18,3 +18,4 @@ tags
 
 # Testing
 test/data
+gramps/webapp/grampsdb/fixtures/initial_data.json

po/POTFILES.in

@@ -551,11 +551,16 @@ gramps/plugins/drawreport/fanchart.py
 gramps/plugins/drawreport/statisticschart.py
 gramps/plugins/drawreport/timeline.py
 gramps/plugins/export/export.gpr.py
+gramps/plugins/export/exportcsv.glade
 gramps/plugins/export/exportcsv.py
+gramps/plugins/export/exportftree.glade
 gramps/plugins/export/exportgedcom.py
+gramps/plugins/export/exportgeneweb.glade
 gramps/plugins/export/exportgeneweb.py
 gramps/plugins/export/exportpkg.py
+gramps/plugins/export/exportvcalendar.glade
 gramps/plugins/export/exportvcalendar.py
+gramps/plugins/export/exportvcard.glade
 gramps/plugins/export/exportvcard.py
 gramps/plugins/export/exportxml.py
 gramps/plugins/gramplet/ageondategramplet.py
@@ -684,6 +689,7 @@ gramps/plugins/tool/ownereditor.glade
 gramps/plugins/tool/ownereditor.py
 gramps/plugins/tool/patchnames.glade
 gramps/plugins/tool/patchnames.py
+gramps/plugins/tool/phpgedview.glade
 gramps/plugins/tool/phpgedviewconnector.py
 gramps/plugins/tool/populatesources.py
 gramps/plugins/tool/rebuild.py

po/POTFILES.skip

@@ -532,11 +532,4 @@ gramps/webapp/grampsdb/view/png.py
 #   Glade files
 #
 gramps/gui/glade/gramps.glade
-gramps/plugins/export/exportcsv.glade
-gramps/plugins/export/exportftree.glade
-gramps/plugins/export/exportgeneweb.glade
-gramps/plugins/export/exportvcalendar.glade
-gramps/plugins/export/exportvcard.glade
 gramps/plugins/tool/check.glade
-# Development tools
-gramps/plugins/tool/phpgedview.glade