Updated french translation, bug fix in Marriage.py

svn: r838

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()
-            father = self.family.getFather()
+        mother = self.family.getMother()
-            mother = self.family.getMother()
+        if father and mother:
-            if father.getGender() == mother.getGender():
+            if const.save_frel(relation) != self.family.getRelationship():
-                self.family.setRelationship("Partners")
+                if father.getGender() == mother.getGender():
-            else:
+                    self.family.setRelationship("Partners")
-                val = const.save_frel(relation)
+                else:
-                if val == "Partners":
+                    val = const.save_frel(relation)
-                    val = "Unknown"
+                    if val == "Partners":
-                if father.getGender() == Person.female or \
+                        val = "Unknown"
-                   mother.getGender() == Person.male:
+                    if father.getGender() == Person.female or \
-                    self.family.setFather(mother)
+                       mother.getGender() == Person.male:
-                    self.family.setMother(father)
+                        self.family.setFather(mother)
-                self.family.setRelationship(val)
+                        self.family.setMother(father)
-            Utils.modified()
+                    self.family.setRelationship(val)
+                Utils.modified()
 
         text = self.notes_field.get_chars(0,-1)
         if text != self.family.getNote():

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"