translation support and use TransUtils for context

svn: r11703
This commit is contained in:
Jérôme Rapinat
2009-01-24 09:40:55 +00:00
parent 384f574fea
commit 0034c7c02c
3 changed files with 147 additions and 65 deletions

111
po/fr.po
View File

@@ -9,8 +9,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trunk\n" "Project-Id-Version: trunk\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-01-22 15:23+0100\n" "POT-Creation-Date: 2009-01-24 10:07+0100\n"
"PO-Revision-Date: 2009-01-22 18:33+0100\n" "PO-Revision-Date: 2009-01-24 10:10+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: <fr@li.org>\n" "Language-Team: <fr@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -459,7 +459,7 @@ msgstr "Enlever le verrou sur la base de données '%s' ?"
#: ../src/DbManager.py:586 #: ../src/DbManager.py:586
msgid "GRAMPS believes that someone else is actively editing this database. You cannot edit this database while it is locked. If no one is editing the database you may safely break the lock. However, if someone else is editing the database and you break the lock, you may corrupt the database." msgid "GRAMPS believes that someone else is actively editing this database. You cannot edit this database while it is locked. If no one is editing the database you may safely break the lock. However, if someone else is editing the database and you break the lock, you may corrupt the database."
msgstr "GRAMPS pense cette base de données est en cours d'édition. Vous ne pouvez pas l'éditer tant qu'elle est verrouillée. Si personne n'édite la base de données vous pouvez enlever le verrou en toute sécurité. Toutefois, si quelqu'un d'autre édite cette base de données et que vous cassez le verrou, vous pouvez la corrompre." msgstr "GRAMPS pense que cette base de données est en cours d'édition. Vous ne pouvez pas l'éditer tant qu'elle est verrouillée. Si personne n'édite la base de données vous pouvez enlever le verrou en toute sécurité. Toutefois, si quelqu'un d'autre édite cette base de données et que vous cassez le verrou, vous pouvez la corrompre."
#: ../src/DbManager.py:592 #: ../src/DbManager.py:592
msgid "Break lock" msgid "Break lock"
@@ -3083,7 +3083,7 @@ msgstr "Très haut"
#: ../src/Utils.py:92 #: ../src/Utils.py:92
#: ../src/Editors/_EditSourceRef.py:137 #: ../src/Editors/_EditSourceRef.py:137
#: ../src/plugins/tool/FindDupes.py:67 #: ../src/plugins/tool/FindDupes.py:68
msgid "High" msgid "High"
msgstr "Haut" msgstr "Haut"
@@ -3095,7 +3095,7 @@ msgstr "Normal"
#: ../src/Utils.py:94 #: ../src/Utils.py:94
#: ../src/Editors/_EditSourceRef.py:135 #: ../src/Editors/_EditSourceRef.py:135
#: ../src/plugins/tool/FindDupes.py:65 #: ../src/plugins/tool/FindDupes.py:66
msgid "Low" msgid "Low"
msgstr "Bas" msgstr "Bas"
@@ -6226,7 +6226,7 @@ msgstr "Livre GRAMPS"
#: ../src/plugins/tool/EventCmp.py:468 #: ../src/plugins/tool/EventCmp.py:468
#: ../src/plugins/tool/EventNames.py:164 #: ../src/plugins/tool/EventNames.py:164
#: ../src/plugins/tool/ExtractCity.py:649 #: ../src/plugins/tool/ExtractCity.py:649
#: ../src/plugins/tool/FindDupes.py:702 #: ../src/plugins/tool/FindDupes.py:703
#: ../src/plugins/tool/Leak.py:135 #: ../src/plugins/tool/Leak.py:135
#: ../src/plugins/tool/NotRelated.py:438 #: ../src/plugins/tool/NotRelated.py:438
#: ../src/plugins/tool/PatchNames.py:375 #: ../src/plugins/tool/PatchNames.py:375
@@ -10996,7 +10996,7 @@ msgstr "Notes pour %s"
#: ../src/plugins/textreport/DetDescendantReport.py:625 #: ../src/plugins/textreport/DetDescendantReport.py:625
#, python-format #, python-format
msgid "More about %(person_name)s:" msgid "More about %(person_name)s:"
msgstr "Encore à propos de %(person_name)s :" msgstr "Plus de détails sur %(person_name)s :"
#: ../src/plugins/textreport/DetAncestralReport.py:309 #: ../src/plugins/textreport/DetAncestralReport.py:309
#: ../src/plugins/textreport/DetDescendantReport.py:584 #: ../src/plugins/textreport/DetDescendantReport.py:584
@@ -11055,7 +11055,7 @@ msgstr "Enfants de %(mother_name)s et %(father_name)s"
#: ../src/plugins/textreport/DetDescendantReport.py:496 #: ../src/plugins/textreport/DetDescendantReport.py:496
#, python-format #, python-format
msgid "More about %(mother_name)s and %(father_name)s:" msgid "More about %(mother_name)s and %(father_name)s:"
msgstr "Encore à propos de %(mother_name)s et %(father_name)s :" msgstr "Plus de détails sur %(mother_name)s et %(father_name)s :"
#: ../src/plugins/textreport/DetAncestralReport.py:719 #: ../src/plugins/textreport/DetAncestralReport.py:719
#: ../src/plugins/textreport/DetDescendantReport.py:702 #: ../src/plugins/textreport/DetDescendantReport.py:702
@@ -11254,7 +11254,7 @@ msgstr "Style pour la première entrée personnelle."
#: ../src/plugins/textreport/DetAncestralReport.py:865 #: ../src/plugins/textreport/DetAncestralReport.py:865
#: ../src/plugins/textreport/DetDescendantReport.py:852 #: ../src/plugins/textreport/DetDescendantReport.py:852
msgid "The style used for the More About header." msgid "The style used for the More About header."
msgstr "Le style utilisé pour l'en-tête À propos." msgstr "Le style utilisé pour l'en-tête Plus de détails."
#: ../src/plugins/textreport/DetAncestralReport.py:875 #: ../src/plugins/textreport/DetAncestralReport.py:875
#: ../src/plugins/textreport/DetDescendantReport.py:862 #: ../src/plugins/textreport/DetDescendantReport.py:862
@@ -12722,78 +12722,78 @@ msgstr "Extraire les données du lieu depuis son titre"
msgid "Attempts to extract city and state/province from a place title" msgid "Attempts to extract city and state/province from a place title"
msgstr "Tentative d'extraction de la ville et de la région depuis le titre du lieu" msgstr "Tentative d'extraction de la ville et de la région depuis le titre du lieu"
#: ../src/plugins/tool/FindDupes.py:66 #: ../src/plugins/tool/FindDupes.py:67
msgid "Medium" msgid "Medium"
msgstr "Moyen" msgstr "Moyen"
# wiki manual # wiki manual
# trunk # trunk
#: ../src/plugins/tool/FindDupes.py:71 #: ../src/plugins/tool/FindDupes.py:72
msgid "manual|Find_Possible_Duplicate_People..." msgid "manual|Find_Possible_Duplicate_People..."
msgstr "Trouver_des_boublons_potentiels..." msgstr "Trouver_des_boublons_potentiels..."
#: ../src/plugins/tool/FindDupes.py:136 #: ../src/plugins/tool/FindDupes.py:137
#: ../src/plugins/tool/FindDupes.py:701 #: ../src/plugins/tool/FindDupes.py:702
msgid "Find Possible Duplicate People" msgid "Find Possible Duplicate People"
msgstr "Recherche des doublons" msgstr "Recherche des doublons"
#: ../src/plugins/tool/FindDupes.py:148 #: ../src/plugins/tool/FindDupes.py:149
#: ../src/plugins/tool/Verify.py:301 #: ../src/plugins/tool/Verify.py:301
msgid "Tool settings" msgid "Tool settings"
msgstr "Propriétés de l'outil" msgstr "Propriétés de l'outil"
#: ../src/plugins/tool/FindDupes.py:148 #: ../src/plugins/tool/FindDupes.py:149
msgid "Find Duplicates tool" msgid "Find Duplicates tool"
msgstr "Recherche des doublons" msgstr "Recherche des doublons"
#: ../src/plugins/tool/FindDupes.py:182 #: ../src/plugins/tool/FindDupes.py:183
msgid "No matches found" msgid "No matches found"
msgstr "Aucune correspondance trouvée" msgstr "Aucune correspondance trouvée"
#: ../src/plugins/tool/FindDupes.py:183 #: ../src/plugins/tool/FindDupes.py:184
msgid "No potential duplicate people were found" msgid "No potential duplicate people were found"
msgstr "Aucun doublon potentiel n'a été trouvé" msgstr "Aucun doublon potentiel n'a été trouvé"
#: ../src/plugins/tool/FindDupes.py:192 #: ../src/plugins/tool/FindDupes.py:193
msgid "Find Duplicates" msgid "Find Duplicates"
msgstr "Recherche des doublons" msgstr "Recherche des doublons"
# Substantif (GNOME fr) # Substantif (GNOME fr)
#: ../src/plugins/tool/FindDupes.py:193 #: ../src/plugins/tool/FindDupes.py:194
msgid "Looking for duplicate people" msgid "Looking for duplicate people"
msgstr "Recherche de doublons" msgstr "Recherche de doublons"
# Substantif (GNOME fr) # Substantif (GNOME fr)
#: ../src/plugins/tool/FindDupes.py:202 #: ../src/plugins/tool/FindDupes.py:203
msgid "Pass 1: Building preliminary lists" msgid "Pass 1: Building preliminary lists"
msgstr "Étape 1 : Construction d'une liste préliminaire" msgstr "Étape 1 : Construction d'une liste préliminaire"
# Substantif (GNOME fr) # Substantif (GNOME fr)
#: ../src/plugins/tool/FindDupes.py:220 #: ../src/plugins/tool/FindDupes.py:221
msgid "Pass 2: Calculating potential matches" msgid "Pass 2: Calculating potential matches"
msgstr "Étape 2 : Calcul des correspondances possibles" msgstr "Étape 2 : Calcul des correspondances possibles"
#: ../src/plugins/tool/FindDupes.py:567 #: ../src/plugins/tool/FindDupes.py:568
msgid "Potential Merges" msgid "Potential Merges"
msgstr "Fusions potentielles" msgstr "Fusions potentielles"
#: ../src/plugins/tool/FindDupes.py:577 #: ../src/plugins/tool/FindDupes.py:578
msgid "Rating" msgid "Rating"
msgstr "Évaluation" msgstr "Évaluation"
#: ../src/plugins/tool/FindDupes.py:577 #: ../src/plugins/tool/FindDupes.py:578
msgid "First Person" msgid "First Person"
msgstr "Premier individu" msgstr "Premier individu"
#: ../src/plugins/tool/FindDupes.py:578 #: ../src/plugins/tool/FindDupes.py:579
msgid "Second Person" msgid "Second Person"
msgstr "Second individu" msgstr "Second individu"
#: ../src/plugins/tool/FindDupes.py:586 #: ../src/plugins/tool/FindDupes.py:587
msgid "Merge candidates" msgid "Merge candidates"
msgstr "Candidats à la fusion" msgstr "Candidats à la fusion"
#: ../src/plugins/tool/FindDupes.py:705 #: ../src/plugins/tool/FindDupes.py:706
msgid "Searches the entire database, looking for individual entries that may represent the same person." msgid "Searches the entire database, looking for individual entries that may represent the same person."
msgstr "Recherche dans la base de données pour trouver d'éventuels doublons." msgstr "Recherche dans la base de données pour trouver d'éventuels doublons."
@@ -18667,7 +18667,7 @@ msgstr "Fiancé"
#: ../src/gen/lib/date.py:385 #: ../src/gen/lib/date.py:385
#: ../src/gen/lib/date.py:418 #: ../src/gen/lib/date.py:418
msgid "more than" msgid "more than"
msgstr "plus que" msgstr "plus de"
# trunk # trunk
#. v = self.date1.sortval - self.date2.sortval #. v = self.date1.sortval - self.date2.sortval
@@ -18687,7 +18687,20 @@ msgstr "plus que"
#: ../src/gen/lib/date.py:336 #: ../src/gen/lib/date.py:336
#: ../src/gen/lib/date.py:423 #: ../src/gen/lib/date.py:423
msgid "less than" msgid "less than"
msgstr "moins que" msgstr "moins de"
# trunk
#. v = self.date1.sortval - self.date2.sortval
#. self.sort = (v, -Span.ABOUT)
#. self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
#: ../src/gen/lib/date.py:309
#: ../src/gen/lib/date.py:341
#: ../src/gen/lib/date.py:380
#: ../src/gen/lib/date.py:395
#: ../src/gen/lib/date.py:401
#: ../src/gen/lib/date.py:428
msgid "about|age"
msgstr "environ"
# trunk # trunk
#. v1 = self.date1.sortval - stop.sortval # min #. v1 = self.date1.sortval - stop.sortval # min
@@ -18715,7 +18728,7 @@ msgstr "entre"
#. self.minmax = (v - Span.ABOUT, v + Span.AFTER) #. self.minmax = (v - Span.ABOUT, v + Span.AFTER)
#: ../src/gen/lib/date.py:368 #: ../src/gen/lib/date.py:368
msgid "more than about" msgid "more than about"
msgstr "plus que environ" msgstr "plus d'environ"
# trunk # trunk
#. v = self.date1.sortval - self.date2.sortval #. v = self.date1.sortval - self.date2.sortval
@@ -18723,7 +18736,37 @@ msgstr "plus que environ"
#. self.minmax = (v - Span.ABOUT, v + Span.ABOUT) #. self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
#: ../src/gen/lib/date.py:390 #: ../src/gen/lib/date.py:390
msgid "less than about" msgid "less than about"
msgstr "moins que environ" msgstr "moins d'environ"
#: ../src/gen/lib/date.py:487
#, python-format
msgid "%d year"
msgstr "%d an"
#: ../src/gen/lib/date.py:487
#, python-format
msgid "%d years"
msgstr "%d ans"
#: ../src/gen/lib/date.py:494
#, python-format
msgid "%d month"
msgstr "%d mois"
#: ../src/gen/lib/date.py:494
#, python-format
msgid "%d months"
msgstr "%d mois"
#: ../src/gen/lib/date.py:501
#, python-format
msgid "%d day"
msgstr "%d jour"
#: ../src/gen/lib/date.py:501
#, python-format
msgid "%d days"
msgstr "%d jours"
# trunk # trunk
#: ../src/gen/lib/date.py:506 #: ../src/gen/lib/date.py:506
@@ -19236,14 +19279,14 @@ msgstr "Correspond aux objets ayant un nombre de références"
#: ../src/Filters/Rules/Person/_HasAssociation.py:53 #: ../src/Filters/Rules/Person/_HasAssociation.py:53
#: ../src/FilterEditor/_EditRule.py:198 #: ../src/FilterEditor/_EditRule.py:198
msgid "lesser than" msgid "lesser than"
msgstr "moins que" msgstr "moins de"
#: ../src/Filters/Rules/_HasReferenceCountBase.py:53 #: ../src/Filters/Rules/_HasReferenceCountBase.py:53
#: ../src/Filters/Rules/Person/_HasAddress.py:56 #: ../src/Filters/Rules/Person/_HasAddress.py:56
#: ../src/Filters/Rules/Person/_HasAssociation.py:55 #: ../src/Filters/Rules/Person/_HasAssociation.py:55
#: ../src/FilterEditor/_EditRule.py:198 #: ../src/FilterEditor/_EditRule.py:198
msgid "greater than" msgid "greater than"
msgstr "plus que" msgstr "plus de"
#: ../src/Filters/Rules/_HasTextMatchingSubstringOf.py:44 #: ../src/Filters/Rules/_HasTextMatchingSubstringOf.py:44
#: ../src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py:45 #: ../src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py:45
@@ -21889,7 +21932,7 @@ msgstr "Glisser pour déplacer; cliquer pour détacher"
# trunk # trunk
#: ../src/glade/gramps.glade.h:71 #: ../src/glade/gramps.glade.h:71
msgid "Dua_l dated" msgid "Dua_l dated"
msgstr "Date d_ouble" msgstr "Date _double"
#: ../src/glade/gramps.glade.h:72 #: ../src/glade/gramps.glade.h:72
msgid "Example:" msgid "Example:"

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-01-22 15:23+0100\n" "POT-Creation-Date: 2009-01-24 10:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2629,7 +2629,7 @@ msgid "Very High"
msgstr "" msgstr ""
#: ../src/Utils.py:92 ../src/Editors/_EditSourceRef.py:137 #: ../src/Utils.py:92 ../src/Editors/_EditSourceRef.py:137
#: ../src/plugins/tool/FindDupes.py:67 #: ../src/plugins/tool/FindDupes.py:68
msgid "High" msgid "High"
msgstr "" msgstr ""
@@ -2639,7 +2639,7 @@ msgid "Normal"
msgstr "" msgstr ""
#: ../src/Utils.py:94 ../src/Editors/_EditSourceRef.py:135 #: ../src/Utils.py:94 ../src/Editors/_EditSourceRef.py:135
#: ../src/plugins/tool/FindDupes.py:65 #: ../src/plugins/tool/FindDupes.py:66
msgid "Low" msgid "Low"
msgstr "" msgstr ""
@@ -5594,7 +5594,7 @@ msgstr ""
#: ../src/plugins/tool/CmdRef.py:242 ../src/plugins/tool/Desbrowser.py:170 #: ../src/plugins/tool/CmdRef.py:242 ../src/plugins/tool/Desbrowser.py:170
#: ../src/plugins/tool/Eval.py:132 ../src/plugins/tool/EventCmp.py:468 #: ../src/plugins/tool/Eval.py:132 ../src/plugins/tool/EventCmp.py:468
#: ../src/plugins/tool/EventNames.py:164 #: ../src/plugins/tool/EventNames.py:164
#: ../src/plugins/tool/ExtractCity.py:649 ../src/plugins/tool/FindDupes.py:702 #: ../src/plugins/tool/ExtractCity.py:649 ../src/plugins/tool/FindDupes.py:703
#: ../src/plugins/tool/Leak.py:135 ../src/plugins/tool/NotRelated.py:438 #: ../src/plugins/tool/Leak.py:135 ../src/plugins/tool/NotRelated.py:438
#: ../src/plugins/tool/PatchNames.py:375 ../src/plugins/tool/Rebuild.py:121 #: ../src/plugins/tool/PatchNames.py:375 ../src/plugins/tool/Rebuild.py:121
#: ../src/plugins/tool/RebuildRefMap.py:123 ../src/plugins/tool/RelCalc.py:271 #: ../src/plugins/tool/RebuildRefMap.py:123 ../src/plugins/tool/RelCalc.py:271
@@ -11688,71 +11688,71 @@ msgstr ""
msgid "Attempts to extract city and state/province from a place title" msgid "Attempts to extract city and state/province from a place title"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:66 #: ../src/plugins/tool/FindDupes.py:67
msgid "Medium" msgid "Medium"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:71 #: ../src/plugins/tool/FindDupes.py:72
msgid "manual|Find_Possible_Duplicate_People..." msgid "manual|Find_Possible_Duplicate_People..."
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:136 ../src/plugins/tool/FindDupes.py:701 #: ../src/plugins/tool/FindDupes.py:137 ../src/plugins/tool/FindDupes.py:702
msgid "Find Possible Duplicate People" msgid "Find Possible Duplicate People"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:148 ../src/plugins/tool/Verify.py:301 #: ../src/plugins/tool/FindDupes.py:149 ../src/plugins/tool/Verify.py:301
msgid "Tool settings" msgid "Tool settings"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:148 #: ../src/plugins/tool/FindDupes.py:149
msgid "Find Duplicates tool" msgid "Find Duplicates tool"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:182 #: ../src/plugins/tool/FindDupes.py:183
msgid "No matches found" msgid "No matches found"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:183 #: ../src/plugins/tool/FindDupes.py:184
msgid "No potential duplicate people were found" msgid "No potential duplicate people were found"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:192 #: ../src/plugins/tool/FindDupes.py:193
msgid "Find Duplicates" msgid "Find Duplicates"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:193 #: ../src/plugins/tool/FindDupes.py:194
msgid "Looking for duplicate people" msgid "Looking for duplicate people"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:202 #: ../src/plugins/tool/FindDupes.py:203
msgid "Pass 1: Building preliminary lists" msgid "Pass 1: Building preliminary lists"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:220 #: ../src/plugins/tool/FindDupes.py:221
msgid "Pass 2: Calculating potential matches" msgid "Pass 2: Calculating potential matches"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:567 #: ../src/plugins/tool/FindDupes.py:568
msgid "Potential Merges" msgid "Potential Merges"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:577 #: ../src/plugins/tool/FindDupes.py:578
msgid "Rating" msgid "Rating"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:577 #: ../src/plugins/tool/FindDupes.py:578
msgid "First Person" msgid "First Person"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:578 #: ../src/plugins/tool/FindDupes.py:579
msgid "Second Person" msgid "Second Person"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:586 #: ../src/plugins/tool/FindDupes.py:587
msgid "Merge candidates" msgid "Merge candidates"
msgstr "" msgstr ""
#: ../src/plugins/tool/FindDupes.py:705 #: ../src/plugins/tool/FindDupes.py:706
msgid "" msgid ""
"Searches the entire database, looking for individual entries that may " "Searches the entire database, looking for individual entries that may "
"represent the same person." "represent the same person."
@@ -17832,6 +17832,15 @@ msgstr ""
msgid "less than" msgid "less than"
msgstr "" msgstr ""
#. v = self.date1.sortval - self.date2.sortval
#. self.sort = (v, -Span.ABOUT)
#. self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
#: ../src/gen/lib/date.py:309 ../src/gen/lib/date.py:341
#: ../src/gen/lib/date.py:380 ../src/gen/lib/date.py:395
#: ../src/gen/lib/date.py:401 ../src/gen/lib/date.py:428
msgid "about|age"
msgstr ""
#. v1 = self.date1.sortval - stop.sortval # min #. v1 = self.date1.sortval - stop.sortval # min
#. v2 = self.date1.sortval - start.sortval # max #. v2 = self.date1.sortval - start.sortval # max
#. self.sort = (v1, v2 - v1) #. self.sort = (v1, v2 - v1)
@@ -17863,6 +17872,36 @@ msgstr ""
msgid "less than about" msgid "less than about"
msgstr "" msgstr ""
#: ../src/gen/lib/date.py:487
#, python-format
msgid "%d year"
msgstr ""
#: ../src/gen/lib/date.py:487
#, python-format
msgid "%d years"
msgstr ""
#: ../src/gen/lib/date.py:494
#, python-format
msgid "%d month"
msgstr ""
#: ../src/gen/lib/date.py:494
#, python-format
msgid "%d months"
msgstr ""
#: ../src/gen/lib/date.py:501
#, python-format
msgid "%d day"
msgstr ""
#: ../src/gen/lib/date.py:501
#, python-format
msgid "%d days"
msgstr ""
#: ../src/gen/lib/date.py:506 #: ../src/gen/lib/date.py:506
msgid "0 days" msgid "0 days"
msgstr "" msgstr ""

