diff --git a/gramps/gen/filters/rules/_haseventbase.py b/gramps/gen/filters/rules/_haseventbase.py index 0bd3b27c5..fd6fd9ce4 100644 --- a/gramps/gen/filters/rules/_haseventbase.py +++ b/gramps/gen/filters/rules/_haseventbase.py @@ -51,8 +51,8 @@ class HasEventBase(Rule): 'Place:', 'Description:', 'Main Participants:' ] - name = 'Events matching parameters' - description = "Matches events with particular parameters" + name = 'Events matching parameters' + description = "Matches events with particular parameters" category = _('Event filters') allow_regex = True diff --git a/gramps/gen/filters/rules/event/_hascitation.py b/gramps/gen/filters/rules/event/_hascitation.py index 390c6d90e..ead645147 100644 --- a/gramps/gen/filters/rules/event/_hascitation.py +++ b/gramps/gen/filters/rules/event/_hascitation.py @@ -48,6 +48,6 @@ class HasCitation(HasCitationBase): labels = [ _('Volume/Page:'), _('Date:'), _('Confidence level:')] - name = _('Events with the ') + name = _('Events with the ') description = _("Matches events with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/family/_hascitation.py b/gramps/gen/filters/rules/family/_hascitation.py index 734e93134..f34db9df9 100644 --- a/gramps/gen/filters/rules/family/_hascitation.py +++ b/gramps/gen/filters/rules/family/_hascitation.py @@ -48,6 +48,6 @@ class HasCitation(HasCitationBase): labels = [ _('Volume/Page:'), _('Date:'), _('Confidence level:')] - name = _('Families with the ') + name = _('Families with the ') description = _("Matches families with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/family/_hasevent.py b/gramps/gen/filters/rules/family/_hasevent.py index 5a22d5891..670d13d71 100644 --- a/gramps/gen/filters/rules/family/_hasevent.py +++ b/gramps/gen/filters/rules/family/_hasevent.py @@ -49,7 +49,7 @@ class HasEvent(HasEventBase): _('Place:'), _('Description:'), _('Main Participants') ] - name = _('Families with the ') + name = _('Families with the ') description = _("Matches families with an event of a particular value") def apply(self, dbase, family): diff --git a/gramps/gen/filters/rules/media/_hascitation.py b/gramps/gen/filters/rules/media/_hascitation.py index d8104ab93..d7112fa63 100644 --- a/gramps/gen/filters/rules/media/_hascitation.py +++ b/gramps/gen/filters/rules/media/_hascitation.py @@ -47,6 +47,6 @@ class HasCitation(HasCitationBase): labels = [ _('Volume/Page:'), _('Date:'), _('Confidence level:')] - name = _('Media with the ') + name = _('Media with the ') description = _("Matches media with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/person/_hasassociation.py b/gramps/gen/filters/rules/person/_hasassociation.py index a6e3d05d3..b7dfc433b 100644 --- a/gramps/gen/filters/rules/person/_hasassociation.py +++ b/gramps/gen/filters/rules/person/_hasassociation.py @@ -62,7 +62,7 @@ class HasAssociation(Rule): self.selected_count = int(self.list[0]) def apply(self, db, person): - count = len(person.get_person_ref_list()) + count = len(person.get_person_ref_list()) if self.count_type == 0: # "less than" return count < self.selected_count elif self.count_type == 2: # "greater than" diff --git a/gramps/gen/filters/rules/person/_hascitation.py b/gramps/gen/filters/rules/person/_hascitation.py index 41c33fd88..d6417aa04 100644 --- a/gramps/gen/filters/rules/person/_hascitation.py +++ b/gramps/gen/filters/rules/person/_hascitation.py @@ -47,6 +47,6 @@ class HasCitation(HasCitationBase): labels = [ _('Volume/Page:'), _('Date:'), _('Confidence level:')] - name = _('People with the ') + name = _('People with the ') description = _("Matches people with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/person/_hasevent.py b/gramps/gen/filters/rules/person/_hasevent.py index 1eeb522c1..23ad3e9b3 100644 --- a/gramps/gen/filters/rules/person/_hasevent.py +++ b/gramps/gen/filters/rules/person/_hasevent.py @@ -51,7 +51,7 @@ class HasEvent(HasEventBase): _('Description:'), _('Main Participants:'), _('Primary Role:') ] - name = _('People with the personal ') + name = _('People with the personal ') description = _("Matches people with a personal event of a particular " "value") diff --git a/gramps/gen/filters/rules/person/_hasfamilyevent.py b/gramps/gen/filters/rules/person/_hasfamilyevent.py index 7d4c905e2..09b4a76c9 100644 --- a/gramps/gen/filters/rules/person/_hasfamilyevent.py +++ b/gramps/gen/filters/rules/person/_hasfamilyevent.py @@ -49,7 +49,7 @@ class HasFamilyEvent(Rule): _('Date:'), _('Place:'), _('Description:') ] - name = _('People with the family ') + name = _('People with the family ') description = _("Matches people with a family event of a particular value") category = _('Event filters') allow_regex = True diff --git a/gramps/gen/filters/rules/person/_hasnameof.py b/gramps/gen/filters/rules/person/_hasnameof.py index 8585993a0..69fa133d7 100644 --- a/gramps/gen/filters/rules/person/_hasnameof.py +++ b/gramps/gen/filters/rules/person/_hasnameof.py @@ -43,7 +43,7 @@ from ....lib.nameorigintype import NameOriginType class HasNameOf(Rule): """Rule that checks for full or partial name matches""" - labels = [_('Given name:'), + labels = [_('Given name:'), _('Full Family name:'), _('person|Title:'), _('Suffix:'), diff --git a/gramps/gen/filters/rules/person/_hassoundexname.py b/gramps/gen/filters/rules/person/_hassoundexname.py index 05b1df409..09634e321 100644 --- a/gramps/gen/filters/rules/person/_hassoundexname.py +++ b/gramps/gen/filters/rules/person/_hassoundexname.py @@ -38,7 +38,7 @@ _ = glocale.translation.sgettext class HasSoundexName(Rule): """Rule that checks for full or partial name matches""" - labels = [_('Name:')] + labels = [_('Name:')] name = _('Soundex match of People with the ') description = _("Soundex Match of people with a specified name. First " "name, Surname, Call name, and Nickname are searched in " diff --git a/gramps/gen/filters/rules/person/_isancestoroffiltermatch.py b/gramps/gen/filters/rules/person/_isancestoroffiltermatch.py index 14bf03cfd..119fe9de5 100644 --- a/gramps/gen/filters/rules/person/_isancestoroffiltermatch.py +++ b/gramps/gen/filters/rules/person/_isancestoroffiltermatch.py @@ -45,7 +45,7 @@ class IsAncestorOfFilterMatch(IsAncestorOf): labels = [ _('Filter name:') ] name = _('Ancestors of match') - category = _("Ancestral filters") + category = _("Ancestral filters") description = _("Matches people that are ancestors " "of anybody matched by a filter") diff --git a/gramps/gen/filters/rules/person/_probablyalive.py b/gramps/gen/filters/rules/person/_probablyalive.py index 85473b6a1..b07f11994 100644 --- a/gramps/gen/filters/rules/person/_probablyalive.py +++ b/gramps/gen/filters/rules/person/_probablyalive.py @@ -42,7 +42,7 @@ class ProbablyAlive(Rule): """People probably alive""" labels = [_("On date:")] - name = _('People probably alive') + name = _('People probably alive') description = _("Matches people without indications of death that are not too old") category = _('General filters') diff --git a/gramps/gen/filters/rules/place/_hascitation.py b/gramps/gen/filters/rules/place/_hascitation.py index 9c70faf8a..92ea0dd11 100644 --- a/gramps/gen/filters/rules/place/_hascitation.py +++ b/gramps/gen/filters/rules/place/_hascitation.py @@ -48,6 +48,6 @@ class HasCitation(HasCitationBase): labels = [ _('Volume/Page:'), _('Date:'), _('Confidence level:')] - name = _('Place with the ') + name = _('Place with the ') description = _("Matches places with a citation of a particular " "value") diff --git a/gramps/gen/utils/db.py b/gramps/gen/utils/db.py index 8a6f94168..6950dac4d 100644 --- a/gramps/gen/utils/db.py +++ b/gramps/gen/utils/db.py @@ -286,7 +286,7 @@ def get_participant_from_event(db, event_handle, all_=False): else: ellipses = True else: - participant = name_displayer.display(person) + participant = name_displayer.display(person) break if ellipses: break diff --git a/gramps/gen/utils/maclocale.py b/gramps/gen/utils/maclocale.py index af8475685..e93fc24cd 100644 --- a/gramps/gen/utils/maclocale.py +++ b/gramps/gen/utils/maclocale.py @@ -257,7 +257,7 @@ def mac_setup_localization(glocale): LOG.debug("Environment LC_MESSAGES value %s not supported", lang) if "LANGUAGE" in os.environ: - lang = [x for x in [glocale.check_available_translations(l) + lang = [x for x in [glocale.check_available_translations(l) for l in os.environ["LANGUAGE"].split(":")] if x] if lang and lang[0]: diff --git a/gramps/gen/utils/test/place_test.py b/gramps/gen/utils/test/place_test.py index f59043afc..168c18a05 100644 --- a/gramps/gen/utils/test/place_test.py +++ b/gramps/gen/utils/test/place_test.py @@ -70,7 +70,7 @@ class PlaceTest(unittest.TestCase): lat, lon = ' 50 : 50 : 59.60 ', ' -2:53 : 9.23 ' self._test_formats_success(lat, lon) - lat, lon = '+50:1', '-2:1:2' + lat, lon = '+50:1', '-2:1:2' self._test_formats_success(lat, lon) def test_bad_latitude(self): @@ -82,138 +82,138 @@ class PlaceTest(unittest.TestCase): self._test_formats_fail(lat, lon) def test_dm_ds(self): - lat, lon = ' 50°59.60\'N', ' 2°53\'E' + lat, lon = ' 50°59.60\'N', ' 2°53\'E' self._test_formats_success(lat, lon) def test_both_in_latitude(self): - lat, lon = ' 11° 11\' 11" N, 11° 11\' 11" O', ' ' + lat, lon = ' 11° 11\' 11" N, 11° 11\' 11" O', ' ' self._test_formats_fail(lat, lon) def test_very_small_negative(self): - lat, lon = '-0.00006', '-0.00006' + lat, lon = '-0.00006', '-0.00006' self._test_formats_success(lat, lon) def test_missing_direction(self): - lat, lon = ' 50°59.60"', ' 2°53\'E' + lat, lon = ' 50°59.60"', ' 2°53\'E' self._test_formats_fail(lat, lon) def test_wrong_direction(self): - lat, lon = ' 50°59.60"E', ' 2°53\'N' + lat, lon = ' 50°59.60"E', ' 2°53\'N' self._test_formats_fail(lat, lon) - lat, lon = ' 50°59.99"E', ' 2°59\'59.99"N' + lat, lon = ' 50°59.99"E', ' 2°59\'59.99"N' self._test_formats_fail(lat, lon) def test_precision(self): - lat, lon = ' 50°59\'59.99"S', ' 2°59\'59.99"E' + lat, lon = ' 50°59\'59.99"S', ' 2°59\'59.99"E' self._test_formats_success(lat, lon) lat, lon = 'N50.849888888888', 'E2.885897222222' self._test_formats_success(lat, lon) def test_large_latitude(self): - lat, lon = '90.849888888888', '2.885897222222' + lat, lon = '90.849888888888', '2.885897222222' self._test_formats_fail(lat, lon) - lat, lon = '-91.2', '-1' + lat, lon = '-91.2', '-1' self._test_formats_fail(lat, lon) def test_extreme_values(self): - lat, lon = '90', '-180' + lat, lon = '90', '-180' self._test_formats_success(lat, lon) - lat, lon = '90° 00\' 00.00" S ', '179° 59\'59.99"W' + lat, lon = '90° 00\' 00.00" S ', '179° 59\'59.99"W' self._test_formats_success(lat, lon) - lat, lon = '90° 00\' 00.00" N', '180° 00\'00.00" E' + lat, lon = '90° 00\' 00.00" N', '180° 00\'00.00" E' self._test_formats_fail(lat, lon) - lat, lon = '90: 00: 00.00 ', '-179: 59:59.99' + lat, lon = '90: 00: 00.00 ', '-179: 59:59.99' self._test_formats_success(lat, lon) - lat, lon = '90° 00\' 00.00" N', '180:00:00.00' + lat, lon = '90° 00\' 00.00" N', '180:00:00.00' self._test_formats_fail(lat, lon) - lat, lon = '90', '180' + lat, lon = '90', '180' self._test_formats_fail(lat, lon) - lat, lon = ' 89°59\'60"N', ' 2°53\'W' + lat, lon = ' 89°59\'60"N', ' 2°53\'W' self._test_formats_fail(lat, lon) - lat, lon = ' 89°60\'00"N', ' 2°53\'W' + lat, lon = ' 89°60\'00"N', ' 2°53\'W' self._test_formats_fail(lat, lon) - lat, lon = ' 89.1°40\'00"N', ' 2°53\'W' + lat, lon = ' 89.1°40\'00"N', ' 2°53\'W' self._test_formats_fail(lat, lon) - lat, lon = ' 89°40\'00"N', ' 2°53.1\'W' + lat, lon = ' 89°40\'00"N', ' 2°53.1\'W' self._test_formats_success(lat, lon) lat, lon = '+61° 43\' 60.00"', '+17° 7\' 60.00"' self._test_formats_fail(lat, lon) def test_zero_crossing(self): - lat, lon = '0', '0' + lat, lon = '0', '0' self._test_formats_success(lat, lon) def test_near_equator(self): - lat, lon = ' 1°1"N', ' 1°1\'E' + lat, lon = ' 1°1"N', ' 1°1\'E' self._test_formats_success(lat, lon) def test_roundoff(self): - lat, lon = ' 1°59.999\'N', ' 1°59.999\'E' + lat, lon = ' 1°59.999\'N', ' 1°59.999\'E' self._test_formats_success(lat, lon) - lat, lon = ' 1°59\'59.9999"N', ' 1°59\'59.9999"E' + lat, lon = ' 1°59\'59.9999"N', ' 1°59\'59.9999"E' self._test_formats_success(lat, lon) - lat, lon = '89°59\'59.9999"S', '179°59\'59.9999"W' + lat, lon = '89°59\'59.9999"S', '179°59\'59.9999"W' self._test_formats_success(lat, lon) - lat, lon = '89°59\'59.9999"N', '179°59\'59.9999"E' + lat, lon = '89°59\'59.9999"N', '179°59\'59.9999"E' self._test_formats_success(lat, lon) def test_number_of_decimals(self): - lat, lon = '89°59\'59.99999999"N', '179°59\'59.99999999"E' + lat, lon = '89°59\'59.99999999"N', '179°59\'59.99999999"E' self._test_formats_success(lat, lon) def test_quote_notation(self): - lat, lon = '89°59\'59.99\'\' N', '179°59\'59.99\'\'E' + lat, lon = '89°59\'59.99\'\' N', '179°59\'59.99\'\'E' self._test_formats_success(lat, lon) def test_decimal_localization(self): lat, lon = '50.849888888888', '2,885897222222' self._test_formats_success(lat, lon) - lat, lon = '89°59\'59.9999"S', '179°59\'59,9999"W' + lat, lon = '89°59\'59.9999"S', '179°59\'59,9999"W' self._test_formats_success(lat, lon) - lat, lon = '89°59\'1.599,999"S', '179°59\'59,9999"W' + lat, lon = '89°59\'1.599,999"S', '179°59\'59,9999"W' self._test_formats_fail(lat, lon) def test_large_longitude(self): - lat, lon = '81.2', '-182.3' + lat, lon = '81.2', '-182.3' self._test_formats_fail(lat, lon) def test_bad_sign(self): - lat, lon = '++50:10:1', '2:1:2' + lat, lon = '++50:10:1', '2:1:2' self._test_formats_fail(lat, lon) - lat, lon = '-50:10:1', '-+2:1:2' + lat, lon = '-50:10:1', '-+2:1:2' self._test_formats_fail(lat, lon) def test_missing_minute(self): - lat, lon = '-50::1', '-2:1:2' + lat, lon = '-50::1', '-2:1:2' self._test_formats_fail(lat, lon) - lat, lon = '+50:', '-2:1:2' + lat, lon = '+50:', '-2:1:2' self._test_formats_fail(lat, lon) def test_extra_whitespace(self): - lat, lon = '- 50 : 2 : 1 ', '-2:1:2' + lat, lon = '- 50 : 2 : 1 ', '-2:1:2' self._test_formats_success(lat, lon) - lat, lon = '+ 50:2 : 1', '-2:1:2' + lat, lon = '+ 50:2 : 1', '-2:1:2' self._test_formats_success(lat, lon) def test_sign_and_direction(self): @@ -221,11 +221,11 @@ class PlaceTest(unittest.TestCase): self._test_formats_success(lat, lon) def test_extra_colon(self): - lat, lon = '+50: 0 : 1 : 1', '-2:1:2' + lat, lon = '+50: 0 : 1 : 1', '-2:1:2' self._test_formats_fail(lat, lon) def test_leading_colon(self): - lat, lon = ': 0 : 1 : 1', ':1:2' + lat, lon = ': 0 : 1 : 1', ':1:2' self._test_formats_fail(lat, lon) def test_degree_symbol(self): diff --git a/gramps/gen/utils/thumbnails.py b/gramps/gen/utils/thumbnails.py index 2d17b05fc..36c2044b1 100644 --- a/gramps/gen/utils/thumbnails.py +++ b/gramps/gen/utils/thumbnails.py @@ -97,7 +97,7 @@ def __get_gconf_string(key): :rtype: unicode """ try: - val = CLIENT.get_string(key) + val = CLIENT.get_string(key) except GObject.GError: val = None return str(val) diff --git a/gramps/grampsapp.py b/gramps/grampsapp.py index 6548893c0..8573a4f9a 100644 --- a/gramps/grampsapp.py +++ b/gramps/grampsapp.py @@ -76,7 +76,7 @@ try: # On Darwin sys.getdefaultencoding() is correct, on Win32 it's # sys.stdout.enoding, and on Linux they're both right. if mac(): - _encoding = sys.getdefaultencoding() + _encoding = sys.getdefaultencoding() else: _encoding = sys.stdout.encoding except: diff --git a/gramps/gui/columnorder.py b/gramps/gui/columnorder.py index a4be59fe7..43d180221 100644 --- a/gramps/gui/columnorder.py +++ b/gramps/gui/columnorder.py @@ -138,7 +138,7 @@ class ColumnOrder(Gtk.Box): #obtain the columns from config file self.oldorder = self.config.get('columns.rank') self.oldsize = self.config.get('columns.size') - self.oldvis = self.config.get('columns.visible') + self.oldvis = self.config.get('columns.visible') colord = [] index = 0 for val, size in zip(self.oldorder, self.oldsize): diff --git a/gramps/gui/editors/addmedia.py b/gramps/gui/editors/addmedia.py index 40db25426..50fbadfee 100644 --- a/gramps/gui/editors/addmedia.py +++ b/gramps/gui/editors/addmedia.py @@ -236,7 +236,7 @@ class AddMedia(ManagedWindow): """ title_msg = _("Cannot display %s") % path - detail_msg = _('Gramps is not able to display the image file. ' + detail_msg = _('Gramps is not able to display the image file. ' 'This may be caused by a corrupt file.') try: diff --git a/gramps/gui/editors/displaytabs/gallerytab.py b/gramps/gui/editors/displaytabs/gallerytab.py index fbcde948a..b7b5242ca 100644 --- a/gramps/gui/editors/displaytabs/gallerytab.py +++ b/gramps/gui/editors/displaytabs/gallerytab.py @@ -510,7 +510,7 @@ class GalleryTab(ButtonTab, DbGUIElement): elif self._DND_EXTRA and mytype == self._DND_EXTRA.drag_type: self.handle_extra_type(mytype, obj) except pickle.UnpicklingError: - files = sel_data.get_uris() + files = sel_data.get_uris() for file in files: protocol, site, mfile, j, k, l = urlparse(file) if protocol == "file": diff --git a/gramps/gui/editors/editeventref.py b/gramps/gui/editors/editeventref.py index 2e96427a2..45e026839 100644 --- a/gramps/gui/editors/editeventref.py +++ b/gramps/gui/editors/editeventref.py @@ -81,13 +81,13 @@ class EditEventRef(EditReference): self.share_btn = self.top.get_object('share_place') self.add_del_btn = self.top.get_object('add_del_place') - tblref = self.top.get_object('table64') + tblref = self.top.get_object('table64') notebook = self.top.get_object('notebook_ref') #recreate start page as GrampsTab notebook.remove_page(0) self.reftab = RefTab(self.dbstate, self.uistate, self.track, _('General'), tblref) - tblref = self.top.get_object('table62') + tblref = self.top.get_object('table62') notebook = self.top.get_object('notebook') #recreate start page as GrampsTab notebook.remove_page(0) diff --git a/gramps/gui/editors/editmediaref.py b/gramps/gui/editors/editmediaref.py index 23e567bd6..86d668298 100644 --- a/gramps/gui/editors/editmediaref.py +++ b/gramps/gui/editors/editmediaref.py @@ -97,7 +97,7 @@ class EditMediaRef(EditReference): self.top.get_object("label427").set_text(_("Y coordinate|Y")) self.top.get_object("label428").set_text(_("Y coordinate|Y")) - tblref = self.top.get_object('table50') + tblref = self.top.get_object('table50') self.notebook_ref = self.top.get_object('notebook_ref') self.track_ref_for_deletion("notebook_ref") self.expander = self.top.get_object('expander1') @@ -106,7 +106,7 @@ class EditMediaRef(EditReference): self.reftab = RefTab(self.dbstate, self.uistate, self.track, _('General'), tblref) self.track_ref_for_deletion("reftab") - tblref = self.top.get_object('table2') + tblref = self.top.get_object('table2') self.notebook_shared = self.top.get_object('notebook_shared') #recreate start page as GrampsTab self.notebook_shared.remove_page(0) diff --git a/gramps/gui/editors/editname.py b/gramps/gui/editors/editname.py index cef2bbb28..3d83058e1 100644 --- a/gramps/gui/editors/editname.py +++ b/gramps/gui/editors/editname.py @@ -120,7 +120,7 @@ class EditName(EditSecondary): self.set_window(self.top.toplevel, None, _("Name Editor")) self.setup_configs('interface.name', 600, 350) - tblgnam = self.top.get_object('table23') + tblgnam = self.top.get_object('table23') notebook = self.top.get_object('notebook') hbox_surn = self.top.get_object('hboxmultsurnames') hbox_surn.set_size_request(-1, diff --git a/gramps/gui/editors/editnote.py b/gramps/gui/editors/editnote.py index 7b2756d31..a3e5daefb 100644 --- a/gramps/gui/editors/editnote.py +++ b/gramps/gui/editors/editnote.py @@ -180,7 +180,7 @@ class EditNote(EditPrimary): self.set_window(win, None, self.get_menu_title()) self.setup_configs('interface.note', 700, 500) - vboxnote = self.top.get_object('vbox131') + vboxnote = self.top.get_object('vbox131') notebook = self.top.get_object('note_notebook') #recreate start page as GrampsTab notebook.remove_page(0) diff --git a/gramps/gui/editors/editplaceref.py b/gramps/gui/editors/editplaceref.py index 95ef04adf..325da6f98 100644 --- a/gramps/gui/editors/editplaceref.py +++ b/gramps/gui/editors/editplaceref.py @@ -63,13 +63,13 @@ class EditPlaceRef(EditReference): #self.place_name_label = self.top.get_object('place_name_label') #self.place_name_label.set_text(_('place|Name:')) - tblref = self.top.get_object('table64') + tblref = self.top.get_object('table64') notebook = self.top.get_object('notebook_ref') #recreate start page as GrampsTab notebook.remove_page(0) self.reftab = RefTab(self.dbstate, self.uistate, self.track, _('General'), tblref) - tblref = self.top.get_object('table62') + tblref = self.top.get_object('table62') notebook = self.top.get_object('notebook') #recreate start page as GrampsTab notebook.remove_page(0) diff --git a/gramps/gui/editors/editreporef.py b/gramps/gui/editors/editreporef.py index 688a5408f..84efaf7ce 100644 --- a/gramps/gui/editors/editreporef.py +++ b/gramps/gui/editors/editreporef.py @@ -63,13 +63,13 @@ class EditRepoRef(EditReference): self.define_warn_box(self.top.get_object("warn_box")) self.define_expander(self.top.get_object("src_expander")) - tblref = self.top.get_object('table70') + tblref = self.top.get_object('table70') notebook = self.top.get_object('notebook_ref') #recreate start page as GrampsTab notebook.remove_page(0) self.reftab = RefTab(self.dbstate, self.uistate, self.track, _('General'), tblref) - tblref = self.top.get_object('table69') + tblref = self.top.get_object('table69') notebook = self.top.get_object('notebook_src') #recreate start page as GrampsTab notebook.remove_page(0) diff --git a/gramps/gui/filters/_searchbar.py b/gramps/gui/filters/_searchbar.py index ee407b475..5bf66814d 100644 --- a/gramps/gui/filters/_searchbar.py +++ b/gramps/gui/filters/_searchbar.py @@ -66,7 +66,7 @@ class SearchBar: self.on_apply_callback = None self.apply_done_callback = None self.dbstate = None - self.uistate = None + self.uistate = None def build( self): self.filterbar.set_spacing(4) diff --git a/gramps/gui/plug/_windows.py b/gramps/gui/plug/_windows.py index 431468008..6e1af3b40 100644 --- a/gramps/gui/plug/_windows.py +++ b/gramps/gui/plug/_windows.py @@ -112,8 +112,8 @@ class PluginStatus(ManagedWindow): #first page with all registered plugins vbox_reg = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) - scrolled_window_reg = Gtk.ScrolledWindow() - self.list_reg = Gtk.TreeView() + scrolled_window_reg = Gtk.ScrolledWindow() + self.list_reg = Gtk.TreeView() # model: plugintype, hidden, pluginname, plugindescr, pluginid self.model_reg = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_STRING) diff --git a/gramps/gui/plug/export/_exportassistant.py b/gramps/gui/plug/export/_exportassistant.py index 16305293d..ac675ac9c 100644 --- a/gramps/gui/plug/export/_exportassistant.py +++ b/gramps/gui/plug/export/_exportassistant.py @@ -499,7 +499,7 @@ class ExportAssistant(ManagedWindow, Gtk.Assistant): #update the label and title if success: - conclusion_title = _('Your data has been saved') + conclusion_title = _('Your data has been saved') conclusion_text = _( 'The copy of your data has been ' 'successfully saved. You may press Close button ' @@ -511,7 +511,7 @@ class ExportAssistant(ManagedWindow, Gtk.Assistant): #add test, what is dir conclusion_text += '\n\n' + _('Filename: %s') %self.chooser.get_filename() else: - conclusion_title = _('Saving failed') + conclusion_title = _('Saving failed') conclusion_text = _( 'There was an error while saving your data. ' 'You may try starting the export again.\n\n' diff --git a/gramps/gui/plug/quick/_quickreports.py b/gramps/gui/plug/quick/_quickreports.py index 38334a350..25a35dcb2 100644 --- a/gramps/gui/plug/quick/_quickreports.py +++ b/gramps/gui/plug/quick/_quickreports.py @@ -246,7 +246,7 @@ def run_report(dbstate, uistate, category, handle, pdata, container=None, if not mod: print("QuickView Error: plugin does not load") return - func = getattr(mod, pdata.runfunc) + func = getattr(mod, pdata.runfunc) if handle: d = TextBufDoc(make_basic_stylesheet(), None, track=track) d.dbstate = dbstate diff --git a/gramps/gui/plug/report/_papermenu.py b/gramps/gui/plug/report/_papermenu.py index a6b9ef255..9d3dd5789 100644 --- a/gramps/gui/plug/report/_papermenu.py +++ b/gramps/gui/plug/report/_papermenu.py @@ -244,7 +244,7 @@ class PaperFrame(Gtk.Box): and worst case fallback to A4 size. """ - papersize, papername = self.papersize_menu.get_value() + papersize, papername = self.papersize_menu.get_value() if papername == 'Custom Size': try: h = float(str(self.pheight.get_text().replace(",", "."))) diff --git a/gramps/gui/plug/report/_styleeditor.py b/gramps/gui/plug/report/_styleeditor.py index b087f3ea3..b408ddcde 100644 --- a/gramps/gui/plug/report/_styleeditor.py +++ b/gramps/gui/plug/report/_styleeditor.py @@ -591,7 +591,7 @@ class StyleEditor(ManagedWindow): # Then change to new paragraph objs = self.plist.get_selected_objects() store, node = self.plist.get_selected() - self.current_name = store.get_value(node, 0) + self.current_name = store.get_value(node, 0) self.current_style = objs[0] self.draw() diff --git a/gramps/gui/selectors/baseselector.py b/gramps/gui/selectors/baseselector.py index fa2276550..325db1703 100644 --- a/gramps/gui/selectors/baseselector.py +++ b/gramps/gui/selectors/baseselector.py @@ -50,9 +50,9 @@ class BaseSelector(ManagedWindow): """ NONE = -1 - TEXT = 0 - MARKUP = 1 - IMAGE = 2 + TEXT = 0 + MARKUP = 1 + IMAGE = 2 def __init__(self, dbstate, uistate, track=[], filter=None, skip=set(), show_search_bar = True, default=None): @@ -80,10 +80,10 @@ class BaseSelector(ManagedWindow): self.glade = Glade() window = self.glade.toplevel - self.showall = self.glade.get_object('showall') + self.showall = self.glade.get_object('showall') title_label = self.glade.get_object('title') vbox = self.glade.get_object('select_person_vbox') - self.tree = self.glade.get_object('plist') + self.tree = self.glade.get_object('plist') self.tree.set_headers_visible(True) self.tree.set_headers_clickable(True) self.tree.connect('row-activated', self._on_row_activated) diff --git a/gramps/gui/undohistory.py b/gramps/gui/undohistory.py index a9ae712ae..e8d2bc9f4 100644 --- a/gramps/gui/undohistory.py +++ b/gramps/gui/undohistory.py @@ -265,7 +265,7 @@ def get_colors(obj, state): """ Return the foreground and background colors for a given state. """ - context = obj.get_style_context() + context = obj.get_style_context() fg_color = gdk_color_to_str(context.get_color(state)) bg_color = gdk_color_to_str(context.get_background_color(state)) return (fg_color, bg_color) diff --git a/gramps/gui/views/listview.py b/gramps/gui/views/listview.py index 34dd7ef05..44ba5711a 100644 --- a/gramps/gui/views/listview.py +++ b/gramps/gui/views/listview.py @@ -523,7 +523,7 @@ class ListView(NavigationView): """ order = self._config.get('columns.rank') size = self._config.get('columns.size') - vis = self._config.get('columns.visible') + vis = self._config.get('columns.visible') colord = [(1 if val in vis else 0, val, size) for val, size in zip(order, size)] diff --git a/gramps/gui/views/treemodels/citationbasemodel.py b/gramps/gui/views/treemodels/citationbasemodel.py index 81b0f488b..9563711d4 100644 --- a/gramps/gui/views/treemodels/citationbasemodel.py +++ b/gramps/gui/views/treemodels/citationbasemodel.py @@ -88,7 +88,7 @@ class CitationBaseModel: if data[COLUMN_DATE]: citation = Citation() citation.unserialize(data) - date_str = get_date(citation) + date_str = get_date(citation) if date_str != "": retval = escape(date_str) if not get_date_valid(citation): diff --git a/gramps/gui/views/treemodels/eventmodel.py b/gramps/gui/views/treemodels/eventmodel.py index 3d6ff3497..ca2599ae0 100644 --- a/gramps/gui/views/treemodels/eventmodel.py +++ b/gramps/gui/views/treemodels/eventmodel.py @@ -156,7 +156,7 @@ class EventModel(FlatBaseModel): if data[COLUMN_DATE]: event = Event() event.unserialize(data) - date_str = get_date(event) + date_str = get_date(event) if date_str != "": retval = escape(date_str) if not get_date_valid(event): diff --git a/gramps/gui/widgets/fanchart.py b/gramps/gui/widgets/fanchart.py index afea98440..b2764e5a5 100644 --- a/gramps/gui/widgets/fanchart.py +++ b/gramps/gui/widgets/fanchart.py @@ -313,7 +313,7 @@ class FanChartBaseWidget(Gtk.DrawingArea): cend[2]/255) if self.background in [BACKGROUND_GENDER, BACKGROUND_SINGLE_COLOR]: # nothing to precompute - self.colors = None + self.colors = None self.maincolor = cstart elif self.background == BACKGROUND_GRAD_GEN: #compute the colors, -1, 0, ..., maxgen @@ -326,7 +326,7 @@ class FanChartBaseWidget(Gtk.DrawingArea): self.colors = [(255*r, 255*g, 255*b) for r, g, b in rgb_colors] elif self.background == BACKGROUND_GRAD_PERIOD: # we fill in in the data structure what the period is, None if not found - self.colors = None + self.colors = None self.minperiod = 1e10 self.maxperiod = -1e10 gen_people = self.people_generator() @@ -358,7 +358,7 @@ class FanChartBaseWidget(Gtk.DrawingArea): elif self.background == BACKGROUND_GRAD_AGE: # we fill in in the data structure what the color age is, white if no age - self.colors = None + self.colors = None gen_people = self.people_generator() for person, userdata in gen_people: self.set_userdata_age(person, userdata) @@ -571,7 +571,7 @@ class FanChartBaseWidget(Gtk.DrawingArea): #we are not in a move, so draw text radial = False if self.radialtext: ## and generation >= 6: - space_arc_text = (radiusin+radiusout)/2 * (stop_rad-start_rad) + space_arc_text = (radiusin+radiusout)/2 * (stop_rad-start_rad) # is there more space to print it radial ? radial= (space_arc_text < (radiusout-radiusin) * 1.1) self.draw_person_text(cr, person, radiusin, radiusout, start_rad, stop_rad, @@ -913,7 +913,7 @@ class FanChartBaseWidget(Gtk.DrawingArea): self._mouse_click = False if self.last_x is None or self.last_y is None: # while mouse is moving, we must update the tooltip based on person - cell_address = self.cell_address_under_cursor(event.x, event.y) + cell_address = self.cell_address_under_cursor(event.x, event.y) self.mouse_x, self.mouse_y = event.x, event.y tooltip = "" if cell_address: diff --git a/gramps/plugins/db/bsddb/bsddb.gpr.py b/gramps/plugins/db/bsddb/bsddb.gpr.py index 261f55c80..6ce179567 100644 --- a/gramps/plugins/db/bsddb/bsddb.gpr.py +++ b/gramps/plugins/db/bsddb/bsddb.gpr.py @@ -25,7 +25,7 @@ plg = newplugin() plg.id = 'bsddb' plg.name = _("BSDDB") plg.name_accell = _("_BSDDB Database") -plg.description = _("Berkeley Software Distribution Database Backend") +plg.description = _("Berkeley Software Distribution Database Backend") plg.version = '1.0' plg.gramps_target_version = "5.1" plg.status = STABLE diff --git a/gramps/plugins/docgen/docgen.gpr.py b/gramps/plugins/docgen/docgen.gpr.py index 99321da56..5ed5b8d7f 100644 --- a/gramps/plugins/docgen/docgen.gpr.py +++ b/gramps/plugins/docgen/docgen.gpr.py @@ -32,7 +32,7 @@ MODULE_VERSION="5.1" plg = newplugin() plg.id = 'asciidoc' plg.name = _("Plain Text") -plg.description = _("Generates documents in plain text format (.txt).") +plg.description = _("Generates documents in plain text format (.txt).") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -53,7 +53,7 @@ plg.extension = "txt" plg = newplugin() plg.id = 'gtkprint' plg.name = _('Print...') -plg.description = _("Generates documents and prints them directly.") +plg.description = _("Generates documents and prints them directly.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -74,7 +74,7 @@ plg.extension = "" plg = newplugin() plg.id = 'htmldoc' plg.name = _('HTML') -plg.description = _("Generates documents in HTML format.") +plg.description = _("Generates documents in HTML format.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -95,7 +95,7 @@ plg.extension = "html" plg = newplugin() plg.id = 'latexdoc' plg.name = _('LaTeX') -plg.description = _("Generates documents in LaTeX format.") +plg.description = _("Generates documents in LaTeX format.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -116,7 +116,7 @@ plg.extension = "tex" plg = newplugin() plg.id = 'odfdoc' plg.name = _('OpenDocument Text') -plg.description = _("Generates documents in OpenDocument " +plg.description = _("Generates documents in OpenDocument " "Text format (.odt).") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -138,7 +138,7 @@ plg.extension = "odt" plg = newplugin() plg.id = 'pdfdoc' plg.name = _('PDF document') -plg.description = _("Generates documents in PDF format (.pdf).") +plg.description = _("Generates documents in PDF format (.pdf).") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -159,7 +159,7 @@ plg.extension = "pdf" plg = newplugin() plg.id = 'psdrawdoc' plg.name = _('PostScript') -plg.description = _("Generates documents in PostScript format (.ps).") +plg.description = _("Generates documents in PostScript format (.ps).") plg.version = '2.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -180,7 +180,7 @@ plg.extension = "ps" plg = newplugin() plg.id = 'rftdoc' plg.name = _('RTF document') -plg.description = _("Generates documents in Rich Text format (.rtf).") +plg.description = _("Generates documents in Rich Text format (.rtf).") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -201,7 +201,7 @@ plg.extension = "rtf" plg = newplugin() plg.id = 'SVG (Scalable Vector Graphics)' plg.name = _('SVG document') -plg.description = _("Generates documents in Scalable " +plg.description = _("Generates documents in Scalable " "Vector Graphics format (.svg).") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION diff --git a/gramps/plugins/drawreport/drawplugins.gpr.py b/gramps/plugins/drawreport/drawplugins.gpr.py index 2f67d5d05..d30064f4b 100644 --- a/gramps/plugins/drawreport/drawplugins.gpr.py +++ b/gramps/plugins/drawreport/drawplugins.gpr.py @@ -35,7 +35,7 @@ MODULE_VERSION="5.1" plg = newplugin() plg.id = 'ancestor_chart,BKI' plg.name = _("Ancestor Chart") -plg.description = _("Produces a graphical ancestral chart") +plg.description = _("Produces a graphical ancestral chart") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -51,7 +51,7 @@ plg.report_modes = [REPORT_MODE_BKI] plg = newplugin() plg.id = 'ancestor_chart' plg.name = _("Ancestor Tree") -plg.description = _("Produces a graphical ancestral tree") +plg.description = _("Produces a graphical ancestral tree") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -73,7 +73,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'calendar' plg.name = _("Calendar") -plg.description = _("Produces a graphical calendar") +plg.description = _("Produces a graphical calendar") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -95,7 +95,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'descend_chart,BKI' plg.name = _("Descendant Chart") -plg.description = _("Produces a graphical descendant chart") +plg.description = _("Produces a graphical descendant chart") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -111,7 +111,7 @@ plg.report_modes = [REPORT_MODE_BKI] plg = newplugin() plg.id = 'descend_chart' plg.name = _("Descendant Tree") -plg.description = _("Produces a graphical descendant tree") +plg.description = _("Produces a graphical descendant tree") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -133,7 +133,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'family_descend_chart,BKI' plg.name = _("Family Descendant Chart") -plg.description = _("Produces a graphical descendant chart around a family") +plg.description = _("Produces a graphical descendant chart around a family") plg.version = '1.0' plg.status = STABLE plg.fname = 'descendtree.py' @@ -150,7 +150,7 @@ plg.report_modes = [REPORT_MODE_BKI] plg = newplugin() plg.id = 'family_descend_chart' plg.name = _("Family Descendant Tree") -plg.description = _("Produces a graphical descendant tree around a family") +plg.description = _("Produces a graphical descendant tree around a family") plg.version = '1.0' plg.status = STABLE plg.fname = 'descendtree.py' @@ -173,7 +173,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'fan_chart' plg.name = _("Fan Chart") -plg.description = _("Produces fan charts") +plg.description = _("Produces fan charts") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -195,7 +195,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'statistics_chart' plg.name = _("Statistics Charts") -plg.description = _("Produces statistical bar and pie charts of the people " +plg.description = _("Produces statistical bar and pie charts of the people " "in the database") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -219,7 +219,7 @@ plg.require_active = False plg = newplugin() plg.id = 'timeline' plg.name = _("Timeline Chart") -plg.description = _("Produces a timeline chart.") +plg.description = _("Produces a timeline chart.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE diff --git a/gramps/plugins/export/export.gpr.py b/gramps/plugins/export/export.gpr.py index 38a9333b9..0a61b865c 100644 --- a/gramps/plugins/export/export.gpr.py +++ b/gramps/plugins/export/export.gpr.py @@ -33,7 +33,7 @@ plg = newplugin() plg.id = 'ex_csv' plg.name = _("Comma Separated Values Spreadsheet (CSV)") plg.name_accell = _("Comma _Separated Values Spreadsheet (CSV)") -plg.description = _("CSV is a common spreadsheet format.") +plg.description = _("CSV is a common spreadsheet format.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -54,7 +54,7 @@ plg = newplugin() plg.id = 'ex_webfamtree' plg.name = _('Web Family Tree') plg.name_accell = _('_Web Family Tree') -plg.description = _("Web Family Tree format") +plg.description = _("Web Family Tree format") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -75,7 +75,7 @@ plg = newplugin() plg.id = 'ex_ged' plg.name = _('GEDCOM') plg.name_accell = _('GE_DCOM') -plg.description = _('GEDCOM is used to transfer data between genealogy programs. ' +plg.description = _('GEDCOM is used to transfer data between genealogy programs. ' 'Most genealogy software will accept a GEDCOM file as input.') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -97,7 +97,7 @@ plg = newplugin() plg.id = 'ex_geneweb' plg.name = _('GeneWeb') plg.name_accell = _('_GeneWeb') -plg.description = _('GeneWeb is a web based genealogy program.') +plg.description = _('GeneWeb is a web based genealogy program.') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -118,7 +118,7 @@ plg = newplugin() plg.id = 'ex_gpkg' plg.name = _('Gramps XML Package (family tree and media)') plg.name_accell = _('Gra_mps XML Package (family tree and media)') -plg.description = _('Gramps package is an archived XML family tree together ' +plg.description = _('Gramps package is an archived XML family tree together ' 'with the media object files.') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -140,7 +140,7 @@ plg = newplugin() plg.id = 'ex_gramps' plg.name = _('Gramps XML (family tree)') plg.name_accell = _('Gramps _XML (family tree)') -plg.description = _('Gramps XML export is a complete archived XML backup of a' +plg.description = _('Gramps XML export is a complete archived XML backup of a' ' Gramps family tree without the media object files.' ' Suitable for backup purposes.') plg.version = '1.0' @@ -163,7 +163,7 @@ plg = newplugin() plg.id = 'ex_vcal' plg.name = _('vCalendar') plg.name_accell = _('vC_alendar') -plg.description = _('vCalendar is used in many calendaring and PIM applications.') +plg.description = _('vCalendar is used in many calendaring and PIM applications.') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -184,7 +184,7 @@ plg = newplugin() plg.id = 'ex_vcard' plg.name = _('vCard') plg.name_accell = _('_vCard') -plg.description = _('vCard is used in many addressbook and pim applications.') +plg.description = _('vCard is used in many addressbook and pim applications.') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE diff --git a/gramps/plugins/graph/graphplugins.gpr.py b/gramps/plugins/graph/graphplugins.gpr.py index 71884e530..e505f631a 100644 --- a/gramps/plugins/graph/graphplugins.gpr.py +++ b/gramps/plugins/graph/graphplugins.gpr.py @@ -34,7 +34,7 @@ MODULE_VERSION="5.1" plg = newplugin() plg.id = 'familylines_graph' plg.name = _("Family Lines Graph") -plg.description = _("Produces family line graphs using Graphviz.") +plg.description = _("Produces family line graphs using Graphviz.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -57,7 +57,7 @@ plg.require_active = False plg = newplugin() plg.id = 'hourglass_graph' plg.name = _("Hourglass Graph") -plg.description = _("Produces an hourglass graph using Graphviz.") +plg.description = _("Produces an hourglass graph using Graphviz.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -79,7 +79,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'rel_graph' plg.name = _("Relationship Graph") -plg.description = _("Produces relationship graphs using Graphviz.") +plg.description = _("Produces relationship graphs using Graphviz.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE diff --git a/gramps/plugins/importer/import.gpr.py b/gramps/plugins/importer/import.gpr.py index c4ef9e4d7..8afe15a1f 100644 --- a/gramps/plugins/importer/import.gpr.py +++ b/gramps/plugins/importer/import.gpr.py @@ -34,7 +34,7 @@ _mime_type_rfc_4180 = "text/csv" # CSV Document See rfc4180 for mime type plg = newplugin() plg.id = 'im_csv' plg.name = _("Comma Separated Values Spreadsheet (CSV)") -plg.description = _("Import data from CSV files") +plg.description = _("Import data from CSV files") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -52,7 +52,7 @@ plg.extension = "csv" plg = newplugin() plg.id = 'im_ged' plg.name = _('GEDCOM') -plg.description = _('GEDCOM is used to transfer data between genealogy programs. ' +plg.description = _('GEDCOM is used to transfer data between genealogy programs. ' 'Most genealogy software will accept a GEDCOM file as input.') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -71,7 +71,7 @@ plg.extension = "ged" plg = newplugin() plg.id = 'im_geneweb' plg.name = _('GeneWeb') -plg.description = _('Import data from GeneWeb files') +plg.description = _('Import data from GeneWeb files') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -89,7 +89,7 @@ plg.extension = "gw" plg = newplugin() plg.id = 'im_gpkg' plg.name = _('Gramps package (portable XML)') -plg.description = _('Import data from a Gramps package (an archived XML ' +plg.description = _('Import data from a Gramps package (an archived XML ' 'Family Tree together with the media object files.)') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -108,7 +108,7 @@ plg.extension = "gpkg" plg = newplugin() plg.id = 'im_gramps' plg.name = _('Gramps XML Family Tree') -plg.description = _('The Gramps XML format is a text ' +plg.description = _('The Gramps XML format is a text ' 'version of a Family Tree. It is ' 'read-write compatible with the ' 'present Gramps database format.') @@ -129,7 +129,7 @@ plg.extension = "gramps" plg = newplugin() plg.id = 'im_grdb' plg.name = _('Gramps 2.x database') -plg.description = _('Import data from Gramps 2.x database files') +plg.description = _('Import data from Gramps 2.x database files') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -147,7 +147,7 @@ plg.extension = "grdb" plg = newplugin() plg.id = 'im_progen' plg.name = _('Pro-Gen') -plg.description = _('Import data from Pro-Gen files') +plg.description = _('Import data from Pro-Gen files') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -165,7 +165,7 @@ plg.extension = "def" plg = newplugin() plg.id = 'im_vcard' plg.name = _('vCard') -plg.description = _('Import data from vCard files') +plg.description = _('Import data from vCard files') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE diff --git a/gramps/plugins/importer/importgeneweb.py b/gramps/plugins/importer/importgeneweb.py index f54662eb6..3db059512 100644 --- a/gramps/plugins/importer/importgeneweb.py +++ b/gramps/plugins/importer/importgeneweb.py @@ -667,13 +667,13 @@ class GeneWebParser: titleparts = self.decode(field[1:-1]).split(":") tname = ttitle = tplace = tstart = tend = tnth = None try: - tname = titleparts[0] + tname = titleparts[0] ttitle = titleparts[1] if titleparts[2]: tplace = self.get_or_create_place(titleparts[2]) tstart = self.parse_date(titleparts[3]) - tend = self.parse_date(titleparts[4]) - tnth = titleparts[5] + tend = self.parse_date(titleparts[4]) + tnth = titleparts[5] except IndexError: # not all parts are written all the time pass if tnth: # Append title numer to title diff --git a/gramps/plugins/lib/libholiday.py b/gramps/plugins/lib/libholiday.py index e527c6a88..27bc117ce 100644 --- a/gramps/plugins/lib/libholiday.py +++ b/gramps/plugins/lib/libholiday.py @@ -128,10 +128,10 @@ def dst(year, area="us"): stop = "%d/%d/%d" % (year, 11, 7 - (math.floor(1 + year * 5 / 4) % 7)) # November else: start = "%d/%d/%d" % (year, 4, (2 + 6 * year - math.floor(year / 4)) % 7 + 1) # April - stop = "%d/%d/%d" % (year, 10, (31 - (math.floor(year * 5 / 4) + 1) % 7)) # October + stop = "%d/%d/%d" % (year, 10, (31 - (math.floor(year * 5 / 4) + 1) % 7)) # October elif area == "eu": start = "%d/%d/%d" % (year, 3, (31 - (math.floor(year * 5 / 4) + 4) % 7)) # March - stop = "%d/%d/%d" % (year, 10, (31 - (math.floor(year * 5 / 4) + 1) % 7)) # Oct + stop = "%d/%d/%d" % (year, 10, (31 - (math.floor(year * 5 / 4) + 1) % 7)) # Oct return (start, stop) def dow(y, m, d): diff --git a/gramps/plugins/lib/libplugins.gpr.py b/gramps/plugins/lib/libplugins.gpr.py index 0056f0b0a..6bf7f5e3c 100644 --- a/gramps/plugins/lib/libplugins.gpr.py +++ b/gramps/plugins/lib/libplugins.gpr.py @@ -32,7 +32,7 @@ MODULE_VERSION="5.1" register(GENERAL, id = 'libcairodoc', name = "Cairodoc lib", -description = _("Provides a library for using Cairo to " +description = _("Provides a library for using Cairo to " "generate documents."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -51,7 +51,7 @@ authors_email = ["http://gramps-project.org"], register(GENERAL, id = 'libgedcom', name = "GEDCOM library", -description = _("Provides GEDCOM processing functionality"), +description = _("Provides GEDCOM processing functionality"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -85,7 +85,7 @@ register(GENERAL, register(GENERAL, id = 'libgrampsxml', name = "Grampsxml lib", -description = _("Provides common functionality for Gramps XML " +description = _("Provides common functionality for Gramps XML " "import/export."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -104,7 +104,7 @@ authors_email = ["http://gramps-project.org"], register(GENERAL, id = 'libholiday', name = "holiday lib", -description = _("Provides holiday information for different countries.") , +description = _("Provides holiday information for different countries.") , version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -122,7 +122,7 @@ authors_email = ["http://gramps-project.org"], register(GENERAL, id = 'libhtmlbackend', name = "htmlbackend lib", -description = _("Manages a HTML file implementing DocBackend.") , +description = _("Manages a HTML file implementing DocBackend.") , version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -140,7 +140,7 @@ authors_email = ["http://gramps-project.org"], register(GENERAL, id = 'libhtmlconst', name = "htmlconst lib", -description = _("Common constants for html files.") , +description = _("Common constants for html files.") , version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -158,7 +158,7 @@ authors_email = ["http://gramps-project.org"], register(GENERAL, id = 'libhtml', name = "html lib", -description = _("Manages an HTML DOM tree.") , +description = _("Manages an HTML DOM tree.") , version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -176,7 +176,7 @@ authors_email = ["gerald.britton@gmail.com"], register(GENERAL, id = 'libmapservice', name = "mapservice lib", -description = _("Provides base functionality for map services.") , +description = _("Provides base functionality for map services.") , version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -193,7 +193,7 @@ authors_email = ["http://gramps-project.org"], register(GENERAL, id = 'libnarrate', name = "narration lib", -description = _("Provides Textual Narration.") , +description = _("Provides Textual Narration.") , version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -210,7 +210,7 @@ authors_email = ["brian@gramps-project.org"], register(GENERAL, id = 'libodfbackend', name = "odfbackend lib", -description = _("Manages an ODF file implementing DocBackend.") , +description = _("Manages an ODF file implementing DocBackend.") , version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -227,7 +227,7 @@ authors_email = ["http://gramps-project.org"], register(GENERAL, id = 'libpersonview', name = "person list lib", -description = _("Provides the Base needed for the List People views.") , +description = _("Provides the Base needed for the List People views.") , version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -244,7 +244,7 @@ authors_email = ["http://gramps-project.org"], register(GENERAL, id = 'libprogen', name = "Pro-Gen lib", -description = _("Provides common functionality for Pro-Gen import"), +description = _("Provides common functionality for Pro-Gen import"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -262,7 +262,7 @@ authors_email = ["http://gramps-project.org"], register(GENERAL, id = 'libplaceview', name = "place list lib", -description = _("Provides the Base needed for the List Place views.") , +description = _("Provides the Base needed for the List Place views.") , version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -279,7 +279,7 @@ authors_email = ["http://gramps-project.org"], register(GENERAL, id = 'libsubstkeyword', name = "Substitution Values", -description = _("Provides variable substitution on display lines.") , +description = _("Provides variable substitution on display lines.") , version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -296,7 +296,7 @@ authors_email = ["http://gramps-project.org"], register(GENERAL, id = 'libtreebase', name = "Graphical report lib", -description = _("Provides the base needed for the ancestor and " +description = _("Provides the base needed for the ancestor and " "descendant graphical reports.") , version = '1.0', gramps_target_version = MODULE_VERSION, diff --git a/gramps/plugins/mapservices/eniroswedenmap.py b/gramps/plugins/mapservices/eniroswedenmap.py index e0aac0b1c..a58b88d17 100644 --- a/gramps/plugins/mapservices/eniroswedenmap.py +++ b/gramps/plugins/mapservices/eniroswedenmap.py @@ -155,7 +155,7 @@ class EniroSVMapService(MapService): if coord_ok: place_title = _build_title(self.database, place) - place_city = _build_city(self.database, place) + place_city = _build_city(self.database, place) x_coord, y_coord = self._lat_lon(place, format="RT90") # Set zoom level to 5 if Sweden/Denmark, others 3 zoom = 5 diff --git a/gramps/plugins/mapservices/mapservice.gpr.py b/gramps/plugins/mapservices/mapservice.gpr.py index eb2f77571..955e2f150 100644 --- a/gramps/plugins/mapservices/mapservice.gpr.py +++ b/gramps/plugins/mapservices/mapservice.gpr.py @@ -31,7 +31,7 @@ MODULE_VERSION="5.1" register(MAPSERVICE, id = 'EniroMaps', name = _("EniroMaps"), -description = _("Opens on kartor.eniro.se"), +description = _("Opens on kartor.eniro.se"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -50,7 +50,7 @@ mapservice = 'EniroSVMapService' register(MAPSERVICE, id = 'GoogleMaps', name = _("GoogleMaps"), -description = _("Open on maps.google.com"), +description = _("Open on maps.google.com"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -69,7 +69,7 @@ mapservice = 'GoogleMapService' register(MAPSERVICE, id = 'OpenStreetMap', name = _("OpenStreetMap"), -description = _("Open on openstreetmap.org"), +description = _("Open on openstreetmap.org"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, diff --git a/gramps/plugins/quickview/quickview.gpr.py b/gramps/plugins/quickview/quickview.gpr.py index c78b59e62..4328732d2 100644 --- a/gramps/plugins/quickview/quickview.gpr.py +++ b/gramps/plugins/quickview/quickview.gpr.py @@ -33,7 +33,7 @@ MODULE_VERSION="5.1" register(QUICKREPORT, id = 'ageondate', name = _("Age on Date"), -description = _("Display people and ages on a particular date"), +description = _("Display people and ages on a particular date"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -53,7 +53,7 @@ runfunc = 'run' register(QUICKREPORT, id = 'attribute_match', name = _("Attribute Match"), -description = _("Display people with same attribute."), +description = _("Display people with same attribute."), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -73,7 +73,7 @@ runfunc = 'run' register(QUICKREPORT, id = 'all_events', name = _("All Events"), -description = _("Display a person's events, both personal and family."), +description = _("Display a person's events, both personal and family."), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -88,7 +88,7 @@ runfunc = 'run' register(QUICKREPORT, id = 'all_events_fam', name = _("All Family Events"), -description = _("Display the family and family members events."), +description = _("Display the family and family members events."), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -108,7 +108,7 @@ runfunc = 'run_fam' register(QUICKREPORT, id = 'all_relations', name = _("Relation to Home Person"), -description = _("Display all relationships between person and home person."), +description = _("Display all relationships between person and home person."), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -128,7 +128,7 @@ runfunc = 'run' register(QUICKREPORT, id = 'filterbyname', name = _("Filter"), -description = _("Display filtered data"), +description = _("Display filtered data"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -148,7 +148,7 @@ runfunc = 'run' register(QUICKREPORT, id = 'father_lineage', name = _("Father lineage"), -description = _("Display father lineage"), +description = _("Display father lineage"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -162,7 +162,7 @@ runfunc = 'run_father' register(QUICKREPORT, id = 'mother_lineage', name = _("Mother lineage"), -description = _("Display mother lineage"), +description = _("Display mother lineage"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -182,7 +182,7 @@ runfunc = 'run_mother' register(QUICKREPORT, id = 'onthisday', name = _("On This Day"), -description = _("Display events on a particular day"), +description = _("Display events on a particular day"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -215,7 +215,7 @@ for (category, item, trans) in refitems: register(QUICKREPORT, id = item + 'references', name = _("%s References") % trans, - description = _("Display references for a %s") % trans, + description = _("Display references for a %s") % trans, version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -229,7 +229,7 @@ for (category, item, trans) in refitems: register(QUICKREPORT, id = 'link_references', name = _("Link References"), - description = _("Display link references for a note"), + description = _("Display link references for a note"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -249,7 +249,7 @@ register(QUICKREPORT, register(QUICKREPORT, id = 'RepoRef', name = _("Repository References"), -description = _("Display the repository reference for sources related to" +description = _("Display the repository reference for sources related to" " the active repository"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -270,7 +270,7 @@ runfunc = 'run' register(QUICKREPORT, id = 'samesurnames', name = _("Same Surnames"), -description = _("Display people with the same surname as a person."), +description = _("Display people with the same surname as a person."), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -284,7 +284,7 @@ runfunc = 'run' register(QUICKREPORT, id = 'samegivens', name = _("Same Given Names"), -description = _("Display people with the same given name as a person."), +description = _("Display people with the same given name as a person."), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -298,7 +298,7 @@ runfunc = 'run_given' register(QUICKREPORT, id = 'samegivens_misc', name = _("Same Given Names - stand-alone"), -description = _("Display people with the same given name as a person."), +description = _("Display people with the same given name as a person."), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -317,7 +317,7 @@ runfunc = 'run_given' register(QUICKREPORT, id = 'siblings', name = _("Siblings"), -description = _("Display a person's siblings."), +description = _("Display a person's siblings."), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, diff --git a/gramps/plugins/rel/rel_ru.py b/gramps/plugins/rel/rel_ru.py index 1b38a595d..cbc947494 100644 --- a/gramps/plugins/rel/rel_ru.py +++ b/gramps/plugins/rel/rel_ru.py @@ -470,7 +470,7 @@ class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator): rel_str = "%s %s" % ( _cousin_level[Gb-1], _seniors_removed_level[Ga-Gb] ) else: - rel_str = "(старшие) дальние родственники" + rel_str = "(старшие) дальние родственники" else: # These are cousins in different generations with the second person # being in a lower generation from the common ancestor than the @@ -479,7 +479,7 @@ class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator): rel_str = "%s %s" % ( _cousin_level[Ga-1], _juniors_removed_level[Gb-Ga] ) else: - rel_str = "(младшие) дальние родственники" + rel_str = "(младшие) дальние родственники" if in_law_b == True: # TODO: Translate this! diff --git a/gramps/plugins/rel/rel_sk.py b/gramps/plugins/rel/rel_sk.py index 6c9cbdeb4..fdc5e912d 100644 --- a/gramps/plugins/rel/rel_sk.py +++ b/gramps/plugins/rel/rel_sk.py @@ -307,7 +307,7 @@ class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator): civ = " a do %s stupňa (civ.)" % ( _removed_level[Ga+Gb+1] ) rel_str = "synovci a netere" + can + civ elif Ga < len(_level_name): - rel_str = "synovci a netere" + bygen % ( + rel_str = "synovci a netere" + bygen % ( Gb) if in_law_b == True: # TODO: Translate this! diff --git a/gramps/plugins/rel/rel_sv.py b/gramps/plugins/rel/rel_sv.py index dafaa4a74..3495d03ce 100644 --- a/gramps/plugins/rel/rel_sv.py +++ b/gramps/plugins/rel/rel_sv.py @@ -403,7 +403,7 @@ class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator): rel_str = "förfäders " + self._get_cousin_kinship(Ga) + \ " i "+ _level_name[Gb] + " generationen" else: - rel_str = "avlägsna kusiner" + rel_str = "avlägsna kusiner" elif Gb > 1 and Gb > Ga: # These are cousins in different generations with the second person # being in a lower generation from the common ancestor than the @@ -415,7 +415,7 @@ class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator): result.append("barn") rel_str = self.pair_up(result,'') else: - rel_str = "avlägsna kusiner" + rel_str = "avlägsna kusiner" if in_law_b == True: rel_str = "makar till %s" % rel_str diff --git a/gramps/plugins/rel/relplugins.gpr.py b/gramps/plugins/rel/relplugins.gpr.py index 536cdfb2c..6ef80dd1d 100644 --- a/gramps/plugins/rel/relplugins.gpr.py +++ b/gramps/plugins/rel/relplugins.gpr.py @@ -32,7 +32,7 @@ MODULE_VERSION="5.1" plg = newplugin() plg.id = 'relcalc_ca' plg.name = _("Catalan Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -46,7 +46,7 @@ plg.lang_list = ['ca_ES', 'ca', 'català', 'Catalan', 'ca_FR', 'ca_AD', 'ca_IT'] plg = newplugin() plg.id = 'relcalc_cs' plg.name = _("Czech Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -59,7 +59,7 @@ plg.lang_list = ["cs", "CZ", "cs_CZ", "česky", "czech", "Czech", "cs_CZ.UTF8", plg = newplugin() plg.id = 'relcalc_da' plg.name = _("Danish Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -75,7 +75,7 @@ plg.lang_list = [ "da", "DA", "da_DK", "danish", "Danish", "da_DK.UTF8", plg = newplugin() plg.id = 'relcalc_de' plg.name = _("German Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -91,7 +91,7 @@ plg.lang_list = ["de", "DE", "de_DE", "deutsch", "Deutsch", "de_DE.UTF8", plg = newplugin() plg.id = 'relcalc_es' plg.name = _("Spanish Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -106,7 +106,7 @@ plg.lang_list = ["es", "ES", "es_ES", "espanol", "Espanol", "es_ES.UTF8", plg = newplugin() plg.id = 'relcalc_fi' plg.name = _("Finnish Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -121,7 +121,7 @@ plg.lang_list = ["fi", "FI", "fi_FI", "finnish", "Finnish", "fi_FI.UTF8", plg = newplugin() plg.id = 'relcalc_fr' plg.name = _("French Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -138,7 +138,7 @@ plg.lang_list = ["fr", "FR", "fr_FR", "fr_CA", "français", plg = newplugin() plg.id = 'relcalc_hr' plg.name = _("Croatian Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -152,7 +152,7 @@ plg.lang_list = ["hrvatski", "Hrvatski", "croatian", "Croatian", "hr", "HR", plg = newplugin() plg.id = 'relcalc_hu' plg.name = _("Hungarian Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -165,7 +165,7 @@ plg.lang_list = ["hu", "HU", "hu_HU", "hu_HU.utf8", "hu_HU.UTF8"] plg = newplugin() plg.id = 'relcalc_is' plg.name = _("Icelandic Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -178,7 +178,7 @@ plg.lang_list = ["is", "IS", "is_IS", "is_IS@euro", "is_IS.utf8"] plg = newplugin() plg.id = 'relcalc_it' plg.name = _("Italian Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -191,7 +191,7 @@ plg.lang_list = ["it", "IT", "it_IT", "it_IT@euro", "it_IT.utf8"] plg = newplugin() plg.id = 'relcalc_nl' plg.name = _("Dutch Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -208,7 +208,7 @@ plg.lang_list = ["nl", "NL", "nl_NL", "nl_BE", "nederlands", "Nederlands", plg = newplugin() plg.id = 'relcalc_no' plg.name = _("Norwegian Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -225,7 +225,7 @@ plg.lang_list = ["nb", "nn", "no", "nb_NO", "nn_NO", "no_NO", "nb_NO.UTF8", plg = newplugin() plg.id = 'relcalc_pl' plg.name = _("Polish Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -241,7 +241,7 @@ plg.lang_list = ["pl", "PL", "pl_PL", "polski", "Polski", plg = newplugin() plg.id = 'relcalc_pt' plg.name = _("Portuguese Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -257,7 +257,7 @@ plg.lang_list = ["pt", "PT", "pt_PT", "pt_BR", "portugues", "Portugues", plg = newplugin() plg.id = 'relcalc_ru' plg.name = _("Russian Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -273,7 +273,7 @@ plg.lang_list = ["ru", "RU", "ru_RU", "koi8r", "ru_koi8r", "russian", plg = newplugin() plg.id = 'relcalc_sk' plg.name = _("Slovak Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -287,7 +287,7 @@ plg.lang_list = ["sk", "SK", "sk_SK", "slovensky", "slovak", "Slovak", plg = newplugin() plg.id = 'relcalc_sl' plg.name = _("Slovenian Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -300,7 +300,7 @@ plg.lang_list = ["sl", "SL", "sl_SI", "slovenščina", "slovenian", "Slovenian", plg = newplugin() plg.id = 'relcalc_sv' plg.name = _("Swedish Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -314,7 +314,7 @@ plg.lang_list = ["sv", "SV", "sv_SE", "swedish", "Swedish", "sv_SE.UTF8", plg = newplugin() plg.id = 'relcalc_uk' plg.name = _("Ukrainian Relationship Calculator") -plg.description = _("Calculates relationships between people") +plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE diff --git a/gramps/plugins/sidebar/sidebar.gpr.py b/gramps/plugins/sidebar/sidebar.gpr.py index d9ae76b47..502857ec6 100644 --- a/gramps/plugins/sidebar/sidebar.gpr.py +++ b/gramps/plugins/sidebar/sidebar.gpr.py @@ -31,7 +31,7 @@ MODULE_VERSION="5.1" register(SIDEBAR, id = 'categorysidebar', name = _("Category Sidebar"), -description = _("A sidebar to allow the selection of view categories"), +description = _("A sidebar to allow the selection of view categories"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -46,7 +46,7 @@ order = START register(SIDEBAR, id = 'dropdownsidebar', name = _("Drop-down Sidebar"), -description = _("Selection of categories and views from drop-down lists"), +description = _("Selection of categories and views from drop-down lists"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -61,7 +61,7 @@ order = END register(SIDEBAR, id = 'expandersidebar', name = _("Expander Sidebar"), -description = _("Selection of views from lists with expanders"), +description = _("Selection of views from lists with expanders"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, diff --git a/gramps/plugins/textreport/birthdayreport.py b/gramps/plugins/textreport/birthdayreport.py index c79eb09c5..f62990668 100644 --- a/gramps/plugins/textreport/birthdayreport.py +++ b/gramps/plugins/textreport/birthdayreport.py @@ -101,7 +101,7 @@ class BirthdayReport(Report): self.text2 = mgobn('text2') self.text3 = mgobn('text3') self.deadtxt = mgobn('deadtxt') - self.filter_option = menu.get_option_by_name('filter') + self.filter_option = menu.get_option_by_name('filter') self.filter = self.filter_option.get_filter() self.showyear = mgobn('showyear') pid = mgobn('pid') diff --git a/gramps/plugins/textreport/textplugins.gpr.py b/gramps/plugins/textreport/textplugins.gpr.py index 0bd0a3af0..cd2dfd4f3 100644 --- a/gramps/plugins/textreport/textplugins.gpr.py +++ b/gramps/plugins/textreport/textplugins.gpr.py @@ -35,7 +35,7 @@ MODULE_VERSION="5.1" plg = newplugin() plg.id = 'ancestor_report' plg.name = _("Ahnentafel Report") -plg.description = _("Produces a textual ancestral report") +plg.description = _("Produces a textual ancestral report") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -57,7 +57,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'birthday_report' plg.name = _("Birthday and Anniversary Report") -plg.description = _("Produces a report of birthdays and anniversaries") +plg.description = _("Produces a report of birthdays and anniversaries") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -79,7 +79,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'custom_text' plg.name = _("Custom Text") -plg.description = _("Add custom text to the book report") +plg.description = _("Add custom text to the book report") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -101,7 +101,7 @@ plg.report_modes = [REPORT_MODE_BKI] plg = newplugin() plg.id = 'descend_report' plg.name = _("Descendant Report") -plg.description = _("Produces a list of descendants of the active person") +plg.description = _("Produces a list of descendants of the active person") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -123,7 +123,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'det_ancestor_report' plg.name = _("Detailed Ancestral Report") -plg.description = _("Produces a detailed ancestral report") +plg.description = _("Produces a detailed ancestral report") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -145,7 +145,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'det_descendant_report' plg.name = _("Detailed Descendant Report") -plg.description = _("Produces a detailed descendant report") +plg.description = _("Produces a detailed descendant report") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -167,7 +167,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'endofline_report' plg.name = _("End of Line Report") -plg.description = _("Produces a textual end of line report") +plg.description = _("Produces a textual end of line report") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -189,7 +189,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'family_group' plg.name = _("Family Group Report") -plg.description = _("Produces a family group report showing information " +plg.description = _("Produces a family group report showing information " "on a set of parents and their children.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -212,7 +212,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'indiv_complete' plg.name = _("Complete Individual Report") -plg.description = _("Produces a complete report on the selected people") +plg.description = _("Produces a complete report on the selected people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -234,7 +234,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'kinship_report' plg.name = _("Kinship Report") -plg.description = _("Produces a textual report of kinship for a given person") +plg.description = _("Produces a textual report of kinship for a given person") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -256,7 +256,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'tag_report' plg.name = _("Tag Report") -plg.description = _("Produces a list of people with a specified tag") +plg.description = _("Produces a list of people with a specified tag") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -279,7 +279,7 @@ plg.require_active = False plg = newplugin() plg.id = 'number_of_ancestors' plg.name = _("Number of Ancestors Report") -plg.description = _("Counts number of ancestors of selected person") +plg.description = _("Counts number of ancestors of selected person") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -301,7 +301,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'place_report' plg.name = _("Place Report") -plg.description = _("Produces a textual place report") +plg.description = _("Produces a textual place report") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -324,7 +324,7 @@ plg.require_active = False plg = newplugin() plg.id = 'simple_book_title' plg.name = _("Title Page") -plg.description = _("Produces a title page for book reports.") +plg.description = _("Produces a title page for book reports.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -346,7 +346,7 @@ plg.report_modes = [REPORT_MODE_BKI] plg = newplugin() plg.id = 'summary' plg.name = _("Database Summary Report") -plg.description = _("Provides a summary of the current database") +plg.description = _("Provides a summary of the current database") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -369,7 +369,7 @@ plg.require_active = False plg = newplugin() plg.id = 'table_of_contents' plg.name = _("Table Of Contents") -plg.description = _("Produces a table of contents for book reports.") +plg.description = _("Produces a table of contents for book reports.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE diff --git a/gramps/plugins/tool/mediamanager.py b/gramps/plugins/tool/mediamanager.py index 95d83b698..a369d7a2d 100644 --- a/gramps/plugins/tool/mediamanager.py +++ b/gramps/plugins/tool/mediamanager.py @@ -386,12 +386,12 @@ class ConclusionPage(Gtk.Box): def set_result(self, success): if success: - conclusion_title = _('Operation successfully finished') + conclusion_title = _('Operation successfully finished') conclusion_text = _( 'The operation you requested has finished successfully. ' 'You may press Close now to continue.') else: - conclusion_title = _('Operation failed') + conclusion_title = _('Operation failed') conclusion_text = _( 'There was an error while performing the requested ' 'operation. You may try starting the tool again.') diff --git a/gramps/plugins/tool/tools.gpr.py b/gramps/plugins/tool/tools.gpr.py index cdbe7cf54..ec3ef498c 100644 --- a/gramps/plugins/tool/tools.gpr.py +++ b/gramps/plugins/tool/tools.gpr.py @@ -36,7 +36,7 @@ MODULE_VERSION="5.1" register(TOOL, id = 'chname', name = _("Fix Capitalization of Family Names"), -description = _("Searches the entire database and attempts to " +description = _("Searches the entire database and attempts to " "fix capitalization of the names."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -59,7 +59,7 @@ tool_modes = [TOOL_MODE_GUI] register(TOOL, id = 'chtype', name = _("Rename Event Types"), -description = _("Allows all the events of a certain name " +description = _("Allows all the events of a certain name " "to be renamed to a new name."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -82,7 +82,7 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] register(TOOL, id = 'check', name = _("Check and Repair Database"), -description = _("Checks the database for integrity problems, fixing the " +description = _("Checks the database for integrity problems, fixing the " "problems that it can"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -105,7 +105,7 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] register(TOOL, id = 'eventcmp', name = _("Compare Individual Events"), -description = _("Aids in the analysis of data by allowing the " +description = _("Aids in the analysis of data by allowing the " "development of custom filters that can be applied " "to the database to find similar events"), version = '1.0', @@ -129,7 +129,7 @@ tool_modes = [TOOL_MODE_GUI] register(TOOL, id = 'evname', name = _("Extract Event Description"), -description = _("Extracts event descriptions from the event data"), +description = _("Extracts event descriptions from the event data"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -151,7 +151,7 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] register(TOOL, id = 'dupfind', name = _("Find Possible Duplicate People"), -description = _("Searches the entire database, looking for " +description = _("Searches the entire database, looking for " "individual entries that may represent the same person."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -174,7 +174,7 @@ tool_modes = [TOOL_MODE_GUI] register(TOOL, id = 'mediaman', name = _("Media Manager"), -description = _("Manages batch operations on media files"), +description = _("Manages batch operations on media files"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -196,7 +196,7 @@ tool_modes = [TOOL_MODE_GUI] register(TOOL, id = 'not_related', name = _("Not Related"), -description = _("Find people who are not in any way related to the " +description = _("Find people who are not in any way related to the " "selected person"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -219,7 +219,7 @@ tool_modes = [TOOL_MODE_GUI] register(TOOL, id = 'editowner', name = _("Edit Database Owner Information"), -description = _("Allow editing database owner information."), +description = _("Allow editing database owner information."), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -241,7 +241,7 @@ tool_modes = [TOOL_MODE_GUI] register(TOOL, id = 'patchnames', name = _("Extract Information from Names"), -description = _("Extract titles, prefixes and compound surnames from given name or family name."), +description = _("Extract titles, prefixes and compound surnames from given name or family name."), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -263,7 +263,7 @@ tool_modes = [TOOL_MODE_GUI] register(TOOL, id = 'rebuild', name = _("Rebuild Secondary Indexes"), -description = _("Rebuilds secondary indexes"), +description = _("Rebuilds secondary indexes"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -285,7 +285,7 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] register(TOOL, id = 'rebuild_refmap', name = _("Rebuild Reference Maps"), -description = _("Rebuilds reference maps"), +description = _("Rebuilds reference maps"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -307,7 +307,7 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] register(TOOL, id = 'rebuild_genstats', name = _("Rebuild Gender Statistics"), -description = _("Rebuilds gender statistics for name gender guessing..."), +description = _("Rebuilds gender statistics for name gender guessing..."), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -329,7 +329,7 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] register(TOOL, id = 'relcalc', name = _("Relationship Calculator"), -description = _("Calculates the relationship between two people"), +description = _("Calculates the relationship between two people"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -351,7 +351,7 @@ tool_modes = [TOOL_MODE_GUI] register(TOOL, id = 'remove_unused', name = _("Remove Unused Objects"), -description = _("Removes unused objects from the database"), +description = _("Removes unused objects from the database"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -373,7 +373,7 @@ tool_modes = [TOOL_MODE_GUI] register(TOOL, id = 'reorder_ids', name = _("Reorder Gramps IDs"), -description = _("Reorders the Gramps IDs " +description = _("Reorders the Gramps IDs " "according to Gramps' default rules."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -396,7 +396,7 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] register(TOOL, id = 'sortevents', name = _("Sorts events"), -description = _("Sorts events"), +description = _("Sorts events"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -418,7 +418,7 @@ tool_modes = [TOOL_MODE_GUI] register(TOOL, id = 'verify', name = _("Verify the Data"), -description = _("Verifies the data against user-defined tests"), +description = _("Verifies the data against user-defined tests"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -440,7 +440,7 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] register(TOOL, id = 'mergecitations', name = _("Merge Citations"), -description = _("Searches the entire database, looking for " +description = _("Searches the entire database, looking for " "citations that have the same Volume/Page, Date and Confidence."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -463,7 +463,7 @@ tool_modes = [TOOL_MODE_GUI] register(TOOL, id = 'loop', name = _("Find database loop"), -description = _("Searches the entire database, looking for " +description = _("Searches the entire database, looking for " "a possible loop."), version = '1.0', gramps_target_version = MODULE_VERSION, diff --git a/gramps/plugins/tool/toolsdebug.gpr.py b/gramps/plugins/tool/toolsdebug.gpr.py index 12d9b9fc9..9101bdc86 100644 --- a/gramps/plugins/tool/toolsdebug.gpr.py +++ b/gramps/plugins/tool/toolsdebug.gpr.py @@ -36,7 +36,7 @@ MODULE_VERSION="5.1" register(TOOL, id = 'test_for_date_parser_and_displayer', name = "Check Localized Date Displayer and Parser", -description = ("This test tool will create many people showing all" +description = ("This test tool will create many people showing all" " different date variants as birth. The death date is" " created by parsing the result of the date displayer for" " the birth date. This way you can ensure that dates" @@ -85,7 +85,7 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] register(TOOL, id = 'testcasegenerator', name = "Generate Testcases for Persons and Families", -description = ("The testcase generator will generate some persons " +description = ("The testcase generator will generate some persons " "and families that have broken links in the database " "or data that is in conflict to a relation."), version = '1.0', @@ -109,7 +109,7 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] register(TOOL, id = 'populatesources', name = "Populate Sources and Citations", -description = ("This tool generates sources and citations for each source in " +description = ("This tool generates sources and citations for each source in " "order to populate the database for testing with significant " "numbers of sources and citations."), version = '1.0', diff --git a/gramps/plugins/view/citationlistview.py b/gramps/plugins/view/citationlistview.py index de378c70c..944b4feda 100644 --- a/gramps/plugins/view/citationlistview.py +++ b/gramps/plugins/view/citationlistview.py @@ -79,16 +79,16 @@ class CitationListView(ListView): """ # The data items here have to correspond, in order, to the items in # src/giu/views/treemodels/citationlismodel.py - COL_TITLE_PAGE = 0 - COL_ID = 1 - COL_DATE = 2 - COL_CONFIDENCE = 3 - COL_PRIV = 4 - COL_TAGS = 5 - COL_CHAN = 6 - COL_SRC_TITLE = 7 - COL_SRC_ID = 8 - COL_SRC_AUTH = 9 + COL_TITLE_PAGE = 0 + COL_ID = 1 + COL_DATE = 2 + COL_CONFIDENCE = 3 + COL_PRIV = 4 + COL_TAGS = 5 + COL_CHAN = 6 + COL_SRC_TITLE = 7 + COL_SRC_ID = 8 + COL_SRC_AUTH = 9 COL_SRC_ABBR = 10 COL_SRC_PINFO = 11 COL_SRC_PRIV = 12 diff --git a/gramps/plugins/view/citationtreeview.py b/gramps/plugins/view/citationtreeview.py index b6de85b5c..985f72575 100644 --- a/gramps/plugins/view/citationtreeview.py +++ b/gramps/plugins/view/citationtreeview.py @@ -78,16 +78,16 @@ class CitationTreeView(ListView): """ # The data items here have to correspond, in order, to the items in # src/giu/views/treemodels/citationtreemodel.py - COL_TITLE_PAGE = 0 - COL_ID = 1 - COL_DATE = 2 - COL_CONFIDENCE = 3 - COL_PRIV = 4 - COL_TAGS = 5 - COL_CHAN = 6 - COL_SRC_AUTH = 7 - COL_SRC_ABBR = 8 - COL_SRC_PINFO = 9 + COL_TITLE_PAGE = 0 + COL_ID = 1 + COL_DATE = 2 + COL_CONFIDENCE = 3 + COL_PRIV = 4 + COL_TAGS = 5 + COL_CHAN = 6 + COL_SRC_AUTH = 7 + COL_SRC_ABBR = 8 + COL_SRC_PINFO = 9 # column definitions COLUMNS = [ (_('Source: Title or Citation: Volume/Page'), TEXT, None), diff --git a/gramps/plugins/view/fanchart2wayview.py b/gramps/plugins/view/fanchart2wayview.py index 9a7ab7fc3..662ad6cad 100644 --- a/gramps/plugins/view/fanchart2wayview.py +++ b/gramps/plugins/view/fanchart2wayview.py @@ -91,8 +91,8 @@ class FanChart2WayView(fanchart2way.FanChart2WayGrampsGUI, NavigationView): self.flipupsidedownname = self._config.get('interface.fanview-flipupsidedownname') self.fonttype = self._config.get('interface.fanview-font') - self.grad_start = self._config.get('interface.color-start-grad') - self.grad_end = self._config.get('interface.color-end-grad') + self.grad_start = self._config.get('interface.color-start-grad') + self.grad_end = self._config.get('interface.color-end-grad') self.form = fanchart.FORM_CIRCLE self.angle_algo = self._config.get('interface.angle-algorithm') self.dupcolor = self._config.get('interface.duplicate-color') @@ -342,7 +342,7 @@ class FanChart2WayView(fanchart2way.FanChart2WayGrampsGUI, NavigationView): def cb_update_maxgen(self, spinbtn, constant): self._config.set(constant, spinbtn.get_value_as_int()) self.generations_asc = int(self._config.get('interface.fanview-maxgen-asc')) - self.generations_desc = int(self._config.get('interface.fanview-maxgen-desc')) + self.generations_desc = int(self._config.get('interface.fanview-maxgen-desc')) self.update() def cb_update_twolinename(self, client, cnxn_id, entry, data): diff --git a/gramps/plugins/view/fanchartdescview.py b/gramps/plugins/view/fanchartdescview.py index 51093acae..9580f6534 100644 --- a/gramps/plugins/view/fanchartdescview.py +++ b/gramps/plugins/view/fanchartdescview.py @@ -86,8 +86,8 @@ class FanChartDescView(fanchartdesc.FanChartDescGrampsGUI, NavigationView): self.flipupsidedownname = self._config.get('interface.fanview-flipupsidedownname') self.fonttype = self._config.get('interface.fanview-font') - self.grad_start = self._config.get('interface.color-start-grad') - self.grad_end = self._config.get('interface.color-end-grad') + self.grad_start = self._config.get('interface.color-start-grad') + self.grad_end = self._config.get('interface.color-end-grad') self.form = self._config.get('interface.fanview-form') self.angle_algo = self._config.get('interface.angle-algorithm') self.dupcolor = self._config.get('interface.duplicate-color') diff --git a/gramps/plugins/view/fanchartview.py b/gramps/plugins/view/fanchartview.py index 65b3f557b..61e45e75f 100644 --- a/gramps/plugins/view/fanchartview.py +++ b/gramps/plugins/view/fanchartview.py @@ -78,14 +78,14 @@ class FanChartView(fanchart.FanChartGrampsGUI, NavigationView): #set needed values self.maxgen = self._config.get('interface.fanview-maxgen') self.background = self._config.get('interface.fanview-background') - self.childring = self._config.get('interface.fanview-childrenring') + self.childring = self._config.get('interface.fanview-childrenring') self.radialtext = self._config.get('interface.fanview-radialtext') self.twolinename = self._config.get('interface.fanview-twolinename') self.flipupsidedownname = self._config.get('interface.fanview-flipupsidedownname') self.fonttype = self._config.get('interface.fanview-font') - self.grad_start = self._config.get('interface.color-start-grad') - self.grad_end = self._config.get('interface.color-end-grad') + self.grad_start = self._config.get('interface.color-start-grad') + self.grad_end = self._config.get('interface.color-end-grad') self.form = self._config.get('interface.fanview-form') self.generic_filter = None self.alpha_filter = 0.2 diff --git a/gramps/plugins/view/view.gpr.py b/gramps/plugins/view/view.gpr.py index d45e10e17..b9109ba4d 100644 --- a/gramps/plugins/view/view.gpr.py +++ b/gramps/plugins/view/view.gpr.py @@ -35,7 +35,7 @@ MODULE_VERSION="5.1" register(VIEW, id = 'eventview', name = _("Events"), -description = _("The view showing all the events"), +description = _("The view showing all the events"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -50,7 +50,7 @@ order = START, register(VIEW, id = 'familyview', name = _("Families"), -description = _("The view showing all families"), +description = _("The view showing all families"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -65,7 +65,7 @@ order = START, register(VIEW, id = 'dashboardview', name = _("Dashboard"), -description = _("The view showing Gramplets"), +description = _("The view showing Gramplets"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -80,7 +80,7 @@ order = START, register(VIEW, id = 'mediaview', name = _("Media"), -description = _("The view showing all the media objects"), +description = _("The view showing all the media objects"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -95,7 +95,7 @@ order = START, register(VIEW, id = 'noteview', name = _("Notes"), -description = _("The view showing all the notes"), +description = _("The view showing all the notes"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -110,7 +110,7 @@ order = START, register(VIEW, id = 'relview', name = _("Relationships"), -description = _("The view showing all relationships of the selected person"), +description = _("The view showing all relationships of the selected person"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -125,7 +125,7 @@ order = START, register(VIEW, id = 'pedigreeview', name = _("Pedigree"), -description = _("The view showing an ancestor pedigree of the selected person"), +description = _("The view showing an ancestor pedigree of the selected person"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -142,7 +142,7 @@ register(VIEW, id = 'fanchartview', name = _("Fan Chart"), category = ("Ancestry", _("Charts")), -description = _("A view showing parents through a fanchart"), +description = _("A view showing parents through a fanchart"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -157,7 +157,7 @@ register(VIEW, id = 'fanchartdescview', name = _("Descendant Fan"), category = ("Ancestry", _("Charts")), -description = _("Showing descendants through a fanchart"), +description = _("Showing descendants through a fanchart"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -172,7 +172,7 @@ register(VIEW, id = 'fanchart2wayview', name = _("2-Way Fan"), category = ("Ancestry", _("Charts")), -description = _("Showing ascendants and descendants through a fanchart"), +description = _("Showing ascendants and descendants through a fanchart"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -186,7 +186,7 @@ stock_icon = 'gramps-fanchart2way', 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 = MODULE_VERSION, @@ -203,7 +203,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 = MODULE_VERSION, @@ -219,7 +219,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 = MODULE_VERSION, status = STABLE, @@ -234,7 +234,7 @@ stock_icon = 'gramps-tree-list', register(VIEW, id = 'placetreeview', name = _("Place Tree"), -description = _("A view displaying places in a tree format."), +description = _("A view displaying places in a tree format."), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -250,7 +250,7 @@ order = START, register(VIEW, id = 'repoview', name = _("Repositories"), -description = _("The view showing all the repositories"), +description = _("The view showing all the repositories"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -265,7 +265,7 @@ order = START, register(VIEW, id = 'sourceview', name = _("Sources"), -description = _("The view showing all the sources"), +description = _("The view showing all the sources"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -281,7 +281,7 @@ stock_icon = 'gramps-tree-list', register(VIEW, id = 'citationlistview', name = _("Citations"), -description = _("The view showing all the citations"), +description = _("The view showing all the citations"), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, @@ -296,7 +296,7 @@ order = START, register(VIEW, id = 'citationtreeview', name = _("Citation Tree"), -description = _("A view displaying citations and sources in a tree format."), +description = _("A view displaying citations and sources in a tree format."), version = '1.0', gramps_target_version = MODULE_VERSION, status = STABLE, diff --git a/gramps/plugins/webreport/webplugins.gpr.py b/gramps/plugins/webreport/webplugins.gpr.py index 6fd84709e..95928487a 100644 --- a/gramps/plugins/webreport/webplugins.gpr.py +++ b/gramps/plugins/webreport/webplugins.gpr.py @@ -32,7 +32,7 @@ MODULE_VERSION="5.1" plg = newplugin() plg.id = 'navwebpage' plg.name = _("Narrated Web Site") -plg.description = _("Produces web (HTML) pages for individuals, or a set of " +plg.description = _("Produces web (HTML) pages for individuals, or a set of " "individuals") plg.version = '2.0' plg.gramps_target_version = MODULE_VERSION @@ -41,7 +41,7 @@ plg.fname = 'narrativeweb.py' plg.ptype = REPORT plg.authors = ["Donald N. Allingham", "Rob G. Healey", "Serge Noiraud"] plg.authors_email = ["don@gramps-project.org", "serge.noiraud@free.fr"] -plg.category = CATEGORY_WEB +plg.category = CATEGORY_WEB plg.reportclass = 'NavWebReport' plg.optionclass = 'NavWebOptions' plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_CLI] @@ -56,7 +56,7 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_CLI] plg = newplugin() plg.id = 'WebCal' plg.name = _("Web Calendar") -plg.description = _("Produces web (HTML) calendars.") +plg.description = _("Produces web (HTML) calendars.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE @@ -64,7 +64,7 @@ plg.fname = 'webcal.py' plg.ptype = REPORT plg.authors = ["Thom Sturgill", "Rob G. Healey"] plg.authors_email = ["thsturgill@yahoo.com", "robhealey1@gmail.com"] -plg.category = CATEGORY_WEB +plg.category = CATEGORY_WEB plg.reportclass = 'WebCalReport' plg.optionclass = 'WebCalOptions' plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_CLI] diff --git a/gramps/plugins/webstuff/webstuff.gpr.py b/gramps/plugins/webstuff/webstuff.gpr.py index 687cb9d80..e5e346b93 100644 --- a/gramps/plugins/webstuff/webstuff.gpr.py +++ b/gramps/plugins/webstuff/webstuff.gpr.py @@ -34,7 +34,7 @@ register(GENERAL, id = 'system webstuff', category = "WEBSTUFF", name = _("Webstuff"), -description = _("Provides a collection of resources for the web"), +description = _("Provides a collection of resources for the web"), version = '1.0', gramps_target_version = MODULE_VERSION, fname = "webstuff.py", diff --git a/gramps/test/regrtest.py b/gramps/test/regrtest.py index 6d38e5602..7931f4642 100755 --- a/gramps/test/regrtest.py +++ b/gramps/test/regrtest.py @@ -150,7 +150,7 @@ if __name__ == '__main__': # hmmm this is starting to look like a unittest.Testprog # (maybe with a custom TestLoader) if args and os.path.isdir(args[0]): - loc = args[0].rstrip(os.path.sep) + loc = args[0].rstrip(os.path.sep) else: loc = gramps_root diff --git a/gramps/test/test_util.py b/gramps/test/test_util.py index 81d4c3271..365e8fdcb 100644 --- a/gramps/test/test_util.py +++ b/gramps/test/test_util.py @@ -62,7 +62,7 @@ def _caller_context(): # so, always take the abspath. def _caller_dir(): """Return directory of caller function (caller outside this module)""" - tb = _caller_context() + tb = _caller_context() return os.path.dirname(os.path.abspath(tb[0]))