Skip to content

Commit a4cdca3

Browse files
prculleyprculley
committed
merge from gramps50
2 parents 8817701 + 015e69a commit a4cdca3

File tree

57 files changed

+15246
-3895
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+15246
-3895
lines changed

‎CalculateEstimatedDates/po/fi-local.po‎

Lines changed: 164 additions & 174 deletions
Large diffs are not rendered by default.

‎DataEntryGramplet/DataEntryGramplet.gpr.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
gramplet_title=_("Data Entry"),
1414
detached_width = 510,
1515
detached_height = 480,
16-
version = '1.0.36',
16+
version = '1.0.37',
1717
gramps_target_version = "5.1",
1818
status=STABLE, # not yet tested with python 3
1919
fname="DataEntryGramplet.py",

‎DataEntryGramplet/DataEntryGramplet.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ def add_data_entry(self, obj):
944944
family.add_child_ref( childref)
945945
person.add_parent_family_handle(family.get_handle())
946946
current_person.add_family_handle(family.get_handle())
947-
if Person.FEMALE:
947+
if current_person.get_gender() == Person.FEMALE:
948948
family.set_mother_handle(current_person.get_handle())
949949
else:
950950
family.set_father_handle(current_person.get_handle())

‎DataEntryGramplet/po/fr-local.po‎

Lines changed: 110 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,143 +46,198 @@ msgid "Data Entry"
4646
msgstr "Saisie des données"
4747

4848
#: DataEntryGramplet/DataEntryGramplet.py:59
49+
#: DataEntryGramplet/DataEntryGramplet.py:71
4950
msgid "Active person"
5051
msgstr "Individu actif"
5152

5253
#: DataEntryGramplet/DataEntryGramplet.py:61
54+
#: DataEntryGramplet/DataEntryGramplet.py:73
5355
msgid "Family:"
5456
msgstr "Famille :"
5557

5658
#: DataEntryGramplet/DataEntryGramplet.py:62
59+
#: DataEntryGramplet/DataEntryGramplet.py:74
5760
msgid "Sources?"
5861
msgstr "Sources ?"
5962

6063
#: DataEntryGramplet/DataEntryGramplet.py:64
6164
#: DataEntryGramplet/DataEntryGramplet.py:93
65+
#: DataEntryGramplet/DataEntryGramplet.py:76
66+
#: DataEntryGramplet/DataEntryGramplet.py:109
6267
msgid "Surname, Given"
6368
msgstr "Nom de famille, Prénom"
6469

6570
#: DataEntryGramplet/DataEntryGramplet.py:65
6671
#: DataEntryGramplet/DataEntryGramplet.py:94
72+
#: DataEntryGramplet/DataEntryGramplet.py:77
73+
#: DataEntryGramplet/DataEntryGramplet.py:110
6774
msgid "Gender"
6875
msgstr "Genre"
6976

7077
#: DataEntryGramplet/DataEntryGramplet.py:65
7178
#: DataEntryGramplet/DataEntryGramplet.py:95
79+
#: DataEntryGramplet/DataEntryGramplet.py:77
80+
#: DataEntryGramplet/DataEntryGramplet.py:111
7281
msgid "female"
7382
msgstr "féminin"
7483

7584
#: DataEntryGramplet/DataEntryGramplet.py:65
7685
#: DataEntryGramplet/DataEntryGramplet.py:95
86+
#: DataEntryGramplet/DataEntryGramplet.py:77
87+
#: DataEntryGramplet/DataEntryGramplet.py:111
7788
msgid "male"
7889
msgstr "masculin"
7990

8091
#: DataEntryGramplet/DataEntryGramplet.py:65
8192
#: DataEntryGramplet/DataEntryGramplet.py:95
93+
#: DataEntryGramplet/DataEntryGramplet.py:77
94+
#: DataEntryGramplet/DataEntryGramplet.py:111
8295
msgid "unknown"
8396
msgstr "inconnu"
8497

