* NEWS: Update.
* src/MergePeople.py: Typos. * src/plugins/NavWebPage.py: Typos. * src/po/template.po: Update for upcoming 2.0.6. svn: r5013
This commit is contained in:
parent
335580cc90
commit
5374ed4b64
@ -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>
|
2005-08-04 Don Allingham <don@gramps-project.org>
|
||||||
* src/PeopleModel.py: provide a work around for the python 2.3 bug unicode
|
* 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,
|
sorting problem with locale.strcoll. For a nul termination during sorting,
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
Version 2.0.6 -- the "Just like my dear Papa!" release
|
Version 2.0.6 -- the "Just like my dear Papa!" release
|
||||||
* New Narrative Web Page added to create a more complete web site.
|
* 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
|
Version 2.0.5 -- the "It's certainly uncontaminated by cheese" release
|
||||||
* New filters based on personal notes.
|
* New filters based on personal notes.
|
||||||
|
@ -275,14 +275,13 @@ class MergePeopleUI:
|
|||||||
QuestionDialog.ErrorDialog(
|
QuestionDialog.ErrorDialog(
|
||||||
_("Cannot merge people"),
|
_("Cannot merge people"),
|
||||||
_("Spouses cannot be merged. To merge these people, "
|
_("Spouses cannot be merged. To merge these people, "
|
||||||
"you must first break the relationship between the "
|
"you must first break the relationship between them."))
|
||||||
"two people."))
|
|
||||||
elif check_for_child(person1,person2):
|
elif check_for_child(person1,person2):
|
||||||
QuestionDialog.ErrorDialog(
|
QuestionDialog.ErrorDialog(
|
||||||
_("Cannot merge people"),
|
_("Cannot merge people"),
|
||||||
_("A parent and child cannot be merged. To merge these "
|
_("A parent and child cannot be merged. To merge these "
|
||||||
"people, you must first break the relationship between "
|
"people, you must first break the relationship between "
|
||||||
"the two people."))
|
"them."))
|
||||||
else:
|
else:
|
||||||
if p1.get_active():
|
if p1.get_active():
|
||||||
merge = MergePeople(db,person1,person2)
|
merge = MergePeople(db,person1,person2)
|
||||||
|
@ -273,7 +273,7 @@ class BasePage:
|
|||||||
value = time.strftime(format,time.localtime(time.time()))
|
value = time.strftime(format,time.localtime(time.time()))
|
||||||
|
|
||||||
msg = _('Generated by <a href="http://gramps-project.org">'
|
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('<div class="navbyline">%s</div>\n' % msg)
|
||||||
of.write('<h1 class="navtitle">%s</h1>\n' % self.title_str)
|
of.write('<h1 class="navtitle">%s</h1>\n' % self.title_str)
|
||||||
@ -754,8 +754,8 @@ class MediaPage(BasePage):
|
|||||||
of.write('<div class="img_navbar">')
|
of.write('<div class="img_navbar">')
|
||||||
if prev:
|
if prev:
|
||||||
self.media_ref_link(of,prev,_('Previous'),True)
|
self.media_ref_link(of,prev,_('Previous'),True)
|
||||||
data = _('%(page_number)d of %(total_pages)d' % {
|
data = _('%(page_number)d of %(total_pages)d' ) % {
|
||||||
'page_number' : page_number, 'total_pages' : total_pages })
|
'page_number' : page_number, 'total_pages' : total_pages }
|
||||||
of.write(' %s ' % data)
|
of.write(' %s ' % data)
|
||||||
if next:
|
if next:
|
||||||
self.media_ref_link(of,next,_('Next'),True)
|
self.media_ref_link(of,next,_('Next'),True)
|
||||||
@ -978,8 +978,8 @@ class SourcesPage(BasePage):
|
|||||||
handle_list = list(handle_set)
|
handle_list = list(handle_set)
|
||||||
|
|
||||||
msg = _("This page contains an index of all the sources in the "
|
msg = _("This page contains an index of all the sources in the "
|
||||||
"database, sorted by their title. Clicking on a sources's "
|
"database, sorted by their title. Clicking on a source's "
|
||||||
"title will take you to that sources's page.")
|
"title will take you to that source's page.")
|
||||||
|
|
||||||
of.write('<h3>%s</h3>\n<p>' % _('Sources'))
|
of.write('<h3>%s</h3>\n<p>' % _('Sources'))
|
||||||
of.write(msg)
|
of.write(msg)
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user