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

Update for spelling of Family Tree.

Browse Source 
svn: r21938
This commit is contained in:
Peter Landgren 2013-04-10 09:34:27 +00:00
parent 3aaa4641d7
commit a71e8f5689
19 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gramps/cli/arghandler.py
View File

@ -218,7 +218,7 @@ class ArgHandler(object):
if not self.check_db(db_path, self.force_unlock):
sys.exit(0)
if create:
self.__error( _("Error: Family tree '%s' already exists.\n"
self.__error( _("Error: Family Tree '%s' already exists.\n"
"The '-C' option cannot be used.") % value)
sys.exit(0)
return db_path
@ -227,9 +227,9 @@ class ArgHandler(object):
db_path, title = self.dbman.create_new_db_cli(title=value)
return db_path
else:
self.__error( _('Error: Input family tree "%s" does not exist.\n'
self.__error( _('Error: Input Family Tree "%s" does not exist.\n'
"If GEDCOM, Gramps-xml or grdb, use the -i option "
"to import into a family tree instead.") % value)
"to import into a Family Tree instead.") % value)
sys.exit(0)
def __handle_import_option(self, value, family_tree_format):
@ -402,7 +402,7 @@ class ArgHandler(object):
"""
if self.list:
print(_('List of known family trees in your database path\n'))
print(_('List of known Family Trees in your database path\n'))
for name, dirname in sorted(self.dbman.family_tree_list(),
key=lambda pair: pair[0].lower()):
@ -415,10 +415,10 @@ class ArgHandler(object):
print(_('Gramps Family Trees:'))
summary_list = self.dbman.family_tree_summary()
for summary in sorted(summary_list,
key=lambda sum: sum["Family tree"].lower()):
print(_("Family Tree \"%s\":") % summary["Family tree"])
key=lambda sum: sum[_("Family Tree")].lower()):
print(_("Family Tree \"%s\":") % summary[_("Family Tree")])
for item in sorted(summary):
if item != "Family tree":
if item != "Family Tree":
print(" %s: %s" % (item, summary[item]))
sys.exit(0)
@ -427,15 +427,15 @@ class ArgHandler(object):
summary_list = self.dbman.family_tree_summary()
print(_("Family Tree"), end="")
for key in sorted(summary_list[0]):
if key != "Family tree":
if key != "Family Tree":
print("\t ", end="")
print(key, end="")
print()
for summary in sorted(summary_list,
key=lambda sum: sum[_("Family tree")].lower()):
print('"%s"' % summary["Family tree"], end="")
key=lambda sum: sum[_("Family Tree")].lower()):
print('"%s"' % summary[_("Family Tree")], end="")
for item in sorted(summary):
if item != _("Family tree"):
if item != _("Family Tree"):
print("\t ", end="")
print('"%s"' % summary[item], end="")
print()
@ -492,7 +492,7 @@ class ArgHandler(object):
try:
self.sm.open_activate(self.imp_db_path)
msg = _("Created empty family tree successfully")
msg = _("Created empty Family Tree successfully")
print(msg, file=sys.stderr)
except:
print(_("Error opening the file."), file=sys.stderr)

10
gramps/cli/argparser.py
View File

@ -63,18 +63,18 @@ Help options
--usage Display brief usage message
Application options
-O, --open=FAMILY_TREE Open family tree
-C, --create=FAMILY_TREE Create on open if new family tree
-O, --open=FAMILY_TREE Open Family Tree
-C, --create=FAMILY_TREE Create on open if new Family Tree
-i, --import=FILENAME Import file
-e, --export=FILENAME Export file
-f, --format=FORMAT Specify family tree format
-f, --format=FORMAT Specify Family Tree format
-a, --action=ACTION Specify action
-p, --options=OPTIONS_STRING Specify options
-d, --debug=LOGGER_NAME Enable debug logs
-l List Family Trees
-L List Family Trees in Detail
-t List Family Trees, tab delimited
-u, --force-unlock Force unlock of family tree
-u, --force-unlock Force unlock of Family Tree
-s, --show Show config settings
-c, --config=[config.setting[:value]] Set config setting(s) and start Gramps
-v, --version Show versions
@ -112,7 +112,7 @@ Use the name=timeline,show=all to find out about all available options for the t
To find out details of a particular option, use show=option_name , e.g. name=timeline,show=off string.
To learn about available report names, use name=show string.
9. To convert a family tree on the fly to a .gramps xml file:
9. To convert a Family Tree on the fly to a .gramps xml file:
gramps -O 'Family Tree 1' -e output.gramps -f gramps-xml
10. To generate a web site into an other locale (in german):

6
gramps/cli/clidbman.py
View File

@ -218,9 +218,9 @@ class CLIDbManager(object):
retval[_("Bsddb version")] = bsddb_version
retval[_("Schema version")] = schema_version
if sys.version_info[0] < 3:
retval[_("Family tree")] = name.encode(glocale.getfilesystemencoding())
retval[_("Family Tree")] = name.encode(glocale.getfilesystemencoding())
else:
retval[_("Family tree")] = name
retval[_("Family Tree")] = name
retval[_("Path")] = dirpath
retval[_("Last accessed")] = time.strftime('%x %X',
time.localtime(tval))
@ -412,7 +412,7 @@ class CLIDbManager(object):
name_file.write(new_text)
name_file.close()
except (OSError, IOError) as msg:
CLIDbManager.ERROR(_("Could not rename family tree"),
CLIDbManager.ERROR(_("Could not rename Family Tree"),
str(msg))
return None, None
return old_text, new_text

8
gramps/gen/db/exceptions.py
View File

@ -81,7 +81,7 @@ class DbVersionError(Exception):
def __str__(self):
return _("The schema version is not supported by this version of "
"Gramps.\n\n"
"This Family tree is schema version %(tree_vers)s, and this "
"This Family Tree is schema version %(tree_vers)s, and this "
"version of Gramps supports versions %(min_vers)s to "
"%(max_vers)s\n\n"
"Please upgrade to the corresponding version or use "
@ -102,14 +102,14 @@ class BsddbDowngradeError(Exception):
def __str__(self):
return _('Gramps stores its data in a Berkeley Database. '
'The family tree you try to load was created with version '
'The family Tree you try to load was created with version '
'%(env_version)s of the Berkeley DB. However, the Gramps '
'version in use right now employs version %(bdb_version)s '
'of the Berkeley DB. So you are trying to load data created '
'in a newer format into an older program; this is bound to '
'fail. The right approach in this case is to use XML export '
'and import. So try to open the family tree on that computer '
'with that software that created the family tree, export it '
'and import. So try to open the family Tree on that computer '
'with that software that created the Family Tree, export it '
'to XML and load that XML into the version of Gramps you '
'intend to use.') % {'env_version': self.env_version,
'bdb_version': self.bdb_version}

2
gramps/gen/relationship.py
View File

@ -859,7 +859,7 @@ class RelationshipCalculator(object):
del common[index]
#check for extra messages
if self.__maxDepthReached :
self.__msg += [_('Family tree reaches back more than the maximum '
self.__msg += [_('Family Tree reaches back more than the maximum '
'%d generations searched.\nIt is possible that '
'relationships have been missed') % (self.__max_depth)]

4
gramps/gui/configure.py
View File

@ -481,7 +481,7 @@ class GrampsPreferences(ConfigureDialog):
table.set_col_spacings(6)
table.set_row_spacings(6)
self.add_text(table, _('Enter your information so people can contact you when you'
' distribute your family tree'), 0, line_wrap=False)
' distribute your Family Tree'), 0, line_wrap=False)
self.add_entry(table, _('Name'), 1, 'researcher.researcher-name')
self.add_entry(table, _('Address'), 2, 'researcher.researcher-addr')
self.add_entry(table, _('Locality'), 3, 'researcher.researcher-locality')
@ -1287,7 +1287,7 @@ class GrampsPreferences(ConfigureDialog):
# _('Family Tree Database path'),
# 0, 'behavior.database-path')
self.add_checkbox(table,
_('Automatically load last family tree'),
_('Automatically load last Family Tree'),
1, 'behavior.autoload')
return _('Family Tree'), table

28
gramps/gui/dbman.py
View File

@ -279,7 +279,7 @@ class DbManager(CLIDbManager):
render.connect('edited', self.__change_name)
render.connect('editing-canceled', self.__stop_edit)
render.connect('editing-started', self.__start_edit)
self.column = Gtk.TreeViewColumn(_('Family tree name'), render,
self.column = Gtk.TreeViewColumn(_('Family Tree name'), render,
text=NAME_COL)
self.column.set_sort_column_id(NAME_COL)
self.column.set_sort_indicator(True)
@ -550,9 +550,9 @@ class DbManager(CLIDbManager):
if len(path.get_indices()) == 1:
QuestionDialog(
_("Remove the '%s' family tree?") % self.data_to_delete[0],
_("Removing this family tree will permanently destroy the data."),
_("Remove family tree"),
_("Remove the '%s' Family Tree?") % self.data_to_delete[0],
_("Removing this Family Tree will permanently destroy the data."),
_("Remove Family Tree"),
self.__really_delete_db)
else:
rev = self.data_to_delete[0]
@ -593,7 +593,7 @@ class DbManager(CLIDbManager):
os.unlink(os.path.join(top, filename))
os.rmdir(self.data_to_delete[1])
except (IOError, OSError) as msg:
DbManager.ERROR(_("Could not delete family tree"),
DbManager.ERROR(_("Could not delete Family Tree"),
str(msg))
# rebuild the display
self.__populate()
@ -646,26 +646,26 @@ class DbManager(CLIDbManager):
#First ask user if he is really sure :-)
yes_no = QuestionDialog2(
_("Repair family tree?"),
_("Repair Family Tree?"),
_(
"If you click <b>Proceed</b>, Gramps will attempt to recover your family tree"
"If you click <b>Proceed</b>, Gramps will attempt to recover your Family Tree"
" from the last good backup. There are several ways this can cause unwanted"
" effects, so <b>backup</b> the family tree first.\n"
"The Family tree you have selected is stored in %s.\n\n"
" effects, so <b>backup</b> the Family Tree first.\n"
"The Family Tree you have selected is stored in %s.\n\n"
"Before doing a repair, verify that the Family Tree can really no longer be "
" opened, as the database back-end can recover from some errors automatically.\n\n"
"<b>Details:</b> Repairing a Family Tree actually uses the last backup of"
" the Family Tree, which Gramps stored on last use. If you have worked for"
" several hours/days without closing Gramps, then all this information will"
" be lost! If the repair fails, then the original family tree will be lost"
" be lost! If the repair fails, then the original Family Tree will be lost"
" forever, hence a backup is needed. If the repair fails, or too much"
" information is lost, you can fix the original family tree manually."
" information is lost, you can fix the original Family Tree manually."
" For details, see the webpage\n"
"http://gramps-project.org/wiki/index.php?title=Recover_corrupted_family_tree\n"
"Before doing a repair, try to open the family tree in the normal manner."
"Before doing a repair, try to open the Family Tree in the normal manner."
" Several errors that trigger the repair button can be fixed automatically."
" If this is the case, you can disable the repair button by removing the"
" file <i>need_recover</i> in the family tree directory."
" file <i>need_recover</i> in the Family Tree directory."
) % dirname,
_("Proceed, I have taken a backup"),
_("Stop"))
@ -731,7 +731,7 @@ class DbManager(CLIDbManager):
try:
self._create_new_db()
except (OSError, IOError) as msg:
DbManager.ERROR(_("Could not create family tree"),
DbManager.ERROR(_("Could not create Family Tree"),
str(msg))
self.new.set_sensitive(True)

4
gramps/gui/grampsgui.py
View File

@ -362,8 +362,8 @@ def __startgramps(errors, argparser):
LOG.error(_(
"\nGramps failed to start. Please report a bug about this.\n"
"This could be because of an error in a (third party) View on startup.\n"
"To use another view, don't load a family tree, change view, and then load"
" your family tree.\n"
"To use another view, don't load a Family Tree, change view, and then load"
" your Family Tree.\n"
"You can also change manually the startup view in the gramps.ini file \n"
"by changing the last-view parameter.\n"
), exc_info=True)

2
gramps/gui/plug/export/_exportassistant.py
View File

@ -597,7 +597,7 @@ class ExportAssistant(Gtk.Assistant, ManagedWindow) :
except:
#an error not catched in the export_function itself
success = False
log.error(_("Error exporting your family tree"), exc_info=True)
log.error(_("Error exporting your Family Tree"), exc_info=True)
return success
def pre_save(self,page):

2
gramps/plugins/gramplet/gramplet.gpr.py
View File

@ -231,7 +231,7 @@ register(GRAMPLET,
register(GRAMPLET,
id="Statistics",
name=_("Statistics"),
description = _("Gramplet showing summary data of the family tree"),
description = _("Gramplet showing summary data of the Family Tree"),
status = STABLE,
fname="statsgramplet.py",
height=230,

2
gramps/plugins/gramplet/welcomegramplet.py
View File

@ -127,7 +127,7 @@ class WelcomeGramplet(Gramplet):
'The first thing you must do is to create a new Family Tree. To '
'create a new Family Tree (sometimes called \'database\') select '
'"Family Trees" from the menu, pick "Manage Family Trees", press '
'"New" and name your family tree. For more details, please read the '
'"New" and name your Family Tree. For more details, please read the '
'information at the links above\n\n')
welcome += boldst(_('Dashboard View')) + '\n\n' + _(
'You are currently reading from the "Dashboard" view, where you can'

4
gramps/plugins/importer/import.gpr.py
View File

@ -87,7 +87,7 @@ plg = newplugin()
plg.id = 'im_gpkg'
plg.name = _('Gramps package (portable XML)')
plg.description = _('Import data from a Gramps package (an archived XML '
'family tree together with the media object files.)')
'Family Tree together with the media object files.)')
plg.version = '1.0'
plg.gramps_target_version = '4.1'
plg.status = STABLE
@ -106,7 +106,7 @@ plg = newplugin()
plg.id = 'im_gramps'
plg.name = _('Gramps XML Family Tree')
plg.description = _('The Gramps XML format is a text '
'version of a family tree. It is '
'version of a Family Tree. It is '
'read-write compatible with the '
'present Gramps database format.')
plg.version = '1.0'

4
gramps/plugins/importer/importgpkg.py
View File

@ -106,7 +106,7 @@ def impData(database, name, user):
database.set_mediapath(tmpdir_path)
user.warn(
_("Base path for relative media set"),
_("The base media path of this family tree has been set to "
_("The base media path of this Family Tree has been set to "
"%s. Consider taking a simpler path. You can change this "
"in the Preferences, while moving your media files to the "
"new position, and using the media manager tool, option "
@ -116,7 +116,7 @@ def impData(database, name, user):
else:
user.warn(
_("Cannot set base media path"),
_("The family tree you imported into already has a base media "
_("The Family Tree you imported into already has a base media "
"path: %(orig_path)s. The imported media objects however "
"are relative from the path %(path)s. You can change the "
"media path in the Preferences or you can convert the "

2
gramps/plugins/importer/importgrdb.py
View File

@ -61,7 +61,7 @@ def importData(database, filename, user):
"You should use an old copy of Gramps at "
"version 3.0.x and import your database into "
"that version. You should then export a copy "
"of your data to Gramps XML (family tree). "
"of your data to Gramps XML (Family Tree). "
"Then you should upgrade to the latest "
"version of Gramps (for example this version), "
"create a new empty database and import the "

4
gramps/plugins/importer/importxml.py
View File

@ -957,7 +957,7 @@ class GrampsParser(UpdateCallback):
elif not oldpath == self.mediapath:
self.user.notify_error(_("Could not change media path"),
_("The opened file has media path %s, which conflicts with"
" the media path of the family tree you import into. "
" the media path of the Family Tree you import into. "
"The original media path has been retained. Copy the "
"files to a correct directory or change the media "
"path in the Preferences."
@ -1670,7 +1670,7 @@ class GrampsParser(UpdateCallback):
if self.db.has_name_group_key(key) :
present = self.db.get_name_group_mapping(key)
if not value == present:
msg = _('Your family tree groups name "%(key)s" together'
msg = _('Your Family Tree groups name "%(key)s" together'
' with "%(parent)s", did not change this grouping to "%(value)s".') % {
'key' : key, 'parent' : present, 'value' : value }
self.user.warn(_("Gramps ignored namemap value"), msg)

2
gramps/plugins/textreport/descendreport.py
View File

@ -425,7 +425,7 @@ class DescendantOptions(MenuReportOptions):
menu.add_option(category_name, "divs", divs)
dups = BooleanOption(_('Show duplicate trees'), True)
dups.set_help(_("Whether to show duplicate family trees in the report."))
dups.set_help(_("Whether to show duplicate Family Trees in the report."))
menu.add_option(category_name, "dups", dups)
def make_default_style(self, default_style):

6
gramps/plugins/tool/check.py
View File

@ -149,11 +149,11 @@ class Check(tool.BatchTool):
if self.db.__class__.__name__ == 'DbBsddb':
if cross_table_duplicates(self.db):
Report(uistate, _(
"Your family tree contains cross table duplicate handles.\n "
"Your Family Tree contains cross table duplicate handles.\n "
"This is bad and can be fixed by making a backup of your\n"
"family tree and importing that backup in an empty family\n"
"Family Tree and importing that backup in an empty family\n"
"tree. The rest of the checking is skipped, the Check and\n"
"Repair tool should be run anew on this new family tree."),
"Repair tool should be run anew on this new Family Tree."),
cli)
return
with DbTxn(_("Check Integrity"), self.db, batch=True) as trans:

2
gramps/plugins/tool/patchnames.glade
View File

@ -140,7 +140,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="ypad">10</property>
<property name="label" translatable="yes">Below is a list of the nicknames, titles, prefixes and compound surnames that Gramps can extract from the family tree.
<property name="label" translatable="yes">Below is a list of the nicknames, titles, prefixes and compound surnames that Gramps can extract from the Family Tree.
If you accept the changes, Gramps will modify the entries that have been selected.
Compound surnames are shown as lists of [prefix, surname, connector].

6
gramps/plugins/view/view.gpr.py
View File

@ -169,7 +169,7 @@ stock_icon = 'gramps-fanchartdesc',
register(VIEW,
id = 'personview',
name = _("Grouped People"),
description = _("The view showing all people in the family tree grouped per"
description = _("The view showing all people in the Family Tree grouped per"
" family name"),
version = '1.0',
gramps_target_version = '4.1',
@ -186,7 +186,7 @@ stock_icon = 'gramps-tree-group',
register(VIEW,
id = 'personlistview',
name = _("People"),
description = _("The view showing all people in the family tree"
description = _("The view showing all people in the Family Tree"
" in a flat list"),
version = '1.0',
gramps_target_version = '4.1',
@ -203,7 +203,7 @@ stock_icon = 'gramps-tree-list',
register(VIEW,
id = 'placelistview',
name = _("Places"),
description = _("The view showing all the places of the family tree"),
description = _("The view showing all the places of the Family Tree"),
version = '1.0',
gramps_target_version = '4.1',
status = STABLE,