[Libreoffice-commits] .: 4 commits - i18npool/source svl/inc svl/qa svl/source

Katarina Machalkova bubli at kemper.freedesktop.org
Tue Mar 8 08:37:54 PST 2011


 i18npool/source/localedata/data/ak_GH.xml  |   14 --
 i18npool/source/localedata/data/ar_DZ.xml  |   14 --
 i18npool/source/localedata/data/ar_EG.xml  |   14 --
 i18npool/source/localedata/data/ar_OM.xml  |   14 --
 i18npool/source/localedata/data/ast_ES.xml |   14 --
 i18npool/source/localedata/data/az_AZ.xml  |   14 --
 i18npool/source/localedata/data/be_BY.xml  |   14 --
 i18npool/source/localedata/data/bg_BG.xml  |   14 --
 i18npool/source/localedata/data/bn_IN.xml  |   14 --
 i18npool/source/localedata/data/br_FR.xml  |   14 --
 i18npool/source/localedata/data/bs_BA.xml  |  110 ++++++++-----------
 i18npool/source/localedata/data/ca_ES.xml  |   14 --
 i18npool/source/localedata/data/cs_CZ.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/cv_RU.xml  |   14 --
 i18npool/source/localedata/data/da_DK.xml  |   14 --
 i18npool/source/localedata/data/de_AT.xml  |   14 --
 i18npool/source/localedata/data/de_CH.xml  |   14 --
 i18npool/source/localedata/data/de_DE.xml  |   14 --
 i18npool/source/localedata/data/de_LI.xml  |   14 --
 i18npool/source/localedata/data/de_LU.xml  |   14 --
 i18npool/source/localedata/data/dz_BT.xml  |  128 ++++++++++------------
 i18npool/source/localedata/data/ee_GH.xml  |   14 --
 i18npool/source/localedata/data/el_GR.xml  |   14 --
 i18npool/source/localedata/data/en_AU.xml  |   12 +-
 i18npool/source/localedata/data/en_CA.xml  |   12 +-
 i18npool/source/localedata/data/en_GB.xml  |  114 ++++++++++----------
 i18npool/source/localedata/data/en_GH.xml  |   12 +-
 i18npool/source/localedata/data/en_JM.xml  |   12 +-
 i18npool/source/localedata/data/en_NA.xml  |   12 +-
 i18npool/source/localedata/data/en_US.xml  |   12 +-
 i18npool/source/localedata/data/en_ZA.xml  |   12 +-
 i18npool/source/localedata/data/eo.xml     |   14 --
 i18npool/source/localedata/data/es_AR.xml  |   14 --
 i18npool/source/localedata/data/es_BO.xml  |   14 --
 i18npool/source/localedata/data/es_CL.xml  |   14 --
 i18npool/source/localedata/data/es_CO.xml  |   14 --
 i18npool/source/localedata/data/es_CR.xml  |  100 ++++++++---------
 i18npool/source/localedata/data/es_DO.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/es_EC.xml  |   14 --
 i18npool/source/localedata/data/es_ES.xml  |   14 --
 i18npool/source/localedata/data/es_GT.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/es_PE.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/et_EE.xml  |   14 --
 i18npool/source/localedata/data/eu.xml     |   14 --
 i18npool/source/localedata/data/fa_IR.xml  |   14 --
 i18npool/source/localedata/data/fi_FI.xml  |   14 --
 i18npool/source/localedata/data/fo_FO.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/fr_BE.xml  |   14 --
 i18npool/source/localedata/data/fr_CA.xml  |   14 --
 i18npool/source/localedata/data/fr_CH.xml  |   14 --
 i18npool/source/localedata/data/fr_FR.xml  |   14 --
 i18npool/source/localedata/data/fr_LU.xml  |   14 --
 i18npool/source/localedata/data/fur_IT.xml |   14 --
 i18npool/source/localedata/data/fy_NL.xml  |   14 --
 i18npool/source/localedata/data/gl_ES.xml  |   14 --
 i18npool/source/localedata/data/gsc_FR.xml |   14 --
 i18npool/source/localedata/data/gug_PY.xml |   14 --
 i18npool/source/localedata/data/ha_GH.xml  |   14 --
 i18npool/source/localedata/data/he_IL.xml  |  110 +++++++++----------
 i18npool/source/localedata/data/hi_IN.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/hil_PH.xml |   14 --
 i18npool/source/localedata/data/hr_HR.xml  |   14 --
 i18npool/source/localedata/data/hsb_DE.xml |   14 --
 i18npool/source/localedata/data/hu_HU.xml  |   14 --
 i18npool/source/localedata/data/hy_AM.xml  |   18 ---
 i18npool/source/localedata/data/ia.xml     |  108 ++++++++-----------
 i18npool/source/localedata/data/id_ID.xml  |   14 --
 i18npool/source/localedata/data/is_IS.xml  |   14 --
 i18npool/source/localedata/data/it_CH.xml  |   14 --
 i18npool/source/localedata/data/it_IT.xml  |   14 --
 i18npool/source/localedata/data/ja_JP.xml  |   14 --
 i18npool/source/localedata/data/ka_GE.xml  |   18 ---
 i18npool/source/localedata/data/kab_DZ.xml |   14 --
 i18npool/source/localedata/data/kk_KZ.xml  |   14 --
 i18npool/source/localedata/data/kl_GL.xml  |   14 --
 i18npool/source/localedata/data/km_KH.xml  |   20 +--
 i18npool/source/localedata/data/ku_TR.xml  |   14 --
 i18npool/source/localedata/data/ky_KG.xml  |   14 --
 i18npool/source/localedata/data/la_VA.xml  |   14 --
 i18npool/source/localedata/data/lb_LU.xml  |   14 --
 i18npool/source/localedata/data/lg_UG.xml  |   14 --
 i18npool/source/localedata/data/ln_CD.xml  |   14 --
 i18npool/source/localedata/data/lo_LA.xml  |   14 --
 i18npool/source/localedata/data/lt_LT.xml  |   14 --
 i18npool/source/localedata/data/ltg_LV.xml |   14 --
 i18npool/source/localedata/data/lv_LV.xml  |   14 --
 i18npool/source/localedata/data/mai_IN.xml |   14 --
 i18npool/source/localedata/data/mk_MK.xml  |   14 --
 i18npool/source/localedata/data/ml_IN.xml  |   14 --
 i18npool/source/localedata/data/mn_MN.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/mt_MT.xml  |   14 --
 i18npool/source/localedata/data/my_MM.xml  |    5 
 i18npool/source/localedata/data/ne_NP.xml  |   14 --
 i18npool/source/localedata/data/nl_BE.xml  |   14 --
 i18npool/source/localedata/data/nl_NL.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/no_NO.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/oc_FR.xml  |   14 --
 i18npool/source/localedata/data/om_ET.xml  |   14 --
 i18npool/source/localedata/data/or_IN.xml  |   14 --
 i18npool/source/localedata/data/pl_PL.xml  |   14 --
 i18npool/source/localedata/data/plt_MG.xml |   14 --
 i18npool/source/localedata/data/pt_BR.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/pt_PT.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/ro_RO.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/ru_RU.xml  |   14 --
 i18npool/source/localedata/data/rue_SK.xml |   14 --
 i18npool/source/localedata/data/rw_RW.xml  |  108 ++++++++-----------
 i18npool/source/localedata/data/sc_IT.xml  |   14 --
 i18npool/source/localedata/data/sg_CF.xml  |   14 --
 i18npool/source/localedata/data/shs_CA.xml |   14 --
 i18npool/source/localedata/data/sk_SK.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/sl_SI.xml  |   14 --
 i18npool/source/localedata/data/so_SO.xml  |   14 --
 i18npool/source/localedata/data/sr_RS.xml  |   14 --
 i18npool/source/localedata/data/sv_FI.xml  |   14 --
 i18npool/source/localedata/data/sv_SE.xml  |   14 --
 i18npool/source/localedata/data/sw_TZ.xml  |   14 --
 i18npool/source/localedata/data/tg_TJ.xml  |   14 --
 i18npool/source/localedata/data/th_TH.xml  |  162 ++++++++++++++---------------
 i18npool/source/localedata/data/ti_ER.xml  |   14 --
 i18npool/source/localedata/data/tk_TM.xml  |   14 --
 i18npool/source/localedata/data/tpi_PG.xml |   14 --
 i18npool/source/localedata/data/tr_TR.xml  |   14 --
 i18npool/source/localedata/data/ug_CN.xml  |   14 --
 i18npool/source/localedata/data/uk_UA.xml  |  104 ++++++++----------
 i18npool/source/localedata/data/uz_UZ.xml  |   14 --
 i18npool/source/localedata/data/vi_VN.xml  |   14 --
 i18npool/source/localedata/data/wa_BE.xml  |   14 --
 svl/inc/svl/zforlist.hxx                   |    4 
 svl/qa/unit/svl.cxx                        |   11 -
 svl/source/numbers/zforlist.cxx            |    9 -
 svl/source/numbers/zformat.cxx             |    4 
 132 files changed, 1561 insertions(+), 2338 deletions(-)

