diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ
index c363352..10e5ac7 100644
--- a/localedata/locales/aa_DJ
+++ b/localedata/locales/aa_DJ
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/aa_ER b/localedata/locales/aa_ER
index 6bd54d9..80ccaef 100644
--- a/localedata/locales/aa_ER
+++ b/localedata/locales/aa_ER
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/aa_ER@saaho b/localedata/locales/aa_ER@saaho
index d0c7c51..2903b36 100644
--- a/localedata/locales/aa_ER@saaho
+++ b/localedata/locales/aa_ER@saaho
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/aa_ET b/localedata/locales/aa_ET
index dc5ba6f..4c7301e 100644
--- a/localedata/locales/aa_ET
+++ b/localedata/locales/aa_ET
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/af_ZA b/localedata/locales/af_ZA
index 143ad75..33e0589 100644
--- a/localedata/locales/af_ZA
+++ b/localedata/locales/af_ZA
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Charset: ISO-8859-1
 
diff --git a/localedata/locales/ak_GH b/localedata/locales/ak_GH
index 159acc8..5832a2c 100644
--- a/localedata/locales/ak_GH
+++ b/localedata/locales/ak_GH
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/localedata/locales/am_ET b/localedata/locales/am_ET
index 35e4687..953b91d 100644
--- a/localedata/locales/am_ET
+++ b/localedata/locales/am_ET
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/an_ES b/localedata/locales/an_ES
index cc18c6b..be648af 100644
--- a/localedata/locales/an_ES
+++ b/localedata/locales/an_ES
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Aragonese Language Locale for Spain
 % Source:
 % Address:
diff --git a/localedata/locales/anp_IN b/localedata/locales/anp_IN
index d08ac9e..0cb92e6 100644
--- a/localedata/locales/anp_IN
+++ b/localedata/locales/anp_IN
@@ -1,5 +1,5 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/ar_AE b/localedata/locales/ar_AE
index e083467..ef6deca 100644
--- a/localedata/locales/ar_AE
+++ b/localedata/locales/ar_AE
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for United Arab Emirates.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_BH b/localedata/locales/ar_BH
index 7a3bdde..c5f9aeb 100644
--- a/localedata/locales/ar_BH
+++ b/localedata/locales/ar_BH
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Bahrain.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_DZ b/localedata/locales/ar_DZ
index 64dda46..2ed9cb3 100644
--- a/localedata/locales/ar_DZ
+++ b/localedata/locales/ar_DZ
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Algeria.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_EG b/localedata/locales/ar_EG
index 0701442..d26557d 100644
--- a/localedata/locales/ar_EG
+++ b/localedata/locales/ar_EG
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Egypt.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_IN b/localedata/locales/ar_IN
index 9665d01..334a273 100644
--- a/localedata/locales/ar_IN
+++ b/localedata/locales/ar_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Contributed by Kentaro Noji   (knoji@jp.ibm.com)
 % Tetsuji Oriata (Oriata@jp.ibm.com) and Others, 2000
 
diff --git a/localedata/locales/ar_IQ b/localedata/locales/ar_IQ
index 24ee343..aacecba 100644
--- a/localedata/locales/ar_IQ
+++ b/localedata/locales/ar_IQ
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Iraq.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_JO b/localedata/locales/ar_JO
index 6de8956..648f1e2 100644
--- a/localedata/locales/ar_JO
+++ b/localedata/locales/ar_JO
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Jordan.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_KW b/localedata/locales/ar_KW
index 9014c21..4c2cbcb 100644
--- a/localedata/locales/ar_KW
+++ b/localedata/locales/ar_KW
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Kuwait.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_LB b/localedata/locales/ar_LB
index d6d53eb..9bb17c0 100644
--- a/localedata/locales/ar_LB
+++ b/localedata/locales/ar_LB
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Lebanon.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_LY b/localedata/locales/ar_LY
index e8da694..464adeb 100644
--- a/localedata/locales/ar_LY
+++ b/localedata/locales/ar_LY
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Libyan Arab Jamahiriya.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_MA b/localedata/locales/ar_MA
index 95a20a4..8585ab7 100644
--- a/localedata/locales/ar_MA
+++ b/localedata/locales/ar_MA
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Morocco.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_OM b/localedata/locales/ar_OM
index f530b4d..4c7e544 100644
--- a/localedata/locales/ar_OM
+++ b/localedata/locales/ar_OM
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Oman.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_QA b/localedata/locales/ar_QA
index a12f6c1..d4da6a1 100644
--- a/localedata/locales/ar_QA
+++ b/localedata/locales/ar_QA
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Qatar.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_SA b/localedata/locales/ar_SA
index 1e4a185..f04d126 100644
--- a/localedata/locales/ar_SA
+++ b/localedata/locales/ar_SA
@@ -1,5 +1,5 @@
 comment_char %
-escape_char  /
+escape_char /
 
 % Arabic Locale
 % Charset: ISO-8859-6
diff --git a/localedata/locales/ar_SD b/localedata/locales/ar_SD
index 68a60b1..7dce602 100644
--- a/localedata/locales/ar_SD
+++ b/localedata/locales/ar_SD
@@ -1,5 +1,5 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/ar_SS b/localedata/locales/ar_SS
index db3cac9..1068ac9 100644
--- a/localedata/locales/ar_SS
+++ b/localedata/locales/ar_SS
@@ -1,5 +1,5 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/ar_SY b/localedata/locales/ar_SY
index a8aef8c..0dbf7a0 100644
--- a/localedata/locales/ar_SY
+++ b/localedata/locales/ar_SY
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Syrian Arab Republic.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_TN b/localedata/locales/ar_TN
index 00c59e5..3577f07 100644
--- a/localedata/locales/ar_TN
+++ b/localedata/locales/ar_TN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Tunisia.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ar_YE b/localedata/locales/ar_YE
index 4665a2a..45f0bfe 100644
--- a/localedata/locales/ar_YE
+++ b/localedata/locales/ar_YE
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Arabic language locale for Yemen.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ast_ES b/localedata/locales/ast_ES
index ade1b6a..6fadd77 100644
--- a/localedata/locales/ast_ES
+++ b/localedata/locales/ast_ES
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Asturian Language Locale for Spain
 % Source:
 % Address:
diff --git a/localedata/locales/az_AZ b/localedata/locales/az_AZ
index 8a99088..0742141 100644
--- a/localedata/locales/az_AZ
+++ b/localedata/locales/az_AZ
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Azeri Language Locale for Azerbaijan (latin)
 % Source:
 % Contact: Pablo Saratxaga
diff --git a/localedata/locales/be_BY b/localedata/locales/be_BY
index 7fb8542..7df9000 100644
--- a/localedata/locales/be_BY
+++ b/localedata/locales/be_BY
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Belarusian Language Locale for Belarus
 % Contact: Alexander Mikhailian
 % Email: mikhailian@altern.org
diff --git a/localedata/locales/be_BY@latin b/localedata/locales/be_BY@latin
index 3afb364..926b07b 100644
--- a/localedata/locales/be_BY@latin
+++ b/localedata/locales/be_BY@latin
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Belarusian Language Latin-Script Locale for Belarus
 % Contact: Ihar Hrachyshka
 % Email: boox.svaboda2006@gmail.com
diff --git a/localedata/locales/bem_ZM b/localedata/locales/bem_ZM
index 9ce6c42..4e37542 100644
--- a/localedata/locales/bem_ZM
+++ b/localedata/locales/bem_ZM
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 % Authors:
 % 2011-04-18, Anthony Musaluke <goof2092@gmail.com>
diff --git a/localedata/locales/ber_DZ b/localedata/locales/ber_DZ
index 474c75b..e1d7178 100644
--- a/localedata/locales/ber_DZ
+++ b/localedata/locales/ber_DZ
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Amazigh Language Locale for Algeria (latin)
 % Source:
 % Contact: Pablo Saratxaga
diff --git a/localedata/locales/ber_MA b/localedata/locales/ber_MA
index 516bfe5..b07ee9a 100644
--- a/localedata/locales/ber_MA
+++ b/localedata/locales/ber_MA
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Amazigh Language Locale for Morocco (tifinagh)
 % Source:
 % Contact: Pablo Saratxaga
diff --git a/localedata/locales/bg_BG b/localedata/locales/bg_BG
index ed12e25..6c562d5 100644
--- a/localedata/locales/bg_BG
+++ b/localedata/locales/bg_BG
@@ -1,5 +1,5 @@
 comment_char %
-escape_char  /
+escape_char /
 
 % Distribution and use is free, also
 % for commercial purposes.
diff --git a/localedata/locales/bhb_IN b/localedata/locales/bhb_IN
index b98d67d..b674d08 100644
--- a/localedata/locales/bhb_IN
+++ b/localedata/locales/bhb_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Bhili(devanagari) language locale for India.
 % Contributed by Alexey Merzliakov <alexey.merzlyakov@samsung.com>
 
diff --git a/localedata/locales/bho_IN b/localedata/locales/bho_IN
index 3e08684..d845ab1 100644
--- a/localedata/locales/bho_IN
+++ b/localedata/locales/bho_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Bhojpuri language locale for India.
 % Contributed by Alok Ranjan <ranjan_aalok@yahoo.com>,
 % Dr.Chandra Mohan <cmkumar1@rediffmail.com>,
diff --git a/localedata/locales/bn_BD b/localedata/locales/bn_BD
index 53acafb..b38fd90 100644
--- a/localedata/locales/bn_BD
+++ b/localedata/locales/bn_BD
@@ -1,5 +1,5 @@
-escape_char /
 comment_char %
+escape_char /
 
 %	This is the locale defination file for Bangladeshi Bengali
 
diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN
index 8023c19..b174b83 100644
--- a/localedata/locales/bn_IN
+++ b/localedata/locales/bn_IN
@@ -1,5 +1,5 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
 
 % Last Update by Runa Bhattacharjee <runab@redhat.com>
 
diff --git a/localedata/locales/bo_CN b/localedata/locales/bo_CN
index 8c866ab..8440c24 100644
--- a/localedata/locales/bo_CN
+++ b/localedata/locales/bo_CN
@@ -1,5 +1,5 @@
 comment_char %
-escape_char  /
+escape_char /
 
 % Tibetan language locale for P.R. of China
 %
diff --git a/localedata/locales/bo_IN b/localedata/locales/bo_IN
index b396ee1..02d1b0b 100644
--- a/localedata/locales/bo_IN
+++ b/localedata/locales/bo_IN
@@ -1,5 +1,5 @@
 comment_char %
-escape_char  /
+escape_char /
 
 % Tibetan language locale for India
 %
diff --git a/localedata/locales/br_FR b/localedata/locales/br_FR
index 85f8d3c..398674a 100644
--- a/localedata/locales/br_FR
+++ b/localedata/locales/br_FR
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Breton Language Locale for France
 % Source: thanks to Denise.Peden@enst-bretagne.fr (Denise Derrien-Peden)
 % Address:
diff --git a/localedata/locales/br_FR@euro b/localedata/locales/br_FR@euro
index db20b80..8e075ab 100644
--- a/localedata/locales/br_FR@euro
+++ b/localedata/locales/br_FR@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Breton Language Locale for France with Euro
 % Language: br
 % Territory: FR
