[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 25 commits - i18nlangtag/source i18npool/Library_localedata_euro.mk i18npool/source include/i18nlangtag svtools/source
Eike Rathke
erack at redhat.com
Mon Jun 2 11:53:21 PDT 2014
i18nlangtag/source/isolang/isolang.cxx | 3
i18npool/Library_localedata_euro.mk | 6 +
i18npool/source/localedata/data/fr_BF.xml | 97 ++++++++++++++----------------
i18npool/source/localedata/data/fr_BJ.xml | 34 ++++++++++
i18npool/source/localedata/data/fr_CI.xml | 34 ++++++++++
i18npool/source/localedata/data/fr_ML.xml | 34 ++++++++++
i18npool/source/localedata/data/fr_NE.xml | 34 ++++++++++
i18npool/source/localedata/data/fr_SN.xml | 34 ++++++++++
i18npool/source/localedata/data/fr_TG.xml | 34 ++++++++++
i18npool/source/localedata/localedata.cxx | 6 +
include/i18nlangtag/lang.h | 3
svtools/source/misc/langtab.src | 6 +
12 files changed, 276 insertions(+), 49 deletions(-)
New commits:
commit a0688f52223d24381a29384396b271c45d123568
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jun 2 20:24:55 2014 +0200
add [fr-TG] to libs, fdo#79353
Change-Id: Ia0f648f4ca601d8ecfb57386ca94942a928907e3
(cherry picked from commit 483c20b148a1e71074897a709136868e694d5d21)
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index ee06f80..d199466 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
CustomTarget/i18npool/localedata/localedata_fr_ML \
CustomTarget/i18npool/localedata/localedata_fr_NE \
CustomTarget/i18npool/localedata/localedata_fr_SN \
+ CustomTarget/i18npool/localedata/localedata_fr_TG \
CustomTarget/i18npool/localedata/localedata_fur_IT \
CustomTarget/i18npool/localedata/localedata_fy_NL \
CustomTarget/i18npool/localedata/localedata_ga_IE \
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index b842ea0..bcd087f 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -106,6 +106,7 @@ static const struct {
{ "fr_SN", lcl_DATA_EURO },
{ "fr_BJ", lcl_DATA_EURO },
{ "fr_NE", lcl_DATA_EURO },
+ { "fr_TG", lcl_DATA_EURO },
{ "it_IT", lcl_DATA_EURO },
{ "it_CH", lcl_DATA_EURO },
{ "sl_SI", lcl_DATA_EURO },
commit dff410590097681fc3df1b21e79ccad7dc7d9d40
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jun 2 20:23:27 2014 +0200
add French Togo [fr-TG] locale data, fdo#79353
Change-Id: Ia9faa9cd23367e2d379a5aa5daaeb49394db7e40
(cherry picked from commit 22959db96eee94faedd5822b5c3169e0fcda7ff4)
diff --git a/i18npool/source/localedata/data/fr_TG.xml b/i18npool/source/localedata/data/fr_TG.xml
new file mode 100644
index 0000000..a322f88
--- /dev/null
+++ b/i18npool/source/localedata/data/fr_TG.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+ <LC_INFO>
+ <Language>
+ <LangID>fr</LangID>
+ <DefaultName>French</DefaultName>
+ </Language>
+ <Country>
+ <CountryID>TG</CountryID>
+ <DefaultName>Togo</DefaultName>
+ </Country>
+ </LC_INFO>
+ <LC_CTYPE unoid="generic" ref="fr_BF" />
+ <LC_FORMAT ref="fr_BF" replaceFrom="[CURRENCY]" replaceTo="[$F-8C0C]" />
+ <LC_COLLATION ref="fr_BF" />
+ <LC_SEARCH ref="fr_BF" />
+ <LC_INDEX ref="fr_BF" />
+ <LC_CALENDAR ref="fr_BF" />
+ <LC_CURRENCY ref="fr_BF" />
+ <LC_TRANSLITERATION ref="fr_BF" />
+ <LC_MISC ref="fr_BF" />
+ <LC_NumberingLevel ref="fr_BF" />
+ <LC_OutLineNumberingLevel ref="fr_BF"/>
+</Locale>
+<!--Version 1.0 -->
commit 6ae4e142b7207861653762b259fb63683ec60ae1
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jun 2 20:17:21 2014 +0200
add LANGUAGE_USER_FRENCH_TOGO 0x8C0C [fr-TG] French (Togo), fdo#79353
Change-Id: Id1e127a3652d4bef280327c2a62d95c17c012656
(cherry picked from commit b247e5f77d23e5cc43ea7e176a5dc01e6b30f17d)
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 3fcb4f7..141d913 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -646,6 +646,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_LENGO, "lgr", "SB", 0 },
{ LANGUAGE_USER_FRENCH_BENIN, "fr", "BJ", 0 },
{ LANGUAGE_USER_FRENCH_NIGER, "fr", "NE", 0 },
+ { LANGUAGE_USER_FRENCH_TOGO, "fr", "TG", 0 },
{ LANGUAGE_MULTIPLE, "mul", "" , 0 }, // multiple languages, many languages are used
{ LANGUAGE_UNDETERMINED, "und", "" , 0 }, // undetermined language, language cannot be identified
{ LANGUAGE_NONE, "zxx", "" , 0 }, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 9a487ac..1c47be7 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -700,6 +700,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_LENGO 0x0692
#define LANGUAGE_USER_FRENCH_BENIN 0x840C /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_FRENCH)) */
#define LANGUAGE_USER_FRENCH_NIGER 0x880C /* makeLangID( 0x22, getPrimaryLanguage( LANGUAGE_FRENCH)) */
+#define LANGUAGE_USER_FRENCH_TOGO 0x8C0C /* makeLangID( 0x23, getPrimaryLanguage( LANGUAGE_FRENCH)) */
/* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index eba2d71..67fcfd3 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -387,6 +387,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "French (Senegal)" ; LANGUAGE_FRENCH_SENEGAL ; > ;
< "French (Benin)" ; LANGUAGE_USER_FRENCH_BENIN ; > ;
< "French (Niger)" ; LANGUAGE_USER_FRENCH_NIGER ; > ;
+ < "French (Togo)" ; LANGUAGE_USER_FRENCH_TOGO ; > ;
};
};
commit bd12bfdf19eed9983dd54071c6cb525802a76c7e
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jun 2 20:13:33 2014 +0200
add [fr-NE] to libs, fdo#79352
Change-Id: Ieae9482da1b3a78e97fb9eac9001dc98867577e7
(cherry picked from commit 29146a6791afcbe4c934dfd1be2c84630d3fb342)
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index ab9028d..ee06f80 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
CustomTarget/i18npool/localedata/localedata_fr_LU \
CustomTarget/i18npool/localedata/localedata_fr_MC \
CustomTarget/i18npool/localedata/localedata_fr_ML \
+ CustomTarget/i18npool/localedata/localedata_fr_NE \
CustomTarget/i18npool/localedata/localedata_fr_SN \
CustomTarget/i18npool/localedata/localedata_fur_IT \
CustomTarget/i18npool/localedata/localedata_fy_NL \
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 1680ae4..b842ea0 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -105,6 +105,7 @@ static const struct {
{ "fr_ML", lcl_DATA_EURO },
{ "fr_SN", lcl_DATA_EURO },
{ "fr_BJ", lcl_DATA_EURO },
+ { "fr_NE", lcl_DATA_EURO },
{ "it_IT", lcl_DATA_EURO },
{ "it_CH", lcl_DATA_EURO },
{ "sl_SI", lcl_DATA_EURO },
commit a52b3f7190266a87a3599bd948593cbd0e78823a
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jun 2 20:11:41 2014 +0200
derive [fr-NE] from [fr-BF] instead, fdo#79352 related
Change-Id: I908c5ad633f8030cab67cf110de76ba28731078b
(cherry picked from commit 944abfc9fb2b24725766632c3a1b0841f3a6d64e)
diff --git a/i18npool/source/localedata/data/fr_NE.xml b/i18npool/source/localedata/data/fr_NE.xml
index c0c2d01..e511ac7 100644
--- a/i18npool/source/localedata/data/fr_NE.xml
+++ b/i18npool/source/localedata/data/fr_NE.xml
@@ -19,349 +19,16 @@
<DefaultName>Niger</DefaultName>
</Country>
</LC_INFO>
- <LC_CTYPE unoid="generic">
- <Separators>
- <DateSeparator>/</DateSeparator>
- <ThousandSeparator>Â </ThousandSeparator>
- <DecimalSeparator>,</DecimalSeparator>
- <TimeSeparator>:</TimeSeparator>
- <Time100SecSeparator>,</Time100SecSeparator>
- <ListSeparator>;</ListSeparator>
- <LongDateDayOfWeekSeparator> </LongDateDayOfWeekSeparator>
- <LongDateDaySeparator> </LongDateDaySeparator>
- <LongDateMonthSeparator> </LongDateMonthSeparator>
- <LongDateYearSeparator> </LongDateYearSeparator>
- </Separators>
- <Markers>
- <QuotationStart>'</QuotationStart>
- <QuotationEnd>'</QuotationEnd>
- <DoubleQuotationStart>"</DoubleQuotationStart>
- <DoubleQuotationEnd>"</DoubleQuotationEnd>
- </Markers>
- <TimeAM>AM</TimeAM>
- <TimePM>PM</TimePM>
- <MeasurementSystem>metric</MeasurementSystem>
- </LC_CTYPE>
- <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$F-880C]">
- <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
- <FormatCode>General</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
- <FormatCode>0</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
- <FormatCode>0,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
- <FormatCode>#Â ##0</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
- <FormatCode>#Â ##0,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
- <FormatCode>#Â ###,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
- <FormatCode>0,00E+00</FormatCode>
- </FormatElement>
- <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
- <FormatCode>0,00E+000</FormatCode>
- </FormatElement>
- <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
- <FormatCode>0%</FormatCode>
- </FormatElement>
- <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
- <FormatCode>0,00%</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
- <FormatCode>#Â ##0[CURRENCY];-#Â ##0[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
- <FormatCode>#Â ##0,00[CURRENCY];-#Â ##0,00[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
- <FormatCode>#Â ##0[CURRENCY];[RED]-#Â ##0[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
- <FormatCode>#Â ##0,00[CURRENCY];[RED]-#Â ##0,00[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
- <FormatCode>#Â ##0,00CCC</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
- <FormatCode>#Â ##0,--[CURRENCY];[RED]-#Â ##0,--[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey11" default="true" type="short" usage="DATE" formatindex="18">
- <FormatCode>YY/MM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
- <FormatCode>NNNNDD MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
- <FormatCode>YY/MM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="21">
- <FormatCode>YYYY/MM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="22">
- <FormatCode>D MMM YY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="23">
- <FormatCode>D MMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey21" default="false" type="long" usage="DATE" formatindex="24">
- <FormatCode>D MMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="25">
- <FormatCode>D MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey22" default="false" type="long" usage="DATE" formatindex="26">
- <FormatCode>D MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey10" default="false" type="medium" usage="DATE" formatindex="27">
- <FormatCode>NN DD/MMM/YY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey18" default="false" type="long" usage="DATE" formatindex="28">
- <FormatCode>NN D MMM YY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey19" default="false" type="long" usage="DATE" formatindex="29">
- <FormatCode>NN D MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
- <FormatCode>NNNND MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
- <FormatCode>MM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="32">
- <FormatCode>YY-MM-DD</FormatCode>
- <DefaultName>ISO 8601</DefaultName>
- </FormatElement>
- <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="33">
- <FormatCode>YYYY-MM-DD</FormatCode>
- <DefaultName>ISO 8601</DefaultName>
- </FormatElement>
- <FormatElement msgid="DateFormatskey1" default="false" type="medium" usage="DATE" formatindex="34">
- <FormatCode>YY/MM</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="35">
- <FormatCode>MMM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="36">
- <FormatCode>MMMM</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="37">
- <FormatCode>QQ YY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey9" default="false" type="medium" usage="DATE" formatindex="38">
- <FormatCode>WW</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39">
- <FormatCode>HH:MM</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME" formatindex="40">
- <FormatCode>HH:MM:SS</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME" formatindex="41">
- <FormatCode>HH:MM AM/PM</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME" formatindex="42">
- <FormatCode>HH:MM:SS AM/PM</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
- <FormatCode>[HH]:MM:SS</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
- <FormatCode>MM:SS,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
- <FormatCode>[HH]:MM:SS,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
- <FormatCode>YY/MM/DD HH:MM</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
- <FormatCode>YYYY/MM/DD HH:MM:SS AM/PM</FormatCode>
- </FormatElement>
- </LC_FORMAT>
- <LC_COLLATION>
- <Collator default="true" unoid="alphanumeric"/>
- <CollationOptions>
- <TransliterationModules>IGNORE_CASE</TransliterationModules>
- </CollationOptions>
- </LC_COLLATION>
- <LC_SEARCH>
- <SearchOptions>
- <TransliterationModules>IGNORE_CASE</TransliterationModules>
- </SearchOptions>
- </LC_SEARCH>
- <LC_INDEX>
- <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-Z</IndexKey>
- <UnicodeScript>0</UnicodeScript>
- <UnicodeScript>1</UnicodeScript>
- <UnicodeScript>6</UnicodeScript>
- <FollowPageWord>sq</FollowPageWord>
- <FollowPageWord>sqq</FollowPageWord>
- </LC_INDEX>
- <LC_CALENDAR>
- <Calendar unoid="gregorian" default="true">
- <DaysOfWeek>
- <Day>
- <DayID>sun</DayID>
- <DefaultAbbrvName>dim</DefaultAbbrvName>
- <DefaultFullName>dimanche</DefaultFullName>
- </Day>
- <Day>
- <DayID>mon</DayID>
- <DefaultAbbrvName>lun</DefaultAbbrvName>
- <DefaultFullName>lundi</DefaultFullName>
- </Day>
- <Day>
- <DayID>tue</DayID>
- <DefaultAbbrvName>mar</DefaultAbbrvName>
- <DefaultFullName>mardi</DefaultFullName>
- </Day>
- <Day>
- <DayID>wed</DayID>
- <DefaultAbbrvName>mer</DefaultAbbrvName>
- <DefaultFullName>mercredi</DefaultFullName>
- </Day>
- <Day>
- <DayID>thu</DayID>
- <DefaultAbbrvName>jeu</DefaultAbbrvName>
- <DefaultFullName>jeudi</DefaultFullName>
- </Day>
- <Day>
- <DayID>fri</DayID>
- <DefaultAbbrvName>ven</DefaultAbbrvName>
- <DefaultFullName>vendredi</DefaultFullName>
- </Day>
- <Day>
- <DayID>sat</DayID>
- <DefaultAbbrvName>sam</DefaultAbbrvName>
- <DefaultFullName>samedi</DefaultFullName>
- </Day>
- </DaysOfWeek>
- <MonthsOfYear>
- <Month>
- <MonthID>jan</MonthID>
- <DefaultAbbrvName>jan</DefaultAbbrvName>
- <DefaultFullName>janvier</DefaultFullName>
- </Month>
- <Month>
- <MonthID>feb</MonthID>
- <DefaultAbbrvName>fév</DefaultAbbrvName>
- <DefaultFullName>février</DefaultFullName>
- </Month>
- <Month>
- <MonthID>mar</MonthID>
- <DefaultAbbrvName>mar</DefaultAbbrvName>
- <DefaultFullName>mars</DefaultFullName>
- </Month>
- <Month>
- <MonthID>apr</MonthID>
- <DefaultAbbrvName>avr</DefaultAbbrvName>
- <DefaultFullName>avril</DefaultFullName>
- </Month>
- <Month>
- <MonthID>may</MonthID>
- <DefaultAbbrvName>mai</DefaultAbbrvName>
- <DefaultFullName>mai</DefaultFullName>
- </Month>
- <Month>
- <MonthID>jun</MonthID>
- <DefaultAbbrvName>jun</DefaultAbbrvName>
- <DefaultFullName>juin</DefaultFullName>
- </Month>
- <Month>
- <MonthID>jul</MonthID>
- <DefaultAbbrvName>jul</DefaultAbbrvName>
- <DefaultFullName>juillet</DefaultFullName>
- </Month>
- <Month>
- <MonthID>aug</MonthID>
- <DefaultAbbrvName>aoû</DefaultAbbrvName>
- <DefaultFullName>août</DefaultFullName>
- </Month>
- <Month>
- <MonthID>sep</MonthID>
- <DefaultAbbrvName>sep</DefaultAbbrvName>
- <DefaultFullName>septembre</DefaultFullName>
- </Month>
- <Month>
- <MonthID>oct</MonthID>
- <DefaultAbbrvName>oct</DefaultAbbrvName>
- <DefaultFullName>octobre</DefaultFullName>
- </Month>
- <Month>
- <MonthID>nov</MonthID>
- <DefaultAbbrvName>nov</DefaultAbbrvName>
- <DefaultFullName>novembre</DefaultFullName>
- </Month>
- <Month>
- <MonthID>dec</MonthID>
- <DefaultAbbrvName>déc</DefaultAbbrvName>
- <DefaultFullName>décembre</DefaultFullName>
- </Month>
- </MonthsOfYear>
- <Eras>
- <Era>
- <EraID>bc</EraID>
- <DefaultAbbrvName>av. J.-C.</DefaultAbbrvName>
- <DefaultFullName>avant Jésus-Christ</DefaultFullName>
- </Era>
- <Era>
- <EraID>ad</EraID>
- <DefaultAbbrvName>ap. J.-C.</DefaultAbbrvName>
- <DefaultFullName>après Jésus-Christ</DefaultFullName>
- </Era>
- </Eras>
- <StartDayOfWeek>
- <DayID>mon</DayID>
- </StartDayOfWeek>
- <MinimalDaysInFirstWeek>4</MinimalDaysInFirstWeek>
- </Calendar>
- </LC_CALENDAR>
- <LC_CURRENCY>
- <Currency default="true" usedInCompatibleFormatCodes="true">
- <CurrencyID>XOF</CurrencyID>
- <CurrencySymbol>F</CurrencySymbol>
- <BankSymbol>XOF</BankSymbol>
- <CurrencyName>Franc CFA - BCEAO</CurrencyName>
- <DecimalPlaces>0</DecimalPlaces>
- </Currency>
- </LC_CURRENCY>
- <LC_TRANSLITERATION>
- <Transliteration unoid="LOWERCASE_UPPERCASE"/>
- <Transliteration unoid="UPPERCASE_LOWERCASE"/>
- <Transliteration unoid="IGNORE_CASE"/>
- </LC_TRANSLITERATION>
- <LC_MISC>
- <ReservedWords>
- <trueWord>vrai</trueWord>
- <falseWord>faux</falseWord>
- <quarter1Word>Premier trimestre</quarter1Word>
- <quarter2Word>Deuxième trimestre</quarter2Word>
- <quarter3Word>Troisième trimestre</quarter3Word>
- <quarter4Word>Quatrième trimestre</quarter4Word>
- <aboveWord>carré</aboveWord>
- <belowWord>Racine carré</belowWord>
- <quarter1Abbreviation>1er trim.</quarter1Abbreviation>
- <quarter2Abbreviation>2e trim.</quarter2Abbreviation>
- <quarter3Abbreviation>3e trim.</quarter3Abbreviation>
- <quarter4Abbreviation>4e trim.</quarter4Abbreviation>
- </ReservedWords>
- </LC_MISC>
- <LC_NumberingLevel>
- <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="4" Prefix=" " Suffix="."/>
- <NumberingLevel NumType="4" Prefix="(" Suffix=")"/>
- <NumberingLevel NumType="2" Prefix=" " Suffix="."/>
- <NumberingLevel NumType="0" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="1" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="1" Prefix="(" Suffix=")"/>
- <NumberingLevel NumType="3" Prefix=" " Suffix="."/>
- </LC_NumberingLevel>
- <LC_OutLineNumberingLevel ref="en_US"/>
+ <LC_CTYPE unoid="generic" ref="fr_BF" />
+ <LC_FORMAT ref="fr_BF" replaceFrom="[CURRENCY]" replaceTo="[$F-880C]" />
+ <LC_COLLATION ref="fr_BF" />
+ <LC_SEARCH ref="fr_BF" />
+ <LC_INDEX ref="fr_BF" />
+ <LC_CALENDAR ref="fr_BF" />
+ <LC_CURRENCY ref="fr_BF" />
+ <LC_TRANSLITERATION ref="fr_BF" />
+ <LC_MISC ref="fr_BF" />
+ <LC_NumberingLevel ref="fr_BF" />
+ <LC_OutLineNumberingLevel ref="fr_BF"/>
</Locale>
<!--Version 1.0 -->
commit 3814496a426c436a154d68e3138b147cdfceee17
Author: David Delma <ddelma at gmail.com>
Date: Wed May 28 08:42:00 2014 +0200
add French Niger [fr-NE] locale data, fdo#79352
Change-Id: I1f74229521a353402790946aa1e6e4b92d0d2cde
(cherry picked from commit bc24aa3796451e2d58d28d1d5d6e5244b5540ad0)
diff --git a/i18npool/source/localedata/data/fr_NE.xml b/i18npool/source/localedata/data/fr_NE.xml
new file mode 100644
index 0000000..c0c2d01
--- /dev/null
+++ b/i18npool/source/localedata/data/fr_NE.xml
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+ <LC_INFO>
+ <Language>
+ <LangID>fr</LangID>
+ <DefaultName>French</DefaultName>
+ </Language>
+ <Country>
+ <CountryID>NE</CountryID>
+ <DefaultName>Niger</DefaultName>
+ </Country>
+ </LC_INFO>
+ <LC_CTYPE unoid="generic">
+ <Separators>
+ <DateSeparator>/</DateSeparator>
+ <ThousandSeparator>Â </ThousandSeparator>
+ <DecimalSeparator>,</DecimalSeparator>
+ <TimeSeparator>:</TimeSeparator>
+ <Time100SecSeparator>,</Time100SecSeparator>
+ <ListSeparator>;</ListSeparator>
+ <LongDateDayOfWeekSeparator> </LongDateDayOfWeekSeparator>
+ <LongDateDaySeparator> </LongDateDaySeparator>
+ <LongDateMonthSeparator> </LongDateMonthSeparator>
+ <LongDateYearSeparator> </LongDateYearSeparator>
+ </Separators>
+ <Markers>
+ <QuotationStart>'</QuotationStart>
+ <QuotationEnd>'</QuotationEnd>
+ <DoubleQuotationStart>"</DoubleQuotationStart>
+ <DoubleQuotationEnd>"</DoubleQuotationEnd>
+ </Markers>
+ <TimeAM>AM</TimeAM>
+ <TimePM>PM</TimePM>
+ <MeasurementSystem>metric</MeasurementSystem>
+ </LC_CTYPE>
+ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$F-880C]">
+ <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
+ <FormatCode>General</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
+ <FormatCode>0</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
+ <FormatCode>0,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
+ <FormatCode>#Â ##0</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
+ <FormatCode>#Â ##0,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
+ <FormatCode>#Â ###,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
+ <FormatCode>0,00E+00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
+ <FormatCode>0,00E+000</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
+ <FormatCode>0%</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
+ <FormatCode>0,00%</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
+ <FormatCode>#Â ##0[CURRENCY];-#Â ##0[CURRENCY]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
+ <FormatCode>#Â ##0,00[CURRENCY];-#Â ##0,00[CURRENCY]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
+ <FormatCode>#Â ##0[CURRENCY];[RED]-#Â ##0[CURRENCY]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
+ <FormatCode>#Â ##0,00[CURRENCY];[RED]-#Â ##0,00[CURRENCY]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
+ <FormatCode>#Â ##0,00CCC</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
+ <FormatCode>#Â ##0,--[CURRENCY];[RED]-#Â ##0,--[CURRENCY]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey11" default="true" type="short" usage="DATE" formatindex="18">
+ <FormatCode>YY/MM/DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
+ <FormatCode>NNNNDD MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
+ <FormatCode>YY/MM/DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="21">
+ <FormatCode>YYYY/MM/DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="22">
+ <FormatCode>D MMM YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="23">
+ <FormatCode>D MMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey21" default="false" type="long" usage="DATE" formatindex="24">
+ <FormatCode>D MMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="25">
+ <FormatCode>D MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey22" default="false" type="long" usage="DATE" formatindex="26">
+ <FormatCode>D MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey10" default="false" type="medium" usage="DATE" formatindex="27">
+ <FormatCode>NN DD/MMM/YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey18" default="false" type="long" usage="DATE" formatindex="28">
+ <FormatCode>NN D MMM YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey19" default="false" type="long" usage="DATE" formatindex="29">
+ <FormatCode>NN D MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
+ <FormatCode>NNNND MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
+ <FormatCode>MM/DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="32">
+ <FormatCode>YY-MM-DD</FormatCode>
+ <DefaultName>ISO 8601</DefaultName>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="33">
+ <FormatCode>YYYY-MM-DD</FormatCode>
+ <DefaultName>ISO 8601</DefaultName>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey1" default="false" type="medium" usage="DATE" formatindex="34">
+ <FormatCode>YY/MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="35">
+ <FormatCode>MMM/DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="36">
+ <FormatCode>MMMM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="37">
+ <FormatCode>QQ YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey9" default="false" type="medium" usage="DATE" formatindex="38">
+ <FormatCode>WW</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39">
+ <FormatCode>HH:MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME" formatindex="40">
+ <FormatCode>HH:MM:SS</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME" formatindex="41">
+ <FormatCode>HH:MM AM/PM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME" formatindex="42">
+ <FormatCode>HH:MM:SS AM/PM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
+ <FormatCode>[HH]:MM:SS</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
+ <FormatCode>MM:SS,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
+ <FormatCode>[HH]:MM:SS,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
+ <FormatCode>YY/MM/DD HH:MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
+ <FormatCode>YYYY/MM/DD HH:MM:SS AM/PM</FormatCode>
+ </FormatElement>
+ </LC_FORMAT>
+ <LC_COLLATION>
+ <Collator default="true" unoid="alphanumeric"/>
+ <CollationOptions>
+ <TransliterationModules>IGNORE_CASE</TransliterationModules>
+ </CollationOptions>
+ </LC_COLLATION>
+ <LC_SEARCH>
+ <SearchOptions>
+ <TransliterationModules>IGNORE_CASE</TransliterationModules>
+ </SearchOptions>
+ </LC_SEARCH>
+ <LC_INDEX>
+ <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-Z</IndexKey>
+ <UnicodeScript>0</UnicodeScript>
+ <UnicodeScript>1</UnicodeScript>
+ <UnicodeScript>6</UnicodeScript>
+ <FollowPageWord>sq</FollowPageWord>
+ <FollowPageWord>sqq</FollowPageWord>
+ </LC_INDEX>
+ <LC_CALENDAR>
+ <Calendar unoid="gregorian" default="true">
+ <DaysOfWeek>
+ <Day>
+ <DayID>sun</DayID>
+ <DefaultAbbrvName>dim</DefaultAbbrvName>
+ <DefaultFullName>dimanche</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>mon</DayID>
+ <DefaultAbbrvName>lun</DefaultAbbrvName>
+ <DefaultFullName>lundi</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>tue</DayID>
+ <DefaultAbbrvName>mar</DefaultAbbrvName>
+ <DefaultFullName>mardi</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>wed</DayID>
+ <DefaultAbbrvName>mer</DefaultAbbrvName>
+ <DefaultFullName>mercredi</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>thu</DayID>
+ <DefaultAbbrvName>jeu</DefaultAbbrvName>
+ <DefaultFullName>jeudi</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>fri</DayID>
+ <DefaultAbbrvName>ven</DefaultAbbrvName>
+ <DefaultFullName>vendredi</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>sat</DayID>
+ <DefaultAbbrvName>sam</DefaultAbbrvName>
+ <DefaultFullName>samedi</DefaultFullName>
+ </Day>
+ </DaysOfWeek>
+ <MonthsOfYear>
+ <Month>
+ <MonthID>jan</MonthID>
+ <DefaultAbbrvName>jan</DefaultAbbrvName>
+ <DefaultFullName>janvier</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>feb</MonthID>
+ <DefaultAbbrvName>fév</DefaultAbbrvName>
+ <DefaultFullName>février</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>mar</MonthID>
+ <DefaultAbbrvName>mar</DefaultAbbrvName>
+ <DefaultFullName>mars</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>apr</MonthID>
+ <DefaultAbbrvName>avr</DefaultAbbrvName>
+ <DefaultFullName>avril</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>may</MonthID>
+ <DefaultAbbrvName>mai</DefaultAbbrvName>
+ <DefaultFullName>mai</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>jun</MonthID>
+ <DefaultAbbrvName>jun</DefaultAbbrvName>
+ <DefaultFullName>juin</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>jul</MonthID>
+ <DefaultAbbrvName>jul</DefaultAbbrvName>
+ <DefaultFullName>juillet</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>aug</MonthID>
+ <DefaultAbbrvName>aoû</DefaultAbbrvName>
+ <DefaultFullName>août</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>sep</MonthID>
+ <DefaultAbbrvName>sep</DefaultAbbrvName>
+ <DefaultFullName>septembre</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>oct</MonthID>
+ <DefaultAbbrvName>oct</DefaultAbbrvName>
+ <DefaultFullName>octobre</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>nov</MonthID>
+ <DefaultAbbrvName>nov</DefaultAbbrvName>
+ <DefaultFullName>novembre</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>dec</MonthID>
+ <DefaultAbbrvName>déc</DefaultAbbrvName>
+ <DefaultFullName>décembre</DefaultFullName>
+ </Month>
+ </MonthsOfYear>
+ <Eras>
+ <Era>
+ <EraID>bc</EraID>
+ <DefaultAbbrvName>av. J.-C.</DefaultAbbrvName>
+ <DefaultFullName>avant Jésus-Christ</DefaultFullName>
+ </Era>
+ <Era>
+ <EraID>ad</EraID>
+ <DefaultAbbrvName>ap. J.-C.</DefaultAbbrvName>
+ <DefaultFullName>après Jésus-Christ</DefaultFullName>
+ </Era>
+ </Eras>
+ <StartDayOfWeek>
+ <DayID>mon</DayID>
+ </StartDayOfWeek>
+ <MinimalDaysInFirstWeek>4</MinimalDaysInFirstWeek>
+ </Calendar>
+ </LC_CALENDAR>
+ <LC_CURRENCY>
+ <Currency default="true" usedInCompatibleFormatCodes="true">
+ <CurrencyID>XOF</CurrencyID>
+ <CurrencySymbol>F</CurrencySymbol>
+ <BankSymbol>XOF</BankSymbol>
+ <CurrencyName>Franc CFA - BCEAO</CurrencyName>
+ <DecimalPlaces>0</DecimalPlaces>
+ </Currency>
+ </LC_CURRENCY>
+ <LC_TRANSLITERATION>
+ <Transliteration unoid="LOWERCASE_UPPERCASE"/>
+ <Transliteration unoid="UPPERCASE_LOWERCASE"/>
+ <Transliteration unoid="IGNORE_CASE"/>
+ </LC_TRANSLITERATION>
+ <LC_MISC>
+ <ReservedWords>
+ <trueWord>vrai</trueWord>
+ <falseWord>faux</falseWord>
+ <quarter1Word>Premier trimestre</quarter1Word>
+ <quarter2Word>Deuxième trimestre</quarter2Word>
+ <quarter3Word>Troisième trimestre</quarter3Word>
+ <quarter4Word>Quatrième trimestre</quarter4Word>
+ <aboveWord>carré</aboveWord>
+ <belowWord>Racine carré</belowWord>
+ <quarter1Abbreviation>1er trim.</quarter1Abbreviation>
+ <quarter2Abbreviation>2e trim.</quarter2Abbreviation>
+ <quarter3Abbreviation>3e trim.</quarter3Abbreviation>
+ <quarter4Abbreviation>4e trim.</quarter4Abbreviation>
+ </ReservedWords>
+ </LC_MISC>
+ <LC_NumberingLevel>
+ <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
+ <NumberingLevel NumType="4" Prefix=" " Suffix="."/>
+ <NumberingLevel NumType="4" Prefix="(" Suffix=")"/>
+ <NumberingLevel NumType="2" Prefix=" " Suffix="."/>
+ <NumberingLevel NumType="0" Prefix=" " Suffix=")"/>
+ <NumberingLevel NumType="1" Prefix=" " Suffix=")"/>
+ <NumberingLevel NumType="1" Prefix="(" Suffix=")"/>
+ <NumberingLevel NumType="3" Prefix=" " Suffix="."/>
+ </LC_NumberingLevel>
+ <LC_OutLineNumberingLevel ref="en_US"/>
+</Locale>
+<!--Version 1.0 -->
commit db0f9168778e0c662350962fa950214b09a0d74b
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jun 2 20:06:54 2014 +0200
add LANGUAGE_USER_FRENCH_NIGER 0x880C [fr-NE] French (Niger), fdo#79352
Change-Id: I6d793317bc1caef4a95275bad263a5b2feac12e4
(cherry picked from commit 4ffdd43ae43b504fbc920a3cf2685b00f8219580)
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index d7fef63..3fcb4f7 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -645,6 +645,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_AVAR, "av", "RU", 0 },
{ LANGUAGE_USER_LENGO, "lgr", "SB", 0 },
{ LANGUAGE_USER_FRENCH_BENIN, "fr", "BJ", 0 },
+ { LANGUAGE_USER_FRENCH_NIGER, "fr", "NE", 0 },
{ LANGUAGE_MULTIPLE, "mul", "" , 0 }, // multiple languages, many languages are used
{ LANGUAGE_UNDETERMINED, "und", "" , 0 }, // undetermined language, language cannot be identified
{ LANGUAGE_NONE, "zxx", "" , 0 }, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index d461e46..9a487ac 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -699,6 +699,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_CREE_PLAINS_SYLLABICS 0x8291 /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_USER_CREE_PLAINS_LATIN)) */
#define LANGUAGE_USER_LENGO 0x0692
#define LANGUAGE_USER_FRENCH_BENIN 0x840C /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_FRENCH)) */
+#define LANGUAGE_USER_FRENCH_NIGER 0x880C /* makeLangID( 0x22, getPrimaryLanguage( LANGUAGE_FRENCH)) */
/* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index af7bb1f..eba2d71 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -386,6 +386,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "French (Mali)" ; LANGUAGE_FRENCH_MALI ; > ;
< "French (Senegal)" ; LANGUAGE_FRENCH_SENEGAL ; > ;
< "French (Benin)" ; LANGUAGE_USER_FRENCH_BENIN ; > ;
+ < "French (Niger)" ; LANGUAGE_USER_FRENCH_NIGER ; > ;
};
};
commit b40853672783ac374fc473ffbf049b58e62848b2
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jun 2 20:01:07 2014 +0200
add [fr-BJ] to libs, fdo#79351
Change-Id: Ia4f807b4479db9e90c2bb639958742360deb0680
(cherry picked from commit 818406fdef33efafbea0d167594d467b755fb2a8)
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index d69edfb..ab9028d 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
CustomTarget/i18npool/localedata/localedata_fo_FO \
CustomTarget/i18npool/localedata/localedata_fr_BE \
CustomTarget/i18npool/localedata/localedata_fr_BF \
+ CustomTarget/i18npool/localedata/localedata_fr_BJ \
CustomTarget/i18npool/localedata/localedata_fr_CA \
CustomTarget/i18npool/localedata/localedata_fr_CH \
CustomTarget/i18npool/localedata/localedata_fr_CI \
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index eee40ba..1680ae4 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -104,6 +104,7 @@ static const struct {
{ "fr_CI", lcl_DATA_EURO },
{ "fr_ML", lcl_DATA_EURO },
{ "fr_SN", lcl_DATA_EURO },
+ { "fr_BJ", lcl_DATA_EURO },
{ "it_IT", lcl_DATA_EURO },
{ "it_CH", lcl_DATA_EURO },
{ "sl_SI", lcl_DATA_EURO },
commit 8fb09016b666a15781c6dd9daf95e3d874864bfe
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jun 2 19:55:20 2014 +0200
add French (Senegal) [fr-SN] to language list, fdo#79350
Change-Id: I80e149700360eb9240c330e3e3d0c38c3785bfa4
(cherry picked from commit 469f5e51a938de824b72acdecf15df5ef60ed608)
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 256f952..af7bb1f 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -384,6 +384,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Lengo" ; LANGUAGE_USER_LENGO ; > ;
< "French (Côte d'Ivoire)" ; LANGUAGE_FRENCH_COTE_D_IVOIRE ; > ;
< "French (Mali)" ; LANGUAGE_FRENCH_MALI ; > ;
+ < "French (Senegal)" ; LANGUAGE_FRENCH_SENEGAL ; > ;
< "French (Benin)" ; LANGUAGE_USER_FRENCH_BENIN ; > ;
};
};
commit 23b0a0c15b59e7a20ef9156ba981b6a86f1ad12d
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jun 2 19:46:17 2014 +0200
derive [fr-BJ] from [fr-BF] instead, fdo#79351 related
Change-Id: Ie6b27d25541c96f3fd148f57b70163cae5ab8d3e
(cherry picked from commit 15387a731ddb115addcce88c1098bbe2196640c3)
diff --git a/i18npool/source/localedata/data/fr_BJ.xml b/i18npool/source/localedata/data/fr_BJ.xml
index 6af9843..e99d703 100644
--- a/i18npool/source/localedata/data/fr_BJ.xml
+++ b/i18npool/source/localedata/data/fr_BJ.xml
@@ -19,349 +19,16 @@
<DefaultName>Bénin</DefaultName>
</Country>
</LC_INFO>
- <LC_CTYPE unoid="generic">
- <Separators>
- <DateSeparator>/</DateSeparator>
- <ThousandSeparator>Â </ThousandSeparator>
- <DecimalSeparator>,</DecimalSeparator>
- <TimeSeparator>:</TimeSeparator>
- <Time100SecSeparator>,</Time100SecSeparator>
- <ListSeparator>;</ListSeparator>
- <LongDateDayOfWeekSeparator> </LongDateDayOfWeekSeparator>
- <LongDateDaySeparator> </LongDateDaySeparator>
- <LongDateMonthSeparator> </LongDateMonthSeparator>
- <LongDateYearSeparator> </LongDateYearSeparator>
- </Separators>
- <Markers>
- <QuotationStart>'</QuotationStart>
- <QuotationEnd>'</QuotationEnd>
- <DoubleQuotationStart>"</DoubleQuotationStart>
- <DoubleQuotationEnd>"</DoubleQuotationEnd>
- </Markers>
- <TimeAM>AM</TimeAM>
- <TimePM>PM</TimePM>
- <MeasurementSystem>metric</MeasurementSystem>
- </LC_CTYPE>
- <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$F-840C]">
- <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
- <FormatCode>General</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
- <FormatCode>0</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
- <FormatCode>0,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
- <FormatCode>#Â ##0</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
- <FormatCode>#Â ##0,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
- <FormatCode>#Â ###,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
- <FormatCode>0,00E+00</FormatCode>
- </FormatElement>
- <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
- <FormatCode>0,00E+000</FormatCode>
- </FormatElement>
- <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
- <FormatCode>0%</FormatCode>
- </FormatElement>
- <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
- <FormatCode>0,00%</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
- <FormatCode>#Â ##0[CURRENCY];-#Â ##0[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
- <FormatCode>#Â ##0,00[CURRENCY];-#Â ##0,00[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
- <FormatCode>#Â ##0[CURRENCY];[RED]-#Â ##0[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
- <FormatCode>#Â ##0,00[CURRENCY];[RED]-#Â ##0,00[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
- <FormatCode>#Â ##0,00CCC</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
- <FormatCode>#Â ##0,--[CURRENCY];[RED]-#Â ##0,--[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey11" default="true" type="short" usage="DATE" formatindex="18">
- <FormatCode>YY/MM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
- <FormatCode>NNNNDD MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
- <FormatCode>YY/MM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="21">
- <FormatCode>YYYY/MM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="22">
- <FormatCode>D MMM YY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="23">
- <FormatCode>D MMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey21" default="false" type="long" usage="DATE" formatindex="24">
- <FormatCode>D MMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="25">
- <FormatCode>D MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey22" default="false" type="long" usage="DATE" formatindex="26">
- <FormatCode>D MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey10" default="false" type="medium" usage="DATE" formatindex="27">
- <FormatCode>NN DD/MMM/YY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey18" default="false" type="long" usage="DATE" formatindex="28">
- <FormatCode>NN D MMM YY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey19" default="false" type="long" usage="DATE" formatindex="29">
- <FormatCode>NN D MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
- <FormatCode>NNNND MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
- <FormatCode>MM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="32">
- <FormatCode>YY-MM-DD</FormatCode>
- <DefaultName>ISO 8601</DefaultName>
- </FormatElement>
- <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="33">
- <FormatCode>YYYY-MM-DD</FormatCode>
- <DefaultName>ISO 8601</DefaultName>
- </FormatElement>
- <FormatElement msgid="DateFormatskey1" default="false" type="medium" usage="DATE" formatindex="34">
- <FormatCode>YY/MM</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="35">
- <FormatCode>MMM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="36">
- <FormatCode>MMMM</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="37">
- <FormatCode>QQ YY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey9" default="false" type="medium" usage="DATE" formatindex="38">
- <FormatCode>WW</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39">
- <FormatCode>HH:MM</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME" formatindex="40">
- <FormatCode>HH:MM:SS</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME" formatindex="41">
- <FormatCode>HH:MM AM/PM</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME" formatindex="42">
- <FormatCode>HH:MM:SS AM/PM</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
- <FormatCode>[HH]:MM:SS</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
- <FormatCode>MM:SS,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
- <FormatCode>[HH]:MM:SS,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
- <FormatCode>YY/MM/DD HH:MM</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
- <FormatCode>YYYY/MM/DD HH:MM:SS AM/PM</FormatCode>
- </FormatElement>
- </LC_FORMAT>
- <LC_COLLATION>
- <Collator default="true" unoid="alphanumeric"/>
- <CollationOptions>
- <TransliterationModules>IGNORE_CASE</TransliterationModules>
- </CollationOptions>
- </LC_COLLATION>
- <LC_SEARCH>
- <SearchOptions>
- <TransliterationModules>IGNORE_CASE</TransliterationModules>
- </SearchOptions>
- </LC_SEARCH>
- <LC_INDEX>
- <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-Z</IndexKey>
- <UnicodeScript>0</UnicodeScript>
- <UnicodeScript>1</UnicodeScript>
- <UnicodeScript>6</UnicodeScript>
- <FollowPageWord>sq</FollowPageWord>
- <FollowPageWord>sqq</FollowPageWord>
- </LC_INDEX>
- <LC_CALENDAR>
- <Calendar unoid="gregorian" default="true">
- <DaysOfWeek>
- <Day>
- <DayID>sun</DayID>
- <DefaultAbbrvName>dim</DefaultAbbrvName>
- <DefaultFullName>dimanche</DefaultFullName>
- </Day>
- <Day>
- <DayID>mon</DayID>
- <DefaultAbbrvName>lun</DefaultAbbrvName>
- <DefaultFullName>lundi</DefaultFullName>
- </Day>
- <Day>
- <DayID>tue</DayID>
- <DefaultAbbrvName>mar</DefaultAbbrvName>
- <DefaultFullName>mardi</DefaultFullName>
- </Day>
- <Day>
- <DayID>wed</DayID>
- <DefaultAbbrvName>mer</DefaultAbbrvName>
- <DefaultFullName>mercredi</DefaultFullName>
- </Day>
- <Day>
- <DayID>thu</DayID>
- <DefaultAbbrvName>jeu</DefaultAbbrvName>
- <DefaultFullName>jeudi</DefaultFullName>
- </Day>
- <Day>
- <DayID>fri</DayID>
- <DefaultAbbrvName>ven</DefaultAbbrvName>
- <DefaultFullName>vendredi</DefaultFullName>
- </Day>
- <Day>
- <DayID>sat</DayID>
- <DefaultAbbrvName>sam</DefaultAbbrvName>
- <DefaultFullName>samedi</DefaultFullName>
- </Day>
- </DaysOfWeek>
- <MonthsOfYear>
- <Month>
- <MonthID>jan</MonthID>
- <DefaultAbbrvName>jan</DefaultAbbrvName>
- <DefaultFullName>janvier</DefaultFullName>
- </Month>
- <Month>
- <MonthID>feb</MonthID>
- <DefaultAbbrvName>fév</DefaultAbbrvName>
- <DefaultFullName>février</DefaultFullName>
- </Month>
- <Month>
- <MonthID>mar</MonthID>
- <DefaultAbbrvName>mar</DefaultAbbrvName>
- <DefaultFullName>mars</DefaultFullName>
- </Month>
- <Month>
- <MonthID>apr</MonthID>
- <DefaultAbbrvName>avr</DefaultAbbrvName>
- <DefaultFullName>avril</DefaultFullName>
- </Month>
- <Month>
- <MonthID>may</MonthID>
- <DefaultAbbrvName>mai</DefaultAbbrvName>
- <DefaultFullName>mai</DefaultFullName>
- </Month>
- <Month>
- <MonthID>jun</MonthID>
- <DefaultAbbrvName>jun</DefaultAbbrvName>
- <DefaultFullName>juin</DefaultFullName>
- </Month>
- <Month>
- <MonthID>jul</MonthID>
- <DefaultAbbrvName>jul</DefaultAbbrvName>
- <DefaultFullName>juillet</DefaultFullName>
- </Month>
- <Month>
- <MonthID>aug</MonthID>
- <DefaultAbbrvName>aoû</DefaultAbbrvName>
- <DefaultFullName>août</DefaultFullName>
- </Month>
- <Month>
- <MonthID>sep</MonthID>
- <DefaultAbbrvName>sep</DefaultAbbrvName>
- <DefaultFullName>septembre</DefaultFullName>
- </Month>
- <Month>
- <MonthID>oct</MonthID>
- <DefaultAbbrvName>oct</DefaultAbbrvName>
- <DefaultFullName>octobre</DefaultFullName>
- </Month>
- <Month>
- <MonthID>nov</MonthID>
- <DefaultAbbrvName>nov</DefaultAbbrvName>
- <DefaultFullName>novembre</DefaultFullName>
- </Month>
- <Month>
- <MonthID>dec</MonthID>
- <DefaultAbbrvName>déc</DefaultAbbrvName>
- <DefaultFullName>décembre</DefaultFullName>
- </Month>
- </MonthsOfYear>
- <Eras>
- <Era>
- <EraID>bc</EraID>
- <DefaultAbbrvName>av. J.-C.</DefaultAbbrvName>
- <DefaultFullName>avant Jésus-Christ</DefaultFullName>
- </Era>
- <Era>
- <EraID>ad</EraID>
- <DefaultAbbrvName>ap. J.-C.</DefaultAbbrvName>
- <DefaultFullName>après Jésus-Christ</DefaultFullName>
- </Era>
- </Eras>
- <StartDayOfWeek>
- <DayID>mon</DayID>
- </StartDayOfWeek>
- <MinimalDaysInFirstWeek>4</MinimalDaysInFirstWeek>
- </Calendar>
- </LC_CALENDAR>
- <LC_CURRENCY>
- <Currency default="true" usedInCompatibleFormatCodes="true">
- <CurrencyID>XOF</CurrencyID>
- <CurrencySymbol>F</CurrencySymbol>
- <BankSymbol>XOF</BankSymbol>
- <CurrencyName>Franc CFA - BCEAO</CurrencyName>
- <DecimalPlaces>0</DecimalPlaces>
- </Currency>
- </LC_CURRENCY>
- <LC_TRANSLITERATION>
- <Transliteration unoid="LOWERCASE_UPPERCASE"/>
- <Transliteration unoid="UPPERCASE_LOWERCASE"/>
- <Transliteration unoid="IGNORE_CASE"/>
- </LC_TRANSLITERATION>
- <LC_MISC>
- <ReservedWords>
- <trueWord>vrai</trueWord>
- <falseWord>faux</falseWord>
- <quarter1Word>Premier trimestre</quarter1Word>
- <quarter2Word>Deuxième trimestre</quarter2Word>
- <quarter3Word>Troisième trimestre</quarter3Word>
- <quarter4Word>Quatrième trimestre</quarter4Word>
- <aboveWord>carré</aboveWord>
- <belowWord>Racine carré</belowWord>
- <quarter1Abbreviation>1er trim.</quarter1Abbreviation>
- <quarter2Abbreviation>2e trim.</quarter2Abbreviation>
- <quarter3Abbreviation>3e trim.</quarter3Abbreviation>
- <quarter4Abbreviation>4e trim.</quarter4Abbreviation>
- </ReservedWords>
- </LC_MISC>
- <LC_NumberingLevel>
- <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="4" Prefix=" " Suffix="."/>
- <NumberingLevel NumType="4" Prefix="(" Suffix=")"/>
- <NumberingLevel NumType="2" Prefix=" " Suffix="."/>
- <NumberingLevel NumType="0" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="1" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="1" Prefix="(" Suffix=")"/>
- <NumberingLevel NumType="3" Prefix=" " Suffix="."/>
- </LC_NumberingLevel>
- <LC_OutLineNumberingLevel ref="en_US"/>
+ <LC_CTYPE unoid="generic" ref="fr_BF" />
+ <LC_FORMAT ref="fr_BF" replaceFrom="[CURRENCY]" replaceTo="[$F-840C]" />
+ <LC_COLLATION ref="fr_BF" />
+ <LC_SEARCH ref="fr_BF" />
+ <LC_INDEX ref="fr_BF" />
+ <LC_CALENDAR ref="fr_BF" />
+ <LC_CURRENCY ref="fr_BF" />
+ <LC_TRANSLITERATION ref="fr_BF" />
+ <LC_MISC ref="fr_BF" />
+ <LC_NumberingLevel ref="fr_BF" />
+ <LC_OutLineNumberingLevel ref="fr_BF"/>
</Locale>
<!--Version 1.0 -->
commit e29adfab87a9983c00ac3ee3b0a4912369382d99
Author: David Delma <ddelma at gmail.com>
Date: Wed May 28 08:40:00 2014 +0200
add French Benin [fr-BJ] locale data, fdo#79351
Change-Id: I7d171f70878a90b8bae26c852ab032da23fca197
(cherry picked from commit 8930b37fb212c77433e2dad17b035921fc2d3bd8)
diff --git a/i18npool/source/localedata/data/fr_BJ.xml b/i18npool/source/localedata/data/fr_BJ.xml
new file mode 100644
index 0000000..6af9843
--- /dev/null
+++ b/i18npool/source/localedata/data/fr_BJ.xml
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+ <LC_INFO>
+ <Language>
+ <LangID>fr</LangID>
+ <DefaultName>French</DefaultName>
+ </Language>
+ <Country>
+ <CountryID>BJ</CountryID>
+ <DefaultName>Bénin</DefaultName>
+ </Country>
+ </LC_INFO>
+ <LC_CTYPE unoid="generic">
+ <Separators>
+ <DateSeparator>/</DateSeparator>
+ <ThousandSeparator>Â </ThousandSeparator>
+ <DecimalSeparator>,</DecimalSeparator>
+ <TimeSeparator>:</TimeSeparator>
+ <Time100SecSeparator>,</Time100SecSeparator>
+ <ListSeparator>;</ListSeparator>
+ <LongDateDayOfWeekSeparator> </LongDateDayOfWeekSeparator>
+ <LongDateDaySeparator> </LongDateDaySeparator>
+ <LongDateMonthSeparator> </LongDateMonthSeparator>
+ <LongDateYearSeparator> </LongDateYearSeparator>
+ </Separators>
+ <Markers>
+ <QuotationStart>'</QuotationStart>
+ <QuotationEnd>'</QuotationEnd>
+ <DoubleQuotationStart>"</DoubleQuotationStart>
+ <DoubleQuotationEnd>"</DoubleQuotationEnd>
+ </Markers>
+ <TimeAM>AM</TimeAM>
+ <TimePM>PM</TimePM>
+ <MeasurementSystem>metric</MeasurementSystem>
+ </LC_CTYPE>
+ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$F-840C]">
+ <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
+ <FormatCode>General</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
+ <FormatCode>0</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
+ <FormatCode>0,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
+ <FormatCode>#Â ##0</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
+ <FormatCode>#Â ##0,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
+ <FormatCode>#Â ###,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
+ <FormatCode>0,00E+00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
+ <FormatCode>0,00E+000</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
+ <FormatCode>0%</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
+ <FormatCode>0,00%</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
+ <FormatCode>#Â ##0[CURRENCY];-#Â ##0[CURRENCY]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
+ <FormatCode>#Â ##0,00[CURRENCY];-#Â ##0,00[CURRENCY]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
+ <FormatCode>#Â ##0[CURRENCY];[RED]-#Â ##0[CURRENCY]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
+ <FormatCode>#Â ##0,00[CURRENCY];[RED]-#Â ##0,00[CURRENCY]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
+ <FormatCode>#Â ##0,00CCC</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
+ <FormatCode>#Â ##0,--[CURRENCY];[RED]-#Â ##0,--[CURRENCY]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey11" default="true" type="short" usage="DATE" formatindex="18">
+ <FormatCode>YY/MM/DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
+ <FormatCode>NNNNDD MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
+ <FormatCode>YY/MM/DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="21">
+ <FormatCode>YYYY/MM/DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="22">
+ <FormatCode>D MMM YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="23">
+ <FormatCode>D MMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey21" default="false" type="long" usage="DATE" formatindex="24">
+ <FormatCode>D MMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="25">
+ <FormatCode>D MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey22" default="false" type="long" usage="DATE" formatindex="26">
+ <FormatCode>D MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey10" default="false" type="medium" usage="DATE" formatindex="27">
+ <FormatCode>NN DD/MMM/YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey18" default="false" type="long" usage="DATE" formatindex="28">
+ <FormatCode>NN D MMM YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey19" default="false" type="long" usage="DATE" formatindex="29">
+ <FormatCode>NN D MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
+ <FormatCode>NNNND MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
+ <FormatCode>MM/DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="32">
+ <FormatCode>YY-MM-DD</FormatCode>
+ <DefaultName>ISO 8601</DefaultName>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="33">
+ <FormatCode>YYYY-MM-DD</FormatCode>
+ <DefaultName>ISO 8601</DefaultName>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey1" default="false" type="medium" usage="DATE" formatindex="34">
+ <FormatCode>YY/MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="35">
+ <FormatCode>MMM/DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="36">
+ <FormatCode>MMMM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="37">
+ <FormatCode>QQ YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey9" default="false" type="medium" usage="DATE" formatindex="38">
+ <FormatCode>WW</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39">
+ <FormatCode>HH:MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME" formatindex="40">
+ <FormatCode>HH:MM:SS</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME" formatindex="41">
+ <FormatCode>HH:MM AM/PM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME" formatindex="42">
+ <FormatCode>HH:MM:SS AM/PM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
+ <FormatCode>[HH]:MM:SS</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
+ <FormatCode>MM:SS,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
+ <FormatCode>[HH]:MM:SS,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
+ <FormatCode>YY/MM/DD HH:MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
+ <FormatCode>YYYY/MM/DD HH:MM:SS AM/PM</FormatCode>
+ </FormatElement>
+ </LC_FORMAT>
+ <LC_COLLATION>
+ <Collator default="true" unoid="alphanumeric"/>
+ <CollationOptions>
+ <TransliterationModules>IGNORE_CASE</TransliterationModules>
+ </CollationOptions>
+ </LC_COLLATION>
+ <LC_SEARCH>
+ <SearchOptions>
+ <TransliterationModules>IGNORE_CASE</TransliterationModules>
+ </SearchOptions>
+ </LC_SEARCH>
+ <LC_INDEX>
+ <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-Z</IndexKey>
+ <UnicodeScript>0</UnicodeScript>
+ <UnicodeScript>1</UnicodeScript>
+ <UnicodeScript>6</UnicodeScript>
+ <FollowPageWord>sq</FollowPageWord>
+ <FollowPageWord>sqq</FollowPageWord>
+ </LC_INDEX>
+ <LC_CALENDAR>
+ <Calendar unoid="gregorian" default="true">
+ <DaysOfWeek>
+ <Day>
+ <DayID>sun</DayID>
+ <DefaultAbbrvName>dim</DefaultAbbrvName>
+ <DefaultFullName>dimanche</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>mon</DayID>
+ <DefaultAbbrvName>lun</DefaultAbbrvName>
+ <DefaultFullName>lundi</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>tue</DayID>
+ <DefaultAbbrvName>mar</DefaultAbbrvName>
+ <DefaultFullName>mardi</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>wed</DayID>
+ <DefaultAbbrvName>mer</DefaultAbbrvName>
+ <DefaultFullName>mercredi</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>thu</DayID>
+ <DefaultAbbrvName>jeu</DefaultAbbrvName>
+ <DefaultFullName>jeudi</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>fri</DayID>
+ <DefaultAbbrvName>ven</DefaultAbbrvName>
+ <DefaultFullName>vendredi</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>sat</DayID>
+ <DefaultAbbrvName>sam</DefaultAbbrvName>
+ <DefaultFullName>samedi</DefaultFullName>
+ </Day>
+ </DaysOfWeek>
+ <MonthsOfYear>
+ <Month>
+ <MonthID>jan</MonthID>
+ <DefaultAbbrvName>jan</DefaultAbbrvName>
+ <DefaultFullName>janvier</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>feb</MonthID>
+ <DefaultAbbrvName>fév</DefaultAbbrvName>
+ <DefaultFullName>février</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>mar</MonthID>
+ <DefaultAbbrvName>mar</DefaultAbbrvName>
+ <DefaultFullName>mars</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>apr</MonthID>
+ <DefaultAbbrvName>avr</DefaultAbbrvName>
+ <DefaultFullName>avril</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>may</MonthID>
+ <DefaultAbbrvName>mai</DefaultAbbrvName>
+ <DefaultFullName>mai</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>jun</MonthID>
+ <DefaultAbbrvName>jun</DefaultAbbrvName>
+ <DefaultFullName>juin</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>jul</MonthID>
+ <DefaultAbbrvName>jul</DefaultAbbrvName>
+ <DefaultFullName>juillet</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>aug</MonthID>
+ <DefaultAbbrvName>aoû</DefaultAbbrvName>
+ <DefaultFullName>août</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>sep</MonthID>
+ <DefaultAbbrvName>sep</DefaultAbbrvName>
+ <DefaultFullName>septembre</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>oct</MonthID>
+ <DefaultAbbrvName>oct</DefaultAbbrvName>
+ <DefaultFullName>octobre</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>nov</MonthID>
+ <DefaultAbbrvName>nov</DefaultAbbrvName>
+ <DefaultFullName>novembre</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>dec</MonthID>
+ <DefaultAbbrvName>déc</DefaultAbbrvName>
+ <DefaultFullName>décembre</DefaultFullName>
+ </Month>
+ </MonthsOfYear>
+ <Eras>
+ <Era>
+ <EraID>bc</EraID>
+ <DefaultAbbrvName>av. J.-C.</DefaultAbbrvName>
+ <DefaultFullName>avant Jésus-Christ</DefaultFullName>
+ </Era>
+ <Era>
+ <EraID>ad</EraID>
+ <DefaultAbbrvName>ap. J.-C.</DefaultAbbrvName>
+ <DefaultFullName>après Jésus-Christ</DefaultFullName>
+ </Era>
+ </Eras>
+ <StartDayOfWeek>
+ <DayID>mon</DayID>
+ </StartDayOfWeek>
+ <MinimalDaysInFirstWeek>4</MinimalDaysInFirstWeek>
+ </Calendar>
+ </LC_CALENDAR>
+ <LC_CURRENCY>
+ <Currency default="true" usedInCompatibleFormatCodes="true">
+ <CurrencyID>XOF</CurrencyID>
+ <CurrencySymbol>F</CurrencySymbol>
+ <BankSymbol>XOF</BankSymbol>
+ <CurrencyName>Franc CFA - BCEAO</CurrencyName>
+ <DecimalPlaces>0</DecimalPlaces>
+ </Currency>
+ </LC_CURRENCY>
+ <LC_TRANSLITERATION>
+ <Transliteration unoid="LOWERCASE_UPPERCASE"/>
+ <Transliteration unoid="UPPERCASE_LOWERCASE"/>
+ <Transliteration unoid="IGNORE_CASE"/>
+ </LC_TRANSLITERATION>
+ <LC_MISC>
+ <ReservedWords>
+ <trueWord>vrai</trueWord>
+ <falseWord>faux</falseWord>
+ <quarter1Word>Premier trimestre</quarter1Word>
+ <quarter2Word>Deuxième trimestre</quarter2Word>
+ <quarter3Word>Troisième trimestre</quarter3Word>
+ <quarter4Word>Quatrième trimestre</quarter4Word>
+ <aboveWord>carré</aboveWord>
+ <belowWord>Racine carré</belowWord>
+ <quarter1Abbreviation>1er trim.</quarter1Abbreviation>
+ <quarter2Abbreviation>2e trim.</quarter2Abbreviation>
+ <quarter3Abbreviation>3e trim.</quarter3Abbreviation>
+ <quarter4Abbreviation>4e trim.</quarter4Abbreviation>
+ </ReservedWords>
+ </LC_MISC>
+ <LC_NumberingLevel>
+ <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
+ <NumberingLevel NumType="4" Prefix=" " Suffix="."/>
+ <NumberingLevel NumType="4" Prefix="(" Suffix=")"/>
+ <NumberingLevel NumType="2" Prefix=" " Suffix="."/>
+ <NumberingLevel NumType="0" Prefix=" " Suffix=")"/>
+ <NumberingLevel NumType="1" Prefix=" " Suffix=")"/>
+ <NumberingLevel NumType="1" Prefix="(" Suffix=")"/>
+ <NumberingLevel NumType="3" Prefix=" " Suffix="."/>
+ </LC_NumberingLevel>
+ <LC_OutLineNumberingLevel ref="en_US"/>
+</Locale>
+<!--Version 1.0 -->
commit ebfafcd551abfa1aff71e22516ebbd3c82511914
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jun 2 19:41:19 2014 +0200
add LANGUAGE_USER_FRENCH_BENIN 0x840C fr-BJ French (Benin), fdo#79351
Change-Id: Idc54b0fae9283d795b79231214cf14aae43adca2
(cherry picked from commit 3a14b9357f13f777721d7af5539bdb385d09fdc5)
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 0f6c6ee..d7fef63 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -644,6 +644,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_PUINAVE, "pui", "CO", 0 },
{ LANGUAGE_USER_AVAR, "av", "RU", 0 },
{ LANGUAGE_USER_LENGO, "lgr", "SB", 0 },
+ { LANGUAGE_USER_FRENCH_BENIN, "fr", "BJ", 0 },
{ LANGUAGE_MULTIPLE, "mul", "" , 0 }, // multiple languages, many languages are used
{ LANGUAGE_UNDETERMINED, "und", "" , 0 }, // undetermined language, language cannot be identified
{ LANGUAGE_NONE, "zxx", "" , 0 }, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 5c23646..d461e46 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -698,6 +698,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_CREE_PLAINS_LATIN 0x0691
#define LANGUAGE_USER_CREE_PLAINS_SYLLABICS 0x8291 /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_USER_CREE_PLAINS_LATIN)) */
#define LANGUAGE_USER_LENGO 0x0692
+#define LANGUAGE_USER_FRENCH_BENIN 0x840C /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_FRENCH)) */
/* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 61bd39c..256f952 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -384,6 +384,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Lengo" ; LANGUAGE_USER_LENGO ; > ;
< "French (Côte d'Ivoire)" ; LANGUAGE_FRENCH_COTE_D_IVOIRE ; > ;
< "French (Mali)" ; LANGUAGE_FRENCH_MALI ; > ;
+ < "French (Benin)" ; LANGUAGE_USER_FRENCH_BENIN ; > ;
};
};
commit cb549dafe0ae6750b82d8eb390f2e64b8892df93
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jun 2 18:58:15 2014 +0200
add [fr-SN] to libs, fdo#79350
Change-Id: Ie663b6f91f858451f79a1247f9ba5ba863123125
(cherry picked from commit a7eee33dc5467fc73eb1be351474dd61e5ebb0fd)
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index f5f5c4e..d69edfb 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
CustomTarget/i18npool/localedata/localedata_fr_LU \
CustomTarget/i18npool/localedata/localedata_fr_MC \
CustomTarget/i18npool/localedata/localedata_fr_ML \
+ CustomTarget/i18npool/localedata/localedata_fr_SN \
CustomTarget/i18npool/localedata/localedata_fur_IT \
CustomTarget/i18npool/localedata/localedata_fy_NL \
CustomTarget/i18npool/localedata/localedata_ga_IE \
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 6736c09..eee40ba 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -103,6 +103,7 @@ static const struct {
{ "fr_BF", lcl_DATA_EURO },
{ "fr_CI", lcl_DATA_EURO },
{ "fr_ML", lcl_DATA_EURO },
+ { "fr_SN", lcl_DATA_EURO },
{ "it_IT", lcl_DATA_EURO },
{ "it_CH", lcl_DATA_EURO },
{ "sl_SI", lcl_DATA_EURO },
commit 1155d5ef6dc2cab7e80288eacd26b14d13117e8b
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jun 2 18:56:39 2014 +0200
derive [fr-SN] from [fr-BF] instead, fdo#79350 related
Change-Id: I0491b43e45b2e36745735317fc87c5de0d78ebd6
(cherry picked from commit fc6ea08d66b1e381079e9c33121fb364f94965b6)
diff --git a/i18npool/source/localedata/data/fr_SN.xml b/i18npool/source/localedata/data/fr_SN.xml
index 83c1465..36ee767 100644
--- a/i18npool/source/localedata/data/fr_SN.xml
+++ b/i18npool/source/localedata/data/fr_SN.xml
@@ -19,349 +19,16 @@
<DefaultName>Sénégal</DefaultName>
</Country>
</LC_INFO>
- <LC_CTYPE unoid="generic">
- <Separators>
- <DateSeparator>/</DateSeparator>
- <ThousandSeparator>Â </ThousandSeparator>
- <DecimalSeparator>,</DecimalSeparator>
- <TimeSeparator>:</TimeSeparator>
- <Time100SecSeparator>,</Time100SecSeparator>
- <ListSeparator>;</ListSeparator>
- <LongDateDayOfWeekSeparator> </LongDateDayOfWeekSeparator>
- <LongDateDaySeparator> </LongDateDaySeparator>
- <LongDateMonthSeparator> </LongDateMonthSeparator>
- <LongDateYearSeparator> </LongDateYearSeparator>
- </Separators>
- <Markers>
- <QuotationStart>'</QuotationStart>
- <QuotationEnd>'</QuotationEnd>
- <DoubleQuotationStart>"</DoubleQuotationStart>
- <DoubleQuotationEnd>"</DoubleQuotationEnd>
- </Markers>
- <TimeAM>AM</TimeAM>
- <TimePM>PM</TimePM>
- <MeasurementSystem>metric</MeasurementSystem>
- </LC_CTYPE>
- <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$F-280c]">
- <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
- <FormatCode>General</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
- <FormatCode>0</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
- <FormatCode>0,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
- <FormatCode>#Â ##0</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
- <FormatCode>#Â ##0,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
- <FormatCode>#Â ###,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
- <FormatCode>0,00E+00</FormatCode>
- </FormatElement>
- <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
- <FormatCode>0,00E+000</FormatCode>
- </FormatElement>
- <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
- <FormatCode>0%</FormatCode>
- </FormatElement>
- <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
- <FormatCode>0,00%</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
- <FormatCode>#Â ##0[CURRENCY];-#Â ##0[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
- <FormatCode>#Â ##0,00[CURRENCY];-#Â ##0,00[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
- <FormatCode>#Â ##0[CURRENCY];[RED]-#Â ##0[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
- <FormatCode>#Â ##0,00[CURRENCY];[RED]-#Â ##0,00[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
- <FormatCode>#Â ##0,00CCC</FormatCode>
- </FormatElement>
- <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
- <FormatCode>#Â ##0,--[CURRENCY];[RED]-#Â ##0,--[CURRENCY]</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey11" default="true" type="short" usage="DATE" formatindex="18">
- <FormatCode>YY/MM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
- <FormatCode>NNNNDD MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
- <FormatCode>YY/MM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="21">
- <FormatCode>YYYY/MM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="22">
- <FormatCode>D MMM YY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="23">
- <FormatCode>D MMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey21" default="false" type="long" usage="DATE" formatindex="24">
- <FormatCode>D MMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="25">
- <FormatCode>D MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey22" default="false" type="long" usage="DATE" formatindex="26">
- <FormatCode>D MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey10" default="false" type="medium" usage="DATE" formatindex="27">
- <FormatCode>NN DD/MMM/YY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey18" default="false" type="long" usage="DATE" formatindex="28">
- <FormatCode>NN D MMM YY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey19" default="false" type="long" usage="DATE" formatindex="29">
- <FormatCode>NN D MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
- <FormatCode>NNNND MMMM YYYY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
- <FormatCode>MM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="32">
- <FormatCode>YY-MM-DD</FormatCode>
- <DefaultName>ISO 8601</DefaultName>
- </FormatElement>
- <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="33">
- <FormatCode>YYYY-MM-DD</FormatCode>
- <DefaultName>ISO 8601</DefaultName>
- </FormatElement>
- <FormatElement msgid="DateFormatskey1" default="false" type="medium" usage="DATE" formatindex="34">
- <FormatCode>YY/MM</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="35">
- <FormatCode>MMM/DD</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="36">
- <FormatCode>MMMM</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="37">
- <FormatCode>QQ YY</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateFormatskey9" default="false" type="medium" usage="DATE" formatindex="38">
- <FormatCode>WW</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39">
- <FormatCode>HH:MM</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME" formatindex="40">
- <FormatCode>HH:MM:SS</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME" formatindex="41">
- <FormatCode>HH:MM AM/PM</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME" formatindex="42">
- <FormatCode>HH:MM:SS AM/PM</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
- <FormatCode>[HH]:MM:SS</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
- <FormatCode>MM:SS,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
- <FormatCode>[HH]:MM:SS,00</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
- <FormatCode>YY/MM/DD HH:MM</FormatCode>
- </FormatElement>
- <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
- <FormatCode>YYYY/MM/DD HH:MM:SS AM/PM</FormatCode>
- </FormatElement>
- </LC_FORMAT>
- <LC_COLLATION>
- <Collator default="true" unoid="alphanumeric"/>
- <CollationOptions>
- <TransliterationModules>IGNORE_CASE</TransliterationModules>
- </CollationOptions>
- </LC_COLLATION>
- <LC_SEARCH>
- <SearchOptions>
- <TransliterationModules>IGNORE_CASE</TransliterationModules>
- </SearchOptions>
- </LC_SEARCH>
- <LC_INDEX>
- <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-Z</IndexKey>
- <UnicodeScript>0</UnicodeScript>
- <UnicodeScript>1</UnicodeScript>
- <UnicodeScript>6</UnicodeScript>
- <FollowPageWord>sq</FollowPageWord>
- <FollowPageWord>sqq</FollowPageWord>
- </LC_INDEX>
- <LC_CALENDAR>
- <Calendar unoid="gregorian" default="true">
- <DaysOfWeek>
- <Day>
- <DayID>sun</DayID>
- <DefaultAbbrvName>dim</DefaultAbbrvName>
- <DefaultFullName>dimanche</DefaultFullName>
- </Day>
- <Day>
- <DayID>mon</DayID>
- <DefaultAbbrvName>lun</DefaultAbbrvName>
- <DefaultFullName>lundi</DefaultFullName>
- </Day>
- <Day>
- <DayID>tue</DayID>
- <DefaultAbbrvName>mar</DefaultAbbrvName>
- <DefaultFullName>mardi</DefaultFullName>
- </Day>
- <Day>
- <DayID>wed</DayID>
- <DefaultAbbrvName>mer</DefaultAbbrvName>
- <DefaultFullName>mercredi</DefaultFullName>
- </Day>
- <Day>
- <DayID>thu</DayID>
- <DefaultAbbrvName>jeu</DefaultAbbrvName>
- <DefaultFullName>jeudi</DefaultFullName>
- </Day>
- <Day>
- <DayID>fri</DayID>
- <DefaultAbbrvName>ven</DefaultAbbrvName>
- <DefaultFullName>vendredi</DefaultFullName>
- </Day>
- <Day>
- <DayID>sat</DayID>
- <DefaultAbbrvName>sam</DefaultAbbrvName>
- <DefaultFullName>samedi</DefaultFullName>
- </Day>
- </DaysOfWeek>
- <MonthsOfYear>
- <Month>
- <MonthID>jan</MonthID>
- <DefaultAbbrvName>jan</DefaultAbbrvName>
- <DefaultFullName>janvier</DefaultFullName>
- </Month>
- <Month>
- <MonthID>feb</MonthID>
- <DefaultAbbrvName>fév</DefaultAbbrvName>
- <DefaultFullName>février</DefaultFullName>
- </Month>
- <Month>
- <MonthID>mar</MonthID>
- <DefaultAbbrvName>mar</DefaultAbbrvName>
- <DefaultFullName>mars</DefaultFullName>
- </Month>
- <Month>
- <MonthID>apr</MonthID>
- <DefaultAbbrvName>avr</DefaultAbbrvName>
- <DefaultFullName>avril</DefaultFullName>
- </Month>
- <Month>
- <MonthID>may</MonthID>
- <DefaultAbbrvName>mai</DefaultAbbrvName>
- <DefaultFullName>mai</DefaultFullName>
- </Month>
- <Month>
- <MonthID>jun</MonthID>
- <DefaultAbbrvName>jun</DefaultAbbrvName>
- <DefaultFullName>juin</DefaultFullName>
- </Month>
- <Month>
- <MonthID>jul</MonthID>
- <DefaultAbbrvName>jul</DefaultAbbrvName>
- <DefaultFullName>juillet</DefaultFullName>
- </Month>
- <Month>
- <MonthID>aug</MonthID>
- <DefaultAbbrvName>aoû</DefaultAbbrvName>
- <DefaultFullName>août</DefaultFullName>
- </Month>
- <Month>
- <MonthID>sep</MonthID>
- <DefaultAbbrvName>sep</DefaultAbbrvName>
- <DefaultFullName>septembre</DefaultFullName>
- </Month>
- <Month>
- <MonthID>oct</MonthID>
- <DefaultAbbrvName>oct</DefaultAbbrvName>
- <DefaultFullName>octobre</DefaultFullName>
- </Month>
- <Month>
- <MonthID>nov</MonthID>
- <DefaultAbbrvName>nov</DefaultAbbrvName>
- <DefaultFullName>novembre</DefaultFullName>
- </Month>
- <Month>
- <MonthID>dec</MonthID>
- <DefaultAbbrvName>déc</DefaultAbbrvName>
- <DefaultFullName>décembre</DefaultFullName>
- </Month>
- </MonthsOfYear>
- <Eras>
- <Era>
- <EraID>bc</EraID>
- <DefaultAbbrvName>av. J.-C.</DefaultAbbrvName>
- <DefaultFullName>avant Jésus-Christ</DefaultFullName>
- </Era>
- <Era>
- <EraID>ad</EraID>
- <DefaultAbbrvName>ap. J.-C.</DefaultAbbrvName>
- <DefaultFullName>après Jésus-Christ</DefaultFullName>
- </Era>
- </Eras>
- <StartDayOfWeek>
- <DayID>mon</DayID>
- </StartDayOfWeek>
- <MinimalDaysInFirstWeek>4</MinimalDaysInFirstWeek>
- </Calendar>
- </LC_CALENDAR>
- <LC_CURRENCY>
- <Currency default="true" usedInCompatibleFormatCodes="true">
- <CurrencyID>XOF</CurrencyID>
- <CurrencySymbol>F</CurrencySymbol>
- <BankSymbol>XOF</BankSymbol>
- <CurrencyName>Franc CFA - BCEAO</CurrencyName>
- <DecimalPlaces>0</DecimalPlaces>
- </Currency>
- </LC_CURRENCY>
- <LC_TRANSLITERATION>
- <Transliteration unoid="LOWERCASE_UPPERCASE"/>
- <Transliteration unoid="UPPERCASE_LOWERCASE"/>
- <Transliteration unoid="IGNORE_CASE"/>
- </LC_TRANSLITERATION>
- <LC_MISC>
- <ReservedWords>
- <trueWord>vrai</trueWord>
- <falseWord>faux</falseWord>
- <quarter1Word>Premier trimestre</quarter1Word>
- <quarter2Word>Deuxième trimestre</quarter2Word>
- <quarter3Word>Troisième trimestre</quarter3Word>
- <quarter4Word>Quatrième trimestre</quarter4Word>
- <aboveWord>carré</aboveWord>
- <belowWord>Racine carré</belowWord>
- <quarter1Abbreviation>1er trim.</quarter1Abbreviation>
- <quarter2Abbreviation>2e trim.</quarter2Abbreviation>
- <quarter3Abbreviation>3e trim.</quarter3Abbreviation>
- <quarter4Abbreviation>4e trim.</quarter4Abbreviation>
- </ReservedWords>
- </LC_MISC>
- <LC_NumberingLevel>
- <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="4" Prefix=" " Suffix="."/>
- <NumberingLevel NumType="4" Prefix="(" Suffix=")"/>
- <NumberingLevel NumType="2" Prefix=" " Suffix="."/>
- <NumberingLevel NumType="0" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="1" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="1" Prefix="(" Suffix=")"/>
- <NumberingLevel NumType="3" Prefix=" " Suffix="."/>
- </LC_NumberingLevel>
- <LC_OutLineNumberingLevel ref="en_US"/>
+ <LC_CTYPE unoid="generic" ref="fr_BF" />
+ <LC_FORMAT ref="fr_BF" replaceFrom="[CURRENCY]" replaceTo="[$F-280C]" />
+ <LC_COLLATION ref="fr_BF" />
+ <LC_SEARCH ref="fr_BF" />
+ <LC_INDEX ref="fr_BF" />
+ <LC_CALENDAR ref="fr_BF" />
+ <LC_CURRENCY ref="fr_BF" />
+ <LC_TRANSLITERATION ref="fr_BF" />
+ <LC_MISC ref="fr_BF" />
+ <LC_NumberingLevel ref="fr_BF" />
+ <LC_OutLineNumberingLevel ref="fr_BF"/>
</Locale>
<!--Version 1.0 -->
commit 734bc23062dd3ff342f86d09e46336c987acdf0d
Author: David Delma <ddelma at gmail.com>
Date: Wed May 28 08:38:00 2014 +0200
add French Senegal [fr-SN] locale data, fdo#79350
Change-Id: I62542d36b582b71b1d4a208bd191097bb6b06b8f
(cherry picked from commit ff6070b25e55a19b0aeebd6bfa0a7f9c0d9bcffb)
diff --git a/i18npool/source/localedata/data/fr_SN.xml b/i18npool/source/localedata/data/fr_SN.xml
new file mode 100644
index 0000000..83c1465
--- /dev/null
+++ b/i18npool/source/localedata/data/fr_SN.xml
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list