New commits:
commit f902f2d7772214fdfe5682b1d001873ba025a06a
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Tue Mar 8 16:50:37 2011 +0100

    Un-breaking the unit test

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index bb8f666..aa1fdd0 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -135,8 +135,6 @@ void Test::testNumberFormat()
         "#,##0",
         "#,##0.00",
         "#,###.00",
-        "#,##0_);(#,##0)",
-        "#,##0.00_);(#,##0.00)",
         0
     };
 
@@ -170,6 +168,7 @@ void Test::testNumberFormat()
         "$#,##0;-$#,##0",
         0
     };
+#endif
 
     const char* pDate[] = {
         "MM/DD/YY",
@@ -212,7 +211,6 @@ void Test::testNumberFormat()
         "MM/DD/YY HH:MM AM/PM",
         0
     };
-#endif
 
     const char* pBoolean[] = {
         "BOOLEAN",
@@ -230,19 +228,16 @@ void Test::testNumberFormat()
         size_t nSize;
         const char** pCodes;
     } aTests[] = {
-        { NF_NUMBER_START, NF_NUMBER_END, 8, pNumber },
+        { NF_NUMBER_START, NF_NUMBER_END, 6, pNumber },
         { NF_SCIENTIFIC_START, NF_SCIENTIFIC_END, 2, pScientific },
         { NF_PERCENT_START, NF_PERCENT_END, 2, pPercent },
         { NF_FRACTION_START, NF_FRACTION_END, 4, pFraction },
 #if 0 // TODO: Find out why on some systems the last two currency format codes differ.
         { NF_CURRENCY_START, NF_CURRENCY_END, 6, pCurrency },
-      // After introducing new num. formats, indexes in standard format list
-      // get shifted and 3 items below cease to work
-      // need to investigate why (bubli)
+#endif
         { NF_DATE_START, NF_DATE_END, 21, pDate },
         { NF_TIME_START, NF_TIME_END, 7, pTime },
         { NF_DATETIME_START, NF_DATETIME_END, 2, pDateTime },
-#endif
         { NF_BOOLEAN, NF_BOOLEAN, 1, pBoolean },
         { NF_TEXT, NF_TEXT, 1, pText }
     };