diff --git a/localedata/locales/brx_IN b/localedata/locales/brx_IN
index 98b7f44..8e17166 100644
--- a/localedata/locales/brx_IN
+++ b/localedata/locales/brx_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Bodo language locale for India.
 % Contributed by Pravin Satpute <psatpute@redhat.com> and Sanjib Narzary <alayaran@gmail.com>
 % Reference http://www.unicode.org/cldr/trac/browser/trunk/common/main/brx.xml
diff --git a/localedata/locales/bs_BA b/localedata/locales/bs_BA
index fa574a1..7206658 100644
--- a/localedata/locales/bs_BA
+++ b/localedata/locales/bs_BA
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Bosnian Language Locale for Bosnia
 % Source: adapted from Croatian locale
 % Contact: Tomislav Vujec
diff --git a/localedata/locales/byn_ER b/localedata/locales/byn_ER
index 435198d..fcafc53 100644
--- a/localedata/locales/byn_ER
+++ b/localedata/locales/byn_ER
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/ca_AD b/localedata/locales/ca_AD
index a2bd3ee..535a37a 100644
--- a/localedata/locales/ca_AD
+++ b/localedata/locales/ca_AD
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Catalan Language Locale for Andorra
 % Language: ca
 % Territory: AD
diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES
index 20a7d78..1111133 100644
--- a/localedata/locales/ca_ES
+++ b/localedata/locales/ca_ES
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Catalan Language Locale for Spain
 % Source: RAP
 % Contact: Jordi Mallach
diff --git a/localedata/locales/ca_ES@euro b/localedata/locales/ca_ES@euro
index ecccc23..afb6e90 100644
--- a/localedata/locales/ca_ES@euro
+++ b/localedata/locales/ca_ES@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Catalan Language Locale for Spain with Euro
 % Language: ca
 % Territory: ES
diff --git a/localedata/locales/ca_FR b/localedata/locales/ca_FR
index 7d9b8a8..76ba3ea 100644
--- a/localedata/locales/ca_FR
+++ b/localedata/locales/ca_FR
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Catalan Language Locale for France
 % Language: ca
 % Territory: FR