98+
# L'espace finale est pour précéder le « : » codé en dur dans certains contextes.
99+
# /!\ vérifier double espace avec search bar "%(titre colonne)s contient"
85100
#: DataEntryGramplet/DataEntryGramplet.py:66
86101
#: DataEntryGramplet/DataEntryGramplet.py:68
87102
#: DataEntryGramplet/DataEntryGramplet.py:69
88103
#: DataEntryGramplet/DataEntryGramplet.py:95
89104
#: DataEntryGramplet/DataEntryGramplet.py:96
90105
#: DataEntryGramplet/DataEntryGramplet.py:97
106+
#: DataEntryGramplet/DataEntryGramplet.py:78
107+
#: DataEntryGramplet/DataEntryGramplet.py:80
108+
#: DataEntryGramplet/DataEntryGramplet.py:81
109+
#: DataEntryGramplet/DataEntryGramplet.py:111
110+
#: DataEntryGramplet/DataEntryGramplet.py:112
111+
#: DataEntryGramplet/DataEntryGramplet.py:113
91112
msgid "Source"
92-
msgstr "Source"
113+
msgstr "Source "
93114

94115
#: DataEntryGramplet/DataEntryGramplet.py:68
95116
#: DataEntryGramplet/DataEntryGramplet.py:96
117+
#: DataEntryGramplet/DataEntryGramplet.py:80
118+
#: DataEntryGramplet/DataEntryGramplet.py:112
96119
msgid "Birth"
97120
msgstr "Naissance"
98121

99122
#: DataEntryGramplet/DataEntryGramplet.py:69
100123
#: DataEntryGramplet/DataEntryGramplet.py:97
124+
#: DataEntryGramplet/DataEntryGramplet.py:81
125+
#: DataEntryGramplet/DataEntryGramplet.py:113
101126
msgid "Death"
102127
msgstr "Décès"
103128

104129
#: DataEntryGramplet/DataEntryGramplet.py:77
130+
#: DataEntryGramplet/DataEntryGramplet.py:89
105131
msgid "Save"
106132
msgstr "Enregistrer"
107133

108134
#: DataEntryGramplet/DataEntryGramplet.py:80
135+
#: DataEntryGramplet/DataEntryGramplet.py:92
109136
msgid "Abandon"
110137
msgstr "Abandonner"
111138

112139
#: DataEntryGramplet/DataEntryGramplet.py:85
140+
#: DataEntryGramplet/DataEntryGramplet.py:97
113141
msgid "New person"
114142
msgstr "Nouvel individu"
115143

116144
#: DataEntryGramplet/DataEntryGramplet.py:86
145+
#: DataEntryGramplet/DataEntryGramplet.py:98
117146
msgid "Add relation"
118147
msgstr "Ajouter la relation"
119148

120149
#: DataEntryGramplet/DataEntryGramplet.py:87
150+
#: DataEntryGramplet/DataEntryGramplet.py:99
121151
msgid "No relation to active person"
122152
msgstr "Aucune relation avec l'individu actif"
123153

124154
#: DataEntryGramplet/DataEntryGramplet.py:88
155+
#: DataEntryGramplet/DataEntryGramplet.py:100
125156
msgid "Add as a Parent"
126157
msgstr "Ajouter comme parent"
127158

128159
#: DataEntryGramplet/DataEntryGramplet.py:89
160+
#: DataEntryGramplet/DataEntryGramplet.py:103
129161
msgid "Add as a Spouse"
130162
msgstr "Ajouter comme conjoint"
131163

132164
#: DataEntryGramplet/DataEntryGramplet.py:90
165+
#: DataEntryGramplet/DataEntryGramplet.py:106
133166
msgid "Add as a Sibling"
134167
msgstr "Ajouter comme frère ou sœur"
135168

136169
#: DataEntryGramplet/DataEntryGramplet.py:91
170+
#: DataEntryGramplet/DataEntryGramplet.py:107
137171
msgid "Add as a Child"
138172
msgstr "Ajouter comme enfant"
139173

140174
#: DataEntryGramplet/DataEntryGramplet.py:105
175+
#: DataEntryGramplet/DataEntryGramplet.py:121
141176
msgid "Add"
142177
msgstr "Ajouter"
143178

144179
#: DataEntryGramplet/DataEntryGramplet.py:108
180+
#: DataEntryGramplet/DataEntryGramplet.py:124
145181
msgid "Copy Active Data"
146182
msgstr "Copier ces données"
147183