commit 90dddf42f604ada86f68c458cb633f1dda3cb8bc
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Tue Mar 8 16:34:08 2011 +0100

    Adding '-N => (N)' format to en_* locale -- bnc659993
    
    LocaleNode.cxx says it's only legal for those based on en_US

diff --git a/i18npool/source/localedata/data/en_AU.xml b/i18npool/source/localedata/data/en_AU.xml
index 6206988..806915e 100644
--- a/i18npool/source/localedata/data/en_AU.xml
+++ b/i18npool/source/localedata/data/en_AU.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
diff --git a/i18npool/source/localedata/data/en_CA.xml b/i18npool/source/localedata/data/en_CA.xml
index 121de11..c654cf7 100644
--- a/i18npool/source/localedata/data/en_CA.xml
+++ b/i18npool/source/localedata/data/en_CA.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
diff --git a/i18npool/source/localedata/data/en_GB.xml b/i18npool/source/localedata/data/en_GB.xml
index f920af8..326ac34 100644
--- a/i18npool/source/localedata/data/en_GB.xml
+++ b/i18npool/source/localedata/data/en_GB.xml
@@ -179,6 +179,14 @@
 <FormatCode>#,###.00</FormatCode>
 <DefaultName></DefaultName>
 </FormatElement>
+ <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+ <FormatCode>#,##0_);(#,##0)</FormatCode>
+ <DefaultName></DefaultName>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+ <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+ <DefaultName></DefaultName>
+ </FormatElement>
 <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
 <FormatCode>[CURRENCY]#,##0;-[CURRENCY]#,##0</FormatCode>
 <DefaultName></DefaultName>
diff --git a/i18npool/source/localedata/data/en_GH.xml b/i18npool/source/localedata/data/en_GH.xml
index 3743746..8f1f6ea 100644
--- a/i18npool/source/localedata/data/en_GH.xml
+++ b/i18npool/source/localedata/data/en_GH.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
diff --git a/i18npool/source/localedata/data/en_JM.xml b/i18npool/source/localedata/data/en_JM.xml
index 186f8d4..780b20d 100644
--- a/i18npool/source/localedata/data/en_JM.xml
+++ b/i18npool/source/localedata/data/en_JM.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
diff --git a/i18npool/source/localedata/data/en_NA.xml b/i18npool/source/localedata/data/en_NA.xml
index bec7059..255dcbf 100644
--- a/i18npool/source/localedata/data/en_NA.xml
+++ b/i18npool/source/localedata/data/en_NA.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
diff --git a/i18npool/source/localedata/data/en_US.xml b/i18npool/source/localedata/data/en_US.xml
index 7029b7c..f6b771b 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
diff --git a/i18npool/source/localedata/data/en_ZA.xml b/i18npool/source/localedata/data/en_ZA.xml
index 4b3be48..c44810b 100644
--- a/i18npool/source/localedata/data/en_ZA.xml
+++ b/i18npool/source/localedata/data/en_ZA.xml
@@ -53,6 +53,12 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
+    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
+      <FormatCode>#,##0_);(#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
+      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+    </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
commit a52392c31c99a1269260d98dbd75916e368b44b3
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Tue Mar 8 16:06:52 2011 +0100

    Handle tinkering with '-N => (N)' number format -- bnc#659993

diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index dd91ceb..779fcfe 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -334,6 +334,10 @@ public:
     // Whether the negative format is without a sign or not
     BOOL IsNegativeWithoutSign() const;
 
