diff --git a/gramps/cli/clidbman.py b/gramps/cli/clidbman.py index 7f5cab052..e21d826c5 100644 --- a/gramps/cli/clidbman.py +++ b/gramps/cli/clidbman.py @@ -194,9 +194,9 @@ class CLIDbManager: for item in sorted(summary): if item != "Family Tree": # translators: needed for French, ignore otherwise - print(_(" %(item)s: %(summary)s") % { - 'item' : item, - 'summary' : summary[item]}) + print(' ' + _("%(str1)s: %(str2)s" + ) % {'str1' : item, + 'str2' : summary[item]}) def family_tree_summary(self, database_names=None): """ diff --git a/gramps/gui/plug/_windows.py b/gramps/gui/plug/_windows.py index bda6bdd90..bb03cd334 100644 --- a/gramps/gui/plug/_windows.py +++ b/gramps/gui/plug/_windows.py @@ -1111,9 +1111,9 @@ class UpdateAddons(ManagedWindow): last_category = None for (status,plugin_url,plugin_dict) in addon_update_list: count = get_count(addon_update_list, plugin_dict["t"]) - category = _("%(adjective)s: %(addon)s") % { - "adjective": status, - "addon": _(plugin_dict["t"])} + # translators: needed for French, ignore otherwise + category = _("%(str1)s: %(str2)s") % {'str1' : status, + 'str2' : _(plugin_dict["t"])} if last_category != category: last_category = category node = self.list.add([False, # initially selected? diff --git a/gramps/plugins/gramplet/whatsnext.py b/gramps/plugins/gramplet/whatsnext.py index 15af24da2..c50b0cd61 100644 --- a/gramps/plugins/gramplet/whatsnext.py +++ b/gramps/plugins/gramplet/whatsnext.py @@ -489,9 +489,10 @@ class WhatNextGramplet(Gramplet): missingbits.append(_("place unknown")) if missingbits: - return [_("%(type)s: %(list)s") % { - 'type': event.get_type(), - 'list': _(", ").join(missingbits)}] + # translators: needed for French, ignore otherwise + return [_("%(str1)s: %(str2)s" + ) % {'str1' : event.get_type(), + 'str2' : _(", ").join(missingbits)}] else: return [] diff --git a/gramps/plugins/textreport/detancestralreport.py b/gramps/plugins/textreport/detancestralreport.py index 6ff34be31..2170479cd 100644 --- a/gramps/plugins/textreport/detancestralreport.py +++ b/gramps/plugins/textreport/detancestralreport.py @@ -365,10 +365,10 @@ class DetAncestorReport(Report): self.doc.start_paragraph('DAR-MoreDetails') atype = self._get_type(alt_name.get_type()) self.doc.write_text_citation( - self._('%(name_kind)s: %(name)s%(endnotes)s' - ) % {'name_kind' : self._(atype), - 'name' : alt_name.get_regular_name(), - 'endnotes' : self.endnotes(alt_name)}) + self._('%(type)s: %(value)s%(endnotes)s' + ) % {'type' : self._(atype), + 'value' : alt_name.get_regular_name(), + 'endnotes' : self.endnotes(alt_name)}) self.doc.end_paragraph() if self.inc_events: diff --git a/gramps/plugins/textreport/detdescendantreport.py b/gramps/plugins/textreport/detdescendantreport.py index 8dce58e36..2566a918f 100644 --- a/gramps/plugins/textreport/detdescendantreport.py +++ b/gramps/plugins/textreport/detdescendantreport.py @@ -895,10 +895,10 @@ class DetDescendantReport(Report): atype = self._get_type(alt_name.get_type()) aname = alt_name.get_regular_name() self.doc.write_text_citation( - self._('%(name_kind)s: %(name)s%(endnotes)s' - ) % {'name_kind' : self._(atype), - 'name' : aname, - 'endnotes' : self.endnotes(alt_name)}) + self._('%(type)s: %(value)s%(endnotes)s' + ) % {'type' : self._(atype), + 'value' : aname, + 'endnotes' : self.endnotes(alt_name)}) self.doc.end_paragraph() if self.inc_events: diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py index 83a675bd5..d66d56023 100644 --- a/gramps/plugins/webreport/narrativeweb.py +++ b/gramps/plugins/webreport/narrativeweb.py @@ -1060,9 +1060,9 @@ class BasePage: attrlist.extend(event_ref.get_attribute_list()) for attr in attrlist: htmllist.extend(Html("p", - _("%(type)s: %(value)s") % { - 'type' : Html("b", attr.get_type()), - 'value' : attr.get_value() + _("%(str1)s: %(str2)s") % { + 'str1' : Html("b", attr.get_type()), + 'str2' : attr.get_value() })) #also output notes attached to the attributes @@ -2599,9 +2599,9 @@ class BasePage: [self._("Confidence"), conf]]: if data: tmp += Html("li", - _("%(label)s: %(data)s") % { - 'label' : label, - 'data' : data + _("%(str1)s: %(str2)s") % { + 'str1' : label, + 'str2' : data }) if self.create_media: for media_ref in sref.get_media_list(): @@ -2649,9 +2649,9 @@ class BasePage: if this_note is not None: format = self.get_note_format(this_note, True) tmp += Html("li", - _("%(type)s: %(format)s") % { - 'type' : str(this_note.get_type()), - 'format' : format + _("%(str1)s: %(str2)s") % { + 'str1' : str(this_note.get_type()), + 'str2' : format }) if tmp: cit_ref_li += tmp