148184
#: DataEntryGramplet/DataEntryGramplet.py:111
185+
#: DataEntryGramplet/DataEntryGramplet.py:127
149186
msgid "Clear"
150-
msgstr "Nettoyer"
187+
msgstr "Effacer"
151188

152189
#: DataEntryGramplet/DataEntryGramplet.py:154
153190
#: DataEntryGramplet/DataEntryGramplet.py:168
154191
#: DataEntryGramplet/DataEntryGramplet.py:299
192+
#: DataEntryGramplet/DataEntryGramplet.py:167
193+
#: DataEntryGramplet/DataEntryGramplet.py:178
194+
#: DataEntryGramplet/DataEntryGramplet.py:315
155195
msgid "in"
156196
msgstr "dans"
157197

158198
#: DataEntryGramplet/DataEntryGramplet.py:419
159199
#: DataEntryGramplet/DataEntryGramplet.py:526
200+
#: DataEntryGramplet/DataEntryGramplet.py:440
201+
#: DataEntryGramplet/DataEntryGramplet.py:568
160202
#, python-format
161203
msgid "Gramplet Data Edit: %s"
162204
msgstr "Gramplet formulaire : %s"
163205

164206
#: DataEntryGramplet/DataEntryGramplet.py:492
207+
#: DataEntryGramplet/DataEntryGramplet.py:514
165208
msgid "Please provide a name."
166209
msgstr "Saisissez un nom."
167210

168211
#: DataEntryGramplet/DataEntryGramplet.py:492
212+
#: DataEntryGramplet/DataEntryGramplet.py:514
169213
msgid "Can't add new person."
170214
msgstr "Impossible d'ajouter un nouvel individu."
171215

172216
#: DataEntryGramplet/DataEntryGramplet.py:500
173217
#: DataEntryGramplet/DataEntryGramplet.py:508
174218
#: DataEntryGramplet/DataEntryGramplet.py:517
175219
#: DataEntryGramplet/DataEntryGramplet.py:522
220+
#: DataEntryGramplet/DataEntryGramplet.py:530
221+
#: DataEntryGramplet/DataEntryGramplet.py:535
222+
#: DataEntryGramplet/DataEntryGramplet.py:540
223+
#: DataEntryGramplet/DataEntryGramplet.py:549
224+
#: DataEntryGramplet/DataEntryGramplet.py:554
225+
#: DataEntryGramplet/DataEntryGramplet.py:559
226+
#: DataEntryGramplet/DataEntryGramplet.py:564
176227
msgid "Please set an active person."
177228
msgstr "Définir l'individu actif."
178229

179230
#: DataEntryGramplet/DataEntryGramplet.py:500
180231
#: DataEntryGramplet/DataEntryGramplet.py:503
232+
#: DataEntryGramplet/DataEntryGramplet.py:522
233+
#: DataEntryGramplet/DataEntryGramplet.py:525
181234
msgid "Can't add new person as a parent."
182235
msgstr "Impossible d'ajouter un nouvel individu comme parent."
183236

184237
#: DataEntryGramplet/DataEntryGramplet.py:503
185238
#: DataEntryGramplet/DataEntryGramplet.py:512
239+
#: DataEntryGramplet/DataEntryGramplet.py:525
240+
#: DataEntryGramplet/DataEntryGramplet.py:544
186241
msgid "Please set the new person's gender."
187242
msgstr "Définir le genre du nouvel individu."
188243

@@ -191,39 +246,90 @@ msgstr "Définir le genre du nouvel individu."
191246
#: DataEntryGramplet/DataEntryGramplet.py:663
192247
#: DataEntryGramplet/DataEntryGramplet.py:700
193248
#: DataEntryGramplet/DataEntryGramplet.py:733
249+
#: DataEntryGramplet/DataEntryGramplet.py:540
250+
#: DataEntryGramplet/DataEntryGramplet.py:544
251+
#: DataEntryGramplet/DataEntryGramplet.py:767
252+
#: DataEntryGramplet/DataEntryGramplet.py:804
253+
#: DataEntryGramplet/DataEntryGramplet.py:837
194254
msgid "Can't add new person as a spouse."
195255
msgstr "Impossible d'ajouter un nouvel individu comme conjoint."
196256