+    BOOL IsNegativeInBracket() const;
+
+    BOOL HasPositiveBracketPlaceholder() const;
+
     // Whether a new SYMBOLTYPE_CURRENCY is contained in the format
     BOOL HasNewCurrency() const;
 
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 5e2031d..3125dc5 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -2744,6 +2744,10 @@ void SvNumberFormatter::GenerateFormat(String& sString,
     utl::DigitGroupingIterator aGrouping( xLocaleData->getDigitGrouping());
     const xub_StrLen nDigitsInFirstGroup = static_cast<xub_StrLen>(aGrouping.get());
     const String& rThSep = GetNumThousandSep();
+
+    SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(nIndex);
+    BOOL insertBrackets = pFormat->IsNegativeInBracket();
+
     if (nAnzLeading == 0)
     {
         if (!bThousand)
@@ -2836,15 +2840,35 @@ void SvNumberFormatter::GenerateFormat(String& sString,
             sString += ';';
         sString += sNegStr;
     }
-    if (IsRed && eType != NUMBERFORMAT_CURRENCY)
+    if ( (IsRed || insertBrackets ) && eType != NUMBERFORMAT_CURRENCY)
     {
         String sTmpStr = sString;
+
+        if ( pFormat->HasPositiveBracketPlaceholder() )
+        {
+             sTmpStr += '_';
+             sTmpStr += ')';
+        }
         sTmpStr += ';';
-        sTmpStr += '[';
-        sTmpStr += pFormatScanner->GetRedString();
-        sTmpStr += ']';
-        sTmpStr += '-';
-        sTmpStr +=sString;
+
+        if (IsRed)
+        {
+            sTmpStr += '[';
+            sTmpStr += pFormatScanner->GetRedString();
+            sTmpStr += ']';
+        }
+
+        if (insertBrackets)
+        {
+            sTmpStr += '(';
+            sTmpStr += sString;
+            sTmpStr += ')';
+        }
+        else
+        {
+            sTmpStr += '-';
+            sTmpStr +=sString;
+        }
         sString = sTmpStr;
     }
 }
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 48a6dcf..39c5a0e 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4114,6 +4114,23 @@ BOOL SvNumberformat::IsNegativeWithoutSign() const
     return FALSE;
 }
 
+BOOL SvNumberformat::IsNegativeInBracket() const
+{
+    USHORT nAnz = NumFor[1].GetCount();
+    if (!nAnz)
+         return FALSE;
+
+    String *tmpStr = NumFor[1].Info().sStrArray;
+    return (tmpStr[0] == '(' && tmpStr[nAnz-1] == ')' );
+}
+
+BOOL SvNumberformat::HasPositiveBracketPlaceholder() const
+{
+    USHORT nAnz = NumFor[0].GetCount();
+    String *tmpStr = NumFor[0].Info().sStrArray;
+    return (tmpStr[nAnz-1].EqualsAscii( "_)" ));
+}
+ 
 DateFormat SvNumberformat::GetDateOrder() const
 {
     if ( (eType & NUMBERFORMAT_DATE) == NUMBERFORMAT_DATE )
commit 36fbbd2be2ff92351cfa9fc68c0a4f7e1f918303
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Tue Mar 8 15:56:53 2011 +0100

    Revert "Introducing new number format ( -N => (N) ) -- bnc#659993"
    
    This reverts commit 97ce42ad29560d39560b7f7c23785142803ae52f.
    
    Adding the format to every lang. breaks the std. format indexing
    (thus, unit test too)
    Moreover, it is not "legal" for non-English locale (or so
    LocaleNode.cxx says)

diff --git a/i18npool/source/localedata/data/ak_GH.xml b/i18npool/source/localedata/data/ak_GH.xml
index 041cff9..afdbf1c 100644
--- a/i18npool/source/localedata/data/ak_GH.xml
+++ b/i18npool/source/localedata/data/ak_GH.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#,##0_);(#,##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/ar_DZ.xml b/i18npool/source/localedata/data/ar_DZ.xml
index 7eb37de..68cf3ed 100644
--- a/i18npool/source/localedata/data/ar_DZ.xml
+++ b/i18npool/source/localedata/data/ar_DZ.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode># ###٫00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode># ##0Ù«00_);(# ##0Ù«00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0Ù«00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0Ù«00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0Ù«00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/ar_EG.xml b/i18npool/source/localedata/data/ar_EG.xml
index 5bb94f4..bc3341d 100644
--- a/i18npool/source/localedata/data/ar_EG.xml
+++ b/i18npool/source/localedata/data/ar_EG.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#Ù¬###Ù«00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#Ù¬##0_);(#Ù¬##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#Ù¬##0Ù«00_);(#Ù¬##0Ù«00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0Ù«00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0Ù«00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0Ù«00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/ar_OM.xml b/i18npool/source/localedata/data/ar_OM.xml
index 6aaf4a7..935e736 100644
--- a/i18npool/source/localedata/data/ar_OM.xml
+++ b/i18npool/source/localedata/data/ar_OM.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#,##0_);(#,##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/ast_ES.xml b/i18npool/source/localedata/data/ast_ES.xml
index f8384fa..05c6360 100644
--- a/i18npool/source/localedata/data/ast_ES.xml
+++ b/i18npool/source/localedata/data/ast_ES.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/az_AZ.xml b/i18npool/source/localedata/data/az_AZ.xml
index 4c60a6c..268aca4 100644
--- a/i18npool/source/localedata/data/az_AZ.xml
+++ b/i18npool/source/localedata/data/az_AZ.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode># ###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode># ##0,00_);(# ##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/be_BY.xml b/i18npool/source/localedata/data/be_BY.xml
index 243f800..70a2ed1 100644
--- a/i18npool/source/localedata/data/be_BY.xml
+++ b/i18npool/source/localedata/data/be_BY.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="5">
       <FormatCode># ###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode># ##0,00_);(# ##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER"  formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
diff --git a/i18npool/source/localedata/data/bg_BG.xml b/i18npool/source/localedata/data/bg_BG.xml
index a202d62..2abd5cc 100644
--- a/i18npool/source/localedata/data/bg_BG.xml
+++ b/i18npool/source/localedata/data/bg_BG.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode> ###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode> ##0_);( ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode> ##0.00_);( ##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/bn_IN.xml b/i18npool/source/localedata/data/bn_IN.xml
index 592e547..1dc7992 100644
--- a/i18npool/source/localedata/data/bn_IN.xml
+++ b/i18npool/source/localedata/data/bn_IN.xml
@@ -54,22 +54,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0.00_);(#.##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/br_FR.xml b/i18npool/source/localedata/data/br_FR.xml
index b6e55d5..85a9eb1 100644
--- a/i18npool/source/localedata/data/br_FR.xml
+++ b/i18npool/source/localedata/data/br_FR.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode># ###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode># ##0,00_);(# ##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/bs_BA.xml b/i18npool/source/localedata/data/bs_BA.xml
index 85ff62d..0dea5e4 100644
--- a/i18npool/source/localedata/data/bs_BA.xml
+++ b/i18npool/source/localedata/data/bs_BA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Locale SYSTEM "locale.dtd">
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
 <Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2" >
 <LC_INFO>
 <Language>
@@ -37,75 +37,75 @@
 <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$KM-141A]">
 <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
 <FormatCode>D.M.YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey2" default="true" type="long" usage="DATE" formatindex="19">
 <FormatCode>NNNN DD. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey3" default="true" type="medium" usage="DATE" formatindex="20">
 <FormatCode>D.M.YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="21">
 <FormatCode>DD.MM.YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="22">
 <FormatCode>D. MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey6" default="false" type="long" usage="DATE" formatindex="23">
 <FormatCode>D. MMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey7" default="false" type="long" usage="DATE" formatindex="25">
 <FormatCode>D. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="27">
 <FormatCode>NN, D. MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey9" default="false" type="long" usage="DATE" formatindex="28">
 <FormatCode>NN, DD. MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="29">
 <FormatCode>NN, D. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="30">
 <FormatCode>NNNND. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="34">
 <FormatCode>MM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey13" default="false" type="short" usage="DATE" formatindex="35">
 <FormatCode>MMM DD</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey14" default="false" type="short" usage="DATE" formatindex="36">
 <FormatCode>MMMM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="37">
 <FormatCode>QQ YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="24">
 <FormatCode>D. MMM. YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey18" default="false" type="long" usage="DATE" formatindex="26">
 <FormatCode>D. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey19" default="false" type="short" usage="DATE" formatindex="31">
 <FormatCode>MM-DD</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="32">
 <FormatCode>YY-MM-DD</FormatCode>
