run intltool-update -m

svn: r15733

po/POTFILES.in

@@ -328,6 +328,7 @@ src/gui/widgets/styledtexteditor.py
 src/gui/widgets/validatedmaskedentry.py
 
 # Simple API
+src/Simple/_SimpleAccess.py
 src/Simple/_SimpleTable.py
 
 # Config package
@@ -335,13 +336,17 @@ src/config.py
 
 # Merge package
 src/Merge/__init__.py
-src/Merge/mergefamily.py
-src/Merge/mergenote.py
-src/Merge/mergeplace.py
 src/Merge/mergeevent.py
-src/Merge/mergeperson.py
-src/Merge/mergesource.py
+src/Merge/mergefamily.py
 src/Merge/mergemedia.py
+src/Merge/mergenote.py
+src/Merge/mergeperson.py
+src/Merge/mergeplace.py
+src/Merge/mergerepository.py
+src/Merge/mergesource.py
+#src/Merge/_MergePerson.py
+#src/Merge/_MergePlace.py
+#src/Merge/_MergeSource.py
 
 # DateHandler package
 src/DateHandler/_Date_bg.py

po/POTFILES.skip

@@ -16,6 +16,7 @@ src/plugins/gramplet/NoteGramplet.py
 src/plugins/gramplet/PluginManagerGramplet.py
 src/plugins/gramplet/PythonGramplet.py
 src/plugins/import/ImportSql.py
+src/plugins/tool/CalculateEstimatedDates.py
 src/plugins/tool/DateParserDisplayTest.py
 src/plugins/tool/DumpGenderStats.py
 src/plugins/tool/PHPGedViewConnector.py
@@ -25,5 +26,8 @@ src/plugins/gramplet/FaqGramplet.py
 src/plugins/gramplet/HeadlineNewsGramplet.py
 src/plugins/quickview/AllNames.py
 src/plugins/quickview/Query.py
-src/ReportBase/_DocReportDialog.py
 src/plugins/sidebar/sidebar.gpr.py
+src/ReportBase/_DocReportDialog.py
+src/Simple/_SimpleDoc.py
+src/web/grampsdb/views.py
+src/web/utils.py