Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change English spellings to American spellings

Browse Source 
svn: r19487
This commit is contained in:
Nick Hall 2012-05-10 18:52:03 +00:00
parent 9369f01ffe
commit dd370f44b5
11 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gen/plug/docgen/graphdoc.py
View File

@ -193,7 +193,7 @@ class GVOptions():
aspect_ratio = EnumeratedListOption(_("Aspect ratio"), "fill")
for item in _RATIO:
aspect_ratio.add_item(item["value"], item["name"])
aspect_ratio.set_help(_("Affects greatly how the graph is layed out "
aspect_ratio.set_help(_("Affects greatly how the graph is laid out "
"on the page."))
menu.add_option(category, "ratio", aspect_ratio)

2
src/gui/configure.py
View File

@ -501,7 +501,7 @@ class GrampsPreferences(ConfigureDialog):
0, 'preferences.family-warn')
self.add_checkbox(
table, _('Suppress warning when cancelling with changed data.'),
table, _('Suppress warning when canceling with changed data.'),
1, 'interface.dont-ask')
self.add_checkbox(

4
src/gui/plug/_guioptions.py
View File

@ -1437,7 +1437,7 @@ class GuiSurnameColorOption(gtk.HBox):
self.__tree_view.set_size_request(150, 150)
self.__tree_view.connect('row-activated', self.__row_clicked)
col1 = gtk.TreeViewColumn(_('Surname'), gtk.CellRendererText(), text=0)
col2 = gtk.TreeViewColumn(_('Colour'), gtk.CellRendererText(), text=1)
col2 = gtk.TreeViewColumn(_('Color'), gtk.CellRendererText(), text=1)
col1.set_resizable(True)
col2.set_resizable(True)
col1.set_sort_column_id(0)
@ -1505,7 +1505,7 @@ class GuiSurnameColorOption(gtk.HBox):
surname = self.__model.get_value(i, 0)
colour = gtk.gdk.color_parse(self.__model.get_value(i, 1))
title = 'Select colour for %s' % surname
title = _('Select color for %s') % surname
colour_dialog = gtk.ColorSelectionDialog(title)
colorsel = colour_dialog.colorsel
colorsel.set_current_color(colour)

2
src/gui/utils.py
View File

@ -222,7 +222,7 @@ class ProgressMeter(object):
Default cancel handler (if enabled).
"""
self.__cancel_button.set_sensitive(False)
self.__lbl.set_label(_("Cancelling..."))
self.__lbl.set_label(_("Canceling..."))
self.__cancelled = True
def get_cancelled(self):

2
src/plugins/gramplet/EditExifMetadata.py
View File

@ -170,7 +170,7 @@ _TOOLTIPS = {
"MediaTitle" : _("Warning: Changing this entry will update the Media "
"object title field in Gramps not Exiv2 metadata."),
"Description" : _("Provide a short descripion for this image."),
"Description" : _("Provide a short description for this image."),
"Artist" : _("Enter the Artist/ Author of this image. The person's name or "
"the company who is responsible for the creation of this image."),

18
src/plugins/graph/GVFamilyLines.py
View File

@ -69,8 +69,8 @@ from gen.display.name import displayer as name_displayer
#
#------------------------------------------------------------------------
_COLORS = [ { 'name' : _("B&W outline"), 'value' : "outline" },
{ 'name' : _("Coloured outline"), 'value' : "colored" },
{ 'name' : _("Colour fill"), 'value' : "filled" }]
{ 'name' : _("Colored outline"), 'value' : "colored" },
{ 'name' : _("Color fill"), 'value' : "filled" }]
#------------------------------------------------------------------------
#
@ -137,11 +137,11 @@ class FamilyLinesOptions(MenuReportOptions):
add_option('removeextra', remove_extra_people)
# ----------------------------
add_option = partial(menu.add_option, _('Family Colours'))
add_option = partial(menu.add_option, _('Family Colors'))
# ----------------------------
surname_color = SurnameColorOption(_('Family colours'))
surname_color.set_help(_('Colours to use for various family lines.'))
surname_color = SurnameColorOption(_('Family colors'))
surname_color.set_help(_('Colors to use for various family lines.'))
add_option('surnamecolors', surname_color)
# -------------------------
@ -149,20 +149,20 @@ class FamilyLinesOptions(MenuReportOptions):
# -------------------------
color_males = ColorOption(_('Males'), '#e0e0ff')
color_males.set_help(_('The colour to use to display men.'))
color_males.set_help(_('The color to use to display men.'))
add_option('colormales', color_males)
color_females = ColorOption(_('Females'), '#ffe0e0')
color_females.set_help(_('The colour to use to display women.'))
color_females.set_help(_('The color to use to display women.'))
add_option('colorfemales', color_females)
color_unknown = ColorOption(_('Unknown'), '#e0e0e0')
color_unknown.set_help(_('The colour to use '
color_unknown.set_help(_('The color to use '
'when the gender is unknown.'))
add_option('colorunknown', color_unknown)
color_family = ColorOption(_('Families'), '#ffffe0')
color_family.set_help(_('The colour to use to display families.'))
color_family.set_help(_('The color to use to display families.'))
add_option('colorfamilies', color_family)
self.limit_parents = BooleanOption(_('Limit the number of ancestors'),

8
src/plugins/graph/GVRelGraph.py
View File

@ -545,21 +545,21 @@ class RelGraphOptions(MenuReportOptions):
add_option("color", color)
color_males = ColorOption(_('Males'), '#e0e0ff')
color_males.set_help(_('The colour to use to display men.'))
color_males.set_help(_('The color to use to display men.'))
add_option('colormales', color_males)
color_females = ColorOption(_('Females'), '#ffe0e0')
color_females.set_help(_('The colour to use to display women.'))
color_females.set_help(_('The color to use to display women.'))
add_option('colorfemales', color_females)
color_unknown = ColorOption(_('Unknown'), '#e0e0e0')
color_unknown.set_help(
_('The colour to use when the gender is unknown.')
_('The color to use when the gender is unknown.')
)
add_option('colorunknown', color_unknown)
color_family = ColorOption(_('Families'), '#ffffe0')
color_family.set_help(_('The colour to use to display families.'))
color_family.set_help(_('The color to use to display families.'))
add_option('colorfamilies', color_family)
arrow = EnumeratedListOption(_("Arrowhead direction"), 'd')

2
src/plugins/lib/libgedcom.py
View File

@ -2823,7 +2823,7 @@ class GedcomParser(UpdateCallback):
@param state: The current state
@type state: CurrentState
"""
self.__add_msg(_("Tag recognised but not supported"), line, state)
self.__add_msg(_("Tag recognized but not supported"), line, state)
self.__skip_subordinate_levels(state.level+1, state)
def __not_recognized(self, line, level, state):

124
src/plugins/lib/libnarrate.py
View File

@ -581,135 +581,135 @@ buried_no_date_no_place = {
}
#------------------------------------------------------------------------
#
# Baptised strings
# Baptized strings
#
#------------------------------------------------------------------------
baptised_full_date_place = {
Person.MALE: [
_("%(male_name)s was baptised on %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
_("He was baptised on %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
_("%(male_name)s was baptized on %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
_("He was baptized on %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
],
Person.FEMALE: [
_("%(female_name)s was baptised on %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
_("She was baptised on %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
_("%(female_name)s was baptized on %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
_("She was baptized on %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
],
Person.UNKNOWN: [
_("%(unknown_gender_name)s was baptised on %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
_("This person was baptised on %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
_("%(unknown_gender_name)s was baptized on %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
_("This person was baptized on %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
],
'succinct' : _("Baptised %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
'succinct' : _("Baptized %(baptism_date)s in %(baptism_place)s%(endnotes)s."),
}
baptised_full_date_no_place = {
Person.MALE: [
_("%(male_name)s was baptised on %(baptism_date)s%(endnotes)s."),
_("He was baptised on %(baptism_date)s%(endnotes)s."),
_("%(male_name)s was baptized on %(baptism_date)s%(endnotes)s."),
_("He was baptized on %(baptism_date)s%(endnotes)s."),
],
Person.FEMALE: [
_("%(female_name)s was baptised on %(baptism_date)s%(endnotes)s."),
_("She was baptised on %(baptism_date)s%(endnotes)s."),
_("%(female_name)s was baptized on %(baptism_date)s%(endnotes)s."),
_("She was baptized on %(baptism_date)s%(endnotes)s."),
],
Person.UNKNOWN: [
_("%(unknown_gender_name)s was baptised on %(baptism_date)s%(endnotes)s."),
_("This person was baptised on %(baptism_date)s%(endnotes)s."),
_("%(unknown_gender_name)s was baptized on %(baptism_date)s%(endnotes)s."),
_("This person was baptized on %(baptism_date)s%(endnotes)s."),
],
'succinct' : _("Baptised %(baptism_date)s%(endnotes)s.")
'succinct' : _("Baptized %(baptism_date)s%(endnotes)s.")
}
baptised_partial_date_place = {
Person.MALE: [
_("%(male_name)s was baptised in %(month_year)s in %(baptism_place)s%(endnotes)s."),
_("He was baptised in %(month_year)s in %(baptism_place)s%(endnotes)s."),
_("%(male_name)s was baptized in %(month_year)s in %(baptism_place)s%(endnotes)s."),
_("He was baptized in %(month_year)s in %(baptism_place)s%(endnotes)s."),
],
Person.FEMALE: [
_("%(female_name)s was baptised in %(month_year)s in %(baptism_place)s%(endnotes)s."),
_("She was baptised in %(month_year)s in %(baptism_place)s%(endnotes)s."),
_("%(female_name)s was baptized in %(month_year)s in %(baptism_place)s%(endnotes)s."),
_("She was baptized in %(month_year)s in %(baptism_place)s%(endnotes)s."),
],
Person.UNKNOWN: [
_("%(unknown_gender_name)s was baptised in %(month_year)s in %(baptism_place)s%(endnotes)s."),
_("This person was baptised in %(month_year)s in %(baptism_place)s%(endnotes)s."),
_("%(unknown_gender_name)s was baptized in %(month_year)s in %(baptism_place)s%(endnotes)s."),
_("This person was baptized in %(month_year)s in %(baptism_place)s%(endnotes)s."),
],
'succinct' : _("Baptised %(month_year)s in %(baptism_place)s%(endnotes)s."),
'succinct' : _("Baptized %(month_year)s in %(baptism_place)s%(endnotes)s."),
}
baptised_partial_date_no_place = {
Person.MALE: [
_("%(male_name)s was baptised in %(month_year)s%(endnotes)s."),
_("He was baptised in %(month_year)s%(endnotes)s."),
_("%(male_name)s was baptized in %(month_year)s%(endnotes)s."),
_("He was baptized in %(month_year)s%(endnotes)s."),
],
Person.FEMALE: [
_("%(female_name)s was baptised in %(month_year)s%(endnotes)s."),
_("She was baptised in %(month_year)s%(endnotes)s."),
_("%(female_name)s was baptized in %(month_year)s%(endnotes)s."),
_("She was baptized in %(month_year)s%(endnotes)s."),
],
Person.UNKNOWN: [
_("%(unknown_gender_name)s was baptised in %(month_year)s%(endnotes)s."),
_("This person was baptised in %(month_year)s%(endnotes)s."),
_("%(unknown_gender_name)s was baptized in %(month_year)s%(endnotes)s."),
_("This person was baptized in %(month_year)s%(endnotes)s."),
],
'succinct' : _("Baptised %(month_year)s%(endnotes)s."),
'succinct' : _("Baptized %(month_year)s%(endnotes)s."),
}
baptised_modified_date_place = {
Person.MALE: [
_("%(male_name)s was baptised %(modified_date)s in %(baptism_place)s%(endnotes)s."),
_("He was baptised %(modified_date)s in %(baptism_place)s%(endnotes)s."),
_("%(male_name)s was baptized %(modified_date)s in %(baptism_place)s%(endnotes)s."),
_("He was baptized %(modified_date)s in %(baptism_place)s%(endnotes)s."),
],
Person.FEMALE: [
_("%(female_name)s was baptised %(modified_date)s in %(baptism_place)s%(endnotes)s."),
_("She was baptised %(modified_date)s in %(baptism_place)s%(endnotes)s."),
_("%(female_name)s was baptized %(modified_date)s in %(baptism_place)s%(endnotes)s."),
_("She was baptized %(modified_date)s in %(baptism_place)s%(endnotes)s."),
],
Person.UNKNOWN: [
_("%(unknown_gender_name)s was baptised %(modified_date)s in %(baptism_place)s%(endnotes)s."),
_("This person was baptised %(modified_date)s in %(baptism_place)s%(endnotes)s."),
_("%(unknown_gender_name)s was baptized %(modified_date)s in %(baptism_place)s%(endnotes)s."),
_("This person was baptized %(modified_date)s in %(baptism_place)s%(endnotes)s."),
],
'succinct' : _("Baptised %(modified_date)s in %(baptism_place)s%(endnotes)s."),
'succinct' : _("Baptized %(modified_date)s in %(baptism_place)s%(endnotes)s."),
}
baptised_modified_date_no_place = {
Person.MALE: [
_("%(male_name)s was baptised %(modified_date)s%(endnotes)s."),
_("He was baptised %(modified_date)s%(endnotes)s."),
_("%(male_name)s was baptized %(modified_date)s%(endnotes)s."),
_("He was baptized %(modified_date)s%(endnotes)s."),
],
Person.FEMALE: [
_("%(female_name)s was baptised %(modified_date)s%(endnotes)s."),
_("She was baptised %(modified_date)s%(endnotes)s."),
_("%(female_name)s was baptized %(modified_date)s%(endnotes)s."),
_("She was baptized %(modified_date)s%(endnotes)s."),
],
Person.UNKNOWN: [
_("%(unknown_gender_name)s was baptised %(modified_date)s%(endnotes)s."),
_("This person was baptised %(modified_date)s%(endnotes)s."),
_("%(unknown_gender_name)s was baptized %(modified_date)s%(endnotes)s."),
_("This person was baptized %(modified_date)s%(endnotes)s."),
],
'succinct' : _("Baptised %(modified_date)s%(endnotes)s."),
'succinct' : _("Baptized %(modified_date)s%(endnotes)s."),
}
baptised_no_date_place = {
Person.MALE : [
_("%(male_name)s was baptised in %(baptism_place)s%(endnotes)s."),
_("He was baptised in %(baptism_place)s%(endnotes)s."),
_("%(male_name)s was baptized in %(baptism_place)s%(endnotes)s."),
_("He was baptized in %(baptism_place)s%(endnotes)s."),
],
Person.FEMALE : [
_("%(female_name)s was baptised in %(baptism_place)s%(endnotes)s."),
_("She was baptised in %(baptism_place)s%(endnotes)s."),
_("%(female_name)s was baptized in %(baptism_place)s%(endnotes)s."),
_("She was baptized in %(baptism_place)s%(endnotes)s."),
],
Person.UNKNOWN : [
_("%(unknown_gender_name)s was baptised in %(baptism_place)s%(endnotes)s."),
_("This person was baptised in %(baptism_place)s%(endnotes)s."),
_("%(unknown_gender_name)s was baptized in %(baptism_place)s%(endnotes)s."),
_("This person was baptized in %(baptism_place)s%(endnotes)s."),
],
'succinct' : _("Baptised in %(baptism_place)s%(endnotes)s."),
'succinct' : _("Baptized in %(baptism_place)s%(endnotes)s."),
}
baptised_no_date_no_place = {
Person.MALE : [
_("%(male_name)s was baptised%(endnotes)s."),
_("He was baptised%(endnotes)s."),
_("%(male_name)s was baptized%(endnotes)s."),
_("He was baptized%(endnotes)s."),
],
Person.FEMALE : [
_("%(female_name)s was baptised%(endnotes)s."),
_("She was baptised%(endnotes)s."),
_("%(female_name)s was baptized%(endnotes)s."),
_("She was baptized%(endnotes)s."),
],
Person.UNKNOWN : [
_("%(unknown_gender_name)s was baptised%(endnotes)s."),
_("This person was baptised%(endnotes)s."),
_("%(unknown_gender_name)s was baptized%(endnotes)s."),
_("This person was baptized%(endnotes)s."),
],
'succinct' : _("Baptised%(endnotes)s."),
'succinct' : _("Baptized%(endnotes)s."),
}
#------------------------------------------------------------------------
@ -1740,11 +1740,11 @@ class Narrator(object):
"""
Get a string narrating the baptism of the subject.
Example sentences:
Person was baptised on Date.
Person was baptised on Date in Place.
Person was baptised in Month_Year.
Person was baptised in Month_Year in Place.
Person was baptised in Place.
Person was baptized on Date.
Person was baptized on Date in Place.
Person was baptized in Month_Year.
Person was baptized in Month_Year in Place.
Person was baptized in Place.
''
:returns: A sentence about the subject's baptism.

12
src/plugins/tool/Rebuild.py
View File

@ -22,7 +22,7 @@
# $Id$
"""Tools/Database Processing/Rebuild Secondary Indices"""
"""Tools/Database Processing/Rebuild Secondary Indexes"""
#-------------------------------------------------------------------------
#
@ -74,7 +74,7 @@ class Rebuild(tool.Tool, UpdateCallback):
self.callback = uistate.pulse_progressbar
uistate.set_busy_cursor(1)
uistate.progress.show()
uistate.push_message(dbstate, _("Rebuilding secondary indices..."))
uistate.push_message(dbstate, _("Rebuilding secondary indexes..."))
UpdateCallback.__init__(self, self.callback)
self.set_total(11)
@ -83,13 +83,13 @@ class Rebuild(tool.Tool, UpdateCallback):
uistate.set_busy_cursor(0)
uistate.progress.hide()
OkDialog(_("Secondary indices rebuilt"),
_('All secondary indices have been rebuilt.'),
OkDialog(_("Secondary indexes rebuilt"),
_('All secondary indexes have been rebuilt.'),
parent=uistate.window)
else:
print "Rebuilding Secondary Indices..."
print "Rebuilding Secondary Indexes..."
self.db.rebuild_secondary(self.update_empty)
print "All secondary indices have been rebuilt."
print "All secondary indexes have been rebuilt."
self.db.enable_signals()

4
src/plugins/tool/tools.gpr.py
View File

@ -349,8 +349,8 @@ tool_modes = [TOOL_MODE_GUI]
register(TOOL,
id = 'rebuild',
name = _("Rebuild Secondary Indices"),
description = _("Rebuilds secondary indices"),
name = _("Rebuild Secondary Indexes"),
description = _("Rebuilds secondary indexes"),
version = '1.0',
gramps_target_version = '3.5',
status = STABLE,