From de88bb34c0b817e73763a3db6884edbd7e86d77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= Date: Sat, 27 Apr 2013 16:24:35 +0000 Subject: [PATCH] 5751: use Minimum Confidence label according to current filter behavior svn: r22108 --- .../filters/rules/citation/_hascitation.py | 2 +- .../gen/filters/rules/event/_hascitation.py | 2 +- .../rules/event/_matchessourceconfidence.py | 2 +- .../gen/filters/rules/family/_hascitation.py | 2 +- .../rules/family/_matchessourceconfidence.py | 2 +- .../gen/filters/rules/media/_hascitation.py | 2 +- .../rules/media/_matchessourceconfidence.py | 2 +- .../gen/filters/rules/person/_hascitation.py | 2 +- .../rules/person/_matchessourceconfidence.py | 2 +- .../gen/filters/rules/place/_hascitation.py | 2 +- .../rules/place/_matchessourceconfidence.py | 2 +- gramps/gui/editors/filtereditor.py | 2 +- po/fr.po | 25 +++++++++---------- po/gramps.pot | 17 ++++++------- 14 files changed, 32 insertions(+), 34 deletions(-) diff --git a/gramps/gen/filters/rules/citation/_hascitation.py b/gramps/gen/filters/rules/citation/_hascitation.py index ef0d875c7..bc0999117 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:'), - _('Confidence level:')] + _('Min. Conf. 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 e4ed276a0..b0f31d0a4 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:'), - _('Confidence level:')] + _('Min. Conf. 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 b5c74fd26..753fc2996 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 = [_('Confidence level:')] + labels = [_('Min. Conf. 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 73990aa67..ab673c31e 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:'), - _('Confidence level:')] + _('Min. Conf. 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 4b2197986..3a175c32c 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 = [_('Confidence level:')] + labels = [_('Min. Conf. 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 2188731df..c89a03ebe 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:'), - _('Confidence level:')] + _('Min. Conf. 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 3fb36597d..070705ae2 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 = [_('Confidence level:')] + labels = [_('Min. Conf. 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 7a85bf598..a527897bc 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:'), - _('Confidence level:')] + _('Min. Conf. 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 baa0d5780..29f490fbe 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 = [_('Confidence level:')] + labels = [_('Min. Conf. 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 50a4c17ec..01547c101 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:'), - _('Confidence level:')] + _('Min. Conf. 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 29b1b4c07..582c65bcb 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 = [_('Confidence level:')] + labels = [_('Min. Conf. 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 5f513771a..a2286ee2b 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 == _('Confidence level:'): + elif v == _('Min. Conf. level:'): t = MyList(list(map(str, list(range(5)))), [confidence[i] for i in range(5)]) else: diff --git a/po/fr.po b/po/fr.po index e61ed196e..cf639529a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: 4.0-beta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-27 17:54+0200\n" -"PO-Revision-Date: 2013-04-27 17:55+0100\n" +"POT-Creation-Date: 2013-04-27 18:20+0200\n" +"PO-Revision-Date: 2013-04-27 18:22+0100\n" "Last-Translator: \n" "Language-Team: French \n" "Language: fr\n" @@ -1391,12 +1391,9 @@ msgstr "Volume/Page :" msgid "Date:" msgstr "Date :" -# trunk #: ../gramps/gen/filters/rules/_hascitationbase.py:53 -#: ../gramps/gui/glade/mergecitation.glade:308 -#: ../gramps/gui/glade/mergecitation.glade:327 -msgid "Confidence:" -msgstr "Niveau de confiance" +msgid "Minimum Confidence|Min. Conf.:" +msgstr "Conf. min. :" # utilise correspondre pour to match, plus facile que être compatible ou concorder dans ce contexte #: ../gramps/gen/filters/rules/_hascitationbase.py:54 @@ -1624,8 +1621,8 @@ msgstr "Correspond aux citations marquées comme privées" #: ../gramps/gen/filters/rules/place/_hascitation.py:52 #: ../gramps/gen/filters/rules/place/_matchessourceconfidence.py:45 #: ../gramps/gui/editors/filtereditor.py:551 -msgid "Confidence level:" -msgstr "Niveau de confiance :" +msgid "Min. Conf. level:" +msgstr "Niv. min. de confiance :" # trunk #: ../gramps/gen/filters/rules/citation/_hasgallery.py:47 @@ -29255,6 +29252,12 @@ msgstr "Source 1" msgid "Source 2" msgstr "Source 2" +# trunk +#: ../gramps/gui/glade/mergecitation.glade:308 +#: ../gramps/gui/glade/mergecitation.glade:327 +msgid "Confidence:" +msgstr "Niveau de confiance" + #: ../gramps/gui/glade/mergecitation.glade:349 #: ../gramps/gui/glade/mergecitation.glade:368 #: ../gramps/gui/glade/mergedata.glade:1038 @@ -30710,10 +30713,6 @@ msgstr "Système de généalogie Gramps" msgid "Manage genealogical information, perform genealogical research and analysis" msgstr "Gestion des informations généalogiques, optimisation de la recherche et de l'analyse" -#: ../gramps/gen/filters/rules/_hascitationbase.py:53 -msgid "Minimum Confidence|Min. Conf.:" -msgstr "Conf. min. :" - # trunk #~ msgid "To Do" #~ msgstr "À faire" diff --git a/po/gramps.pot b/po/gramps.pot index 3501a6430..42e02e061 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 17:54+0200\n" +"POT-Creation-Date: 2013-04-27 18:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1148,9 +1148,7 @@ msgid "Date:" msgstr "" #: ../gramps/gen/filters/rules/_hascitationbase.py:53 -#: ../gramps/gui/glade/mergecitation.glade:308 -#: ../gramps/gui/glade/mergecitation.glade:327 -msgid "Confidence:" +msgid "Minimum Confidence|Min. Conf.:" msgstr "" #: ../gramps/gen/filters/rules/_hascitationbase.py:54 @@ -1367,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 "Confidence level:" +msgid "Min. Conf. level:" msgstr "" #: ../gramps/gen/filters/rules/citation/_hasgallery.py:47 @@ -27819,6 +27817,11 @@ msgstr "" msgid "Source 2" msgstr "" +#: ../gramps/gui/glade/mergecitation.glade:308 +#: ../gramps/gui/glade/mergecitation.glade:327 +msgid "Confidence:" +msgstr "" + #: ../gramps/gui/glade/mergecitation.glade:349 #: ../gramps/gui/glade/mergecitation.glade:368 #: ../gramps/gui/glade/mergedata.glade:1038 @@ -29450,7 +29453,3 @@ msgstr "" msgid "" "Manage genealogical information, perform genealogical research and analysis" msgstr "" - -#: ../gramps/gen/filters/rules/_hascitationbase.py:53 -msgid "Minimum Confidence|Min. Conf.:" -msgstr ""