Third update for consistent use of Gramps. See issue 3355.

svn: r13633
This commit is contained in:
Peter Landgren 2009-11-19 17:32:11 +00:00
parent 22b476be8a
commit 0b711b211c
18 changed files with 76 additions and 68 deletions

View File

@ -322,10 +322,10 @@ if __name__ == "__main__":
a = Assistant(complete)
a.add_text_page('Getting started',
'Welcome to GRAMPS, the Genealogical Research '
'Welcome to Gramps, the Genealogical Research '
'and Analysis Management Programming System.\n'
'Several options and information need to be gathered '
'before GRAMPS is ready to be used. Any of this '
'before Gramps is ready to be used. Any of this '
'information can be changed in the future in the '
'Preferences dialog under the Settings menu.')

View File

@ -561,7 +561,7 @@ def set_titles(window, title, text, msg=None):
title.set_text('<span weight="bold" size="larger">%s</span>' % text)
title.set_use_markup(True)
if msg:
window.set_title('%s - GRAMPS' % msg)
window.set_title('%s - Gramps' % msg)
else:
window.set_title('%s - GRAMPS' % text)
window.set_title('%s - Gramps' % text)
window.set_icon_from_file(const.ICON)

View File

@ -24,10 +24,10 @@ import gtk
from gettext import gettext as _
_type_map = {
'application/x-gramps' : 'GRAMPS database',
'application/x-gramps-xml' : 'GRAMPS XML database',
'application/x-gramps' : 'Gramps database',
'application/x-gramps-xml' : 'Gramps XML database',
'application/x-gedcom' : 'GEDCOM database',
'application/x-gramps-package': 'GRAMPS package',
'application/x-gramps-package': 'Gramps package',
'image/jpeg' : 'JPEG image',
'application/pdf' : 'PDF document',
'text/rtf' : 'Rich Text File',
@ -36,7 +36,7 @@ _type_map = {
mimetypes.add_type('application/x-gramps','.grdb')
mimetypes.add_type('application/x-gramps','.GRDB')
mimetypes.add_type('application/x-gramps-xml','.gramps')
mimetypes.add_type('application/x-gramps-xml','.GRAMPS')
mimetypes.add_type('application/x-gramps-xml','.Gramps')
mimetypes.add_type('application/x-gedcom','.ged')
mimetypes.add_type('application/x-gedcom','.GED')
mimetypes.add_type('application/x-gramps-package','.gpkg')

View File

@ -55,7 +55,7 @@ class SaveDialog(object):
self.top = self.xml.toplevel
self.top.set_icon(ICON)
self.top.set_title("%s - GRAMPS" % msg1)
self.top.set_title("%s - Gramps" % msg1)
self.dontask = self.xml.get_object('dontask')
self.task1 = task1
@ -86,7 +86,7 @@ class QuestionDialog(object):
self.top = self.xml.toplevel
self.top.set_icon(ICON)
self.top.set_title("%s - GRAMPS" % msg1)
self.top.set_title("%s - Gramps" % msg1)
label1 = self.xml.get_object('qd_label1')
label1.set_text('<span weight="bold" size="larger">%s</span>' % msg1)
@ -112,7 +112,7 @@ class QuestionDialog2(object):
self.top = self.xml.toplevel
self.top.set_icon(ICON)
self.top.set_title("%s - GRAMPS" % msg1)
self.top.set_title("%s - Gramps" % msg1)
label1 = self.xml.get_object('qd_label1')
label1.set_text('<span weight="bold" size="larger">%s</span>' % msg1)
@ -142,7 +142,7 @@ class OptionDialog(object):
self.top = self.xml.toplevel
self.top.set_icon(ICON)
self.top.set_title("%s - GRAMPS" % msg1)
self.top.set_title("%s - Gramps" % msg1)
label1 = self.xml.get_object('od_label1')
label1.set_text('<span weight="bold" size="larger">%s</span>' % msg1)
@ -179,7 +179,7 @@ class ErrorDialog(gtk.MessageDialog):
self.set_markup('<span weight="bold" size="larger">%s</span>' % msg1)
self.format_secondary_text(msg2)
self.set_icon(ICON)
self.set_title("%s - GRAMPS" % msg1)
self.set_title("%s - Gramps" % msg1)
self.show()
self.run()
self.destroy()
@ -215,7 +215,7 @@ class WarningDialog(gtk.MessageDialog):
self.set_markup('<span weight="bold" size="larger">%s</span>' % msg1)
self.format_secondary_markup(msg2)
self.set_icon(ICON)
self.set_title("%s - GRAMPS" % msg1)
self.set_title("%s - Gramps" % msg1)
self.show()
self.run()
self.destroy()
@ -230,7 +230,7 @@ class OkDialog(gtk.MessageDialog):
self.set_markup('<span weight="bold" size="larger">%s</span>' % msg1)
self.format_secondary_text(msg2)
self.set_icon(ICON)
self.set_title("%s - GRAMPS" % msg1)
self.set_title("%s - Gramps" % msg1)
self.show()
self.run()
self.destroy()
@ -244,7 +244,7 @@ class InfoDialog(object):
self.top = self.xml.toplevel
self.top.set_icon(ICON)
self.top.set_title("%s - GRAMPS" % msg1)
self.top.set_title("%s - Gramps" % msg1)
label = self.xml.get_object('toplabel')
label.set_text('<span weight="bold" size="larger">%s</span>' % msg1)
@ -271,7 +271,7 @@ class MissingMediaDialog(object):
self.top = self.xml.toplevel
self.top.set_icon(ICON)
self.top.set_title("%s - GRAMPS" % msg1)
self.top.set_title("%s - Gramps" % msg1)
self.task1 = task1
self.task2 = task2
@ -326,7 +326,7 @@ class MessageHideDialog(object):
self.top = self.xml.toplevel
self.top.set_icon(ICON)
self.top.set_title("%s - GRAMPS" % title)
self.top.set_title("%s - Gramps" % title)
dont_show = self.xml.get_object('dont_show')
dont_show.set_active(config.get(key))

View File

@ -122,7 +122,7 @@ class ReportDialog(ManagedWindow.ManagedWindow):
self.style_name = self.options.handler.get_default_stylesheet_name()
window = gtk.Dialog('GRAMPS')
window = gtk.Dialog('Gramps')
self.set_window(window, None, self.get_title())
self.window.set_has_separator(False)
self.window.set_modal(True)
@ -177,7 +177,7 @@ class ReportDialog(ManagedWindow.ManagedWindow):
"""The window title for this dialog"""
name = self.report_name
category = standalone_categories[self.category]
return "%s - %s - GRAMPS" % (name, category)
return "%s - %s - Gramps" % (name, category)
#------------------------------------------------------------------------
#

View File

@ -54,6 +54,14 @@ else:
LOCALEDOMAIN = 'gramps'
import gtk
try:
if gtk.ver <= (2, 20, 0):
import gtk.glade
gtk.glade.bindtextdomain(LOCALEDOMAIN, LOCALEDIR)
except:
pass
#-------------------------------------------------------------------------
#
# Public Functions

View File

@ -291,7 +291,7 @@ class ArgHandler(object):
sys.exit(0)
if self.list_more:
print 'GRAMPS Family Trees:'
print 'Gramps Family Trees:'
summary_list = self.dbman.family_tree_summary()
for summary in summary_list:
print "Family Tree \"%s\":" % summary["Family tree"]

View File

@ -155,11 +155,11 @@ else:
# About box information
#
#-------------------------------------------------------------------------
PROGRAM_NAME = "GRAMPS"
PROGRAM_NAME = "Gramps"
VERSION = "@VERSIONSTRING@"
COPYRIGHT_MSG = u"\u00A9 2001-2006 Donald N. Allingham\n" \
u"\u00A9 2007-2009 The GRAMPS Developers"
COMMENTS = _("GRAMPS (Genealogical Research and Analysis "
u"\u00A9 2007-2009 The Gramps Developers"
COMMENTS = _("Gramps (Genealogical Research and Analysis "
"Management Programming System) is a personal "
"genealogy program.")
AUTHORS = [

View File

@ -8,7 +8,7 @@
{% block meta %}
<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="generator" content="GRAMPS 3.2.0-0.SVN12859M http://gramps-project.org/" />
<meta name="generator" content="Gramps 3.2.0-0.SVN12859M http://gramps-project.org/" />
<meta name="author" content="" />
{% endblock %}
<link href="/images/favicon2.ico" type="image/x-icon" rel="shortcut icon" />

View File

@ -7,7 +7,7 @@
<p> &nbsp; </p>
<p id="description">Welcome to GRAMPS Connect, a new web-based collaboration tool.
<p id="description">Welcome to Gramps Connect, a new web-based collaboration tool.
{% if user.is_authenticated %}
You are now logged in

View File

@ -1,7 +1,7 @@
{% extends "gramps-base.html" %}
{% block title %}GRAMPS Connect - login {% endblock %}
{% block heading %}GRAMPS - login {% endblock %}
{% block title %}Gramps Connect - login {% endblock %}
{% block heading %}Gramps - login {% endblock %}
{% block content %}
<h2>User Login</h2>

View File

@ -808,7 +808,7 @@ def check_in(dbase, filename, callback, cursor_func = None):
"""
Checks in the specified file into RCS
"""
init = [ "rcs", '-x,v', '-i', '-U', '-q', '-t-"GRAMPS database"' ]
init = [ "rcs", '-x,v', '-i', '-U', '-q', '-t-"Gramps database"' ]
ci_cmd = [ "ci", '-x,v', "-q", "-f" ]
archive_name = filename + ",v"

View File

@ -122,7 +122,7 @@ QUALITY_MAP = {
#-------------------------------------------------------------------------
def sort_by_gramps_id(first, second):
"""
Sort objects by their GRAMPS ID.
Sort objects by their Gramps ID.
"""
return cmp(first.gramps_id, second.gramps_id)
@ -133,7 +133,7 @@ def sort_by_gramps_id(first, second):
#-------------------------------------------------------------------------
def sort_handles_by_id(handle_list, handle_to_object):
"""
Sort a list of handles by the GRAMPS ID.
Sort a list of handles by the Gramps ID.
The function that returns the object from the handle needs to be supplied
so that we get the right object.
@ -380,9 +380,9 @@ class GedcomWriter(BasicUtils.UpdateCallback):
rname = self.dbase.get_researcher().get_name()
self.__writeln(0, "HEAD")
self.__writeln(1, "SOUR", "GRAMPS")
self.__writeln(1, "SOUR", "Gramps")
self.__writeln(2, "VERS", const.VERSION)
self.__writeln(2, "NAME", "GRAMPS")
self.__writeln(2, "NAME", "Gramps")
self.__writeln(1, "DATE", date_str)
self.__writeln(2, "TIME", time_str)
self.__writeln(1, "SUBM", "@SUBM@")
@ -537,7 +537,7 @@ class GedcomWriter(BasicUtils.UpdateCallback):
"""
Write out the list of note handles to the current level.
We use the GRAMPS ID as the XREF for the GEDCOM file.
We use the Gramps ID as the XREF for the GEDCOM file.
"""
for note_handle in notelist:
@ -747,7 +747,7 @@ class GedcomWriter(BasicUtils.UpdateCallback):
def __child_families(self, person):
"""
Write the GRAMPS ID as the XREF for each family in which the person
Write the Gramps ID as the XREF for each family in which the person
is listed as a child.
"""
@ -760,7 +760,7 @@ class GedcomWriter(BasicUtils.UpdateCallback):
def __parent_families(self, person):
"""
Write the GRAMPS ID as the XREF for each family in which the person
Write the Gramps ID as the XREF for each family in which the person
is listed as a parent.
"""
@ -797,7 +797,7 @@ class GedcomWriter(BasicUtils.UpdateCallback):
def __families(self):
"""
Write out the list of families, sorting by GRAMPS ID.
Write out the list of families, sorting by Gramps ID.
"""
self.reset(_("Writing families"))
self.progress_cnt += 1
@ -857,7 +857,7 @@ class GedcomWriter(BasicUtils.UpdateCallback):
"""
Write the family reference to the file.
This is either 'WIFE' or 'HUSB'. As usual, we use the GRAMPS ID as the
This is either 'WIFE' or 'HUSB'. As usual, we use the Gramps ID as the
XREF value.
"""
@ -951,7 +951,7 @@ class GedcomWriter(BasicUtils.UpdateCallback):
def __sources(self):
"""
Write out the list of sources, sorting by GRAMPS ID.
Write out the list of sources, sorting by Gramps ID.
"""
self.reset(_("Writing sources"))
self.progress_cnt += 1
@ -985,7 +985,7 @@ class GedcomWriter(BasicUtils.UpdateCallback):
def __notes(self):
"""
Write out the list of notes, sorting by GRAMPS ID.
Write out the list of notes, sorting by Gramps ID.
"""
self.reset(_("Writing notes"))
self.progress_cnt += 1
@ -1012,7 +1012,7 @@ class GedcomWriter(BasicUtils.UpdateCallback):
def __repos(self):
"""
Write out the list of repositories, sorting by GRAMPS ID.
Write out the list of repositories, sorting by Gramps ID.
REPOSITORY_RECORD:=
n @<XREF:REPO>@ REPO {1:1}

View File

@ -26,7 +26,7 @@
"""
Contains the interface to allow a database to get written using
GRAMPS' XML file format.
Gramps' XML file format.
"""
#-------------------------------------------------------------------------
@ -52,7 +52,7 @@ log = logging.getLogger(".WriteXML")
#-------------------------------------------------------------------------
#
# load GRAMPS libraries
# load Gramps libraries
#
#-------------------------------------------------------------------------
import gen.lib
@ -200,7 +200,7 @@ class GrampsDbXmlWriter(UpdateCallback):
self.g.write('<?xml version="1.0" encoding="UTF-8"?>\n')
self.g.write('<!DOCTYPE database '
'PUBLIC "-//GRAMPS//DTD GRAMPS XML %s//EN"\n'
'PUBLIC "-//Gramps//DTD Gramps XML %s//EN"\n'
'"http://gramps-project.org/xml/%s/grampsxml.dtd">\n'
% (libgrampsxml.GRAMPS_XML_VERSION,
libgrampsxml.GRAMPS_XML_VERSION))

View File

@ -88,14 +88,14 @@ class HeadlineNewsGramplet(Gramplet):
self.limit = 5
# Description, Type, URL, Pretty URL for User
self.feeds = [
("GRAMPS Wiki Headline News", "wiki", (self.RAW % "HeadlineNews"), (self.URL % "HeadlineNews")),
("GRAMPS Blog Comments", "rss", "http://blog.gramps-project.org/?feed=comments-rss2", None),
("GRAMPS Blog Posts", "rss", "http://blog.gramps-project.org/?feed=rss", None),
("GRAMPS Wiki Changes", "rss", "http://www.gramps-project.org/wiki/index.php?title=Special:RecentChanges&feed=rss", None),
("GRAMPS Bugtracker Issues", "rss", "http://www.gramps-project.org/bugs/issues_rss.php?key=ece7d21451d76337acf776c9a4384773", None),
("GRAMPS SVN Commits", "rss", "http://cia.vc/stats/project/Gramps/.rss", None),
("Gramps Wiki Headline News", "wiki", (self.RAW % "HeadlineNews"), (self.URL % "HeadlineNews")),
("Gramps Blog Comments", "rss", "http://blog.gramps-project.org/?feed=comments-rss2", None),
("Gramps Blog Posts", "rss", "http://blog.gramps-project.org/?feed=rss", None),
("Gramps Wiki Changes", "rss", "http://www.gramps-project.org/wiki/index.php?title=Special:RecentChanges&feed=rss", None),
("Gramps Bugtracker Issues", "rss", "http://www.gramps-project.org/bugs/issues_rss.php?key=ece7d21451d76337acf776c9a4384773", None),
("Gramps SVN Commits", "rss", "http://cia.vc/stats/project/Gramps/.rss", None),
]
self.set_tooltip(_("Read GRAMPS headline news"))
self.set_tooltip(_("Read Gramps headline news"))
self.update_interval = 3600 * 1000 # in miliseconds (1 hour)
self.set_use_markup(True)
self.set_wrap(False)
@ -111,7 +111,7 @@ class HeadlineNewsGramplet(Gramplet):
return True # keep updating!
def main(self):
self.set_text("Loading GRAMPS Headline News...\n")
self.set_text("Loading Gramps Headline News...\n")
fresh = True
yield True
for (feed_description, feed_type, feed_url, pretty_url) in self.feeds:
@ -218,7 +218,7 @@ class HeadlineNewsGramplet(Gramplet):
if "|" in page:
template, heading, body = page.split("|", 2)
if template.lower() == "release":
newtext = "GRAMPS " + heading + " released.\n\n"
newtext = "Gramps " + heading + " released.\n\n"
else:
#newtext = "<B>%s</B>\n\n" % heading
newtext = ""

View File

@ -535,7 +535,7 @@ class CheckIntegrity(object):
else:
self.bad_photo.append(ObjectId)
fs_top = gtk.FileChooserDialog("%s - GRAMPS" % _("Select file"),
fs_top = gtk.FileChooserDialog("%s - Gramps" % _("Select file"),
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
gtk.STOCK_OK, gtk.RESPONSE_OK)
)

View File

@ -120,7 +120,7 @@ class TestcaseGenerator(Tool.BatchTool):
self.run_tool(cli=True)
def init_gui(self,uistate):
title = "%s - GRAMPS" % _("Generate testcases")
title = "%s - Gramps" % _("Generate testcases")
self.top = gtk.Dialog(title)
self.top.set_default_size(400,150)
self.top.set_has_separator(False)
@ -193,7 +193,7 @@ class TestcaseGenerator(Tool.BatchTool):
def run_tool(self, cli=False):
self.cli = cli
if( not cli):
title = "%s - GRAMPS" % _("Generate testcases")
title = "%s - Gramps" % _("Generate testcases")
self.top = gtk.Window()
self.top.set_title(title)
self.top.set_position(gtk.WIN_POS_MOUSE)

View File

@ -23,7 +23,7 @@
#------------------------------------------------------------------------
#
# default views of GRAMPS
# default views of Gramps
#
#------------------------------------------------------------------------
@ -34,7 +34,7 @@ description = _("The view showing all the events"),
version = '1.0',
status = STABLE,
fname = 'eventview.py',
authors = [u"The GRAMPS project"],
authors = [u"The Gramps project"],
authors_email = ["http://gramps-project.org"],
category = VIEW_EVENT,
viewclass = 'EventView',
@ -48,7 +48,7 @@ description = _("The view showing all families"),
version = '1.0',
status = STABLE,
fname = 'familyview.py',
authors = [u"The GRAMPS project"],
authors = [u"The Gramps project"],
authors_email = ["http://gramps-project.org"],
category = VIEW_FAMILY,
viewclass = 'FamilyView',
@ -62,7 +62,7 @@ description = _("The view allowing to see Gramplets"),
version = '1.0',
status = STABLE,
fname = 'grampletview.py',
authors = [u"The GRAMPS project"],
authors = [u"The Gramps project"],
authors_email = ["http://gramps-project.org"],
category = VIEW_MISC,
viewclass = 'GrampletView',
@ -76,7 +76,7 @@ description = _("The view showing all the media objects"),
version = '1.0',
status = STABLE,
fname = 'mediaview.py',
authors = [u"The GRAMPS project"],
authors = [u"The Gramps project"],
authors_email = ["http://gramps-project.org"],
category = VIEW_MEDIA,
viewclass = 'MediaView',
@ -90,7 +90,7 @@ description = _("The view showing all the notes"),
version = '1.0',
status = STABLE,
fname = 'noteview.py',
authors = [u"The GRAMPS project"],
authors = [u"The Gramps project"],
authors_email = ["http://gramps-project.org"],
category = VIEW_NOTE,
viewclass = 'NoteView',
@ -104,7 +104,7 @@ description = _("The view showing all relationships of the selected person"),
version = '1.0',
status = STABLE,
fname = 'relview.py',
authors = [u"The GRAMPS project"],
authors = [u"The Gramps project"],
authors_email = ["http://gramps-project.org"],
category = VIEW_REL,
viewclass = 'RelationshipView',
@ -118,7 +118,7 @@ description = _("The view showing an ancestor pedigree of the selected person")
version = '1.0',
status = STABLE,
fname = 'pedigreeview.py',
authors = [u"The GRAMPS project"],
authors = [u"The Gramps project"],
authors_email = ["http://gramps-project.org"],
category = VIEW_PEDI,
viewclass = 'PedigreeView',
@ -131,7 +131,7 @@ description = _("The view showing all people in the family tree"),
version = '1.0',
status = STABLE,
fname = 'personview.py',
authors = [u"The GRAMPS project"],
authors = [u"The Gramps project"],
authors_email = ["http://gramps-project.org"],
category = VIEW_PERSON,
viewclass = 'PersonView',
@ -145,7 +145,7 @@ description = _("The view showing all the places of the family tree"),
version = '1.0',
status = STABLE,
fname = 'placeview.py',
authors = [u"The GRAMPS project"],
authors = [u"The Gramps project"],
authors_email = ["http://gramps-project.org"],
category = VIEW_PLACE,
viewclass = 'PlaceView',
@ -159,7 +159,7 @@ description = _("The view showing all the repositories"),
version = '1.0',
status = STABLE,
fname = 'repoview.py',
authors = [u"The GRAMPS project"],
authors = [u"The Gramps project"],
authors_email = ["http://gramps-project.org"],
category = VIEW_REPO,
viewclass = 'RepositoryView',
@ -173,7 +173,7 @@ description = _("The view showing all the sources"),
version = '1.0',
status = STABLE,
fname = 'sourceview.py',
authors = [u"The GRAMPS project"],
authors = [u"The Gramps project"],
authors_email = ["http://gramps-project.org"],
category = VIEW_SOURCE,
viewclass = 'SourceView',