* NEWS: Update.

* src/MergePeople.py: Typos.
* src/plugins/NavWebPage.py: Typos.
* src/po/template.po: Update for upcoming 2.0.6.


svn: r5013

gramps2/ChangeLog

@@ -1,3 +1,9 @@
+2005-08-04  Alex Roitman  <shura@gramps-project.org>
+	* NEWS: Update.
+	* src/MergePeople.py: Typos.
+	* src/plugins/NavWebPage.py: Typos.
+	* src/po/template.po: Update for upcoming 2.0.6.
+
 2005-08-04  Don Allingham  <don@gramps-project.org>
 	* src/PeopleModel.py: provide a work around for the python 2.3 bug unicode
 	sorting problem with locale.strcoll. For a nul termination during sorting,

gramps2/NEWS

@@ -1,5 +1,7 @@
 Version 2.0.6 -- the "Just like my dear Papa!" release
 * New Narrative Web Page added to create a more complete web site.
+* Progress meters in plugins.
+* Numerous bug fixes.
 
 Version 2.0.5 -- the "It's certainly uncontaminated by cheese" release
 * New filters based on personal notes.

gramps2/src/MergePeople.py

@@ -275,14 +275,13 @@ class MergePeopleUI:
                 QuestionDialog.ErrorDialog(
                     _("Cannot merge people"),
                     _("Spouses cannot be merged. To merge these people, "
-                      "you must first break the relationship between the "
-                      "two people."))
+                      "you must first break the relationship between them."))
             elif check_for_child(person1,person2):
                 QuestionDialog.ErrorDialog(
                     _("Cannot merge people"),
                     _("A parent and child cannot be merged. To merge these "
                       "people, you must first break the relationship between "
-                      "the two people."))
+                      "them."))
             else:
                 if p1.get_active():
                     merge = MergePeople(db,person1,person2)

gramps2/src/plugins/NavWebPage.py

@@ -273,7 +273,7 @@ class BasePage:
         value = time.strftime(format,time.localtime(time.time()))
 
         msg = _('Generated by <a href="http://gramps-project.org">'
-                'GRAMPS</a> on %(date)s' % { 'date' : value })
+                'GRAMPS</a> on %(date)s') % { 'date' : value }
 
         of.write('<div class="navbyline">%s</div>\n' % msg)
         of.write('<h1 class="navtitle">%s</h1>\n' % self.title_str)
@@ -754,8 +754,8 @@ class MediaPage(BasePage):
         of.write('<div class="img_navbar">')
         if prev:
             self.media_ref_link(of,prev,_('Previous'),True)
-        data = _('%(page_number)d of %(total_pages)d' % {
-            'page_number' : page_number, 'total_pages' : total_pages })
+        data = _('%(page_number)d of %(total_pages)d' ) % {
+            'page_number' : page_number, 'total_pages' : total_pages }
         of.write('&nbsp;&nbsp;%s&nbsp;&nbsp;' % data)
         if next:
             self.media_ref_link(of,next,_('Next'),True)
@@ -978,8 +978,8 @@ class SourcesPage(BasePage):
         handle_list = list(handle_set)
 
         msg = _("This page contains an index of all the sources in the "
-                "database, sorted by their title. Clicking on a sources's "
-                "title will take you to that sources's page.")
+                "database, sorted by their title. Clicking on a source's "
+                "title will take you to that source's page.")
 
         of.write('<h3>%s</h3>\n<p>' % _('Sources'))
         of.write(msg)