View File

@@ -28,7 +28,7 @@
# Python modules # Python modules
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
from gettext import gettext as _ from TransUtils import sgettext
from gettext import ngettext as _s from gettext import ngettext as _s
#------------------------------------------------------------------------ #------------------------------------------------------------------------
@@ -306,7 +306,7 @@ class Span:
#v = self.date1.sortval - self.date2.sortval #v = self.date1.sortval - self.date2.sortval
#self.sort = (v, -Span.ABOUT) #self.sort = (v, -Span.ABOUT)
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT) #self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
self.repr = "about " + self._format(self._diff(self.date1, self.date2)) self.repr = _("about|age") + " " + self._format(self._diff(self.date1, self.date2))
elif (self.date2.get_modifier() == Date.MOD_RANGE or elif (self.date2.get_modifier() == Date.MOD_RANGE or
self.date2.get_modifier() == Date.MOD_SPAN): self.date2.get_modifier() == Date.MOD_SPAN):
start, stop = self.date2.get_start_stop_range() start, stop = self.date2.get_start_stop_range()
@@ -338,7 +338,7 @@ class Span:
#v = self.date1.sortval - self.date2.sortval #v = self.date1.sortval - self.date2.sortval
#self.sort = (v, -Span.ABOUT) #self.sort = (v, -Span.ABOUT)
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT) #self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
self.repr = "about " + self._format(self._diff(self.date1, self.date2)) self.repr = _("about|age") + " " + self._format(self._diff(self.date1, self.date2))
elif (self.date2.get_modifier() == Date.MOD_RANGE or elif (self.date2.get_modifier() == Date.MOD_RANGE or
self.date2.get_modifier() == Date.MOD_SPAN): self.date2.get_modifier() == Date.MOD_SPAN):
#v = self.date1.sortval - self.date2.sortval #v = self.date1.sortval - self.date2.sortval
@@ -377,7 +377,7 @@ class Span:
#v = self.date1.sortval - self.date2.sortval #v = self.date1.sortval - self.date2.sortval
#self.sort = (v, -Span.ABOUT) #self.sort = (v, -Span.ABOUT)
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT) #self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
self.repr = "about " + self._format(self._diff(self.date1, self.date2)) self.repr = _("about|age") + " " + self._format(self._diff(self.date1, self.date2))
elif self.date2.get_modifier() == Date.MOD_BEFORE: elif self.date2.get_modifier() == Date.MOD_BEFORE:
#v = self.date1.sortval - self.date2.sortval #v = self.date1.sortval - self.date2.sortval
#self.sort = (v, -Span.BEFORE) #self.sort = (v, -Span.BEFORE)
@@ -392,13 +392,13 @@ class Span:
#v = self.date1.sortval - self.date2.sortval #v = self.date1.sortval - self.date2.sortval
#self.sort = (v, -Span.ABOUT) #self.sort = (v, -Span.ABOUT)
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT) #self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
self.repr = "about " + self._format(self._diff(self.date1, self.date2)) self.repr = _("about|age") + " " + self._format(self._diff(self.date1, self.date2))
elif (self.date2.get_modifier() == Date.MOD_RANGE or elif (self.date2.get_modifier() == Date.MOD_RANGE or
self.date2.get_modifier() == Date.MOD_SPAN): self.date2.get_modifier() == Date.MOD_SPAN):
#v = self.date1.sortval - self.date2.sortval #v = self.date1.sortval - self.date2.sortval
#self.sort = (v, -Span.ABOUT) #self.sort = (v, -Span.ABOUT)
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT) #self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
self.repr = "about " + self._format(self._diff(self.date1, self.date2)) self.repr = _("about|age") + " " + self._format(self._diff(self.date1, self.date2))
elif (self.date1.get_modifier() == Date.MOD_RANGE or elif (self.date1.get_modifier() == Date.MOD_RANGE or
self.date1.get_modifier() == Date.MOD_SPAN): # SPAN---------------------------- self.date1.get_modifier() == Date.MOD_SPAN): # SPAN----------------------------
if self.date2.get_modifier() == Date.MOD_NONE: if self.date2.get_modifier() == Date.MOD_NONE:
@@ -425,7 +425,7 @@ class Span:
#v = self.date1.sortval - self.date2.sortval #v = self.date1.sortval - self.date2.sortval
#self.sort = (v, -Span.ABOUT) #self.sort = (v, -Span.ABOUT)
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT) #self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
self.repr = "about " + self._format(self._diff(self.date1, self.date2)) self.repr = _("about|age") + " " + self._format(self._diff(self.date1, self.date2))
elif (self.date2.get_modifier() == Date.MOD_RANGE or elif (self.date2.get_modifier() == Date.MOD_RANGE or
self.date2.get_modifier() == Date.MOD_SPAN): self.date2.get_modifier() == Date.MOD_SPAN):
start1, stop1 = self.date1.get_start_stop_range() start1, stop1 = self.date1.get_start_stop_range()
@@ -484,21 +484,21 @@ class Span:
retval = "" retval = ""
detail = 0 detail = 0
if diff_tuple[0] != 0: if diff_tuple[0] != 0:
retval += (_s("%d year", "%d years", diff_tuple[0]) % diff_tuple[0]) retval += (_s(_("%d year"), _("%d years"), diff_tuple[0]) % diff_tuple[0])
detail += 1 detail += 1
if self.precision == detail: if self.precision == detail:
return retval return retval
if diff_tuple[1] != 0: if diff_tuple[1] != 0:
if retval != "": if retval != "":
retval += ", " retval += ", "
retval += (_s("%d month", "%d months", diff_tuple[1]) % diff_tuple[1]) retval += (_s(_("%d month"), _("%d months"), diff_tuple[1]) % diff_tuple[1])
detail += 1 detail += 1
if self.precision == detail: if self.precision == detail:
return retval return retval
if diff_tuple[2] != 0: if diff_tuple[2] != 0:
if retval != "": if retval != "":
retval += ", " retval += ", "
retval += (_s("%d day", "%d days", diff_tuple[2]) % diff_tuple[2]) retval += (_s(_("%d day"), _("%d days"), diff_tuple[2]) % diff_tuple[2])
detail += 1 detail += 1
if self.precision == detail: if self.precision == detail:
return retval return retval