@@ -117,115 +117,107 @@
 </FormatElement>
 <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="38">
 <FormatCode>WW</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME"  formatindex="39">
 <FormatCode>HH:MM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME"  formatindex="40">
 <FormatCode>HH:MM:SS</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME"  formatindex="41">
 <FormatCode>HH:MM AM/PM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME"  formatindex="42">
 <FormatCode>HH:MM:SS AM/PM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME"  formatindex="43">
 <FormatCode>[HH]:MM:SS</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME"  formatindex="44">
 <FormatCode>MM:SS,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME"  formatindex="45">
 <FormatCode>[HH]:MM:SS,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME"  formatindex="46">
 <FormatCode>DD.MM.YY HH:MM AM/PM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME"  formatindex="47">
 <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER"  formatindex="0">
 <FormatCode>General</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER"  formatindex="1">
 <FormatCode>0</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="2">
 <FormatCode>0,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER"  formatindex="3">
 <FormatCode>#.##0</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="4">
 <FormatCode>#.##0,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="5">
 <FormatCode>#.###,00</FormatCode>
-      <DefaultName/>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-      <DefaultName/>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
 <FormatCode>[CURRENCY]#.##0;-[CURRENCY]#.##0</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY"  formatindex="13">
 <FormatCode>[CURRENCY]#.##0,00;-[CURRENCY]#.##0,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY"  formatindex="14">
 <FormatCode>[CURRENCY]#.##0;[RED]-[CURRENCY]#.##0</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY"  formatindex="15">
 <FormatCode>[CURRENCY]#.##0,00;[RED]-[CURRENCY]#.##0,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY"  formatindex="16">
 <FormatCode>#.##0,00 CCC</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY"  formatindex="17">
 <FormatCode>[CURRENCY]#.##0,--;[RED]-[CURRENCY]#.##0,--</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
 <FormatCode>0%</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+<FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER"  formatindex="9">
 <FormatCode>0,00%</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+<FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="6">
 <FormatCode>0,00E+000</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+<FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="7">
 <FormatCode>0,00E+00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 </LC_FORMAT>
 <LC_COLLATION>
@@ -360,9 +352,7 @@
 <DefaultFullName>AD</DefaultFullName>
 </Era>
 </Eras>
