From 5268a4e4ac51830e227d67adb8636757c2d77595 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Thu, 14 Mar 2002 15:04:48 +0000 Subject: [PATCH] Updated french translation, bug fix in Marriage.py svn: r838 --- gramps/src/Marriage.py | 31 +++++++++++---------- gramps/src/locale/fr/LC_MESSAGES/gramps.mo | Bin 82845 -> 82843 bytes gramps/src/po/fr.po | 4 +-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/gramps/src/Marriage.py b/gramps/src/Marriage.py index 2d1d44d4a..f42e3f8a4 100644 --- a/gramps/src/Marriage.py +++ b/gramps/src/Marriage.py @@ -369,21 +369,22 @@ class Marriage: GnomeWarningDialog("%s" % msg1) relation = self.type_field.entry.get_text() - if const.save_frel(relation) != self.family.getRelationship(): - father = self.family.getFather() - mother = self.family.getMother() - if father.getGender() == mother.getGender(): - self.family.setRelationship("Partners") - else: - val = const.save_frel(relation) - if val == "Partners": - val = "Unknown" - if father.getGender() == Person.female or \ - mother.getGender() == Person.male: - self.family.setFather(mother) - self.family.setMother(father) - self.family.setRelationship(val) - Utils.modified() + father = self.family.getFather() + mother = self.family.getMother() + if father and mother: + if const.save_frel(relation) != self.family.getRelationship(): + if father.getGender() == mother.getGender(): + self.family.setRelationship("Partners") + else: + val = const.save_frel(relation) + if val == "Partners": + val = "Unknown" + if father.getGender() == Person.female or \ + mother.getGender() == Person.male: + self.family.setFather(mother) + self.family.setMother(father) + self.family.setRelationship(val) + Utils.modified() text = self.notes_field.get_chars(0,-1) if text != self.family.getNote(): diff --git a/gramps/src/locale/fr/LC_MESSAGES/gramps.mo b/gramps/src/locale/fr/LC_MESSAGES/gramps.mo index b01b29c05e5eff2db643a524ff0dff528556b6f4..e84d38e2309d44325e031158135264a4b7475e6a 100644 GIT binary patch delta 8188 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 EKh{d^SpWb4 delta 8190 zcmXZfd6-qjnSk+gffkTOnx@%gx!us+G)S{HdjqmLvP6RhFaZ=0jfxC|Ao3vGM;v5% zCM*I1$|wmM0vZ9)xF89*jfmptL=uySMO3yC5g8<=S>}Cj)j#~I>YP){S6|g_o?4jm zp9^!g4JyghNRs5l!6eDUvzW%5LrHQi7DoqQL+ax(g)^}k&ce>PD%SrCn^6A>OYt&R z!8V73?V@GTPKT3B_JyuA*m3vxpl7sCv|n@p`rhDJzaiF#;*GQqkL^!jHR|gy2cM2U zi`A)b!F+t_a3)E5Q+S_-`dIBqSV1E!q}~bZ;H~I~6R|1Yi@CS}8{-;miQCZj|HgWF z6n%aU3$XSVA<|`d4fO#T3JyFH9dI%l(nZ(~ccKFxkI$-ICid zjSr$*y9Srx2CRu4zYG)Wg^rsUM!^Bb;~bogSL1nf<;hn`(iZAs1@^>FI13H!X7u~5 z=mb8%26!A@`9&HsconWiBk~OT z-Un#M-=Ob(kJa%4y3#ArS|?&|VfPeK#A=M6+;cJvG!;#rhoVccHud#rN1M?BUO^-9 z2D-wxF-?d2(UqP#6^>tx{|(=DMkmx4yWtRY!gDcW;ZX{8adCXG7G2rXSc1E;4W2;v zKKGl@J`g)nzYlBSdNfCVhvvXBbjvDn1m>R(Nj?dk&|{~Ge<6jXG`MHm(G|RdPT*kl z3YJnY_%=zp;4pN64Ep^l^tio>M&^BVVV|H8{R_^%7L5pz| zW>!+jz8Ed|zp$rcu)Z&%5m}G@a5H*ioKN^{z;x#xn)~7^gVLt8iu?W{9 z6Uiihq%e?%_t6h)|Bxgtuo)WC-so10M)&$*Y=_UF$+ZtX6<=d6p27xr5$!McLdb;z ztV6vdT8`QCKahgSHXQAEDmu`U=y~6ThU^{8!~JMvj$%HZM+dI;k1%j^^!v`}jrcQk z0n;&!Yof1Vq38c|3a;d$4cPFESHT0DHJ+@y}8Mdf9cAD>(a^5LzW7JH z6)$0D9Cl}?wqrAV7n|eJ%f#PoOs*u!4N#1p+o{p@XbyaUcJK+>!Pn@XS4mRY zq-uZ-sTZOP>50BK78~JgG#OW52mCcU!A~+2Tw%3TDw`bFp<6Km{ooFC;AvP7|2?*^ zMw9Y6^muMXZ@xF9@1h~zkM8*a^a}q1(|C22RQ6uTw4>k_OhO|u8}0BJ^urgTuVNYX zx6o5^7ClbQs|MSl6YPmCa434?-Gk=Da%_n&U>ZNf?D;=Up)m~?(2&%tmP!h6All(% zG?Wj<`bu+$U{CCwlgeiQ%;@sy^XLux9y;DBEb{li>Q$-i@hgoEM3ZA2 z8j(4e!e66Xu@T*}SFs!qqoL2Q9zxy%Jw?UQ-e?4FMw4|4HpLa#gz=LXC{)Au&~v>H z-Mha;52HzV9NqJ8qyLD{tJDbZUyZ(3ADvJWbZZOIE$M+SY;=4+6Eh~;JPKy>3N*AE zWBoV% z(XHKvRdFY}(9EAGIMAQb3+LPT;4(U~yxdgwj&F)~_!Bg_Zi)4==;@e%E?^Sc&s|s- zA4FHa0CR8!I*~QVxS8ZP6g-b_qQ~tsbbv}Ud#lwCThJ6u(oX0~2clbYD|$ct5?%QM zEWl;x!nUI;-G@%(2wsQZVD|UFNnS{jLNq%oqIaNs^eFxdK7nq8c1u^LP8CG>{;8~T2|Mj>KtqC*;S{vG&E8az%JbY@SZE82vH?nQLvJJ6NvjP6Iz z`4{LyF2(i+jl+dgf^BHO0gcEswEsuYNGxg0`8O%n(%_yxi{`+4=)_KnK{eZ6Q z3L3hq&BDra(Z372qc`SV=yyxdJAWCr$F1lD4`LdxAd$}`>E@jpgE74Q39)0h5GzoX1_sK_S@*YDYb{1WE^%fzAim<7_|2-(U@>|g3b1!zr zdFTM!(d68XM&>X&f$z|X{fMsEUl{i^2VFod^t~qNcZJa|Xc7-n&;Mu&*@4lO%)>Ug z+!yfm=!fVY9!7KI0;VuG9j@LyG(rv0mA67qO&J>cZfI_dK_@;3GlpzF1$`V1-EYu{ z?2PT7#`dG=z?J9#`2}HuX>?*;&;f^`&u>9b*LXBC_s04(G$IcdaQ{4_rNjqqDi$1zvs=PgV2HQL!U22lXwgIBeNepU6q)|#;rq6^h6^xAQKBC z&g=g zUxa?w8`GZuTPV2aGtfO-gbuh1eepdsHx6NUJb}KKZWrGB8G1pDkIuz%>gzFkTG0N^ zqYJoWvp-tL{h2)|WFTx_M zz}7eko#-NT!JFE1{(W&L4JOO~pff&;rP!b>eApK|QlEr|a#i%VIG*}z=mHvb2sttc zozQSJcgCSPa4(t@bK~=M9XS6Uqb)SF!FRA2Poo1h=os#S;^;_hOZz-@<(sh!?!z=* z!7@yD3f_c9U>>@K&!Q805#5rV848~BchJ!9MQ3;foxsJ|Ubl1Dk|IpgUXET+qp$?$ zqaogc9?y@_6(2wcI*Fd1@8k1-qT^&zUBZLrX!aMOd(<24=;!D}CZNah0W@cpqFc5R zO{P8Q7JQ8kRKIIjaZ~jD*61J!Hj=%pCDLB9{;|sIVjvqri{1tkou0|vA z6qexcu@ioVCTI0-!5-)hdJlS`&5yo>?WrF{->=u5E%5wbPr(q5Lqq=vzJ(jmq@2_v zgz`V4PoPP+0XyTL(JQxl&oI&cct7~`fTlePtyBDQ280vDgUV#pL zBf4iJ<{xC`CNN=##_g7fcrF02SyIs%KS zPedoM7>&^5Xhhbb$L1w;!u!$496;Ycg8n$2M04acnp^pO!*4+``rZ`uyO|jZ_ov8m zbY`df1<#=a|A-Eh^be<@2HIg>thbJKKrfnJI2Z3gkK-XM#ah>g(3hk4!eDd)nK7|2 z5glj>dR}M5_QmLoSE9#peQe)^zP~;CIy$jE=zE`{Np}z(=seobm1vCt+3zz+E(I@y zCg=z4!-Hfn8p;u9vivl*kHRX{$H(Ur&`3>2BRB%3rS?K9ngWd-_(eFRSs-FMP zDA>X0Xa`5)3&&#n$>?|S`GxrWQfyBKhVQDQ6Rv|!AQz2L!)Ob1;9_(OO0mYR6#7`e z!O@?f9gRjm_(g0Vk7oVdXfn=3QYTr84!9g0aP^MQhcsN1Uz)VJbMnKJr_Pw3{nt`i L>5eLg)=mC@(b?*o diff --git a/gramps/src/po/fr.po b/gramps/src/po/fr.po index 77874d450..633b87301 100644 --- a/gramps/src/po/fr.po +++ b/gramps/src/po/fr.po @@ -270,11 +270,11 @@ msgstr "Septembre" #: Date.py:108 msgid "(from|between|bet|bet." -msgstr "(de|entre|ent|ent.)" +msgstr "(de|entre|ent|ent." #: Date.py:109 msgid "(and|to|-" -msgstr "(et|à|-)" +msgstr "(et|à|-" #: Date.py:241 Date.py:267 Date.py:280 msgid "from"