i18n/fr.po
changeset 7869 2c6ef18e956a
parent 7868 39a54b88906d
child 7931 60068dc83457
equal deleted inserted replaced
7868:39a54b88906d 7869:2c6ef18e956a
  1092 
  1092 
  1093 msgctxt "inlined:CWRelation.relation_type.subject"
  1093 msgctxt "inlined:CWRelation.relation_type.subject"
  1094 msgid "add a CWRType"
  1094 msgid "add a CWRType"
  1095 msgstr "ajouter un type de relation"
  1095 msgstr "ajouter un type de relation"
  1096 
  1096 
  1097 <<<<<<< /home/syt/src/cubicweb/i18n/fr.po
       
  1098 msgid "add a CWSource"
       
  1099 msgstr "ajouter une source"
       
  1100 
       
  1101 =======
       
  1102 >>>>>>> /tmp/fr.po~other.KbuYNx
       
  1103 msgctxt "inlined:CWUser.use_email.subject"
  1097 msgctxt "inlined:CWUser.use_email.subject"
  1104 msgid "add a EmailAddress"
  1098 msgid "add a EmailAddress"
  1105 msgstr "ajouter une adresse électronique"
  1099 msgstr "ajouter une adresse électronique"
  1106 
  1100 
  1107 # subject and object forms for each relation type
  1101 # subject and object forms for each relation type