# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Various fixes for all French locales
# DP: Related bugs: #248377  #351786 #345481
# DP: Dpatch author: Denis Barbier <barbier@debian.org>
# DP: Patch author: Denis Barbier
# DP: Upstream status: not submitted
# DP: Date: 2006-01-10

---
 localedata/locales/fr_BE |   20 +++++++++++++++-----
 localedata/locales/fr_CA |   15 ++++++++++-----
 localedata/locales/fr_CH |   23 +++++++++++++++--------
 localedata/locales/fr_FR |   21 ++++++++++++++++++---
 localedata/locales/fr_LU |   23 ++++++++++++++++-------
 5 files changed, 74 insertions(+), 28 deletions(-)

--- a/localedata/locales/fr_BE
+++ b/locales/fr_BE
@@ -42,6 +42,7 @@
 category  "fr_BE:2000";LC_NAME
 category  "fr_BE:2000";LC_ADDRESS
 category  "fr_BE:2000";LC_TELEPHONE
+category  "fr_BE:2000";LC_MEASUREMENT
 
 END LC_IDENTIFICATION
 
@@ -117,9 +118,10 @@
 t_fmt   "<U0025><U0054>"
 am_pm   "";""
 t_fmt_ampm ""
-date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
+<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
+<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
 END LC_TIME
 
 LC_PAPER
@@ -142,8 +144,7 @@
 END LC_MEASUREMENT
 
 LC_NAME
-name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
-<U0025><U006D><U0025><U0074><U0025><U0066>"
+copy "fr_FR"
 END LC_NAME
 
 LC_ADDRESS
@@ -155,4 +156,13 @@
 country_ab2 "<U0042><U0045>"
 country_ab3 "<U0042><U0045><U004C>"
 country_num 056
+country_name "<U0042><U0065><U006C><U0067><U0069><U0071><U0075><U0065>"
+country_car "<U0042>"
+% FIXME
+country_post "<U0042><U0045>"
+country_isbn 2
+lang_name "<U0066><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
+lang_ab   "<U0066><U0072>"
+lang_term "<U0066><U0072><U0061>"
+lang_lib  "<U0066><U0072><U0065>"
 END LC_ADDRESS
--- a/localedata/locales/fr_CA
+++ b/locales/fr_CA
@@ -43,6 +43,7 @@
 category  "fr_CA:2000";LC_NAME
 category  "fr_CA:2000";LC_ADDRESS
 category  "fr_CA:2000";LC_TELEPHONE
+category  "fr_CA:2000";LC_MEASUREMENT
 
 END LC_IDENTIFICATION
 
@@ -118,9 +119,10 @@
 t_fmt   "<U0025><U0054>"
 am_pm   "";""
 t_fmt_ampm ""
-date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
+<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
+<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
 END LC_TIME
 
 LC_PAPER
@@ -136,8 +138,7 @@
 END LC_MEASUREMENT
 
 LC_NAME
-name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
-<U0025><U006D><U0025><U0074><U0025><U0066>"
+copy "fr_FR"
 END LC_NAME
 
 LC_ADDRESS
@@ -149,6 +150,10 @@
 country_ab2 "<U0043><U0041>"
 country_ab3 "<U0043><U0041><U004E>"
 country_num 124
+country_name "<U0043><U0061><U006E><U0061><U0064><U0061>"
+country_car "<U0043><U0044><U004E>"
+country_post "<U0043><U0041>"
+country_isbn 2
 lang_name "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
 lang_ab   "<U0066><U0072>"
 lang_term "<U0066><U0072><U0061>"
--- a/localedata/locales/fr_CH
+++ b/locales/fr_CH
@@ -43,6 +43,7 @@
 category  "fr_CH:2000";LC_NAME
 category  "fr_CH:2000";LC_ADDRESS
 category  "fr_CH:2000";LC_TELEPHONE
+category  "fr_CH:2000";LC_MEASUREMENT
 
 END LC_IDENTIFICATION
 
@@ -64,9 +65,7 @@
 END LC_MONETARY
 
 LC_NUMERIC
-decimal_point             "<U002C>"
-thousands_sep             ""
-grouping                  0;0
+copy "de_CH"
 END LC_NUMERIC
 
 LC_TIME
@@ -104,9 +103,10 @@
 t_fmt   "<U0025><U0054>"
 am_pm   "";""
 t_fmt_ampm ""