-      <StartDayOfWeek>
-        <DayID>mon</DayID>
-      </StartDayOfWeek>
+<StartDayOfWeek><DayID>mon</DayID></StartDayOfWeek>
 <MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
 </Calendar>
 </LC_CALENDAR>
diff --git a/i18npool/source/localedata/data/ca_ES.xml b/i18npool/source/localedata/data/ca_ES.xml
index dc4e8e9..b73579a 100644
--- a/i18npool/source/localedata/data/ca_ES.xml
+++ b/i18npool/source/localedata/data/ca_ES.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/cs_CZ.xml b/i18npool/source/localedata/data/cs_CZ.xml
index 99e54c2..977b68f 100644
--- a/i18npool/source/localedata/data/cs_CZ.xml
+++ b/i18npool/source/localedata/data/cs_CZ.xml
@@ -37,59 +37,59 @@
 <LC_FORMAT>
 <FormatElement msgid="DateFormatskey0" default="true" type="short" usage="DATE" formatindex="18">
 <FormatCode>D.M.YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey1" default="true" type="long" usage="DATE" formatindex="19">
 <FormatCode>NNNNDD. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey2" default="true" type="medium" usage="DATE" formatindex="20">
 <FormatCode>D.M.YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="21">
 <FormatCode>D.M.YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey4" default="false" type="long" usage="DATE" formatindex="22">
 <FormatCode>D. MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey5" default="false" type="long" usage="DATE" formatindex="23">
 <FormatCode>D. MMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey6" default="false" type="long" usage="DATE" formatindex="24">
 <FormatCode>D. MMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey7" default="false" type="long" usage="DATE" formatindex="25">
 <FormatCode>D. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey8" default="false" type="long" usage="DATE" formatindex="26">
 <FormatCode>D. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey9" default="false" type="long" usage="DATE" formatindex="27">
 <FormatCode>NN, D. MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey10" default="false" type="medium" usage="DATE" formatindex="28">
 <FormatCode>NN, DD. MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="29">
 <FormatCode>NN, D. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="30">
 <FormatCode>NNNND. MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey13" default="false" type="short" usage="DATE" formatindex="31">
 <FormatCode>DD-MM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey14" default="false" type="medium" usage="DATE" formatindex="32">
 <FormatCode>YY-MM-DD</FormatCode>
@@ -101,131 +101,123 @@
 </FormatElement>
 <FormatElement msgid="DateFormatskey16" default="false" type="medium" usage="DATE" formatindex="34">
 <FormatCode>MM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey17" default="false" type="medium" usage="DATE" formatindex="35">
 <FormatCode>MMM DD</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey18" default="false" type="medium" usage="DATE" formatindex="36">
 <FormatCode>MMMM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="37">
 <FormatCode>QQ YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="38">
 <FormatCode>WW</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME"  formatindex="39">
 <FormatCode>HH:MM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME"  formatindex="40">
 <FormatCode>HH:MM:SS</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME"  formatindex="41">
 <FormatCode>HH:MM AM/PM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME"  formatindex="42">
 <FormatCode>HH:MM:SS AM/PM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME"  formatindex="43">
 <FormatCode>[HH]:MM:SS</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME"  formatindex="44">
 <FormatCode>MM:SS,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME"  formatindex="45">
 <FormatCode>[HH]:MM:SS,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME"  formatindex="46">
 <FormatCode>DD.MM.YY HH:MM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME"  formatindex="47">
 <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER"  formatindex="0">
 <FormatCode>Standard</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER"  formatindex="1">
 <FormatCode>0</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="2">
 <FormatCode>0,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER"  formatindex="3">
 <FormatCode># ##0</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="4">
 <FormatCode># ##0,00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="5">
 <FormatCode># ###,00</FormatCode>
-      <DefaultName/>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-      <DefaultName/>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode># ##0,00_);(# ##0,00)</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
 <FormatCode># ##0 [$Kč-405];-# ##0 [$Kč-405]</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY"  formatindex="13">
 <FormatCode># ##0,00 [$Kč-405];-# ##0,00 [$Kč-405]</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY"  formatindex="14">
 <FormatCode># ##0 [$Kč-405];[RED]-# ##0 [$Kč-405]</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY"  formatindex="15">
 <FormatCode># ##0,00 [$Kč-405];[RED]-# ##0,00 [$Kč-405]</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY"  formatindex="16">
 <FormatCode># ##0,00 CCC</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY"  formatindex="17">
 <FormatCode># ##0,-- [$Kč-405];[RED]-# ##0,-- [$Kč-405]</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
 <FormatCode>0%</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+<FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER"  formatindex="9">
 <FormatCode>0,00%</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+<FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="6">
 <FormatCode>0,00E+000</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+<FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="7">
 <FormatCode>0,00E+00</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 </LC_FORMAT>
 <LC_COLLATION ref="en_US"/>
