Modified Files:

* configure.in : changed fr_FR to fr.
 * src/plugins/rel_fr.py : added fr_CA and fr_CA.UTF-8 to the locale list.
Added Files:
 * src/po/fr.po : version from the STABLE branch.
Removed Files:
 * src/po/fr_FR.po


svn: r3973

configure.in

@@ -33,7 +33,7 @@ if test x$ICONV = xno; then
   AC_MSG_ERROR(Couldn't find iconv program.)
 fi
 
-LANGUAGES="hu zh_CN cs da de es fr_FR it nb nl no pl pt_BR ro ru sv eo" 
+LANGUAGES="hu zh_CN cs da de es fr it nb nl no pl pt_BR ro ru sv eo" 
 AC_SUBST(LANGUAGES)
 
 DISTLANGS=

src/plugins/rel_fr.py

@@ -221,5 +221,5 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
 from PluginMgr import register_relcalc
 
 register_relcalc(RelationshipCalculator,
-    ["fr","FR","fr_FR","francais","Francais","fr_FR.UTF8","fr_FR@euro","fr_FR.UTF8@euro",
-            "french","French", "fr_FR.UTF-8", "fr_FR.utf-8", "fr_FR.utf8"])
+    ["fr", "FR", "fr_FR", "fr_CA", "francais", "Francais", "fr_FR.UTF8", "fr_FR@euro", "fr_FR.UTF8@euro",
+            "french","French", "fr_FR.UTF-8", "fr_FR.utf-8", "fr_FR.utf8", "fr_CA.UTF-8"])