-date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
+<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
+<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
 END LC_TIME
 
 LC_PAPER
@@ -128,8 +128,7 @@
 END LC_MEASUREMENT
 
 LC_NAME
-name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
-<U0025><U006D><U0025><U0074><U0025><U0066>"
+copy "fr_FR"
 END LC_NAME
 
 LC_ADDRESS
@@ -141,4 +140,12 @@
 country_ab2 "<U0043><U0048>"
 country_ab3 "<U0043><U0048><U0045>"
 country_num 756
+country_name "<U0053><U0075><U0069><U0073><U0073><U0065>"
+country_car "<U0043><U0048>"
+country_post "<U0043><U0048>"
+country_isbn 2
+lang_name "<U0066><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
+lang_ab   "<U0066><U0072>"
+lang_term "<U0066><U0072><U0061>"
+lang_lib  "<U0066><U0072><U0065>"
 END LC_ADDRESS
--- a/localedata/locales/fr_FR
+++ b/locales/fr_FR
@@ -44,6 +44,7 @@
 category  "fr_FR:2000";LC_NAME
 category  "fr_FR:2000";LC_ADDRESS
 category  "fr_FR:2000";LC_TELEPHONE
+category  "fr_FR:2000";LC_MEASUREMENT
 
 END LC_IDENTIFICATION
 
@@ -137,9 +138,10 @@
 t_fmt   "<U0025><U0054>"
 am_pm   "";""
 t_fmt_ampm ""
-date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
+<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
+<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
 
 week    7;19971201;4
 first_weekday 1
@@ -166,6 +168,11 @@
 LC_NAME
 name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
 <U0025><U006D><U0025><U0074><U0025><U0066>"
+name_gen    ""
+name_mr     "<U004D><U002E>"
+name_mrs    "<U004D><U006D><U0065>"
+name_miss   "<U004D><U006C><U006C><U0065>"
+name_ms     ""
 END LC_NAME
 
 LC_ADDRESS
@@ -177,4 +184,12 @@
 country_ab2 "<U0046><U0052>"
 country_ab3 "<U0046><U0052><U0041>"
 country_num 250
+country_name "<U0046><U0072><U0061><U006E><U0063><U0065>"
+country_car "<U0046>"
+country_post "<U0046><U0052>"
+country_isbn 2
+lang_name "<U0066><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
+lang_ab   "<U0066><U0072>"
+lang_term "<U0066><U0072><U0061>"
+lang_lib  "<U0066><U0072><U0065>"
 END LC_ADDRESS
--- a/localedata/locales/fr_LU
+++ b/locales/fr_LU
@@ -42,6 +42,7 @@
 category  "fr_LU:2000";LC_NAME
 category  "fr_LU:2000";LC_ADDRESS
 category  "fr_LU:2000";LC_TELEPHONE
+category  "fr_LU:2000";LC_MEASUREMENT
 
 END LC_IDENTIFICATION
 
@@ -78,8 +79,8 @@
 
 LC_NUMERIC
 decimal_point             "<U002C>"
-thousands_sep             ""
-grouping                  0;0
+thousands_sep             "<U0020>"
+grouping                  3;3
 END LC_NUMERIC
 
 LC_TIME
@@ -117,9 +118,10 @@
 t_fmt   "<U0025><U0054>"
 am_pm   "";""
 t_fmt_ampm ""
-date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
+<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
+<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
 END LC_TIME
 
 LC_PAPER
@@ -141,8 +143,7 @@
 END LC_MEASUREMENT
 
 LC_NAME
-name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
-<U0025><U006D><U0025><U0074><U0025><U0066>"
+copy "fr_FR"
 END LC_NAME
 
 LC_ADDRESS
@@ -154,4 +155,12 @@
 country_ab2 "<U004C><U0055>"
 country_ab3 "<U004C><U0055><U0058>"
 country_num 442
+country_name "<U004C><U0075><U0078><U0065><U006D><U0062><U006F><U0075><U0072><U0067>"
+country_car "<U004C>"
+country_post "<U004C><U0055>"
+country_isbn 2
+lang_name "<U0066><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
+lang_ab   "<U0066><U0072>"
+lang_term "<U0066><U0072><U0061>"
+lang_lib  "<U0066><U0072><U0065>"
 END LC_ADDRESS