X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flanguages;h=33e29f1210d48efc2da96fd599e8b474e3659f44;hb=21316375fee44ecd1896d81913c9ee4066c6a980;hp=5bd660fec448a955d8d7e9c266b5b3f48fcc519d;hpb=cdd34c2beea9eb7c1bed8a3b39afc25337fe5a2d;p=lyx.git

diff --git a/lib/languages b/lib/languages
index 5bd660fec4..33e29f1210 100644
--- a/lib/languages
+++ b/lib/languages
@@ -2,7 +2,8 @@
 afrikaans   afrikaans	"Afrikaans"	false  iso8859-1  af_ZA	 ""
 american    american	"American"	false  iso8859-1  en_US	 ""
 arabic      arabic	"Arabic"	true   iso8859-6  ar_SA	 ""
-austrian    austrian	"Austrian"	false  iso8859-1  de_AU	 ""
+austrian    austrian	"Austrian"	false  iso8859-1  de_AT	 ""
+naustrian   naustrian   "Austrian (new spelling)" false  iso8859-1  de_AT	 ""
 bahasa      bahasa	"Bahasa"	false  iso8859-1  in_ID	 ""
 belarusian  belarusian	"Belarusian"	false  cp1251     be_BY	 ""
 basque      basque      "Basque"        false  iso8859-1  eu_ES  ""
@@ -11,7 +12,7 @@ breton      breton	"Breton"	false  iso8859-1  br_FR	 ""
 british     british	"British"	false  iso8859-1  en_GB	 ""
 bulgarian   bulgarian   "Bulgarian"     false  cp1251     bg_BG  ""
 canadian    canadian	"Canadian"	false  iso8859-1  en_CA	 ""
-canadien    frenchb   "French Canadian"	false  iso8859-1  fr_CA	 ""
+canadien    canadien	"French Canadian"	false  iso8859-1  fr_CA	 ""
 catalan     catalan 	"Catalan"	false  iso8859-1  ca_ES	 ""
 croatian    croatian	"Croatian"	false  iso8859-2  hr_HR	 ""
 czech       czech	"Czech"		false  iso8859-2  cs_CZ	 ""
@@ -22,8 +23,8 @@ esperanto   esperanto	"Esperanto"	false  iso8859-3  eo	 ""
 #and what country code should esperanto have?? (Garst)
 estonian    estonian	"Estonian"	false  iso8859-1  et_EE	 ""
 finnish     finnish	"Finnish"	false  iso8859-1  fi_FI	 ""
-frenchb     frenchb	"French"	false  iso8859-1  fr_FR	 ""
-french      french "French (GUTenberg)" false  iso8859-1  fr_FR	 ""
+# We redefine \og and \fg (guillemets) for older french language definitions
+french      french 	"French"	false  iso8859-1  fr_FR	 "\addto\extrasfrench{\providecommand{\og}{\leavevmode\flqq~}\providecommand{\fg}{\ifdim\lastskip>\z@\unskip\fi~\frqq}}"
 galician    galician	"Galician"	false  iso8859-1  gl_ES	 ""
 # There are two Galicia's one in Spain one in E.Europe. Because of
 # the font encoding I am assuming this is the one in Spain. (Garst)
@@ -50,7 +51,7 @@ russian     russian	"Russian"	false  koi8       ru_RU	 ""
 scottish    scottish	"Scottish"	false  iso8859-1  gd_GB	 ""
 serbian     croatian "Serbian"  false  iso8859-5  sr_HR     ""
 serbocroatian croatian "Serbo-Croatian" false iso8859-2 sh_HR ""
-spanish     spanish	"Spanish"	false  iso8859-1  es_ES	 "\addto\extrasspanish{\bbl@deactivate{~}}"
+spanish     spanish	"Spanish"	false  iso8859-1  es_ES	 "\deactivatetilden"
 slovak      slovak	"Slovak"	false  iso8859-2  sk_SK	 ""
 slovene     slovene	"Slovene"	false  iso8859-2  sl_SI	 ""
 swedish     swedish	"Swedish"	false  iso8859-1  sv_SE	 ""