diff --git a/i18npool/source/localedata/data/cv_RU.xml b/i18npool/source/localedata/data/cv_RU.xml
index 4e2003a..b5fd2b5 100644
--- a/i18npool/source/localedata/data/cv_RU.xml
+++ b/i18npool/source/localedata/data/cv_RU.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode># ###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode># ##0_);(# ##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode># ##0,00_);(# ##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/da_DK.xml b/i18npool/source/localedata/data/da_DK.xml
index b2150a9..37e1fb9 100644
--- a/i18npool/source/localedata/data/da_DK.xml
+++ b/i18npool/source/localedata/data/da_DK.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/de_AT.xml b/i18npool/source/localedata/data/de_AT.xml
index ce8f438..a23e3bd 100644
--- a/i18npool/source/localedata/data/de_AT.xml
+++ b/i18npool/source/localedata/data/de_AT.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/de_CH.xml b/i18npool/source/localedata/data/de_CH.xml
index 86620ab..6e423a7 100644
--- a/i18npool/source/localedata/data/de_CH.xml
+++ b/i18npool/source/localedata/data/de_CH.xml
@@ -56,22 +56,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#'###.00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#'##0_);(#'##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#'##0.00_);(#'##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/de_DE.xml b/i18npool/source/localedata/data/de_DE.xml
index 93850d4..a83b3db 100644
--- a/i18npool/source/localedata/data/de_DE.xml
+++ b/i18npool/source/localedata/data/de_DE.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/de_LI.xml b/i18npool/source/localedata/data/de_LI.xml
index ff00cf5..9908831 100644
--- a/i18npool/source/localedata/data/de_LI.xml
+++ b/i18npool/source/localedata/data/de_LI.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#'###.00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#'##0_);(#'##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#'##0.00_);(#'##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/de_LU.xml b/i18npool/source/localedata/data/de_LU.xml
index 802ee8d..5cd6db4 100644
--- a/i18npool/source/localedata/data/de_LU.xml
+++ b/i18npool/source/localedata/data/de_LU.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/dz_BT.xml b/i18npool/source/localedata/data/dz_BT.xml
index 64e9dab..7b21b63 100644
--- a/i18npool/source/localedata/data/dz_BT.xml
+++ b/i18npool/source/localedata/data/dz_BT.xml
@@ -37,75 +37,74 @@
   <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$Nu-851]">
     <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
       <FormatCode>[NatNum1]YY-MM-DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28">
       <FormatCode>[NatNum1]NN YY-MMM DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
       <FormatCode>[NatNum1]YY-MM</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35">
       <FormatCode>[NatNum1]MMM-DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36">
       <FormatCode>MMMM</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37">
       <FormatCode>[NatNum1]QQ YY</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21">
       <FormatCode>[NatNum1]YYYY-MM-DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
       <FormatCode>[NatNum1]YY-MM-DD</FormatCode>
-      <DefaultName/>
-    </FormatElement>
-    <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
+      <DefaultName></DefaultName>
+      </FormatElement><FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22">
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23">
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25">
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27">
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29">
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24">
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26">
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32">
       <FormatCode>YY-MM-DD</FormatCode>
@@ -117,175 +116,168 @@
     </FormatElement>
     <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38">
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <!-- Time format was originally "ཆུ་ཚོད་" HH "སྐར་མ་" MM "སྐར་ཆ་་" SS -->            
     <!-- Replaced with HH:MM:SS until more information is available -->
     <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME"  formatindex="39">
       <FormatCode>HH:MM</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME"  formatindex="40">
       <FormatCode>HH:MM:SS</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME"  formatindex="41">
       <FormatCode>[NatNum1]HH:MM AM/PM</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME"  formatindex="42">
       <FormatCode>[NatNum1]HH:MM:SS AM/PM</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME"  formatindex="43">
       <FormatCode>[HH]:MM:SS</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME"  formatindex="44">
       <FormatCode>[NatNum1]HH:MM:SS.00</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME"  formatindex="45">
       <FormatCode>[HH]:MM:SS.00</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME"  formatindex="46">
       <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
       <FormatCode>[NatNum1]DD-MM-YYYY HH:MM:SS</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER"  formatindex="0">
       <FormatCode>General</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER"  formatindex="1">
       <FormatCode>[NatNum1]0</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="2">
       <FormatCode>[NatNum1]0.00</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER"  formatindex="3">
       <FormatCode>[NatNum1]#,##0</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="4">
       <FormatCode>[NatNum1]#,##0.00</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="5">
       <FormatCode>[NatNum1]#,###.00</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
 <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER"  formatindex="59">
       <FormatCode>0</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="60">
       <FormatCode>0.00</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="FixedFormatskey9" default="false" type="short" usage="FIXED_NUMBER"  formatindex="61">
       <FormatCode>#,##0</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="FixedFormatskey10" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="62">
       <FormatCode>#,##0.00</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="FixedFormatskey11" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="63">
       <FormatCode>#,###.00</FormatCode>
