From 9246af61a323ddd02853a34f2c01ca920c6c543c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= Date: Sat, 27 Apr 2013 17:14:46 +0000 Subject: [PATCH] 5751: revert 22108, using own filter rule, behavior and label via filtereditor svn: r22110 --- .../gen/filters/rules/citation/_hascitation.py | 2 +- gramps/gen/filters/rules/event/_hascitation.py | 2 +- .../rules/event/_matchessourceconfidence.py | 2 +- gramps/gen/filters/rules/family/_hascitation.py | 2 +- .../rules/family/_matchessourceconfidence.py | 2 +- gramps/gen/filters/rules/media/_hascitation.py | 2 +- .../rules/media/_matchessourceconfidence.py | 2 +- gramps/gen/filters/rules/person/_hascitation.py | 2 +- .../rules/person/_matchessourceconfidence.py | 2 +- gramps/gen/filters/rules/place/_hascitation.py | 2 +- .../rules/place/_matchessourceconfidence.py | 2 +- gramps/gui/editors/filtereditor.py | 2 +- po/gramps.pot | 16 ++++++++-------- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gramps/gen/filters/rules/citation/_hascitation.py b/gramps/gen/filters/rules/citation/_hascitation.py index bc0999117..ef0d875c7 100644 --- a/gramps/gen/filters/rules/citation/_hascitation.py +++ b/gramps/gen/filters/rules/citation/_hascitation.py @@ -49,7 +49,7 @@ class HasCitation(Rule): labels = [ _('Volume/Page:'), _('Date:'), - _('Min. Conf. level:')] + _('Confidence level:')] name = _('Citations matching parameters') category = _('General filters') description = _("Matches citations with particular parameters") diff --git a/gramps/gen/filters/rules/event/_hascitation.py b/gramps/gen/filters/rules/event/_hascitation.py index b0f31d0a4..e4ed276a0 100644 --- a/gramps/gen/filters/rules/event/_hascitation.py +++ b/gramps/gen/filters/rules/event/_hascitation.py @@ -49,7 +49,7 @@ class HasCitation(HasCitationBase): labels = [ _('Volume/Page:'), _('Date:'), - _('Min. Conf. level:')] + _('Confidence level:')] name = _('Event with the ') description = _("Matches events with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/event/_matchessourceconfidence.py b/gramps/gen/filters/rules/event/_matchessourceconfidence.py index 753fc2996..b5c74fd26 100644 --- a/gramps/gen/filters/rules/event/_matchessourceconfidence.py +++ b/gramps/gen/filters/rules/event/_matchessourceconfidence.py @@ -43,7 +43,7 @@ from .._matchessourceconfidencebase import MatchesSourceConfidenceBase class MatchesSourceConfidence(MatchesSourceConfidenceBase): """Events matching a specific confidence level on its 'direct' source references""" - labels = [_('Min. Conf. level:')] + labels = [_('Confidence level:')] name = _('Events with at least one direct source >= ') description = _("Matches events with at least one direct source with confidence level(s)") diff --git a/gramps/gen/filters/rules/family/_hascitation.py b/gramps/gen/filters/rules/family/_hascitation.py index ab673c31e..73990aa67 100644 --- a/gramps/gen/filters/rules/family/_hascitation.py +++ b/gramps/gen/filters/rules/family/_hascitation.py @@ -49,7 +49,7 @@ class HasCitation(HasCitationBase): labels = [ _('Volume/Page:'), _('Date:'), - _('Min. Conf. level:')] + _('Confidence level:')] name = _('Family with the ') description = _("Matches families with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/family/_matchessourceconfidence.py b/gramps/gen/filters/rules/family/_matchessourceconfidence.py index 3a175c32c..4b2197986 100644 --- a/gramps/gen/filters/rules/family/_matchessourceconfidence.py +++ b/gramps/gen/filters/rules/family/_matchessourceconfidence.py @@ -42,7 +42,7 @@ from .._matchessourceconfidencebase import MatchesSourceConfidenceBase class MatchesSourceConfidence(MatchesSourceConfidenceBase): """Families matching a specific confidence level on its 'direct' source references""" - labels = [_('Min. Conf. level:')] + labels = [_('Confidence level:')] name = _('Families with at least one direct source >= ') description = _("Matches families with at least one direct source with confidence level(s)") diff --git a/gramps/gen/filters/rules/media/_hascitation.py b/gramps/gen/filters/rules/media/_hascitation.py index c89a03ebe..2188731df 100644 --- a/gramps/gen/filters/rules/media/_hascitation.py +++ b/gramps/gen/filters/rules/media/_hascitation.py @@ -48,7 +48,7 @@ class HasCitation(HasCitationBase): labels = [ _('Volume/Page:'), _('Date:'), - _('Min. Conf. level:')] + _('Confidence level:')] name = _('Media with the ') description = _("Matches media with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/media/_matchessourceconfidence.py b/gramps/gen/filters/rules/media/_matchessourceconfidence.py index 070705ae2..3fb36597d 100644 --- a/gramps/gen/filters/rules/media/_matchessourceconfidence.py +++ b/gramps/gen/filters/rules/media/_matchessourceconfidence.py @@ -42,6 +42,6 @@ from .._matchessourceconfidencebase import MatchesSourceConfidenceBase class MatchesSourceConfidence(MatchesSourceConfidenceBase): """Media matching a specific confidence level on its 'direct' source references""" - labels = [_('Min. Conf. level:')] + labels = [_('Confidence level:')] name = _('Media with a direct source >= ') description = _("Matches media with at least one direct source with confidence level(s)") diff --git a/gramps/gen/filters/rules/person/_hascitation.py b/gramps/gen/filters/rules/person/_hascitation.py index a527897bc..7a85bf598 100644 --- a/gramps/gen/filters/rules/person/_hascitation.py +++ b/gramps/gen/filters/rules/person/_hascitation.py @@ -48,7 +48,7 @@ class HasCitation(HasCitationBase): labels = [ _('Volume/Page:'), _('Date:'), - _('Min. Conf. level:')] + _('Confidence level:')] name = _('People with the ') description = _("Matches people with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/person/_matchessourceconfidence.py b/gramps/gen/filters/rules/person/_matchessourceconfidence.py index 29f490fbe..baa0d5780 100644 --- a/gramps/gen/filters/rules/person/_matchessourceconfidence.py +++ b/gramps/gen/filters/rules/person/_matchessourceconfidence.py @@ -42,7 +42,7 @@ from .._matchessourceconfidencebase import MatchesSourceConfidenceBase class MatchesSourceConfidence(MatchesSourceConfidenceBase): """Persons matching a specific confidence level on its 'direct' source references""" - labels = [_('Min. Conf. level:')] + labels = [_('Confidence level:')] name = _('Persons with at least one direct source >= ') description = _("Matches persons with at least one direct source with confidence level(s)") diff --git a/gramps/gen/filters/rules/place/_hascitation.py b/gramps/gen/filters/rules/place/_hascitation.py index 01547c101..50a4c17ec 100644 --- a/gramps/gen/filters/rules/place/_hascitation.py +++ b/gramps/gen/filters/rules/place/_hascitation.py @@ -49,7 +49,7 @@ class HasCitation(HasCitationBase): labels = [ _('Volume/Page:'), _('Date:'), - _('Min. Conf. level:')] + _('Confidence level:')] name = _('Place with the ') description = _("Matches places with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/place/_matchessourceconfidence.py b/gramps/gen/filters/rules/place/_matchessourceconfidence.py index 582c65bcb..29b1b4c07 100644 --- a/gramps/gen/filters/rules/place/_matchessourceconfidence.py +++ b/gramps/gen/filters/rules/place/_matchessourceconfidence.py @@ -42,6 +42,6 @@ from .._matchessourceconfidencebase import MatchesSourceConfidenceBase class MatchesSourceConfidence(MatchesSourceConfidenceBase): """Media matching a specific confidence level on its 'direct' source references""" - labels = [_('Min. Conf. level:')] + labels = [_('Confidence level:')] name = _('Place with a direct source >= ') description = _("Matches places with at least one direct source with confidence level(s)") diff --git a/gramps/gui/editors/filtereditor.py b/gramps/gui/editors/filtereditor.py index a2286ee2b..5f513771a 100644 --- a/gramps/gui/editors/filtereditor.py +++ b/gramps/gui/editors/filtereditor.py @@ -548,7 +548,7 @@ class EditRule(ManagedWindow): taglist = [''] taglist = taglist + [tag.get_name() for tag in dbstate.db.iter_tags()] t = MyList(taglist, taglist) - elif v == _('Min. Conf. level:'): + elif v == _('Confidence level:'): t = MyList(list(map(str, list(range(5)))), [confidence[i] for i in range(5)]) else: diff --git a/po/gramps.pot b/po/gramps.pot index 5f975332a..3ab5ff75e 100644 --- a/po/gramps.pot +++ b/po/gramps.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-27 18:31+0200\n" +"POT-Creation-Date: 2013-04-27 19:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -609,8 +609,8 @@ msgstr "" #: ../gramps/cli/plug/__init__.py:312 ../gramps/gen/plug/report/_paper.py:91 #: ../gramps/gen/plug/report/_paper.py:113 -#: ../gramps/gui/plug/report/_papermenu.py:184 -#: ../gramps/gui/plug/report/_papermenu.py:245 +#: ../gramps/gui/plug/report/_papermenu.py:185 +#: ../gramps/gui/plug/report/_papermenu.py:246 msgid "Custom Size" msgstr "" @@ -1365,7 +1365,7 @@ msgstr "" #: ../gramps/gen/filters/rules/place/_hascitation.py:52 #: ../gramps/gen/filters/rules/place/_matchessourceconfidence.py:45 #: ../gramps/gui/editors/filtereditor.py:551 -msgid "Min. Conf. level:" +msgid "Confidence level:" msgstr "" #: ../gramps/gen/filters/rules/citation/_hasgallery.py:47 @@ -10648,15 +10648,15 @@ msgstr "" msgid "CSS file" msgstr "" -#: ../gramps/gui/plug/report/_papermenu.py:102 +#: ../gramps/gui/plug/report/_papermenu.py:103 msgid "Portrait" msgstr "" -#: ../gramps/gui/plug/report/_papermenu.py:103 +#: ../gramps/gui/plug/report/_papermenu.py:104 msgid "Landscape" msgstr "" -#: ../gramps/gui/plug/report/_papermenu.py:206 +#: ../gramps/gui/plug/report/_papermenu.py:207 #: ../gramps/gui/glade/papermenu.glade:131 #: ../gramps/gui/glade/papermenu.glade:148 #: ../gramps/gui/glade/papermenu.glade:295 @@ -10672,7 +10672,7 @@ msgstr "" msgid "cm" msgstr "" -#: ../gramps/gui/plug/report/_papermenu.py:210 +#: ../gramps/gui/plug/report/_papermenu.py:211 msgid "inch|in." msgstr ""