197257
#: DataEntryGramplet/DataEntryGramplet.py:517
258+
#: DataEntryGramplet/DataEntryGramplet.py:559
198259
msgid "Can't add new person as a sibling."
199260
msgstr "Impossible d'ajouter un nouvel individu comme frère ou sœur."
200261

201262
#: DataEntryGramplet/DataEntryGramplet.py:522
202263
#: DataEntryGramplet/DataEntryGramplet.py:779
264+
#: DataEntryGramplet/DataEntryGramplet.py:564
265+
#: DataEntryGramplet/DataEntryGramplet.py:937
203266
msgid "Can't add new person as a child."
204267
msgstr "Impossible d'ajouter un nouvel individu comme enfant."
205268

206269
#: DataEntryGramplet/DataEntryGramplet.py:658
270+
#: DataEntryGramplet/DataEntryGramplet.py:762
207271
msgid "Please set Active person."
208272
msgstr "Définir l'individu actif."
209273

210274
#: DataEntryGramplet/DataEntryGramplet.py:659
275+
#: DataEntryGramplet/DataEntryGramplet.py:763
211276
msgid "Can't add new person as a spouse to no one."
212-
msgstr "Impossible d'ajouter un nouvel individu en tant que conjoint de personne."
277+
msgstr ""
278+
"Impossible d'ajouter un nouvel individu en tant que conjoint de personne."
213279

214280
#: DataEntryGramplet/DataEntryGramplet.py:662
281+
#: DataEntryGramplet/DataEntryGramplet.py:766
215282
msgid "Please set gender on Active or new person."
216283
msgstr "Saisissez le genre du nouvel individu ou de la personne active."
217284

218285
#: DataEntryGramplet/DataEntryGramplet.py:699
219286
#: DataEntryGramplet/DataEntryGramplet.py:732
287+
#: DataEntryGramplet/DataEntryGramplet.py:803
288+
#: DataEntryGramplet/DataEntryGramplet.py:836
220289
msgid "Same genders on Active and new person."
221290
msgstr "Même genre entre la personne active et le nouvel individu."
222291

223292
#: DataEntryGramplet/DataEntryGramplet.py:778
293+
#: DataEntryGramplet/DataEntryGramplet.py:936
224294
msgid "Please set gender on Active person."
225295
msgstr "Saisissez le genre de l'individu actif."
226296

297+
#: DataEntryGramplet/DataEntryGramplet.py:77
298+
#: DataEntryGramplet/DataEntryGramplet.py:111
299+
msgid "other"
300+
msgstr "autre"
301+
302+
#: DataEntryGramplet/DataEntryGramplet.py:101
303+
msgid "Add as a Mother"
304+
msgstr "Ajouter comme mère"
305+
306+
#: DataEntryGramplet/DataEntryGramplet.py:102
307+
msgid "Add as a Father"
308+
msgstr "Ajouter comme père"
309+
310+
#: DataEntryGramplet/DataEntryGramplet.py:104
311+
msgid "Add as a Wife"
312+
msgstr "Ajouter comme conjointe"
313+
314+
#: DataEntryGramplet/DataEntryGramplet.py:105
315+
msgid "Add as a Husband"
316+
msgstr "Ajouter comme conjoint"
317+
318+
#: DataEntryGramplet/DataEntryGramplet.py:530
319+
msgid "Can't add new person as a mother."
320+
msgstr "Impossible d'ajouter comme mère."
321+
322+
#: DataEntryGramplet/DataEntryGramplet.py:535
323+
msgid "Can't add new person as a father."
324+
msgstr "Impossible d'ajouter comme père."
325+
326+
#: DataEntryGramplet/DataEntryGramplet.py:549
327+
msgid "Can't add new person as a wife."
328+
msgstr "Impossible d'ajouter comme conjointe."
329+
330+
#: DataEntryGramplet/DataEntryGramplet.py:554
331+
msgid "Can't add new person as a husband."
332+
msgstr "Impossible d'ajouter comme conjoint."
333+
227334
#~ msgid "Gramplet Data Entry: %s"
228335
#~ msgstr "Gramplet formulaire : %s"
229-

0 commit comments

Comments
 (0)