-      <DefaultName/>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey12" default="false" type="short" usage="FIXED_NUMBER" formatindex="64">
-      <FormatCode>#,##0_);(#,##0)</FormatCode>
-      <DefaultName/>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey13" default="false" type="medium" usage="FIXED_NUMBER" formatindex="65">
-      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
       <FormatCode>[NatNum1][CURRENCY]#,##0;[NatNum1]-[CURRENCY]#,##0</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY"  formatindex="13">
       <FormatCode>[NatNum1][CURRENCY]#,##0.00;[NatNum1]-[CURRENCY]#,##0.00</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY"  formatindex="14">
       <FormatCode>[NatNum1][CURRENCY]#,##0;[NatNum1][RED]-[CURRENCY]#,##0</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY"  formatindex="15">
       <FormatCode>[NatNum1][CURRENCY]#,##0.00;[NatNum1][RED]-[CURRENCY]#,##0.00</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY"  formatindex="16">
       <FormatCode>[NatNum1]#,##0.00 CCC</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY"  formatindex="17">
       <FormatCode>[NatNum1][CURRENCY]#,##0.--;[NatNum1][RED]-[CURRENCY]#,##0.--</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
  <FormatElement msgid="CurrencyFormatskey7" default="false" type="short" usage="CURRENCY"  formatindex="50">
       <FormatCode>[CURRENCY]#,##0;-[CURRENCY]#,##0</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey8" default="false" type="medium" usage="CURRENCY"  formatindex="51">
       <FormatCode>[CURRENCY]#,##0.00;-[CURRENCY]#,##0.00</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey9" default="false" type="medium" usage="CURRENCY"  formatindex="52">
       <FormatCode>[CURRENCY]#,##0;[RED]-[CURRENCY]#,##0</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey10" default="false" type="medium" usage="CURRENCY"  formatindex="53">
       <FormatCode>[CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey11" default="false" type="medium" usage="CURRENCY"  formatindex="54">
       <FormatCode>#,##0.00 CCC</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey12" default="false" type="medium" usage="CURRENCY"  formatindex="55">
       <FormatCode>[CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
       <!-- Percentage formats other than % sign are not possible in 2.0  0 "བརྒྱ་ཆ་་" is replaced by % -->            
       <FormatCode>[NatNum1]0%</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER"  formatindex="9">
       <FormatCode>[NatNum1]0.00%</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
 <FormatElement msgid="PercentFormatskey3" default="false" type="short" usage="PERCENT_NUMBER"  formatindex="56">
      <FormatCode>0%</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="PercentFormatskey4" default="false" type="long" usage="PERCENT_NUMBER"  formatindex="57">
       <FormatCode>0.00%</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
     <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="7">
       <FormatCode>0.00E+00</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
    <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="58">
       <FormatCode>[NatNum1]0.00E+00</FormatCode>
-      <DefaultName/>
+      <DefaultName></DefaultName>
     </FormatElement>
+
   </LC_FORMAT>
   <LC_COLLATION>
     <Collator unoid="charset" default="true"/>
diff --git a/i18npool/source/localedata/data/ee_GH.xml b/i18npool/source/localedata/data/ee_GH.xml
index 5a95aa5..2d48077 100644
--- a/i18npool/source/localedata/data/ee_GH.xml
+++ b/i18npool/source/localedata/data/ee_GH.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#,##0_);(#,##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/el_GR.xml b/i18npool/source/localedata/data/el_GR.xml
index dcc699d..e7985e2 100644
--- a/i18npool/source/localedata/data/el_GR.xml
+++ b/i18npool/source/localedata/data/el_GR.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#.###,00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#.##0_);(#.##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0,00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0,00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0,00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/en_AU.xml b/i18npool/source/localedata/data/en_AU.xml
index bb9c912..6206988 100644
--- a/i18npool/source/localedata/data/en_AU.xml
+++ b/i18npool/source/localedata/data/en_AU.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#,##0_);(#,##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/en_CA.xml b/i18npool/source/localedata/data/en_CA.xml
index e2655fd..121de11 100644
--- a/i18npool/source/localedata/data/en_CA.xml
+++ b/i18npool/source/localedata/data/en_CA.xml
@@ -53,22 +53,16 @@
     <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
       <FormatCode>#,###.00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="6">
-      <FormatCode>#,##0_);(#,##0)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="7">
-      <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
-    </FormatElement>
-    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="8">
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
       <FormatCode>0.00E+000</FormatCode>
     </FormatElement>
-    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="9">
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
       <FormatCode>0.00E+00</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="10">
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
       <FormatCode>0%</FormatCode>
     </FormatElement>
-    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="11">
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
       <FormatCode>0.00%</FormatCode>
     </FormatElement>
     <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
diff --git a/i18npool/source/localedata/data/en_GB.xml b/i18npool/source/localedata/data/en_GB.xml
index 063eed5..f920af8 100644
--- a/i18npool/source/localedata/data/en_GB.xml
+++ b/i18npool/source/localedata/data/en_GB.xml
@@ -37,75 +37,75 @@
 <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$£-809]">
 <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
 <FormatCode>DD/MM/YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28">
 <FormatCode>NN DD/MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
 <FormatCode>MM/YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35">
 <FormatCode>DD/MMM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36">
 <FormatCode>MMMM</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37">
 <FormatCode>QQ YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21">
 <FormatCode>DD/MM/YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
 <FormatCode>DD/MM/YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
 <FormatCode>DD MMMM YYYY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22">
 <FormatCode>D MMM YY</FormatCode>
-      <DefaultName/>
+<DefaultName></DefaultName>
 </FormatElement>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list