diff --git a/localedata/locales/ca_IT b/localedata/locales/ca_IT
index 0ddb05c..f9ea3aa 100644
--- a/localedata/locales/ca_IT
+++ b/localedata/locales/ca_IT
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Catalan Language Locale for Italy (L'Alguer)
 % Language: ca
 % Territory: IT
diff --git a/localedata/locales/ce_RU b/localedata/locales/ce_RU
index cdeffaf..1656b32 100644
--- a/localedata/locales/ce_RU
+++ b/localedata/locales/ce_RU
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Chechen locale for RUSSIAN FEDERATION.
 % Contributed by Kentaroh Noji  Arslanbek Astemirov <s-o-f-t AT mail DOT ru>
 % Charset: UTF-8
diff --git a/localedata/locales/cmn_TW b/localedata/locales/cmn_TW
index a332659..67cc7e2 100644
--- a/localedata/locales/cmn_TW
+++ b/localedata/locales/cmn_TW
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/localedata/locales/crh_UA b/localedata/locales/crh_UA
index 2e75f44..5eaf893 100644
--- a/localedata/locales/crh_UA
+++ b/localedata/locales/crh_UA
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Crimean Tatar (Crimean Turkish) Language Locale for Ukraine (latin)
 % Source:	Re<U015F>at SABIQ
 % Contact:	Re<U015F>at SABIQ
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 8ad1154..06373f4 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -1,6 +1,6 @@
-escape_char /
 comment_char %
-%
+escape_char /
+
 % Czech Language Locale for Czech
 % Source:
 % Address: 	U Å¡koly 292		Without diactitical chars:	U skoly 292
diff --git a/localedata/locales/csb_PL b/localedata/locales/csb_PL
index 48df333..fd0278d 100644
--- a/localedata/locales/csb_PL
+++ b/localedata/locales/csb_PL
@@ -1,6 +1,6 @@
 comment_char %
 escape_char /
-%
+
 % Kashubian Language Locale for Poland
 % Source: csb_PL locale
 % Contact: Michal Ostrowski
diff --git a/localedata/locales/cv_RU b/localedata/locales/cv_RU
index 889aaf5..5d2a0e8 100644
--- a/localedata/locales/cv_RU
+++ b/localedata/locales/cv_RU
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Chuvash Language Locale for Russia
 % Language: cv
 % Territory: RU
diff --git a/localedata/locales/cy_GB b/localedata/locales/cy_GB
index 66298e0..1aa0cbe 100644
--- a/localedata/locales/cy_GB
+++ b/localedata/locales/cy_GB
@@ -1,5 +1,6 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
+
 % charset "ISO-8859-14"
 % Distribution and use is free, also  for commercial purposes.
 
diff --git a/localedata/locales/da_DK b/localedata/locales/da_DK
index 3248e3c..12f754e 100644
--- a/localedata/locales/da_DK
+++ b/localedata/locales/da_DK
@@ -1,5 +1,5 @@
-escape_char /
 comment_char %
+escape_char /
 
 % Danish language locale for Denmark
 % Source: Danish Standards Association
diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT
index 7c31538..e0f11f0 100644
--- a/localedata/locales/de_AT
+++ b/localedata/locales/de_AT
@@ -1,5 +1,5 @@
 comment_char %
-escape_char  /
+escape_char /
 
 % German Language Locale for Austria
 % Source: O:sterreiches Normungsinstitut
diff --git a/localedata/locales/de_AT@euro b/localedata/locales/de_AT@euro
index 2a2d47f..92cb8e6 100644
--- a/localedata/locales/de_AT@euro
+++ b/localedata/locales/de_AT@euro
@@ -1,5 +1,5 @@
 comment_char %
-escape_char  /
+escape_char /
 
 % German Language Locale for Austria with Euro
 % Source: O:sterreiches Normungsinstitut
diff --git a/localedata/locales/de_BE b/localedata/locales/de_BE
index 993bd59..d55f4d8 100644
--- a/localedata/locales/de_BE
+++ b/localedata/locales/de_BE
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % German Language Locale for Belgium
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/de_BE@euro b/localedata/locales/de_BE@euro
index a0d299c..e2c8206 100644
--- a/localedata/locales/de_BE@euro
+++ b/localedata/locales/de_BE@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % German Language Locale for Belgium with Euro
 % Language: de
 % Territory: BE
diff --git a/localedata/locales/de_CH b/localedata/locales/de_CH
index 150dce0..08382de 100644
--- a/localedata/locales/de_CH
+++ b/localedata/locales/de_CH
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % German Language Locale for Switzerland
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE
index e2704a7..fd48107 100644
--- a/localedata/locales/de_DE
+++ b/localedata/locales/de_DE
@@ -1,5 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
+
 % Locale for German locale in Germany
 % Contributed by Ulrich Drepper <drepper@redhat.com>, 2000
 
diff --git a/localedata/locales/de_DE@euro b/localedata/locales/de_DE@euro
index cc7e073..39cb350 100644
--- a/localedata/locales/de_DE@euro
+++ b/localedata/locales/de_DE@euro
@@ -1,5 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
+
 % Locale for German locale in Germany
 % Contributed by Ulrich Drepper <drepper@redhat.com>, 2000
 
diff --git a/localedata/locales/de_LU b/localedata/locales/de_LU
index 226b73c..0d2d9c7 100644
--- a/localedata/locales/de_LU
+++ b/localedata/locales/de_LU
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % German Language Locale for Luxemburg
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/de_LU@euro b/localedata/locales/de_LU@euro
index c267677..1b23ac3 100644
--- a/localedata/locales/de_LU@euro
+++ b/localedata/locales/de_LU@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % German Language Locale for Luxemburg with Euro
 % Language: de
 % Territory: LU
diff --git a/localedata/locales/doi_IN b/localedata/locales/doi_IN
index 1d3e6d4..b23df74 100644
--- a/localedata/locales/doi_IN
+++ b/localedata/locales/doi_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Dogri language locale for India.
 % Contributed by Pravin Satpute <psatpute@redhat.com> and Sushil Badyal <badyalsk@gmail.com>
 
diff --git a/localedata/locales/dv_MV b/localedata/locales/dv_MV
index 34fe69d..44a8b93 100644
--- a/localedata/locales/dv_MV
+++ b/localedata/locales/dv_MV
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Dhivehi Language Locale for Maldives
 % Source:
 % Contact: Sofwathuallah Mohamed
diff --git a/localedata/locales/dz_BT b/localedata/locales/dz_BT
index ac89db8..eeefa87 100644
--- a/localedata/locales/dz_BT
+++ b/localedata/locales/dz_BT
@@ -1,5 +1,5 @@
 comment_char %
-escape_char  /
+escape_char /
 
 % Bhutanese(Bhutan) locale
 %
diff --git a/localedata/locales/el_CY b/localedata/locales/el_CY
index 4a6ebc4..afbf95f 100644
--- a/localedata/locales/el_CY
+++ b/localedata/locales/el_CY
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Greek Language Locale for Cyprus
 % Based on locale el_GR by Keld Simonsen.
 
diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR
index 254463c..d2d5cdd 100644
--- a/localedata/locales/el_GR
+++ b/localedata/locales/el_GR
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Greek Language Locale for Greece
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/el_GR@euro b/localedata/locales/el_GR@euro
index c7e889a..178228f 100644
--- a/localedata/locales/el_GR@euro
+++ b/localedata/locales/el_GR@euro
@@ -1,5 +1,5 @@
-escape_char /
 comment_char %
+escape_char /
 
 LC_IDENTIFICATION
 title      "Greek locale for Greece with Euro"
diff --git a/localedata/locales/en_AG b/localedata/locales/en_AG
index 763ba82..d03818e 100644
--- a/localedata/locales/en_AG
+++ b/localedata/locales/en_AG
@@ -1,5 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
+
 % English language locale for Antigua and Barbuda.
 % Contributed by Ulrich Drepper <drepper@redhat.com>, 2008
 
diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU
index c501421..84bf70a 100644
--- a/localedata/locales/en_AU
+++ b/localedata/locales/en_AU
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % English language locale for Australia
 % Source: RAP
diff --git a/localedata/locales/en_BW b/localedata/locales/en_BW
index 5f65c55..89af773 100644
--- a/localedata/locales/en_BW
+++ b/localedata/locales/en_BW
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % English language locale for Botswana
 % Source: RAP
diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA
index bc52baa..deaf90d 100644
--- a/localedata/locales/en_CA
+++ b/localedata/locales/en_CA
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % English language locale for Canada
 % sorting according to CAN/CSA-Z243.4.1-1992
diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK
index 585f4cd..d4fd896 100644
--- a/localedata/locales/en_DK
+++ b/localedata/locales/en_DK
@@ -1,5 +1,5 @@
-escape_char /
 comment_char %
+escape_char /
 
 % English language locale for Denmark
 %
diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB
index 3acab4c..fb790f9 100644
--- a/localedata/locales/en_GB
+++ b/localedata/locales/en_GB
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % English language locale for Britain
 % Source: RAP
diff --git a/localedata/locales/en_HK b/localedata/locales/en_HK
index f5fae32..9ae5db1 100644
--- a/localedata/locales/en_HK
+++ b/localedata/locales/en_HK
@@ -1,5 +1,5 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
 
 % English locale for Hong Kong
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
diff --git a/localedata/locales/en_IE b/localedata/locales/en_IE
index a8b080e..ee40350 100644
--- a/localedata/locales/en_IE
+++ b/localedata/locales/en_IE
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % English language locale for Ireland
 % Source: RAP
diff --git a/localedata/locales/en_IE@euro b/localedata/locales/en_IE@euro
index 1d3c5b3..ba03f0e 100644
--- a/localedata/locales/en_IE@euro
+++ b/localedata/locales/en_IE@euro
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % English language locale for Ireland with Euro
 % Language: en
diff --git a/localedata/locales/en_IN b/localedata/locales/en_IN
index c76cfff..c201d13 100644
--- a/localedata/locales/en_IN
+++ b/localedata/locales/en_IN
@@ -1,5 +1,5 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
 
 % English locale for India.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
diff --git a/localedata/locales/en_NG b/localedata/locales/en_NG
index 364b549..100dc3d 100644
--- a/localedata/locales/en_NG
+++ b/localedata/locales/en_NG
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % English language locale for Nigeria
 % Language: en
diff --git a/localedata/locales/en_NZ b/localedata/locales/en_NZ
index 2454383..e5f4a5a 100644
--- a/localedata/locales/en_NZ
+++ b/localedata/locales/en_NZ
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % English language locale for New Zealand
 % Source: RAP
diff --git a/localedata/locales/en_PH b/localedata/locales/en_PH
index 90fca0b..1d1904f 100644
--- a/localedata/locales/en_PH
+++ b/localedata/locales/en_PH
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % English language locale for Philippines.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/en_SG b/localedata/locales/en_SG
index cee0683..3598619 100644
--- a/localedata/locales/en_SG
+++ b/localedata/locales/en_SG
@@ -1,5 +1,5 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
 
 % English language locale for Singapore.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
diff --git a/localedata/locales/en_US b/localedata/locales/en_US
index d79c228..ecfa6c7 100644
--- a/localedata/locales/en_US
+++ b/localedata/locales/en_US
@@ -1,5 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
+
 % Locale for English locale in the USA
 % Contributed by Ulrich Drepper <drepper@redhat.com>, 2000
 
diff --git a/localedata/locales/en_ZA b/localedata/locales/en_ZA
index 1227278..5554521 100644
--- a/localedata/locales/en_ZA
+++ b/localedata/locales/en_ZA
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % English language locale for South Africa
 % Source: Zuza Software Foundation (Translate.org.za)
diff --git a/localedata/locales/en_ZM b/localedata/locales/en_ZM
index ee0f9a2..e9c8cee 100644
--- a/localedata/locales/en_ZM
+++ b/localedata/locales/en_ZM
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 % Authors:
 % 2011-04-18, Anthony Musaluke <goof2092@gmail.com>
diff --git a/localedata/locales/en_ZW b/localedata/locales/en_ZW
index 1fb2468..262d9d9 100644
--- a/localedata/locales/en_ZW
+++ b/localedata/locales/en_ZW
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % English language locale for Zimbabwe
 % Source: RAP
diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR
index 26f394a..115885a 100644
--- a/localedata/locales/es_AR
+++ b/localedata/locales/es_AR
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Argentina
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO
index b2ecb50..0fcc9ee 100644
--- a/localedata/locales/es_BO
+++ b/localedata/locales/es_BO
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Bolivia
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL
index ae612cb..4a8f709 100644
--- a/localedata/locales/es_CL
+++ b/localedata/locales/es_CL
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Chile
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO
index 6405910..3eeab57 100644
--- a/localedata/locales/es_CO
+++ b/localedata/locales/es_CO
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Colombia
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR
index b5dec84..b6b9f6b 100644
--- a/localedata/locales/es_CR
+++ b/localedata/locales/es_CR
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Costa Rica
 % Language: es
 % Territory: CR
diff --git a/localedata/locales/es_CU b/localedata/locales/es_CU
index 344af64..31b45c9 100644
--- a/localedata/locales/es_CU
+++ b/localedata/locales/es_CU
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish Language Locale for Cuba
 % Address: San Antonio de los Ba<U00F8>os Highway, Kilometer 1 1/2,
 %          University of Informatic Sciences
diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO
index d142c35..e21425f 100644
--- a/localedata/locales/es_DO
+++ b/localedata/locales/es_DO
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Dominican Republic
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC
index d8f2256..d52460f 100644
--- a/localedata/locales/es_EC
+++ b/localedata/locales/es_EC
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish Language Locale for Ecuador
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES
index 7849bd9..1a88eca 100644
--- a/localedata/locales/es_ES
+++ b/localedata/locales/es_ES
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish Language Locale for Spain
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_ES@euro b/localedata/locales/es_ES@euro
index 8ffc7cc..ceb3c08 100644
--- a/localedata/locales/es_ES@euro
+++ b/localedata/locales/es_ES@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish Language Locale for Spain with Euro
 % Language: es
 % Territory: ES
diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT
index 25f5185..1b92d98 100644
--- a/localedata/locales/es_GT
+++ b/localedata/locales/es_GT
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Guatemala
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN
index 11a4c37..bf6e3dc 100644
--- a/localedata/locales/es_HN
+++ b/localedata/locales/es_HN
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Honduras
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX
index 258a073..ef3522f 100644
--- a/localedata/locales/es_MX
+++ b/localedata/locales/es_MX
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Mexico
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_NI b/localedata/locales/es_NI
index d2944ef..c566d8f 100644
--- a/localedata/locales/es_NI
+++ b/localedata/locales/es_NI
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Nicaragua
 % Language: es
 % Territory: NI
diff --git a/localedata/locales/es_PA b/localedata/locales/es_PA
index 0e82bf0..45aedaf 100644
--- a/localedata/locales/es_PA
+++ b/localedata/locales/es_PA
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Panama
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_PE b/localedata/locales/es_PE
index 5557060..e4305fe 100644
--- a/localedata/locales/es_PE
+++ b/localedata/locales/es_PE
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Peru
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_PR b/localedata/locales/es_PR
index 91a0d7d..bd7bdb3 100644
--- a/localedata/locales/es_PR
+++ b/localedata/locales/es_PR
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Puerto Rico
 % Language: es
 % Territory: PR
diff --git a/localedata/locales/es_PY b/localedata/locales/es_PY
index 1d3d20b..c1c4289 100644
--- a/localedata/locales/es_PY
+++ b/localedata/locales/es_PY
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Paraguay
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV
index 041ebdc..167898e 100644
--- a/localedata/locales/es_SV
+++ b/localedata/locales/es_SV
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for El Salvador
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_US b/localedata/locales/es_US
index 312e1ca..fcd712e 100644
--- a/localedata/locales/es_US
+++ b/localedata/locales/es_US
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish Language Locale for U.S.A.
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY
index d6dd11c..67cee7c 100644
--- a/localedata/locales/es_UY
+++ b/localedata/locales/es_UY
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Uruguay
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE
index 53d42bd..1dcecb1 100644
--- a/localedata/locales/es_VE
+++ b/localedata/locales/es_VE
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Spanish language locale for Venezuela
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE
index d1a0291..2b026ca 100644
--- a/localedata/locales/et_EE
+++ b/localedata/locales/et_EE
@@ -1,5 +1,5 @@
-escape_char  /
 comment_char %
+escape_char /
 
 % Estonian language locale for Estonia
 % according to EVS 8:1993
diff --git a/localedata/locales/eu_ES b/localedata/locales/eu_ES
index 12491d2..7f35ed1 100644
--- a/localedata/locales/eu_ES
+++ b/localedata/locales/eu_ES
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Basque Language Locale for Spain
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/eu_ES@euro b/localedata/locales/eu_ES@euro
index 1d2ac5a..7552ca6 100644
--- a/localedata/locales/eu_ES@euro
+++ b/localedata/locales/eu_ES@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Basque Language Locale for Spain with Euro
 % Language: eu
 % Territory: ES
diff --git a/localedata/locales/fa_IR b/localedata/locales/fa_IR
index 73702d2..5b43aee 100644
--- a/localedata/locales/fa_IR
+++ b/localedata/locales/fa_IR
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Persian Language Locale for Iran with UTF-8 character set
 % Source: Sharif FarsiWeb, Inc.
 % Address: 5, Shahid Ghasemi Habibollah, Azadi Ave, Tehran, Iran
diff --git a/localedata/locales/ff_SN b/localedata/locales/ff_SN
index d3adda2..4a66565 100644
--- a/localedata/locales/ff_SN
+++ b/localedata/locales/ff_SN
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 % Authors:
 % 2011-03-28, admin@pulaar-fulfulde.org
diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI
index e87878c..a39397c 100644
--- a/localedata/locales/fi_FI
+++ b/localedata/locales/fi_FI
@@ -1,5 +1,5 @@
-escape_char     /
-comment_char    %
+comment_char %
+escape_char /
 
 % Finnish language locale for Finland
 % sorting according to SFS 4600 (1986-06-09)
diff --git a/localedata/locales/fi_FI@euro b/localedata/locales/fi_FI@euro
index 02bc4bb..8c9ccc6 100644
--- a/localedata/locales/fi_FI@euro
+++ b/localedata/locales/fi_FI@euro
@@ -1,5 +1,5 @@
-escape_char     /
-comment_char    %
+comment_char %
+escape_char /
 
 % Finnish language locale for Finland with Euro
 % Language: fi
diff --git a/localedata/locales/fil_PH b/localedata/locales/fil_PH
index 58cead3..05f4ac4 100644
--- a/localedata/locales/fil_PH
+++ b/localedata/locales/fil_PH
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Filipino Language Locale for Philippines
 % Source:
 % Contact: Rene Torres, Pablo Saratxaga
diff --git a/localedata/locales/fo_FO b/localedata/locales/fo_FO
index c029e68..53d5367 100644
--- a/localedata/locales/fo_FO
+++ b/localedata/locales/fo_FO
@@ -1,5 +1,5 @@
-escape_char /
 comment_char %
+escape_char /
 
 % Faroese language locale for Faroe Islands
 % Source: Danish Standards Association
diff --git a/localedata/locales/fr_BE b/localedata/locales/fr_BE
index eec3a6d..0bfdf55 100644
--- a/localedata/locales/fr_BE
+++ b/localedata/locales/fr_BE
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % French Language Locale for Belgium
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/fr_BE@euro b/localedata/locales/fr_BE@euro
index 4c85905..7cc0301 100644
--- a/localedata/locales/fr_BE@euro
+++ b/localedata/locales/fr_BE@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % French Language Locale for Belgium with Euro
 % Language: fr
 % Territory: BE
diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA
index fa42053..23565b3 100644
--- a/localedata/locales/fr_CA
+++ b/localedata/locales/fr_CA
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % French Language Locale for Canada
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/fr_CH b/localedata/locales/fr_CH
index fa9aca4..70156b4 100644
--- a/localedata/locales/fr_CH
+++ b/localedata/locales/fr_CH
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % French Language Locale for Switzerland
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/fr_FR b/localedata/locales/fr_FR
index c88e06d..2c69c57 100644
--- a/localedata/locales/fr_FR
+++ b/localedata/locales/fr_FR
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % French Language Locale for France
 % Source: RAP
 % Language: fr
diff --git a/localedata/locales/fr_FR@euro b/localedata/locales/fr_FR@euro
index c1ae9d8..08e51e0 100644
--- a/localedata/locales/fr_FR@euro
+++ b/localedata/locales/fr_FR@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % French Language Locale for France with Euro
 % Language: fr
 % Territory: FR
diff --git a/localedata/locales/fr_LU b/localedata/locales/fr_LU
index fe13896..714eb7b 100644
--- a/localedata/locales/fr_LU
+++ b/localedata/locales/fr_LU
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % French Language Locale for Luxemburg
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/fr_LU@euro b/localedata/locales/fr_LU@euro
index 1c2828e..9950cb1 100644
--- a/localedata/locales/fr_LU@euro
+++ b/localedata/locales/fr_LU@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % French Language Locale for Luxemburg with Euro
 % Language: fr
 % Territory: LU
diff --git a/localedata/locales/fur_IT b/localedata/locales/fur_IT
index 72aa489..ab2dedb 100644
--- a/localedata/locales/fur_IT
+++ b/localedata/locales/fur_IT
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Furlan Language Locale for Italy
 % Language: fur
 % Territory: IT
diff --git a/localedata/locales/fy_DE b/localedata/locales/fy_DE
index 046d775..b160d08 100644
--- a/localedata/locales/fy_DE
+++ b/localedata/locales/fy_DE
@@ -1,5 +1,6 @@
 comment_char %
-escape_char  /
+escape_char /
+
 % charset "ISO_8859-1:1987"
 % Distribution and use is
 
diff --git a/localedata/locales/fy_NL b/localedata/locales/fy_NL
index e097c2a..878ab7f 100644
--- a/localedata/locales/fy_NL
+++ b/localedata/locales/fy_NL
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Frisian Language Locale for the Netherlands
 % Language: fy
 % Territory: NL
diff --git a/localedata/locales/ga_IE b/localedata/locales/ga_IE
index e9269dc..5379fb7 100644
--- a/localedata/locales/ga_IE
+++ b/localedata/locales/ga_IE
@@ -1,5 +1,6 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
+
 % Irish language locale for Ireland
 % Source: NSAI
 % Address: Glasnevin, Dublin 9, Ireland
diff --git a/localedata/locales/ga_IE@euro b/localedata/locales/ga_IE@euro
index 99422e3..6c0222b 100644
--- a/localedata/locales/ga_IE@euro
+++ b/localedata/locales/ga_IE@euro
@@ -1,5 +1,6 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
+
 % Irish language locale for Ireland with Euro
 % Language: ga
 % Territory: IE
diff --git a/localedata/locales/gd_GB b/localedata/locales/gd_GB
index 41943f5..6e90236 100644
--- a/localedata/locales/gd_GB
+++ b/localedata/locales/gd_GB
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/localedata/locales/gez_ER b/localedata/locales/gez_ER
index 712de15..3a9cbb7 100644
--- a/localedata/locales/gez_ER
+++ b/localedata/locales/gez_ER
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/gez_ER@abegede b/localedata/locales/gez_ER@abegede
index 5d700b3..cce7001 100644
--- a/localedata/locales/gez_ER@abegede
+++ b/localedata/locales/gez_ER@abegede
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/gez_ET b/localedata/locales/gez_ET
index b0eea50..68a00dc 100644
--- a/localedata/locales/gez_ET
+++ b/localedata/locales/gez_ET
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/gez_ET@abegede b/localedata/locales/gez_ET@abegede
index 423c8ae..040825f 100644
--- a/localedata/locales/gez_ET@abegede
+++ b/localedata/locales/gez_ET@abegede
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/gl_ES b/localedata/locales/gl_ES
index 4200c7d..65d2043 100644
--- a/localedata/locales/gl_ES
+++ b/localedata/locales/gl_ES
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Galician Language Locale for Spain
 % Source: GPUL
 % Address: Facultade de InformÃ¡tica
diff --git a/localedata/locales/gl_ES@euro b/localedata/locales/gl_ES@euro
index 20a3341..1e9019d 100644
--- a/localedata/locales/gl_ES@euro
+++ b/localedata/locales/gl_ES@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Galician Language Locale for Spain with Euro
 % Language: gl
 % Territory: ES
diff --git a/localedata/locales/gu_IN b/localedata/locales/gu_IN
index 1e50441..76ca0d2 100644
--- a/localedata/locales/gu_IN
+++ b/localedata/locales/gu_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Gurajati Language Locale For India.
 % Copied from hi_IN one, G Karunakar <karunakar@freedomink.org>
 % Gujarati stuff from Tapan Parikh <tap2k@yahoo.com>
diff --git a/localedata/locales/gv_GB b/localedata/locales/gv_GB
index bc7a13a..7afdef8 100644
--- a/localedata/locales/gv_GB
+++ b/localedata/locales/gv_GB
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % WARNING: UNOFFICIAL; EXPERIMENTAL. CHECK WITH Keld Simonsen
 % to see if there is an offical release for Manx Gaelic.
diff --git a/localedata/locales/ha_NG b/localedata/locales/ha_NG
index 0797233..819a40d 100644
--- a/localedata/locales/ha_NG
+++ b/localedata/locales/ha_NG
@@ -1,6 +1,6 @@
-escape_char /
 comment_char %
-%
+escape_char /
+
 % Hausa language locale for Nigeria
 % Source:
 % Contact: Pablo Saratxaga
diff --git a/localedata/locales/hak_TW b/localedata/locales/hak_TW
index 454ebad..8eae21a 100644
--- a/localedata/locales/hak_TW
+++ b/localedata/locales/hak_TW
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/localedata/locales/he_IL b/localedata/locales/he_IL
index 41b5084..1a7c161 100644
--- a/localedata/locales/he_IL
+++ b/localedata/locales/he_IL
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Hebrew Language Locale for Israel
 % Source: RAP
 % Address: Sankt Jo/rgens Alle 8
diff --git a/localedata/locales/hi_IN b/localedata/locales/hi_IN
index 0670fff..1d70ae2 100644
--- a/localedata/locales/hi_IN
+++ b/localedata/locales/hi_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Hindi language locale for India.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/hne_IN b/localedata/locales/hne_IN
index 1699b07..2836808 100644
--- a/localedata/locales/hne_IN
+++ b/localedata/locales/hne_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Chhattisgarhi language locale for India.
 % Contributed by Pravin Satpute <psatpute@redhat.com> and
 % Ravishankar Shrivastava <raviratlami@gmail.com>.
diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR
index 6dc8645..363ea64 100644
--- a/localedata/locales/hr_HR
+++ b/localedata/locales/hr_HR
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Croatian Language Locale for Croatia
 % Source: CARNet/MZT
 % Address: Josipa Marohnica bb
diff --git a/localedata/locales/hsb_DE b/localedata/locales/hsb_DE
index db130fd..291fc2e 100644
--- a/localedata/locales/hsb_DE
+++ b/localedata/locales/hsb_DE
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Upper Sorbian Language Locale for Germany
 % by Andrzej Krzysztofowicz <ankry at mif pg gda pl>
 % Source: information from Michael Wolf <milupo at sorbzilla de>
diff --git a/localedata/locales/ht_HT b/localedata/locales/ht_HT
index 66ae10b..8efcae2 100644
--- a/localedata/locales/ht_HT
+++ b/localedata/locales/ht_HT
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 
 
diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU
index 0a8a17c..170549e 100644
--- a/localedata/locales/hu_HU
+++ b/localedata/locales/hu_HU
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Hungarian Language Locale for Hungary
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/hy_AM b/localedata/locales/hy_AM
index 5610889..ee1567c 100644
--- a/localedata/locales/hy_AM
+++ b/localedata/locales/hy_AM
@@ -1,5 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
+
 % Charset: UTF-8
 % Distribution and use is free, also for commercial purposes.
 
diff --git a/localedata/locales/i18n b/localedata/locales/i18n
index 5cdbff8..ffd8408 100644
--- a/localedata/locales/i18n
+++ b/localedata/locales/i18n
@@ -1,5 +1,5 @@
-escape_char /
 comment_char %
+escape_char /
 
 LC_IDENTIFICATION
 title                 ""
diff --git a/localedata/locales/ia_FR b/localedata/locales/ia_FR
index 722cc6e..cbb82dc 100644
--- a/localedata/locales/ia_FR
+++ b/localedata/locales/ia_FR
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Interlingua locale for France
 % Language: ia
 % Territory: FR
diff --git a/localedata/locales/id_ID b/localedata/locales/id_ID
index 07afc3c..de3c9bc 100644
--- a/localedata/locales/id_ID
+++ b/localedata/locales/id_ID
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Indonesian language locale for Indonesia
 % Source:
diff --git a/localedata/locales/ig_NG b/localedata/locales/ig_NG
index b74fc44..c2d9838 100644
--- a/localedata/locales/ig_NG
+++ b/localedata/locales/ig_NG
@@ -1,6 +1,6 @@
-escape_char /
 comment_char %
-%
+escape_char /
+
 % Igbo language locale for Nigeria
 % Source:
 % Contact: Pablo Saratxaga
diff --git a/localedata/locales/ik_CA b/localedata/locales/ik_CA
index 6e0e654..24e8cb8 100644
--- a/localedata/locales/ik_CA
+++ b/localedata/locales/ik_CA
@@ -1,6 +1,6 @@
-escape_char /
 comment_char %
-%
+escape_char /
+
 % Inupiaq language locale for Canada
 % Source:
 % Contact: Pablo Saratxaga
diff --git a/localedata/locales/is_IS b/localedata/locales/is_IS
index fd919dc..9e36ffb 100644
--- a/localedata/locales/is_IS
+++ b/localedata/locales/is_IS
@@ -1,5 +1,5 @@
 comment_char %
-escape_char  /
+escape_char /
 
 % Icelandic Language Locale for Iceland
 % Source: Stadlarad I'slands
diff --git a/localedata/locales/it_CH b/localedata/locales/it_CH
index 5f50d7e..95ca08d 100644
--- a/localedata/locales/it_CH
+++ b/localedata/locales/it_CH
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Italian Language Locale for Switzerland
 % Language: it
 % Territory: CH
diff --git a/localedata/locales/it_IT b/localedata/locales/it_IT
index 2383b82..973475e 100644
--- a/localedata/locales/it_IT
+++ b/localedata/locales/it_IT
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Italian Language Locale for Italy
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/it_IT@euro b/localedata/locales/it_IT@euro
index fb9114c..cabcb4a 100644
--- a/localedata/locales/it_IT@euro
+++ b/localedata/locales/it_IT@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Italian Language Locale for Italy with Euro
 % Language: it
 % Territory: IT
diff --git a/localedata/locales/iu_CA b/localedata/locales/iu_CA
index 4f184e5..2a3bb27 100644
--- a/localedata/locales/iu_CA
+++ b/localedata/locales/iu_CA
@@ -1,5 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
+
 % charset "UTF-8"
 % Distribution and use is free, also for commercial purposes.
 
diff --git a/localedata/locales/iw_IL b/localedata/locales/iw_IL
index 0ff60e4..ae40472 100644
--- a/localedata/locales/iw_IL
+++ b/localedata/locales/iw_IL
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Hebrew Language Locale for Israel
 % Source: RAP
 % Address: Sankt Jo/rgens Alle 8
diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP
index 0422176..0861954 100644
--- a/localedata/locales/ja_JP
+++ b/localedata/locales/ja_JP
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Name:    localedef for ja_JP
 % Version: 0.7
diff --git a/localedata/locales/ka_GE b/localedata/locales/ka_GE
index 459c467..d3e84bb 100644
--- a/localedata/locales/ka_GE
+++ b/localedata/locales/ka_GE
@@ -1,5 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
+
 % charset "GEORGIAN-PS"
 % Distribution and use is free, also for commercial purposes.
 
diff --git a/localedata/locales/kk_KZ b/localedata/locales/kk_KZ
index 89b303b..ed9efe3 100644
--- a/localedata/locales/kk_KZ
+++ b/localedata/locales/kk_KZ
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Kazakh Language Locale for Kazakhstan
 % Source: NIPI, Kazakhstan Copper Corporation
 % Address: 6, Gagarin, 477000, Zhezkazgan, Kazakhstan
diff --git a/localedata/locales/kl_GL b/localedata/locales/kl_GL
index a721387..27103b7 100644
--- a/localedata/locales/kl_GL
+++ b/localedata/locales/kl_GL
@@ -1,5 +1,5 @@
-escape_char /
 comment_char %
+escape_char /
 
 % Greenlandic language locale for Greenland
 % Source: Danish Standards Association
diff --git a/localedata/locales/km_KH b/localedata/locales/km_KH
index 895c606..e21635e 100644
--- a/localedata/locales/km_KH
+++ b/localedata/locales/km_KH
@@ -1,7 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
 
-%
 % Khmer Language Locale for Cambodia
 %
 % Name:         km_KH
diff --git a/localedata/locales/kn_IN b/localedata/locales/kn_IN
index 3421f85..1a8ee8e 100644
--- a/localedata/locales/kn_IN
+++ b/localedata/locales/kn_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Kannada language locale for India.
 % Copied fron hi_IN one, G Karunakar <karunakar@freedomink.org> . Kannada Translations by Arun Sharma <arun@sharma-home.net>
 
diff --git a/localedata/locales/ko_KR b/localedata/locales/ko_KR
index 15b55f4..3f87b30 100644
--- a/localedata/locales/ko_KR
+++ b/localedata/locales/ko_KR
@@ -1,5 +1,5 @@
-escape_char /
 comment_char %
+escape_char /
 
 % Korean language locale for Republic of Korea (South Korea)
 % Source:
diff --git a/localedata/locales/kok_IN b/localedata/locales/kok_IN
index 6bc9738..6fa3fb9 100644
--- a/localedata/locales/kok_IN
+++ b/localedata/locales/kok_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Konkani language locale for India.
 % Contributed by Pravin Satpute <psatpute@redhat.com> and
 % Shailendra Bandodkar <sbandodk@redhat.com>.
diff --git a/localedata/locales/ks_IN b/localedata/locales/ks_IN
index 5399027..816d384 100644
--- a/localedata/locales/ks_IN
+++ b/localedata/locales/ks_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Kashmiri language locale for India.
 % Contributed by Pravin Satpute <psatpute@redhat.com> and
 % Mr. Mohammad Nayeem <mohammad.nayeem@gmail.com>
diff --git a/localedata/locales/ks_IN@devanagari b/localedata/locales/ks_IN@devanagari
index 5b48380..c40e98a 100644
--- a/localedata/locales/ks_IN@devanagari
+++ b/localedata/locales/ks_IN@devanagari
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Kashmiri(devanagari) language locale for India.
 % Contributed by Rakesh Pandit <rakesh.pandit@gmail.com> and
 % Pravin Satpute <psatpute@redhat.com>
diff --git a/localedata/locales/ku_TR b/localedata/locales/ku_TR
index f73b671..d988314 100644
--- a/localedata/locales/ku_TR
+++ b/localedata/locales/ku_TR
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Kurdish (latin) language locale for Turkey
 % Source: Kader DILSIZ
diff --git a/localedata/locales/kw_GB b/localedata/locales/kw_GB
index bd737af..c7a4478 100644
--- a/localedata/locales/kw_GB
+++ b/localedata/locales/kw_GB
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Cornish language locale for Britain
 % WARNING: UNOFFICIAL; EXPERIMENTAL. CHECK WITH Keld Simonsen
diff --git a/localedata/locales/ky_KG b/localedata/locales/ky_KG
index 9bb11d9..f4e1096 100644
--- a/localedata/locales/ky_KG
+++ b/localedata/locales/ky_KG
@@ -1,5 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
+
 % charset "UTF-8"
 
 %
diff --git a/localedata/locales/lb_LU b/localedata/locales/lb_LU
index 1140979..d6bcf9e 100644
--- a/localedata/locales/lb_LU
+++ b/localedata/locales/lb_LU
@@ -1,5 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
+
 % Locale for Luxembourgish locale in Luxembourg
 % Contributed by Pit Wenkin <pit@wenkin.lu>, 2011
 % Charset UTF-8
diff --git a/localedata/locales/lg_UG b/localedata/locales/lg_UG
index d79a816..06a3614 100644
--- a/localedata/locales/lg_UG
+++ b/localedata/locales/lg_UG
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Luganda language locale for Uganda
 % Source: Akademe ya Luganda
diff --git a/localedata/locales/li_BE b/localedata/locales/li_BE
index 5a89754..fb35df5 100644
--- a/localedata/locales/li_BE
+++ b/localedata/locales/li_BE
@@ -1,5 +1,6 @@
 comment_char %
-escape_char  /
+escape_char /
+
 % Distribution and use is
 
 LC_IDENTIFICATION
diff --git a/localedata/locales/li_NL b/localedata/locales/li_NL
index b07c4a4..2ccb22f 100644
--- a/localedata/locales/li_NL
+++ b/localedata/locales/li_NL
@@ -1,5 +1,6 @@
 comment_char %
-escape_char  /
+escape_char /
+
 % Distribution and use is
 
 LC_IDENTIFICATION
diff --git a/localedata/locales/lij_IT b/localedata/locales/lij_IT
index 698f557..4fa2586 100644
--- a/localedata/locales/lij_IT
+++ b/localedata/locales/lij_IT
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Locale for Ligurian locale in Italy
 % Contributed by Alessio Gastaldi <alessio.gastaldi@libero.it>, 2010
 
diff --git a/localedata/locales/lo_LA b/localedata/locales/lo_LA
index 67d6802..995c1f8 100644
--- a/localedata/locales/lo_LA
+++ b/localedata/locales/lo_LA
@@ -1,7 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
 
-%
 % Lao Lanuage Locale for Laos
 %
 % Name:         lo_LA
diff --git a/localedata/locales/lt_LT b/localedata/locales/lt_LT
index 47714c7..b4e131b 100644
--- a/localedata/locales/lt_LT
+++ b/localedata/locales/lt_LT
@@ -1,5 +1,5 @@
-escape_char /
 comment_char %
+escape_char /
 
 % Lithuanian language locale for Lithuania
 % Created on January 30, 1992
diff --git a/localedata/locales/lv_LV b/localedata/locales/lv_LV
index 59c9030..5727fb1 100644
--- a/localedata/locales/lv_LV
+++ b/localedata/locales/lv_LV
@@ -1,5 +1,5 @@
-escape_char /
 comment_char %
+escape_char /
 
 % Latvian language locale for Latvia
 % Source: Latvian Standard LVS 24-93
diff --git a/localedata/locales/lzh_TW b/localedata/locales/lzh_TW
index 73b4897..2ece4a3 100644
--- a/localedata/locales/lzh_TW
+++ b/localedata/locales/lzh_TW
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/localedata/locales/mag_IN b/localedata/locales/mag_IN
index a33ab94..b7b9edf 100644
--- a/localedata/locales/mag_IN
+++ b/localedata/locales/mag_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Magahi language locale for India.
 % Contributed by Chandan Kumar <chandankumar.093047@gmail.com>,
 % Rajesh Ranjan <rajeshkajha@yahoo.com>
diff --git a/localedata/locales/mai_IN b/localedata/locales/mai_IN
index e84bd91..c1129cf 100644
--- a/localedata/locales/mai_IN
+++ b/localedata/locales/mai_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Maithili language locale for India.
 % Contributed by Rajesh Ranjan <rajeshkajha@yahoo.com> and
 % Sangeeta Kumari <sangeeta09@gmail.com>.
diff --git a/localedata/locales/mg_MG b/localedata/locales/mg_MG
index aaad1fc..0181090 100644
--- a/localedata/locales/mg_MG
+++ b/localedata/locales/mg_MG
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Malagasy Language Locale for Madagascar
 % Source: The Debian Project modified by http://linuxmg.org
 % Contact: Christian Perrier
diff --git a/localedata/locales/mhr_RU b/localedata/locales/mhr_RU
index 4b79dc0..25b56e0 100644
--- a/localedata/locales/mhr_RU
+++ b/localedata/locales/mhr_RU
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Meadow Mari Language Locale
 % Source: PeshSajSoft Ltd.
 % Address: 112, Komsomolskaya Street
diff --git a/localedata/locales/mi_NZ b/localedata/locales/mi_NZ
index f9b5b4f..b7f8c98 100644
--- a/localedata/locales/mi_NZ
+++ b/localedata/locales/mi_NZ
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Maori language locale for New Zealand
 % Source: James Gasson
 % Contact: James Gasson, Pablo Saratxaga
diff --git a/localedata/locales/mk_MK b/localedata/locales/mk_MK
index b751679..4c17a56 100644
--- a/localedata/locales/mk_MK
+++ b/localedata/locales/mk_MK
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Macedonian language locale for Macedonia
 % Damjan Georgievski { gdamjan %% gmail.com }
 % Revision: 2.2 (2006-09-12)
diff --git a/localedata/locales/ml_IN b/localedata/locales/ml_IN
index 83077cc..d86fc25 100644
--- a/localedata/locales/ml_IN
+++ b/localedata/locales/ml_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Malayalam language locale for India.
 % Contributed by Free Software Foundation of India http://gnu.org.in
 % E-Mail : gnu@gnu.org.in
diff --git a/localedata/locales/mn_MN b/localedata/locales/mn_MN
index 6649537..abac0e3 100644
--- a/localedata/locales/mn_MN
+++ b/localedata/locales/mn_MN
@@ -1,5 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
+
 % Mongolian language (cyrillic) locale for Mongolia
 % Sanlig Badral <badral@chinggis.com>
 % Revision: 1.0 (2005-5-21)
diff --git a/localedata/locales/mni_IN b/localedata/locales/mni_IN
index 187e134..aff4fcc 100644
--- a/localedata/locales/mni_IN
+++ b/localedata/locales/mni_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Manipuri language locale for India.
 % Contributed by Mr. Pravin Satpute <psatpute AT redhat DOT com> and Ms. Rebika Devi < rebika_srd AT rediffmail DOT com>
 
diff --git a/localedata/locales/mr_IN b/localedata/locales/mr_IN
index 161071a..da4f7f1 100644
--- a/localedata/locales/mr_IN
+++ b/localedata/locales/mr_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Marathi language locale for India.
 % Contributed by Kentaroh Noji and Tetsuji Orita <orita@jp.ibm.com>.
 
diff --git a/localedata/locales/ms_MY b/localedata/locales/ms_MY
index 8ce4c0c..2a055fc 100644
--- a/localedata/locales/ms_MY
+++ b/localedata/locales/ms_MY
@@ -1,5 +1,5 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
 
 % Malay language locale for Malaysia.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
diff --git a/localedata/locales/mt_MT b/localedata/locales/mt_MT
index 34a4976..8d0cee2 100644
--- a/localedata/locales/mt_MT
+++ b/localedata/locales/mt_MT
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Maltese language locale for Malta.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/my_MM b/localedata/locales/my_MM
index c5bac5e..167572f 100644
--- a/localedata/locales/my_MM
+++ b/localedata/locales/my_MM
@@ -1,5 +1,6 @@
-escape_char     /
-comment_char    %
+comment_char %
+escape_char /
+
 % This is the locale definition file for Myanmar Burmese
 % It is derived from the locale by Ngwe Tun <ngwestar@etrademyanmar.com> and
 % Members of the Solveware Solution Team. http://www.myazedi.com
diff --git a/localedata/locales/nan_TW b/localedata/locales/nan_TW
index 0c11174..d5bbf1c 100644
--- a/localedata/locales/nan_TW
+++ b/localedata/locales/nan_TW
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin
index eb2b292..83ad6a6 100644
--- a/localedata/locales/nan_TW@latin
+++ b/localedata/locales/nan_TW@latin
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Minnan Language Locale for Taiwan
 % Source:
 % Contact: Arne Goetje
diff --git a/localedata/locales/nb_NO b/localedata/locales/nb_NO
index 332092a..206103b 100644
--- a/localedata/locales/nb_NO
+++ b/localedata/locales/nb_NO
@@ -1,5 +1,5 @@
-escape_char	/
-comment_char    %
+comment_char %
+escape_char /
 
 % Norwegian language locale for Norway
 % Source: Norsk Standardiseringsforbund
diff --git a/localedata/locales/nds_DE b/localedata/locales/nds_DE
index e1ab6e0..18ddcc2 100644
--- a/localedata/locales/nds_DE
+++ b/localedata/locales/nds_DE
@@ -1,5 +1,6 @@
 comment_char %
-escape_char  /
+escape_char /
+
 % Distribution and use is
 
 LC_IDENTIFICATION
diff --git a/localedata/locales/nds_NL b/localedata/locales/nds_NL
index 14051f6..4c057be 100644
--- a/localedata/locales/nds_NL
+++ b/localedata/locales/nds_NL
@@ -1,5 +1,6 @@
 comment_char %
-escape_char  /
+escape_char /
+
 % Distribution and use is
 
 LC_IDENTIFICATION
diff --git a/localedata/locales/ne_NP b/localedata/locales/ne_NP
index 1a462c7..be8913d 100644
--- a/localedata/locales/ne_NP
+++ b/localedata/locales/ne_NP
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Nepali language locale for Nepal.
 % Contributed by Pawan Chitrakar <pc@info.com.np>
 
diff --git a/localedata/locales/nhn_MX b/localedata/locales/nhn_MX
index af5620a..7d6d6c9 100644
--- a/localedata/locales/nhn_MX
+++ b/localedata/locales/nhn_MX
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Central Nahuatl locale for Mexico
 % Source: RAP
 % Address: Texcoco/Estado de Mexico, Mexico
diff --git a/localedata/locales/niu_NU b/localedata/locales/niu_NU
index 3a4f02e..206b1b4 100644
--- a/localedata/locales/niu_NU
+++ b/localedata/locales/niu_NU
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 LC_IDENTIFICATION
 title        "Niuean (Vagahau Niue) locale for Niue"
diff --git a/localedata/locales/niu_NZ b/localedata/locales/niu_NZ
index eb746f2..09a60ae 100644
--- a/localedata/locales/niu_NZ
+++ b/localedata/locales/niu_NZ
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 LC_IDENTIFICATION
 title        "Niuean (Vagahau Niue) locale for New Zealand"
diff --git a/localedata/locales/nl_AW b/localedata/locales/nl_AW
index 5989f2e..85d5c13 100644
--- a/localedata/locales/nl_AW
+++ b/localedata/locales/nl_AW
@@ -1,5 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
+
 % Dutch language locale for Aruba.
 % Contributed by Ulrich Drepper <drepper@redhat.com>, 2008
 
diff --git a/localedata/locales/nl_BE b/localedata/locales/nl_BE
index 78661fd..96f8813 100644
--- a/localedata/locales/nl_BE
+++ b/localedata/locales/nl_BE
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Dutch Language Locale for Belgium
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/nl_BE@euro b/localedata/locales/nl_BE@euro
index df36cee..9c6a541 100644
--- a/localedata/locales/nl_BE@euro
+++ b/localedata/locales/nl_BE@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Dutch Language Locale for Belgium with Euro
 % Language: nl
 % Territory: BE
diff --git a/localedata/locales/nl_NL b/localedata/locales/nl_NL
index c83fbfa..52dc8e9 100644
--- a/localedata/locales/nl_NL
+++ b/localedata/locales/nl_NL
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Dutch Language Locale for the Netherlands
 % http://www.taaltelefoon.be/
 % http://taaladvies.net/
diff --git a/localedata/locales/nl_NL@euro b/localedata/locales/nl_NL@euro
index 6179e72..403bc60 100644
--- a/localedata/locales/nl_NL@euro
+++ b/localedata/locales/nl_NL@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Dutch Language Locale for the Netherlands with Euro
 % Language: nl
 % Territory: NL
diff --git a/localedata/locales/nn_NO b/localedata/locales/nn_NO
index 5114196..f8e3be4 100644
--- a/localedata/locales/nn_NO
+++ b/localedata/locales/nn_NO
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Nynorsk language locale for Norway.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/nr_ZA b/localedata/locales/nr_ZA
index ae27bcc..4d27073 100644
--- a/localedata/locales/nr_ZA
+++ b/localedata/locales/nr_ZA
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Charset: UTF-8
 
diff --git a/localedata/locales/nso_ZA b/localedata/locales/nso_ZA
index fd13354..1fc970c 100644
--- a/localedata/locales/nso_ZA
+++ b/localedata/locales/nso_ZA
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Charset: UTF-8
 
diff --git a/localedata/locales/oc_FR b/localedata/locales/oc_FR
index 10e3a03..6e8268d 100644
--- a/localedata/locales/oc_FR
+++ b/localedata/locales/oc_FR
@@ -1,5 +1,6 @@
 comment_char %
-escape_char  /
+escape_char /
+
 % charset "ISO_8859-1:1987"
 % Distribution and use is free, also for commercial purposes.
 
diff --git a/localedata/locales/om_ET b/localedata/locales/om_ET
index f9c710b..d764907 100644
--- a/localedata/locales/om_ET
+++ b/localedata/locales/om_ET
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/om_KE b/localedata/locales/om_KE
index 5387e4e..653f034 100644
--- a/localedata/locales/om_KE
+++ b/localedata/locales/om_KE
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/os_RU b/localedata/locales/os_RU
index 3686bfa..2bf9d53 100644
--- a/localedata/locales/os_RU
+++ b/localedata/locales/os_RU
@@ -1,7 +1,6 @@
 comment_char %
-escape_char  /
+escape_char /
 
-%
 % Ossetian Language Locale for Russia
 % Language: os
 % Territory: RU
diff --git a/localedata/locales/pa_IN b/localedata/locales/pa_IN
index 1e54894..856bc60 100644
--- a/localedata/locales/pa_IN
+++ b/localedata/locales/pa_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Punjabi language locale for Indian Punjabi(Gurmukhi)
 % Last update by A Alam <amanlinux@netscape.net>
 
diff --git a/localedata/locales/pa_PK b/localedata/locales/pa_PK
index cb46aae..f0fbd4a 100644
--- a/localedata/locales/pa_PK
+++ b/localedata/locales/pa_PK
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Punjabi (Shamukhi) Language Locale for Pakistan
 % Source:
 % Contact: Amanpreet Singh Alam
diff --git a/localedata/locales/pap_AW b/localedata/locales/pap_AW
index f902e34..87d24ac 100644
--- a/localedata/locales/pap_AW
+++ b/localedata/locales/pap_AW
@@ -1,5 +1,5 @@
 comment_char %
-escape_char  /
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/pap_CW b/localedata/locales/pap_CW
index db39144..6808194 100644
--- a/localedata/locales/pap_CW
+++ b/localedata/locales/pap_CW
@@ -1,5 +1,5 @@
 comment_char %
-escape_char  /
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/pl_PL b/localedata/locales/pl_PL
index e829330..4864a46 100644
--- a/localedata/locales/pl_PL
+++ b/localedata/locales/pl_PL
@@ -1,6 +1,6 @@
 comment_char %
 escape_char /
-%
+
 % Polish Language Locale for Poland
 % Source: RAP
 % Address: Sankt Jo/rgens Alle 8
diff --git a/localedata/locales/ps_AF b/localedata/locales/ps_AF
index a58d2c7..0210cc1 100644
--- a/localedata/locales/ps_AF
+++ b/localedata/locales/ps_AF
@@ -1,5 +1,5 @@
-escape_char /
 comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%% locale definition file "ps_AF"  %%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/localedata/locales/pt_BR b/localedata/locales/pt_BR
index 64c0250..67e5f3b 100644
--- a/localedata/locales/pt_BR
+++ b/localedata/locales/pt_BR
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Portuguese Language Locale for Brasil
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/pt_PT b/localedata/locales/pt_PT
index f248207..b4a3354 100644
--- a/localedata/locales/pt_PT
+++ b/localedata/locales/pt_PT
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Portuguese Language Locale for Portugal
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/pt_PT@euro b/localedata/locales/pt_PT@euro
index 16bcb14..bb20665 100644
--- a/localedata/locales/pt_PT@euro
+++ b/localedata/locales/pt_PT@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Portuguese Language Locale for Portugal with Euro
 % Language: pt
 % Territory: PT
diff --git a/localedata/locales/quz_PE b/localedata/locales/quz_PE
index 0e6fe85..2c5eb4e 100644
--- a/localedata/locales/quz_PE
+++ b/localedata/locales/quz_PE
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/localedata/locales/raj_IN b/localedata/locales/raj_IN
index a2621fd..5690eee 100644
--- a/localedata/locales/raj_IN
+++ b/localedata/locales/raj_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Rajasthani language locale for India.
 % Contributed by Meghraj Suthar <meghrajsuthar03@gmail.com>
 % Rajesh Ranjan <rajeshkajha@yahoo.com>, Chandan Kumar <chandankumar.093047@gmail.com>
diff --git a/localedata/locales/ro_RO b/localedata/locales/ro_RO
index 07004d6..f592cb7 100644
--- a/localedata/locales/ro_RO
+++ b/localedata/locales/ro_RO
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Romanian Language Locale for Romania
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU
index 2e51a4d..3450f9f 100644
--- a/localedata/locales/ru_RU
+++ b/localedata/locales/ru_RU
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Russian Language Locale for Russia
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/ru_UA b/localedata/locales/ru_UA
index 29c4522..9de625c 100644
--- a/localedata/locales/ru_UA
+++ b/localedata/locales/ru_UA
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Russian Language Locale for Ukraine
 % Source: RFC 2319
 % Contact: Denis V. Dmitrienko
diff --git a/localedata/locales/rw_RW b/localedata/locales/rw_RW
index 1f50300..c2a229d 100644
--- a/localedata/locales/rw_RW
+++ b/localedata/locales/rw_RW
@@ -1,5 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
+
 % Locale for Kinyarwanda locale in Rwanda
 % Contributed by Steve Murphy <murf@e-tools.com>, 2004
 % with help from:
diff --git a/localedata/locales/sa_IN b/localedata/locales/sa_IN
index b09252e..409672f 100644
--- a/localedata/locales/sa_IN
+++ b/localedata/locales/sa_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Sanskrit language locale for India.
 % Contributed by Vidya Ayer <svaksha@gmail.com>
 % and Christian Perrier <bubulle@debian.org>
diff --git a/localedata/locales/sat_IN b/localedata/locales/sat_IN
index a69287b..bb8494e 100644
--- a/localedata/locales/sat_IN
+++ b/localedata/locales/sat_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Santali language locale for India.
 % Contributed by Mr. Pravin Satpute <psatpute AT redhat DOT com>  and Mr. Thakur Prasad Murmu <tp_murmu AT yahoo DOT com>
 
diff --git a/localedata/locales/sc_IT b/localedata/locales/sc_IT
index 1b75657..749468c 100644
--- a/localedata/locales/sc_IT
+++ b/localedata/locales/sc_IT
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Sardinian Language Locale for Italy
 % Language: sc
 % Territory: IT
diff --git a/localedata/locales/sd_IN b/localedata/locales/sd_IN
index e57edf5..b2ebe64 100644
--- a/localedata/locales/sd_IN
+++ b/localedata/locales/sd_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Sindhi language locale for India.
 % Contributed by Pravin Satpute <psatpute@redhat.com> and
 % DR K.P. LEKHWANI
diff --git a/localedata/locales/sd_IN@devanagari b/localedata/locales/sd_IN@devanagari
index 6e7549b..3e55fa6 100644
--- a/localedata/locales/sd_IN@devanagari
+++ b/localedata/locales/sd_IN@devanagari
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Sindhi language locale for India.
 % Contributed by Pravin Satpute <psatpute@redhat.com> and
 % DR K.P. LEKHWANI
diff --git a/localedata/locales/se_NO b/localedata/locales/se_NO
index 80bc50b..06bc114 100644
--- a/localedata/locales/se_NO
+++ b/localedata/locales/se_NO
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Northern Saami Language Locale for Norway
 % Source: http://www.hum.uit.no/a/trond/loc.html
 % Contact: BÃ¸rre Gaup
diff --git a/localedata/locales/shs_CA b/localedata/locales/shs_CA
index 6b72fb1..6916a07 100644
--- a/localedata/locales/shs_CA
+++ b/localedata/locales/shs_CA
@@ -1,5 +1,5 @@
+comment_char %
 escape_char /
-comment_char  %
 
 % Secwepemctsin (Shuswap) language locale for Canada
 % sorting according to CAN/CSA-Z243.4.1-1992
diff --git a/localedata/locales/si_LK b/localedata/locales/si_LK
index 6ed12cc..ccb658d 100644
--- a/localedata/locales/si_LK
+++ b/localedata/locales/si_LK
@@ -1,5 +1,6 @@
-escape_char  /
 comment_char %
+escape_char /
+
 % Sinhala language locale for Sri Lanka.
 % Charset: UTF-8
 % Contributed by Anuradha Ratnaweera <anuradha at gnu org>
diff --git a/localedata/locales/sid_ET b/localedata/locales/sid_ET
index 6cda039..85c2046 100644
--- a/localedata/locales/sid_ET
+++ b/localedata/locales/sid_ET
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK
index 8ef4f00..c0029e8 100644
--- a/localedata/locales/sk_SK
+++ b/localedata/locales/sk_SK
@@ -1,6 +1,6 @@
-escape_char /
 comment_char %
-%
+escape_char /
+
 % Slovak Language Locale for Slovak
 % Source:
 % Address: Narcisov<a'> 56, SK-821 01 Bratislava, Slovak Republic
diff --git a/localedata/locales/sl_SI b/localedata/locales/sl_SI
index 4e6c183..f2aee58 100644
--- a/localedata/locales/sl_SI
+++ b/localedata/locales/sl_SI
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Slovenian language locale for Slovenia
 % Source: USM/MZT
 % Address: Kotnikova 6,
diff --git a/localedata/locales/so_DJ b/localedata/locales/so_DJ
index 3e0127b..7f66340 100644
--- a/localedata/locales/so_DJ
+++ b/localedata/locales/so_DJ
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/so_ET b/localedata/locales/so_ET
index 1d1f3ea..f85fa3d 100644
--- a/localedata/locales/so_ET
+++ b/localedata/locales/so_ET
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/so_KE b/localedata/locales/so_KE
index 14555ae..f1ed4c9 100644
--- a/localedata/locales/so_KE
+++ b/localedata/locales/so_KE
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/so_SO b/localedata/locales/so_SO
index 0c750cb..2df75ef 100644
--- a/localedata/locales/so_SO
+++ b/localedata/locales/so_SO
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/sq_AL b/localedata/locales/sq_AL
index f2f6b4a..0dd4930 100644
--- a/localedata/locales/sq_AL
+++ b/localedata/locales/sq_AL
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Albanian language locale for Albania.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/sq_MK b/localedata/locales/sq_MK
index 9d6aef7..c419207 100644
--- a/localedata/locales/sq_MK
+++ b/localedata/locales/sq_MK
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Albanian language locale for Macedonia.
 % Contributed by Agron Selimaj <linuxmaster@verizon.net>
 
diff --git a/localedata/locales/sr_ME b/localedata/locales/sr_ME
index dd68df8..b06bd70 100644
--- a/localedata/locales/sr_ME
+++ b/localedata/locales/sr_ME
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Serbian Language locale for Montenegro
 % Source: sr_YU, sr_CS locale
 % Address:
diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS
index ffea86f..e45e477 100644
--- a/localedata/locales/sr_RS
+++ b/localedata/locales/sr_RS
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Serbian Language Locale for Serbia
 % Source: sr_YU, sr_CS locales
 % Address:
diff --git a/localedata/locales/sr_RS@latin b/localedata/locales/sr_RS@latin
index fd10ea6..f197663 100644
--- a/localedata/locales/sr_RS@latin
+++ b/localedata/locales/sr_RS@latin
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Serbian Language Locale for Serbia
 % Source: sr_YU, sr_CS locales
 % Address:
diff --git a/localedata/locales/ss_ZA b/localedata/locales/ss_ZA
index b296451..a21cea4 100644
--- a/localedata/locales/ss_ZA
+++ b/localedata/locales/ss_ZA
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Charset: UTF-8
 
diff --git a/localedata/locales/st_ZA b/localedata/locales/st_ZA
index dcf3e72..1c3cc75 100644
--- a/localedata/locales/st_ZA
+++ b/localedata/locales/st_ZA
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Charset: UTF-8
 
diff --git a/localedata/locales/sv_FI b/localedata/locales/sv_FI
index 44fac85..f43df58 100644
--- a/localedata/locales/sv_FI
+++ b/localedata/locales/sv_FI
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Swedish Language Locale for Finland
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/sv_FI@euro b/localedata/locales/sv_FI@euro
index dcd9b75..28a7477 100644
--- a/localedata/locales/sv_FI@euro
+++ b/localedata/locales/sv_FI@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Swedish Language Locale for Finland with Euro
 % Language: sv
 % Territory: FI
diff --git a/localedata/locales/sv_SE b/localedata/locales/sv_SE
index 3134c6a..208ec80 100644
--- a/localedata/locales/sv_SE
+++ b/localedata/locales/sv_SE
@@ -1,5 +1,5 @@
-escape_char	/
-comment_char    %
+comment_char %
+escape_char /
 
 % Swedish language locale for Sweden
 % Source: RAP
diff --git a/localedata/locales/sw_KE b/localedata/locales/sw_KE
index 9412648..81dd5f3 100644
--- a/localedata/locales/sw_KE
+++ b/localedata/locales/sw_KE
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 % Authors:
 % 2011-03-07, locales@kamusi.org
diff --git a/localedata/locales/sw_TZ b/localedata/locales/sw_TZ
index a2faf07..a3ef478 100644
--- a/localedata/locales/sw_TZ
+++ b/localedata/locales/sw_TZ
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+
 % Charset: UTF-8
 % Authors:
 % 2011-03-07, locales@kamusi.org
diff --git a/localedata/locales/szl_PL b/localedata/locales/szl_PL
index fd142f8..9d5002b 100644
--- a/localedata/locales/szl_PL
+++ b/localedata/locales/szl_PL
@@ -1,6 +1,6 @@
 comment_char %
 escape_char /
-%
+
 % Silesian Language Locale for Poland
 % Source: szl_PL locale
 % Contact: Przemyslaw Buczkowski
diff --git a/localedata/locales/ta_IN b/localedata/locales/ta_IN
index 70c624e..5992f29 100644
--- a/localedata/locales/ta_IN
+++ b/localedata/locales/ta_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Tamil language locale for India.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/ta_LK b/localedata/locales/ta_LK
index e1af5f9..4e33b13 100644
--- a/localedata/locales/ta_LK
+++ b/localedata/locales/ta_LK
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Tamil language locale for Sri Lanka
 % Language: ta
 % Territory: LK
diff --git a/localedata/locales/tcy_IN b/localedata/locales/tcy_IN
index a737bb3..513cf1f 100644
--- a/localedata/locales/tcy_IN
+++ b/localedata/locales/tcy_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Tulu (kannada) language locale for India.
 
 % *** Below just modify to suit your language. I have modified for Kannada
diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN
index d42088f..ecb461e 100644
--- a/localedata/locales/te_IN
+++ b/localedata/locales/te_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Telugu language locale for India.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/tg_TJ b/localedata/locales/tg_TJ
index c783625..64a31b7 100644
--- a/localedata/locales/tg_TJ
+++ b/localedata/locales/tg_TJ
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Tajik Language Locale for Tajikistan
 % Source:
 % Contact: Pablo Saratxaga, Roger Kovacs
diff --git a/localedata/locales/th_TH b/localedata/locales/th_TH
index 5b8c41b..a1339e4 100644
--- a/localedata/locales/th_TH
+++ b/localedata/locales/th_TH
@@ -1,7 +1,6 @@
-escape_char /
 comment_char %
+escape_char /
 
-%
 % Thailand (Thai) locale
 %
 % Name:       th_TH
diff --git a/localedata/locales/the_NP b/localedata/locales/the_NP
index d889890..d2228d8 100644
--- a/localedata/locales/the_NP
+++ b/localedata/locales/the_NP
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Tharu language locale for Nepal.
 % Contributed by Arun Kumar Pyasi <arun@chitwanix.com>
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/localedata/locales/ti_ER b/localedata/locales/ti_ER
index a7ddbad..2870f58 100644
--- a/localedata/locales/ti_ER
+++ b/localedata/locales/ti_ER
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/ti_ET b/localedata/locales/ti_ET
index e2c3446..d140934 100644
--- a/localedata/locales/ti_ET
+++ b/localedata/locales/ti_ET
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/tig_ER b/localedata/locales/tig_ER
index d300f87..96c6c7d 100644
--- a/localedata/locales/tig_ER
+++ b/localedata/locales/tig_ER
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/tk_TM b/localedata/locales/tk_TM
index cb7ed17..68fa2fa 100644
--- a/localedata/locales/tk_TM
+++ b/localedata/locales/tk_TM
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Turkmen Language Locale for Turkmenistan (latin)
 % Source: Ghorban M. Tavakoly
 % Contact: Pablo Saratxaga & Ghorban M. Tavakoly
diff --git a/localedata/locales/tl_PH b/localedata/locales/tl_PH
index 583bc2d..85f5c20 100644
--- a/localedata/locales/tl_PH
+++ b/localedata/locales/tl_PH
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Tagalog Language Locale for Philippines
 % Source:
 % Contact:
diff --git a/localedata/locales/tn_ZA b/localedata/locales/tn_ZA
index f2a85ed..e96af79 100644
--- a/localedata/locales/tn_ZA
+++ b/localedata/locales/tn_ZA
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Charset: UTF-8
 
diff --git a/localedata/locales/tr_CY b/localedata/locales/tr_CY
index e2e6936..c18cc39 100644
--- a/localedata/locales/tr_CY
+++ b/localedata/locales/tr_CY
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Turkish Language Locale for Cyprus
 % Language: tr
 % Territory: CY
diff --git a/localedata/locales/tr_TR b/localedata/locales/tr_TR
index 00a18a1..f9043ff 100644
--- a/localedata/locales/tr_TR
+++ b/localedata/locales/tr_TR
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Turkish Language Locale for Turkey
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/localedata/locales/ts_ZA b/localedata/locales/ts_ZA
index b8225fc..bb3448d 100644
--- a/localedata/locales/ts_ZA
+++ b/localedata/locales/ts_ZA
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Charset: UTF-8
 
diff --git a/localedata/locales/tt_RU b/localedata/locales/tt_RU
index 804f7f0..b240024 100644
--- a/localedata/locales/tt_RU
+++ b/localedata/locales/tt_RU
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Tatar Language Locale for Russia
 % Source:
 % Contact: Pablo Saratxaga, Rinat Norkin
diff --git a/localedata/locales/tt_RU@iqtelif b/localedata/locales/tt_RU@iqtelif
index 8e455d6..5d6600d 100644
--- a/localedata/locales/tt_RU@iqtelif
+++ b/localedata/locales/tt_RU@iqtelif
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Tatar Language Locale using IQTElif alphabet; for Tatarstan, Russian Federation
 % Source:	Reshat Sabiq
 % Contact:	Reshat Sabiq
diff --git a/localedata/locales/ug_CN b/localedata/locales/ug_CN
index e25d528..e10448e 100644
--- a/localedata/locales/ug_CN
+++ b/localedata/locales/ug_CN
@@ -1,6 +1,6 @@
-escape_char /
 comment_char %
-%
+escape_char /
+
 % Uyghur language locale for China
 % Source:
 % Contact:   Eagle Burkut
diff --git a/localedata/locales/uk_UA b/localedata/locales/uk_UA
index 5e58043..6949403 100644
--- a/localedata/locales/uk_UA
+++ b/localedata/locales/uk_UA
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Copyright (C) 2003-2006 Volodymyr M. Lisivka <v_lisivka@sourceforge.net>
 % Copyright (C) 2006 Max Kutny <mkutny@gmail.com>
 %
diff --git a/localedata/locales/unm_US b/localedata/locales/unm_US
index 482a7da..f53d9a9 100644
--- a/localedata/locales/unm_US
+++ b/localedata/locales/unm_US
@@ -1,6 +1,6 @@
 comment_char %
 escape_char /
-%
+
 % Unami Delaware Locale for U.S.A.
 % Language: unm
 % Contact: lugubrili@hotmail.com
diff --git a/localedata/locales/ur_IN b/localedata/locales/ur_IN
index 8813b51..16c9031 100644
--- a/localedata/locales/ur_IN
+++ b/localedata/locales/ur_IN
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Urdu language locale for India.
 % Contributed by Pravin Satpute <psatpute@redhat.com> and
 % Mrs. Nasreen Khan
diff --git a/localedata/locales/ur_PK b/localedata/locales/ur_PK
index 2bc5225..c65b201 100644
--- a/localedata/locales/ur_PK
+++ b/localedata/locales/ur_PK
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Urdu Language Locale for Pakistan
 % Source:
 % Contact: Shehzad Ashiq Ali, Pablo Saratxaga
diff --git a/localedata/locales/uz_UZ b/localedata/locales/uz_UZ
index b26cd4c..517b384 100644
--- a/localedata/locales/uz_UZ
+++ b/localedata/locales/uz_UZ
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Uzbek (latin) language locale for Uzbekistan
 % Source: Bobir Ismailov
diff --git a/localedata/locales/uz_UZ@cyrillic b/localedata/locales/uz_UZ@cyrillic
index 8ed4ee5..786c7fd 100644
--- a/localedata/locales/uz_UZ@cyrillic
+++ b/localedata/locales/uz_UZ@cyrillic
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Uzbek language (cyrillic) locale for Uzbekistan
 % Source: Mashrab Kuvatov
diff --git a/localedata/locales/ve_ZA b/localedata/locales/ve_ZA
index 9694401..98859de 100644
--- a/localedata/locales/ve_ZA
+++ b/localedata/locales/ve_ZA
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Charset: UTF-8
 
diff --git a/localedata/locales/vi_VN b/localedata/locales/vi_VN
index e8c86a1..082466a 100644
--- a/localedata/locales/vi_VN
+++ b/localedata/locales/vi_VN
@@ -1,6 +1,6 @@
-escape_char /
 comment_char %
-%
+escape_char /
+
 % Vietnamese language locale for Vietnam
 % Source: glibc locale and info from vietnamese native speakers
 % Address:
diff --git a/localedata/locales/wa_BE b/localedata/locales/wa_BE
index a2fb3be..ad987ac 100644
--- a/localedata/locales/wa_BE
+++ b/localedata/locales/wa_BE
@@ -1,5 +1,6 @@
 comment_char %
-escape_char  /
+escape_char /
+
 % charset "UTF-8"
 % Distribution and use is free, also for commercial purposes.
 
diff --git a/localedata/locales/wa_BE@euro b/localedata/locales/wa_BE@euro
index 09ad80c..1eb6d7d 100644
--- a/localedata/locales/wa_BE@euro
+++ b/localedata/locales/wa_BE@euro
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Walloon Language Locale for Belgium with Euro
 % Language: wa
 % Territory: BE
diff --git a/localedata/locales/wae_CH b/localedata/locales/wae_CH
index 5f11613..38c4ab5 100644
--- a/localedata/locales/wae_CH
+++ b/localedata/locales/wae_CH
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Charset: UTF-8
 
diff --git a/localedata/locales/wal_ET b/localedata/locales/wal_ET
index 9e21397..b374a69 100644
--- a/localedata/locales/wal_ET
+++ b/localedata/locales/wal_ET
@@ -1,6 +1,5 @@
-comment_char    %
-escape_char     /
-
+comment_char %
+escape_char /
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/localedata/locales/wo_SN b/localedata/locales/wo_SN
index b31679f..29abf29 100644
--- a/localedata/locales/wo_SN
+++ b/localedata/locales/wo_SN
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Wolof locale for Senegal
 % Source: The Debian Project
 % Contact: Christian Perrier/Samba Ndao Diop
diff --git a/localedata/locales/xh_ZA b/localedata/locales/xh_ZA
index 2a24540..d5b02ee 100644
--- a/localedata/locales/xh_ZA
+++ b/localedata/locales/xh_ZA
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Charset: UTF-8
 
diff --git a/localedata/locales/yi_US b/localedata/locales/yi_US
index 97ed218..b9f9406 100644
--- a/localedata/locales/yi_US
+++ b/localedata/locales/yi_US
@@ -1,5 +1,6 @@
 comment_char %
-escape_char  /
+escape_char /
+
 % charset "UTF-8"
 % Distribution and use is free, also for commercial purposes.
 %
diff --git a/localedata/locales/yo_NG b/localedata/locales/yo_NG
index c8ff82e..4c0a636 100644
--- a/localedata/locales/yo_NG
+++ b/localedata/locales/yo_NG
@@ -1,6 +1,6 @@
-escape_char /
 comment_char %
-%
+escape_char /
+
 % Yoruba language locale for Nigeria
 % Source:
 % Contact: Pablo Saratxaga
diff --git a/localedata/locales/yue_HK b/localedata/locales/yue_HK
index 96e9901..4fed793 100644
--- a/localedata/locales/yue_HK
+++ b/localedata/locales/yue_HK
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Yue Chinese (Cantonese) language locale for Hong Kong.
 % Maintained by Chunshek Chan <chunshek@gmail.com>
 % Based on Chinese locale by Kentaroh Noji <knoji@jp.ibm.com> and
diff --git a/localedata/locales/zh_CN b/localedata/locales/zh_CN
index ff21c85..c15edc0 100644
--- a/localedata/locales/zh_CN
+++ b/localedata/locales/zh_CN
@@ -1,6 +1,6 @@
 comment_char %
-escape_char  /
-%
+escape_char /
+
 % Chinese language locale for the Peoples Republic of China
 %
 % This work is based on ISO PDTR 14652, Unicode 3.0, locale definition
diff --git a/localedata/locales/zh_HK b/localedata/locales/zh_HK
index d0cd837..48ae2da 100644
--- a/localedata/locales/zh_HK
+++ b/localedata/locales/zh_HK
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Chinese language locale for Hong Kong.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/zh_SG b/localedata/locales/zh_SG
index 1723cf4..fd19300 100644
--- a/localedata/locales/zh_SG
+++ b/localedata/locales/zh_SG
@@ -1,5 +1,6 @@
-comment_char    %
-escape_char     /
+comment_char %
+escape_char /
+
 % Chinese language locale for Singapore.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/localedata/locales/zh_TW b/localedata/locales/zh_TW
index e3eeb4d..137c06f 100644
--- a/localedata/locales/zh_TW
+++ b/localedata/locales/zh_TW
@@ -1,6 +1,6 @@
 comment_char %
 escape_char /
-%
+
 % Chinese language locale for Taiwan R.O.C.
 % charmap: BIG5-CP950
 %
diff --git a/localedata/locales/zu_ZA b/localedata/locales/zu_ZA
index 2c78e51..a56f4ec 100644
--- a/localedata/locales/zu_ZA
+++ b/localedata/locales/zu_ZA
@@ -1,5 +1,5 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 
 % Charset: UTF-8
 
