Use acadian rather than canadien

This is what babel-french urges, and canadien currently is broken.

acadien seems to be there for at least 15 years

diff --git a/lib/languages b/lib/languages
index b9580222608a33567dedc840db0c950bd422f2a4..0b5277ad21de67912bdb1708db0d4c8aa07a1951 100644 (file)
--- a/lib/languages
+++ b/lib/languages
@@ -355,7 +355,7 @@ End
 #       PolyglossiaOpts  "variant=french"
 Language canadien
        GuiName          "French (Canada)"
-       BabelName        canadien
+       BabelName        acadian
 #      PolyglossiaName  french
 #      PolyglossiaOpts  "variant=canadien"
        QuoteStyle       french

diff --git a/status.23x b/status.23x
index dd96002a09725da482aef4e672fa6c1adf4af051..19be58dd33c4ec86bd8561f4221e3dde656800b1 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -102,6 +102,9 @@ What's new
 
 - Fix loading order problem with rotfloat/rotating and graphicx (bug 11502).
 
+- Fix LaTeX error with Canadian French as second language. LyX now uses
+  the (recommended) babel option "acadian" rather than "canadien".
+
 
 * USER INTERFACE