Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts: comphelper/source/misc/servicedecl.cxx i18npool/source/breakiterator/breakiteratorImpl.cxx l10ntools/scripts/localize.pl svl/source/items/itemset.cxx svl/source/memtools/svarray.cxx svl/source/numbers/zformat.cxx svtools/source/brwbox/brwbox1.cxx tools/source/stream/strmwnt.cxx vcl/inc/vcl/graphite_adaptors.hxx vcl/inc/vcl/graphite_layout.hxx vcl/inc/vcl/graphite_serverfont.hxx vcl/source/control/imgctrl.cxx vcl/source/gdi/outdev.cxx vcl/source/gdi/outdev3.cxx vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/graphite_adaptors.cxx vcl/source/glyphs/graphite_layout.cxx vcl/source/window/winproc.cxx vcl/unx/source/fontmanager/fontconfig.cxx
author: Jan Holesovsky <kendy@suse.cz> 2011-03-18 15:55:08 +0100
committer: Jan Holesovsky <kendy@suse.cz> 2011-03-18 15:55:08 +0100
commit: 4fdd55226d2972e3a256426db3122ac23b0615c6 (patch)
tree: 23f5b3a68382d6d3b8db0cb5e2537ed74a228d7c /i18npool
parent: c3d5444d84e18fa82235bb9d419861ac5e54f544 (diff)
parent: e1028d9225bc47922c387aa462887c7643bc6c40 (diff)
32 files changed, 3151 insertions, 327 deletions
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index ddd149c5b809..a29e78b547ec 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -517,6 +517,11 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_GIKUYU                0x0655
 #define LANGUAGE_USER_RUSYN_UKRAINE         0x0656
 #define LANGUAGE_USER_RUSYN_SLOVAKIA        0x8256  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_USER_RUSYN_UKRAINE)) */
+#define LANGUAGE_USER_YIDDISH_US            0x083D  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_YIDDISH)) */
+#define LANGUAGE_USER_LIMBU                 0x0657
+#define LANGUAGE_USER_LOJBAN                0x0658  /* no locale */
+#define LANGUAGE_USER_KABYLE                0x0659
+#define LANGUAGE_USER_HAITIAN               0x065A
 
 
 #endif /* INCLUDED_I18NPOOL_LANG_H */
diff --git a/i18npool/inc/i18npool/paper.hxx b/i18npool/inc/i18npool/paper.hxx
index bfc0c59e10d3..ad95e0db8cc8 100644
--- a/i18npool/inc/i18npool/paper.hxx
+++ b/i18npool/inc/i18npool/paper.hxx
@@ -35,6 +35,10 @@
 #include <rtl/string.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 
+//!! WARNING: be aware of cui/source/tabpages/page.h where someone had the broken idea
+//!! of duplicating the values of this enum in order to use those defines within
+//!! src files.
+//!! Thus don't reorder the enum values here without changing the code there as well.
 enum Paper
 {
     PAPER_A0,
@@ -117,6 +121,9 @@ enum Paper
     PAPER_ARCHE
 };
 
+// defined for 'equal size' test with the implementation array
+#define NUM_PAPER_ENTRIES   (PAPER_ARCHE - PAPER_A0 + 1)
+
 // ---------
 // - Paper -
 // ---------
diff --git a/i18npool/prj/build.lst b/i18npool/prj/build.lst
index 29caab0f90db..4e4dd4a03b0d 100644
--- a/i18npool/prj/build.lst
+++ b/i18npool/prj/build.lst
@@ -1,4 +1,4 @@
-inp  i18npool    :   bridges sax stoc comphelper ICU:icu i18nutil regexp cpputools NULL
+inp  i18npool    :   bridges sax stoc comphelper ICU:icu i18nutil regexp cpputools LIBXSLT:libxslt NULL
 inp  i18npool                                   usr1    -   all inp_mkout NULL
 inp  i18npool\inc                               nmake   -   all inp_inc NULL
 inp  i18npool\source\registerservices           nmake   -   all inp_rserv inp_inc NULL
@@ -24,4 +24,4 @@ inp  i18npool\source\textconversion\data        nmake   -   all inp_textconv_dic
 inp  i18npool\source\search                     nmake   -   all inp_search inp_inc NULL
 inp  i18npool\source\ordinalsuffix              nmake   -   all inp_ordinalsuffix NULL
 inp  i18npool\util                              nmake   -   all inp_util inp_brkit inp_dict inp_chclass inp_translit inp_cal inp_dnum inp_natnum inp_localedata inp_locdata_data inp_numformat inp_rserv inp_index inp_index_data inp_collator inp_collator_data inp_inputchecker inp_textconversion inp_textconv_dict inp_search inp_isolang inp_paper inp_ordinalsuffix NULL
-inp  i18npool\qa\cppunit                        nmake   -   all inp_qa_cppunit inp_util NULL
+#FIXME (needs update for new component registration): inp  i18npool\qa\cppunit                        nmake   -   all inp_qa_cppunit inp_util NULL
diff --git a/i18npool/prj/d.lst b/i18npool/prj/d.lst
index 54aefa732b89..8d27137424a9 100644
--- a/i18npool/prj/d.lst
+++ b/i18npool/prj/d.lst
@@ -46,3 +46,5 @@ mkdir: %_DEST%\inc%_EXT%\i18npool
 ..\%__SRC%\lib\libi18npaper*.so %_DEST%\lib%_EXT%\libi18npaper*.so
 ..\%__SRC%\lib\libi18npaper*.dylib %_DEST%\lib%_EXT%\libi18npaper*.dylib
 
+..\%__SRC%\misc\i18npool.component %_DEST%\xml%_EXT%\i18npool.component
+..\%__SRC%\misc\i18nsearch.component %_DEST%\xml%_EXT%\i18nsearch.component
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index f80010825b93..8e7c02f9c34c 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -443,47 +443,39 @@ sal_Int16 SAL_CALL BreakIteratorImpl::getWordType( const OUString& /*Text*/,
         return 0;
 }
 
-static sal_Int16 scriptTypes[] = {
-    ScriptType::WEAK, ScriptType::WEAK, ScriptType::COMPLEX, ScriptType::LATIN, ScriptType::COMPLEX,
-    ScriptType::ASIAN, ScriptType::LATIN, ScriptType::LATIN, ScriptType::LATIN, ScriptType::COMPLEX,
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::LATIN, ScriptType::LATIN, ScriptType::LATIN,
-// 15
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::ASIAN, ScriptType::ASIAN, ScriptType::COMPLEX,
-    ScriptType::ASIAN, ScriptType::COMPLEX, ScriptType::ASIAN, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::LATIN, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::LATIN,
-// 30
-    ScriptType::LATIN, ScriptType::COMPLEX, ScriptType::LATIN, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::LATIN, ScriptType::ASIAN, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-// 45
-    ScriptType::COMPLEX, ScriptType::LATIN, ScriptType::LATIN, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::LATIN, ScriptType::LATIN, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::LATIN,
-    ScriptType::COMPLEX, ScriptType::LATIN, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-// 60
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::LATIN, ScriptType::LATIN, ScriptType::COMPLEX,
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::ASIAN, ScriptType::ASIAN,
-// 75
-    ScriptType::COMPLEX, ScriptType::LATIN, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::LATIN, ScriptType::LATIN, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-// 90
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::WEAK, ScriptType::WEAK, ScriptType::COMPLEX,
-// 105
-    ScriptType::ASIAN, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::ASIAN,
-// 120
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::WEAK, ScriptType::WEAK,
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-// 135
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX, ScriptType::COMPLEX,
-    ScriptType::COMPLEX,
-    ScriptType::WEAK};
+typedef struct {
+    UBlockCode from;
+    UBlockCode to;
+    sal_Int16 script;
+} UBlock2Script;
+
+// for a list of the UBLOCK_... values see:
+// http://icu-project.org/apiref/icu4c/uchar_8h.html
+// where enum UBlockCode is defined.
+// See also http://www.unicode.org/charts/ for general reference
+static UBlock2Script scriptList[] = {
+    {UBLOCK_NO_BLOCK, UBLOCK_NO_BLOCK, ScriptType::WEAK},
+    {UBLOCK_BASIC_LATIN, UBLOCK_ARMENIAN, ScriptType::LATIN},
+    {UBLOCK_HEBREW, UBLOCK_MYANMAR, ScriptType::COMPLEX},
+    {UBLOCK_GEORGIAN, UBLOCK_GEORGIAN, ScriptType::LATIN},
+    {UBLOCK_HANGUL_JAMO, UBLOCK_HANGUL_JAMO, ScriptType::ASIAN},
+    {UBLOCK_ETHIOPIC, UBLOCK_ETHIOPIC, ScriptType::COMPLEX},
+    {UBLOCK_CHEROKEE, UBLOCK_RUNIC, ScriptType::LATIN},
+    {UBLOCK_KHMER, UBLOCK_MONGOLIAN, ScriptType::COMPLEX},
+    {UBLOCK_LATIN_EXTENDED_ADDITIONAL, UBLOCK_GREEK_EXTENDED, ScriptType::LATIN},
+    {UBLOCK_GENERAL_PUNCTUATION, UBLOCK_GENERAL_PUNCTUATION, ScriptType::LATIN},
+    {UBLOCK_CJK_RADICALS_SUPPLEMENT, UBLOCK_HANGUL_SYLLABLES, ScriptType::ASIAN},
+    {UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS, UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS, ScriptType::ASIAN},
+    {UBLOCK_ARABIC_PRESENTATION_FORMS_A, UBLOCK_ARABIC_PRESENTATION_FORMS_A, ScriptType::COMPLEX},
+    {UBLOCK_CJK_COMPATIBILITY_FORMS, UBLOCK_CJK_COMPATIBILITY_FORMS, ScriptType::ASIAN},
+    {UBLOCK_ARABIC_PRESENTATION_FORMS_B, UBLOCK_ARABIC_PRESENTATION_FORMS_B, ScriptType::COMPLEX},
+    {UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS, UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS, ScriptType::ASIAN},
+    {UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B, UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT, ScriptType::ASIAN},
+    {UBLOCK_CJK_STROKES, UBLOCK_CJK_STROKES, ScriptType::ASIAN},
+    {UBLOCK_LATIN_EXTENDED_C, UBLOCK_LATIN_EXTENDED_D, ScriptType::LATIN}
+};
+
+#define scriptListCount SAL_N_ELEMENTS(scriptList)
 
 sal_Int16  BreakIteratorImpl::getScriptClass(sal_uInt32 currentChar)
 {
@@ -496,10 +488,21 @@ sal_Int16  BreakIteratorImpl::getScriptClass(sal_uInt32 currentChar)
             int32_t script = u_getIntPropertyValue(currentChar, UCHAR_SCRIPT);
             if (script < 0)
                 nRet = ScriptType::WEAK;
-            else if (static_cast<size_t>(script) >= SAL_N_ELEMENTS(scriptTypes))
-                nRet = ScriptType::COMPLEX;         // anything new is going to be pretty wild
-            else
-                nRet = scriptTypes[script];
+            // workaround for Coptic
+            else if ( 0x2C80 <= currentChar && 0x2CE3 >= currentChar)
+                nRet = ScriptType::LATIN;
+            // work-around for ligatures (see http://www.unicode.org/charts/PDF/UFB00.pdf)
+            else if ((0xFB00 <= currentChar && currentChar <= 0xFB06) ||
+                     (0xFB13 <= currentChar && currentChar <= 0xFB17))
+                nRet = ScriptType::LATIN;
+            else {
+                UBlockCode block=ublock_getCode(currentChar);
+                sal_uInt16 i;
+                for ( i = 0; i < scriptListCount; i++) {
+                    if (block <= scriptList[i].to) break;
+                }
+                nRet=(i < scriptListCount && block >= scriptList[i].from) ? scriptList[i].script : ScriptType::WEAK;
+            }
         }
         return nRet;
 }
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index 1ffed4efac3a..5cd86d7857db 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -994,9 +994,11 @@ Calendar_gregorian::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16
                 sprintf(aStr, "%02d", value);   // #100211# - checked
                 break;
             case CalendarDisplayCode::SHORT_YEAR:
-                // Take last 2 digits, or only one if vallue<10, for example,
+                // Take last 2 digits, or only one if value<10, for example,
                 // in case of the Gengou calendar.
-                if (value < 100)
+                // #i116701# For values in non-Gregorian era years use all
+                // digits.
+                if (value < 100 || eraArray)
                     sprintf(aStr, "%d", value); // #100211# - checked
                 else
                     sprintf(aStr, "%02d", value % 100); // #100211# - checked
diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx
index 408688496971..fdb01a6d15f1 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -293,7 +293,6 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 //    { LANGUAGE_USER_CATALAN_VALENCIAN,      "ca", "ES" },   // In case MS format files escaped into the wild, map them back.
     { LANGUAGE_FRENCH_CAMEROON,             "fr", "CM" },
     { LANGUAGE_FRENCH_COTE_D_IVOIRE,        "fr", "CI" },
-    { LANGUAGE_FRENCH_HAITI,                "fr", "HT" },
     { LANGUAGE_FRENCH_MALI,                 "fr", "ML" },
     { LANGUAGE_FRENCH_SENEGAL,              "fr", "SN" },
     { LANGUAGE_FRENCH_ZAIRE,                "fr", "CD" },   // Democratic Republic Of Congo
@@ -354,6 +353,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
     { LANGUAGE_PAPIAMENTU,                 "pap", "AN" },
     { LANGUAGE_USER_PAPIAMENTU_ARUBA,      "pap", "AW" },
     { LANGUAGE_ENGLISH_SINGAPORE,           "en", "SG" },
+    { LANGUAGE_USER_YIDDISH_US,             "yi", "US" },
     { LANGUAGE_YIDDISH,                     "yi", "IL" },   // new: old was "ji"
     { LANGUAGE_YIDDISH,                     "ji", "IL" },   // old: new is "yi"
     { LANGUAGE_SYRIAC,                     "syr", "TR" },   // "TR" according to http://www.ethnologue.com/show_language.asp?code=SYC
@@ -464,6 +464,11 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_GIKUYU,                 "ki", "KE" },
     { LANGUAGE_USER_RUSYN_UKRAINE,         "rue", "UA" },
     { LANGUAGE_USER_RUSYN_SLOVAKIA,        "rue", "SK" },
+    { LANGUAGE_USER_LIMBU,                 "lif", "NP" },
+    { LANGUAGE_USER_LOJBAN,                "jbo", ""   },
+    { LANGUAGE_USER_KABYLE,                "kab", "DZ" },
+    { LANGUAGE_USER_HAITIAN,                "ht", "HT" },
+    { LANGUAGE_FRENCH_HAITI,                "fr", "HT" },
     { LANGUAGE_NONE,                       "zxx", ""   },   // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
     { LANGUAGE_DONTKNOW,                    "",   ""   }    // marks end of table
 };
@@ -688,6 +693,7 @@ static const MsLangId::IsoLangEntry & lcl_lookupFallbackEntry( LanguageType nLan
                 case LANGUAGE_BASQUE:
                 case LANGUAGE_USER_ESPERANTO:
                 case LANGUAGE_USER_INTERLINGUA:
+                case LANGUAGE_USER_LOJBAN:
                     return *pEntry;
                 default:
                     ;   // nothing
@@ -768,6 +774,7 @@ static const MsLangId::IsoLangEntry & lcl_lookupFallbackEntry(
                     case LANGUAGE_BASQUE:
                     case LANGUAGE_USER_ESPERANTO:
                     case LANGUAGE_USER_INTERLINGUA:
+                    case LANGUAGE_USER_LOJBAN:
                         return *pEntry;
                     default:
                         ;   // nothing
diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index 5000e2981b96..c11d4d6d1387 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -340,6 +340,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
         case LANGUAGE_FARSI:
         case LANGUAGE_HEBREW:
         case LANGUAGE_YIDDISH:
+        case LANGUAGE_USER_YIDDISH_US:
         case LANGUAGE_MARATHI:
         case LANGUAGE_PUNJABI:
         case LANGUAGE_GUJARATI:
@@ -375,6 +376,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
         case LANGUAGE_USER_DOGRI_INDIA:
         case LANGUAGE_USER_MAITHILI_INDIA:
         case LANGUAGE_UIGHUR_CHINA:
+        case LANGUAGE_USER_LIMBU:
             nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
             break;
 
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 57e01e5ab340..05f6156489a6 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -163,9 +163,11 @@ LocaleNode* LocaleNode::createNode (const OUString& name, const Reference< XAttr
 //   printf(" name: '%s'\n", p->getName().pData->buffer );
 //   printf("value: '%s'\n", p->getValue().pData->buffer );
 
+#define OSTR(s) (OUStringToOString( (s), RTL_TEXTENCODING_UTF8).getStr())
+
 void print_OUString( const OUString& s )
 {
-    printf( "%s", OUStringToOString( s, RTL_TEXTENCODING_UTF8).getStr());
+    printf( "%s", OSTR(s));
 }
 
 bool is_empty_string( const OUString& s )
@@ -266,16 +268,16 @@ void LocaleNode :: generateCode (const OFileWriter &of) const
         fprintf( stderr, "Error: less than %ld character%s (%ld) in %s '%s'.\n",
                 sal::static_int_cast< long >(nMinLen), (nMinLen > 1 ? "s" : ""),
                 sal::static_int_cast< long >(nLen),
-                (pNode ? OUStringToOString( pNode->getName(), RTL_TEXTENCODING_UTF8).getStr() : ""),
-                OUStringToOString( aVal, RTL_TEXTENCODING_UTF8).getStr());
+                (pNode ? OSTR( pNode->getName()) : ""),
+                OSTR( aVal));
     }
     else if (nLen > nMaxLen && nMaxLen >= 0)
         fprintf( stderr,
                 "Warning: more than %ld character%s (%ld) in %s %s not supported by application.\n",
                 sal::static_int_cast< long >(nMaxLen), (nMaxLen > 1 ? "s" : ""),
                 sal::static_int_cast< long >(nLen),
-                (pNode ? OUStringToOString( pNode->getName(), RTL_TEXTENCODING_UTF8).getStr() : ""),
-                OUStringToOString( aVal, RTL_TEXTENCODING_UTF8).getStr());
+                (pNode ? OSTR( pNode->getName()) : ""),
+                OSTR( aVal));
     return aVal;
 }
 
@@ -306,7 +308,7 @@ void LocaleNode::incError( const char* pStr ) const
 
 void LocaleNode::incError( const ::rtl::OUString& rStr ) const
 {
-    incError( OUStringToOString( rStr, RTL_TEXTENCODING_UTF8).getStr());
+    incError( OSTR( rStr));
 }
 
 char* LocaleNode::prepareErrorFormat( const char* pFormat, const char* pDefaultConversion ) const
@@ -332,8 +334,7 @@ void LocaleNode::incErrorInt( const char* pStr, int nVal ) const
 void LocaleNode::incErrorStr( const char* pStr, const ::rtl::OUString& rVal ) const
 {
     ++nError;
-    fprintf( stderr, prepareErrorFormat( pStr, ": %s"), OUStringToOString(
-                rVal, RTL_TEXTENCODING_UTF8).getStr());
+    fprintf( stderr, prepareErrorFormat( pStr, ": %s"), OSTR( rVal));
 }
 
 void LCInfoNode::generateCode (const OFileWriter &of) const
@@ -501,6 +502,64 @@ void LCCTYPENode::generateCode (const OFileWriter &of) const
     if (aQuoteEnd == aDoubleQuoteEnd)
         fprintf( stderr, "Warning: %s\n",
                 "QuotationEnd equals DoubleQuotationEnd. Not necessarily an error, but unusual.");
+    // Known good values, exclude ASCII single (U+0027, ') and double (U+0022, ") quotes.
+    int ic;
+    switch (ic = aQuoteStart.toChar())
+    {
+        case 0x2018:    // LEFT SINGLE QUOTATION MARK
+        case 0x201a:    // SINGLE LOW-9 QUOTATION MARK
+        case 0x201b:    // SINGLE HIGH-REVERSED-9 QUOTATION MARK
+        case 0x2039:    // SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+        case 0x203a:    // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+        case 0x300c:    // LEFT CORNER BRACKET (Chinese)
+            ;
+            break;
+        default:
+            fprintf( stderr, "Warning: %s U+%04X %s\n",
+                    "QuotationStart may be wrong:", ic, OSTR( aQuoteStart));
+    }
+    switch (ic = aQuoteEnd.toChar())
+    {
+        case 0x2019:    // RIGHT SINGLE QUOTATION MARK
+        case 0x201a:    // SINGLE LOW-9 QUOTATION MARK
+        case 0x201b:    // SINGLE HIGH-REVERSED-9 QUOTATION MARK
+        case 0x2039:    // SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+        case 0x203a:    // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+        case 0x300d:    // RIGHT CORNER BRACKET (Chinese)
+            ;
+            break;
+        default:
+            fprintf( stderr, "Warning: %s U+%04X %s\n",
+                    "QuotationEnd may be wrong:", ic, OSTR( aQuoteEnd));
+    }
+    switch (ic = aDoubleQuoteStart.toChar())
+    {
+        case 0x00ab:    // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+        case 0x00bb:    // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+        case 0x201c:    // LEFT DOUBLE QUOTATION MARK
+        case 0x201e:    // DOUBLE LOW-9 QUOTATION MARK
+        case 0x201f:    // DOUBLE HIGH-REVERSED-9 QUOTATION MARK
+        case 0x300e:    // LEFT WHITE CORNER BRACKET (Chinese)
+            ;
+            break;
+        default:
+            fprintf( stderr, "Warning: %s U+%04X %s\n",
+                    "DoubleQuotationStart may be wrong:", ic, OSTR( aDoubleQuoteStart));
+    }
+    switch (ic = aDoubleQuoteEnd.toChar())
+    {
+        case 0x00ab:    // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+        case 0x00bb:    // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+        case 0x201d:    // RIGHT DOUBLE QUOTATION MARK
+        case 0x201e:    // DOUBLE LOW-9 QUOTATION MARK
+        case 0x201f:    // DOUBLE HIGH-REVERSED-9 QUOTATION MARK
+        case 0x300f:    // RIGHT WHITE CORNER BRACKET (Chinese)
+            ;
+            break;
+        default:
+            fprintf( stderr, "Warning: %s U+%04X %s\n",
+                    "DoubleQuotationEnd may be wrong:", ic, OSTR( aDoubleQuoteEnd));
+    }
 
     writeParameterCheckLen( of, "TimeAM", "timeAM", 1, -1);
     writeParameterCheckLen( of, "TimePM", "timePM", 1, -1);
@@ -640,7 +699,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
                                         fprintf( stderr,
                                                 "Warning: Can't check separators used in FormatCode due to LC_CTYPE ref=\"%s\".\n"
                                                 "If these two locales use identical format codes, you should consider to use the ref= mechanism also for the LC_FORMAT element, together with replaceFrom= and replaceTo= for the currency.\n",
-                                                OUStringToOString( aRef, RTL_TEXTENCODING_UTF8).getStr());
+                                                OSTR( aRef));
                                     bCtypeIsRef = true;
                                     pCtype = 0;
                                 }
diff --git a/i18npool/source/localedata/data/dsb_DE.xml b/i18npool/source/localedata/data/dsb_DE.xml
new file mode 100644
index 000000000000..fe953ec807c1
--- /dev/null
+++ b/i18npool/source/localedata/data/dsb_DE.xml
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+  <LC_INFO>
+    <Language>
+      <LangID>dsb</LangID>
+      <DefaultName>Sorbian, Lower</DefaultName>
+    </Language>
+    <Country>
+      <CountryID>DE</CountryID>
+      <DefaultName>Germany</DefaultName>
+    </Country>
+  </LC_INFO>
+  <LC_CTYPE unoid="generic">
+    <Separators>
+      <DateSeparator>.</DateSeparator>
+      <ThousandSeparator>&#160;</ThousandSeparator><!-- a non-breaking space (U+00A0) as a thousand separator; alternatively, there could be no separator at all -->
+      <DecimalSeparator>,</DecimalSeparator>
+      <TimeSeparator>:</TimeSeparator>
+      <Time100SecSeparator>,</Time100SecSeparator>
+      <ListSeparator>;</ListSeparator>
+      <LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
+      <LongDateDaySeparator>. </LongDateDaySeparator>
+      <LongDateMonthSeparator> </LongDateMonthSeparator>
+      <LongDateYearSeparator> </LongDateYearSeparator>
+    </Separators>
+    <Markers>
+      <QuotationStart>‚</QuotationStart>
+      <QuotationEnd>‘</QuotationEnd>
+      <DoubleQuotationStart>„</DoubleQuotationStart>
+      <DoubleQuotationEnd>“</DoubleQuotationEnd>
+    </Markers>
+    <TimeAM>dopołdnja</TimeAM>
+    <TimePM>wótpołdnja</TimePM>
+    <MeasurementSystem>metric</MeasurementSystem>
+  </LC_CTYPE>
+  <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-82E]">
+    <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
+      <FormatCode>Standard</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
+      <FormatCode>0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
+      <FormatCode>0,00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
+      <FormatCode># ##0</FormatCode><!-- a non-breaking space (U+00A0) as a thousand separator -->
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
+      <FormatCode># ##0,00</FormatCode><!-- a non-breaking space (U+00A0) as a thousand separator -->
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
+      <FormatCode># ###,00</FormatCode><!-- a non-breaking space (U+00A0) as a thousand separator -->
+    </FormatElement>
+    <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="7">
+      <FormatCode>0,00E+00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
+      <FormatCode>0%</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
+      <FormatCode>0,00%</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
+      <FormatCode># ##0 [CURRENCY];-# ##0 [CURRENCY]</FormatCode><!-- a non-breaking space (U+00A0) as a thousand separator -->
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
+      <FormatCode># ##0,00 [CURRENCY];-# ##0,00 [CURRENCY]</FormatCode><!-- a non-breaking space (U+00A0) as a thousand separator -->
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
+      <FormatCode># ##0 [CURRENCY];[RED]-# ##0 [CURRENCY]</FormatCode><!-- a non-breaking space (U+00A0) as a thousand separator -->
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
+      <FormatCode># ##0,00 [CURRENCY];[RED]-# ##0,00 [CURRENCY]</FormatCode><!-- a non-breaking space (U+00A0) as a thousand separator -->
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
+      <FormatCode>CCC# ##0,00</FormatCode><!-- a non-breaking space (U+00A0) as a thousand separator -->
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
+      <FormatCode># ##0,-- [CURRENCY];[RED]-# ##0,-- [CURRENCY]</FormatCode><!-- a non-breaking space (U+00A0) as a thousand separator -->
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey11" default="true" type="short" usage="DATE" formatindex="18">
+      <FormatCode>D.MM.YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
+      <FormatCode>NNNND. MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
+      <FormatCode>DD.MM.YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="21">
+      <FormatCode>DD.MM.YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="22">
+      <FormatCode>D. MMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="23">
+      <FormatCode>D. MMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey21" default="false" type="long" usage="DATE" formatindex="24">
+      <FormatCode>D. MMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="25">
+      <FormatCode>D. MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey22" default="false" type="long" usage="DATE" formatindex="26">
+      <FormatCode>D. MMMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey10" default="false" type="medium" usage="DATE" formatindex="27">
+      <FormatCode>NN, DD. MMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey18" default="false" type="long" usage="DATE" formatindex="28">
+      <FormatCode>NN, D. MMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey19" default="false" type="long" usage="DATE" formatindex="29">
+      <FormatCode>NN, D. MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
+      <FormatCode>NNNND. MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
+      <FormatCode>MM.DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="32">
+      <FormatCode>YY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="33">
+      <FormatCode>YYYY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey1" default="false" type="medium" usage="DATE" formatindex="34">
+      <FormatCode>MM.YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="35">
+      <FormatCode>D. MMM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="36">
+      <FormatCode>MMMM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="37">
+      <FormatCode>QQ YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey9" default="false" type="medium" usage="DATE" formatindex="38">
+      <FormatCode>WW</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39">
+      <FormatCode>H:MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME" formatindex="40">
+      <FormatCode>H:MM:SS</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME" formatindex="41">
+      <FormatCode>H:MM AM/PM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME" formatindex="42">
+      <FormatCode>H:MM:SS AM/PM</FormatCode><!-- with commonly used 24-hour time, the AM/PM indicator is not needed -->
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
+      <FormatCode>[H]:MM:SS</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
+      <FormatCode>MM:SS,00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
+      <FormatCode>[H]:MM:SS,00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
+      <FormatCode>DD.MM.YY H:MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
+      <FormatCode>DD.MM.YYYY H:MM:SS AM/PM</FormatCode><!-- with commonly used 24-hour time, the AM/PM indicator is useless (and also never used) -->
+    </FormatElement>
+  </LC_FORMAT>
+  <LC_COLLATION>
+    <Collator default="true" unoid="alphanumeric"/>
+    <CollationOptions>
+      <TransliterationModules>IGNORE_CASE</TransliterationModules>
+    </CollationOptions>
+  </LC_COLLATION>
+  <LC_SEARCH>
+    <SearchOptions>
+      <TransliterationModules>IGNORE_CASE</TransliterationModules>
+    </SearchOptions>
+  </LC_SEARCH>
+  <LC_INDEX>
+    <IndexKey unoid="alphanumeric" default="true" phonetic="false">A-C Č Ć D E Ě F-H {Ch} I-K Ł L-N Ń O Ó P-R Ŕ S Š Ś T-Z Ž Ź</IndexKey>
+    <UnicodeScript>0</UnicodeScript>
+    <UnicodeScript>1</UnicodeScript>
+    <UnicodeScript>2</UnicodeScript>
+    <FollowPageWord>bok</FollowPageWord><!-- there's no conventional abbreviation -->
+    <FollowPageWord>boki</FollowPageWord><!-- there's no conventional abbreviation -->
+  </LC_INDEX>
+  <LC_CALENDAR>
+    <Calendar unoid="gregorian" default="true">
+      <DaysOfWeek>
+        <Day>
+          <DayID>sun</DayID>
+          <DefaultAbbrvName>nje.</DefaultAbbrvName>
+          <DefaultFullName>njeźela</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>mon</DayID>
+          <DefaultAbbrvName>pón.</DefaultAbbrvName>
+          <DefaultFullName>pónjeźela</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>tue</DayID>
+          <DefaultAbbrvName>wał.</DefaultAbbrvName>
+          <DefaultFullName>wałtora</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>wed</DayID>
+          <DefaultAbbrvName>srj.</DefaultAbbrvName>
+          <DefaultFullName>srjoda</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>thu</DayID>
+          <DefaultAbbrvName>stw.</DefaultAbbrvName>
+          <DefaultFullName>stwórtk</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>fri</DayID>
+          <DefaultAbbrvName>pět.</DefaultAbbrvName>
+          <DefaultFullName>pětk</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>sat</DayID>
+          <DefaultAbbrvName>sob.</DefaultAbbrvName>
+          <DefaultFullName>sobota</DefaultFullName>
+        </Day>
+      </DaysOfWeek>
+      <MonthsOfYear>
+        <Month>
+          <MonthID>jan</MonthID>
+          <DefaultAbbrvName>jan.</DefaultAbbrvName>
+          <DefaultFullName>januar</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>feb</MonthID>
+          <DefaultAbbrvName>feb.</DefaultAbbrvName>
+          <DefaultFullName>februar</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>mar</MonthID>
+          <DefaultAbbrvName>měr.</DefaultAbbrvName>
+          <DefaultFullName>měrc</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>apr</MonthID>
+          <DefaultAbbrvName>apr.</DefaultAbbrvName>
+          <DefaultFullName>apryl</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>may</MonthID>
+          <DefaultAbbrvName>maj</DefaultAbbrvName>
+          <DefaultFullName>maj</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jun</MonthID>
+          <DefaultAbbrvName>jun.</DefaultAbbrvName>
+          <DefaultFullName>junij</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jul</MonthID>
+          <DefaultAbbrvName>jul.</DefaultAbbrvName>
+          <DefaultFullName>julij</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>aug</MonthID>
+          <DefaultAbbrvName>awg.</DefaultAbbrvName>
+          <DefaultFullName>awgust</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>sep</MonthID>
+          <DefaultAbbrvName>sep.</DefaultAbbrvName>
+          <DefaultFullName>september</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>oct</MonthID>
+          <DefaultAbbrvName>okt.</DefaultAbbrvName>
+          <DefaultFullName>oktober</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>nov</MonthID>
+          <DefaultAbbrvName>now.</DefaultAbbrvName>
+          <DefaultFullName>nowember</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>dec</MonthID>
+          <DefaultAbbrvName>dec.</DefaultAbbrvName>
+          <DefaultFullName>december</DefaultFullName>
+        </Month>
+      </MonthsOfYear>
+      <Eras>
+        <Era>
+          <EraID>bc</EraID>
+          <DefaultAbbrvName>pś. Kr.</DefaultAbbrvName>
+          <DefaultFullName>pśed Kristusom</DefaultFullName>
+        </Era>
+        <Era>
+          <EraID>ad</EraID>
+          <DefaultAbbrvName>pó Kr.</DefaultAbbrvName>
+          <DefaultFullName>pó Kristusu</DefaultFullName>
+        </Era>
+      </Eras>
+      <StartDayOfWeek>
+        <DayID>mon</DayID>
+      </StartDayOfWeek>
+      <MinimalDaysInFirstWeek>4</MinimalDaysInFirstWeek>
+    </Calendar>
+  </LC_CALENDAR>
+  <LC_CURRENCY>
+    <Currency default="true" usedInCompatibleFormatCodes="true">
+      <CurrencyID>EUR</CurrencyID>
+      <CurrencySymbol>€</CurrencySymbol>
+      <BankSymbol>EUR</BankSymbol>
+      <CurrencyName>euro</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+  </LC_CURRENCY>
+  <LC_TRANSLITERATION>
+    <Transliteration unoid="LOWERCASE_UPPERCASE"/>
+    <Transliteration unoid="UPPERCASE_LOWERCASE"/>
+    <Transliteration unoid="IGNORE_CASE"/>
+  </LC_TRANSLITERATION>
+  <LC_MISC>
+    <ReservedWords>
+      <trueWord>wěrno</trueWord>
+      <falseWord>njewěrno</falseWord>
+      <quarter1Word>prědny kwartal</quarter1Word>
+      <quarter2Word>drugi kwartal</quarter2Word>
+      <quarter3Word>tśeśi kwartal</quarter3Word>
+      <quarter4Word>stwórty kwartal</quarter4Word>
+      <aboveWord>nad</aboveWord>
+      <belowWord>pód</belowWord>
+      <quarter1Abbreviation>K1</quarter1Abbreviation>
+      <quarter2Abbreviation>K2</quarter2Abbreviation>
+      <quarter3Abbreviation>K3</quarter3Abbreviation>
+      <quarter4Abbreviation>K4</quarter4Abbreviation>
+    </ReservedWords>
+  </LC_MISC>
+  <LC_NumberingLevel ref="en_US"/>
+  <LC_OutLineNumberingLevel ref="en_US"/>
+</Locale>
+<!--Version 1.0  -->
diff --git a/i18npool/source/localedata/data/fi_FI.xml b/i18npool/source/localedata/data/fi_FI.xml
index 432d5f155423..1f7747d8b97a 100644
--- a/i18npool/source/localedata/data/fi_FI.xml
+++ b/i18npool/source/localedata/data/fi_FI.xml
@@ -179,7 +179,7 @@
   <LC_COLLATION ref="en_US" />
   <LC_SEARCH ref="en_US"/>
   <LC_INDEX>
-    <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-V X-Z Ä Ö</IndexKey>
+    <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-Z Ä Ö</IndexKey>
     <UnicodeScript>0</UnicodeScript>
     <UnicodeScript>1</UnicodeScript>
     <FollowPageWord>p.</FollowPageWord>
diff --git a/i18npool/source/localedata/data/haw_US.xml b/i18npool/source/localedata/data/haw_US.xml
new file mode 100644
index 000000000000..b9fd553e24ef
--- /dev/null
+++ b/i18npool/source/localedata/data/haw_US.xml
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+  <LC_INFO>
+    <Language>
+      <LangID>haw</LangID>
+      <DefaultName>Hawaiian</DefaultName>
+    </Language>
+    <Country>
+      <CountryID>US</CountryID>
+      <DefaultName>United States</DefaultName>
+    </Country>
+  </LC_INFO>
+  <LC_CTYPE unoid="generic">
+    <Separators>
+      <DateSeparator>/</DateSeparator>
+      <ThousandSeparator>,</ThousandSeparator>
+      <DecimalSeparator>.</DecimalSeparator>
+      <TimeSeparator>:</TimeSeparator>
+      <Time100SecSeparator>.</Time100SecSeparator>
+      <ListSeparator>;</ListSeparator>
+      <LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
+      <LongDateDaySeparator> </LongDateDaySeparator>
+      <LongDateMonthSeparator> </LongDateMonthSeparator>
+      <LongDateYearSeparator> </LongDateYearSeparator>
+    </Separators>
+    <Markers>
+      <QuotationStart>‘</QuotationStart>
+      <QuotationEnd>’</QuotationEnd>
+      <DoubleQuotationStart>“</DoubleQuotationStart>
+      <DoubleQuotationEnd>”</DoubleQuotationEnd>
+    </Markers>
+    <TimeAM>AM</TimeAM>
+    <TimePM>PM</TimePM>
+    <MeasurementSystem>metric</MeasurementSystem>
+  </LC_CTYPE>
+  <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$$-475]">
+    <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
+      <FormatCode>General</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
+      <FormatCode>0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
+      <FormatCode>0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
+      <FormatCode>#,##0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
+      <FormatCode>#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
+      <FormatCode>#,###.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
+      <FormatCode>0.00E+00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
+      <FormatCode>0.00E+000</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
+      <FormatCode>0%</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
+      <FormatCode>0.00%</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
+      <FormatCode>[CURRENCY]#,##0;([CURRENCY]#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
+      <FormatCode>[CURRENCY]#,##0.00;([CURRENCY]#,##0.00)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
+      <FormatCode>[CURRENCY]#,##0;[RED]([CURRENCY]#,##0)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
+      <FormatCode>[CURRENCY]#,##0.00;[RED]([CURRENCY]#,##0.00)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
+      <FormatCode>CCC#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
+      <FormatCode>[CURRENCY]#,##0.--;[RED]([CURRENCY]#,##0.--)</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey11" default="true" type="short" usage="DATE" formatindex="18">
+      <FormatCode>YY/MM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
+      <FormatCode>NNNNDD MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
+      <FormatCode>YY/MM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="21">
+      <FormatCode>YYYY/MM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="22">
+      <FormatCode>D MMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="23">
+      <FormatCode>D MMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey21" default="false" type="long" usage="DATE" formatindex="24">
+      <FormatCode>D MMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="25">
+      <FormatCode>D MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey22" default="false" type="long" usage="DATE" formatindex="26">
+      <FormatCode>D MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey10" default="false" type="medium" usage="DATE" formatindex="27">
+      <FormatCode>NN, DD/MMM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey18" default="false" type="long" usage="DATE" formatindex="28">
+      <FormatCode>NN, D MMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey19" default="false" type="long" usage="DATE" formatindex="29">
+      <FormatCode>NN, D MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
+      <FormatCode>NNNND MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
+      <FormatCode>MM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="32">
+      <FormatCode>YY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="33">
+      <FormatCode>YYYY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey1" default="false" type="medium" usage="DATE" formatindex="34">
+      <FormatCode>YY/MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="35">
+      <FormatCode>MMM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="36">
+      <FormatCode>MMMM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="37">
+      <FormatCode>QQ YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey9" default="false" type="medium" usage="DATE" formatindex="38">
+      <FormatCode>WW</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39">
+      <FormatCode>HH:MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME" formatindex="40">
+      <FormatCode>HH:MM:SS</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME" formatindex="41">
+      <FormatCode>HH:MM AM/PM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME" formatindex="42">
+      <FormatCode>HH:MM:SS AM/PM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
+      <FormatCode>[HH]:MM:SS</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
+      <FormatCode>MM:SS.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
+      <FormatCode>[HH]:MM:SS.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
+      <FormatCode>YY/MM/DD HH:MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
+      <FormatCode>YYYY/MM/DD HH:MM:SS AM/PM</FormatCode>
+    </FormatElement>
+  </LC_FORMAT>
+  <LC_COLLATION>
+    <Collator default="true" unoid="alphanumeric"/>
+    <CollationOptions>
+      <TransliterationModules>IGNORE_CASE</TransliterationModules>
+    </CollationOptions>
+  </LC_COLLATION>
+  <LC_SEARCH>
+    <SearchOptions>
+      <TransliterationModules>IGNORE_CASE</TransliterationModules>
+    </SearchOptions>
+  </LC_SEARCH>
+  <LC_INDEX>
+    <IndexKey phonetic="false" default="true" unoid="alphanumeric">A E I O U H K L M N P W</IndexKey>
+    <UnicodeScript>0</UnicodeScript>
+    <UnicodeScript>1</UnicodeScript>
+    <FollowPageWord>p.</FollowPageWord>
+    <FollowPageWord>pp.</FollowPageWord>
+  </LC_INDEX>
+  <LC_CALENDAR>
+    <Calendar unoid="gregorian" default="true">
+      <DaysOfWeek>
+        <Day>
+          <DayID>sun</DayID>
+          <DefaultAbbrvName>LP</DefaultAbbrvName>
+          <DefaultFullName>Lāpule</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>mon</DayID>
+          <DefaultAbbrvName>P1</DefaultAbbrvName>
+          <DefaultFullName>Poʻakahi</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>tue</DayID>
+          <DefaultAbbrvName>P2</DefaultAbbrvName>
+          <DefaultFullName>Poʻalua</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>wed</DayID>
+          <DefaultAbbrvName>P3</DefaultAbbrvName>
+          <DefaultFullName>Poʻakolu</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>thu</DayID>
+          <DefaultAbbrvName>P4</DefaultAbbrvName>
+          <DefaultFullName>Poʻahā</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>fri</DayID>
+          <DefaultAbbrvName>P5</DefaultAbbrvName>
+          <DefaultFullName>Poʻalima</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>sat</DayID>
+          <DefaultAbbrvName>P6</DefaultAbbrvName>
+          <DefaultFullName>Poʻaono</DefaultFullName>
+        </Day>
+      </DaysOfWeek>
+      <MonthsOfYear>
+        <Month>
+          <MonthID>jan</MonthID>
+          <DefaultAbbrvName>Ian.</DefaultAbbrvName>
+          <DefaultFullName>Ianuali</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>feb</MonthID>
+          <DefaultAbbrvName>Pep.</DefaultAbbrvName>
+          <DefaultFullName>Pepeluali</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>mar</MonthID>
+          <DefaultAbbrvName>Mal.</DefaultAbbrvName>
+          <DefaultFullName>Malaki</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>apr</MonthID>
+          <DefaultAbbrvName>ʻAp.</DefaultAbbrvName>
+          <DefaultFullName>ʻApelila</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>may</MonthID>
+          <DefaultAbbrvName>Mei</DefaultAbbrvName>
+          <DefaultFullName>Mei</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jun</MonthID>
+          <DefaultAbbrvName>Iun.</DefaultAbbrvName>
+          <DefaultFullName>Iune</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jul</MonthID>
+          <DefaultAbbrvName>Iul.</DefaultAbbrvName>
+          <DefaultFullName>Iulai</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>aug</MonthID>
+          <DefaultAbbrvName>ʻAuk.</DefaultAbbrvName>
+          <DefaultFullName>ʻAukake</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>sep</MonthID>
+          <DefaultAbbrvName>Kep.</DefaultAbbrvName>
+          <DefaultFullName>Kepakemapa</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>oct</MonthID>
+          <DefaultAbbrvName>ʻOk.</DefaultAbbrvName>
+          <DefaultFullName>ʻOkakopa</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>nov</MonthID>
+          <DefaultAbbrvName>Now.</DefaultAbbrvName>
+          <DefaultFullName>Nowemapa</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>dec</MonthID>
+          <DefaultAbbrvName>Kek.</DefaultAbbrvName>
+          <DefaultFullName>Kekemapa</DefaultFullName>
+        </Month>
+      </MonthsOfYear>
+      <Eras>
+        <Era>
+          <EraID>bc</EraID>
+          <DefaultAbbrvName>BC</DefaultAbbrvName>
+          <DefaultFullName>BC</DefaultFullName>
+        </Era>
+        <Era>
+          <EraID>ad</EraID>
+          <DefaultAbbrvName>CE</DefaultAbbrvName>
+          <DefaultFullName>CE</DefaultFullName>
+        </Era>
+      </Eras>
+      <StartDayOfWeek>
+        <DayID>mon</DayID>
+      </StartDayOfWeek>
+      <MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
+    </Calendar>
+  </LC_CALENDAR>
+  <LC_CURRENCY>
+    <Currency default="true" usedInCompatibleFormatCodes="true">
+      <CurrencyID>USD</CurrencyID>
+      <CurrencySymbol>$</CurrencySymbol>
+      <BankSymbol>USD</BankSymbol>
+      <CurrencyName>Kālā ʻAmelika</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+  </LC_CURRENCY>
+  <LC_TRANSLITERATION>
+    <Transliteration unoid="LOWERCASE_UPPERCASE"/>
+    <Transliteration unoid="UPPERCASE_LOWERCASE"/>
+    <Transliteration unoid="IGNORE_CASE"/>
+  </LC_TRANSLITERATION>
+  <LC_MISC>
+    <ReservedWords>
+      <trueWord>ʻOiaʻiʻo</trueWord>
+      <falseWord>Hewa</falseWord>
+      <quarter1Word>Kau Hapahā 1</quarter1Word>
+      <quarter2Word>Kau Hapaha 2</quarter2Word>
+      <quarter3Word>Kau Hapahā 3</quarter3Word>
+      <quarter4Word>Kau Hapahā 4</quarter4Word>
+      <aboveWord>Luna</aboveWord>
+      <belowWord>Lalo</belowWord>
+      <quarter1Abbreviation>KH1</quarter1Abbreviation>
+      <quarter2Abbreviation>KH2</quarter2Abbreviation>
+      <quarter3Abbreviation>KH3</quarter3Abbreviation>
+      <quarter4Abbreviation>KH4</quarter4Abbreviation>
+    </ReservedWords>
+  </LC_MISC>
+  <LC_NumberingLevel>
+    <NumberingLevel NumType="4" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="4" Prefix=" "  Suffix="."/>
+    <NumberingLevel NumType="4" Prefix="("  Suffix=")"/>
+    <NumberingLevel NumType="2" Prefix=" "  Suffix="."/>
+    <NumberingLevel NumType="0" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="1" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="1" Prefix="("  Suffix=")"/>
+    <NumberingLevel NumType="3" Prefix=" "  Suffix="."/>
+  </LC_NumberingLevel>
+  <LC_OutLineNumberingLevel ref="en_US"/>
+</Locale>
+<!--Version 1.0  -->
diff --git a/i18npool/source/localedata/data/hsb_DE.xml b/i18npool/source/localedata/data/hsb_DE.xml
index 6513dad5f57e..1e4c70a26fd3 100644
--- a/i18npool/source/localedata/data/hsb_DE.xml
+++ b/i18npool/source/localedata/data/hsb_DE.xml
@@ -34,7 +34,7 @@
     <TimePM>popołdnju</TimePM>
     <MeasurementSystem>metric</MeasurementSystem>
   </LC_CTYPE>
-  <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-042E]">
+  <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-42E]">
     <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
       <FormatCode>Standard</FormatCode>
     </FormatElement>
diff --git a/i18npool/source/localedata/data/ht_HT.xml b/i18npool/source/localedata/data/ht_HT.xml
new file mode 100644
index 000000000000..99109c72a909
--- /dev/null
+++ b/i18npool/source/localedata/data/ht_HT.xml
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+  <LC_INFO>
+    <Language>
+      <LangID>ht</LangID>
+      <DefaultName>Haitian Creole</DefaultName>
+    </Language>
+    <Country>
+      <CountryID>HT</CountryID>
+      <DefaultName>Haiti</DefaultName>
+    </Country>
+  </LC_INFO>
+  <LC_CTYPE unoid="generic">
+    <Separators>
+      <DateSeparator>/</DateSeparator>
+      <ThousandSeparator>,</ThousandSeparator>
+      <DecimalSeparator>.</DecimalSeparator>
+      <TimeSeparator>:</TimeSeparator>
+      <Time100SecSeparator>.</Time100SecSeparator>
+      <ListSeparator>;</ListSeparator>
+      <LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
+      <LongDateDaySeparator>, </LongDateDaySeparator>
+      <LongDateMonthSeparator> </LongDateMonthSeparator>
+      <LongDateYearSeparator> </LongDateYearSeparator>
+    </Separators>
+    <Markers>
+      <QuotationStart>‘</QuotationStart>
+      <QuotationEnd>’</QuotationEnd>
+      <DoubleQuotationStart>“</DoubleQuotationStart>
+      <DoubleQuotationEnd>”</DoubleQuotationEnd>
+    </Markers>
+    <TimeAM>AM</TimeAM>
+    <TimePM>PM</TimePM>
+    <MeasurementSystem>metric</MeasurementSystem>
+  </LC_CTYPE>
+  <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$G-65A]">
+    <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
+      <FormatCode>General</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
+      <FormatCode>0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
+      <FormatCode>0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
+      <FormatCode>#,##0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
+      <FormatCode>#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
+      <FormatCode>#,###.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
+      <FormatCode>0.00E+00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
+      <FormatCode>0.00E+000</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
+      <FormatCode>0%</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
+      <FormatCode>0.00%</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
+      <FormatCode>[CURRENCY]#,##0;-[CURRENCY]#,##0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
+      <FormatCode>[CURRENCY]#,##0.00;-[CURRENCY]#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
+      <FormatCode>[CURRENCY]#,##0;[RED]-[CURRENCY]#,##0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
+      <FormatCode>[CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
+      <FormatCode>CCC#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
+      <FormatCode>[CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey11" default="true" type="short" usage="DATE" formatindex="18">
+      <FormatCode>D/MM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
+      <FormatCode>NNNNDD, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
+      <FormatCode>DD/MM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="21">
+      <FormatCode>DD/MM/YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="22">
+      <FormatCode>D, MMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="23">
+      <FormatCode>D, MMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey21" default="false" type="long" usage="DATE" formatindex="24">
+      <FormatCode>D, MMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="25">
+      <FormatCode>D, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey22" default="false" type="long" usage="DATE" formatindex="26">
+      <FormatCode>D, MMMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey10" default="false" type="medium" usage="DATE" formatindex="27">
+      <FormatCode>NN, DD/MMM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey18" default="false" type="long" usage="DATE" formatindex="28">
+      <FormatCode>NN, D, MMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey19" default="false" type="long" usage="DATE" formatindex="29">
+      <FormatCode>NN, D, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
+      <FormatCode>NNNND, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
+      <FormatCode>MM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="32">
+      <FormatCode>YY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="33">
+      <FormatCode>YYYY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey1" default="false" type="medium" usage="DATE" formatindex="34">
+      <FormatCode>MM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="35">
+      <FormatCode>MMM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="36">
+      <FormatCode>MMMM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="37">
+      <FormatCode>QQ YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey9" default="false" type="medium" usage="DATE" formatindex="38">
+      <FormatCode>WW</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39">
+      <FormatCode>HH:MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME" formatindex="40">
+      <FormatCode>HH:MM:SS</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME" formatindex="41">
+      <FormatCode>HH:MM AM/PM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME" formatindex="42">
+      <FormatCode>HH:MM:SS AM/PM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
+      <FormatCode>[HH]:MM:SS</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
+      <FormatCode>MM:SS.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
+      <FormatCode>[HH]:MM:SS.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
+      <FormatCode>DD/MM/YY HH:MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
+      <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode>
+    </FormatElement>
+  </LC_FORMAT>
+  <LC_COLLATION>
+    <Collator default="true" unoid="alphanumeric"/>
+    <CollationOptions>
+      <TransliterationModules>IGNORE_CASE</TransliterationModules>
+    </CollationOptions>
+  </LC_COLLATION>
+  <LC_SEARCH>
+    <SearchOptions>
+      <TransliterationModules>IGNORE_CASE</TransliterationModules>
+    </SearchOptions>
+  </LC_SEARCH>
+  <LC_INDEX>
+    <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-Z</IndexKey>
+    <UnicodeScript>0</UnicodeScript>
+    <UnicodeScript>1</UnicodeScript>
+    <FollowPageWord>s</FollowPageWord>
+    <FollowPageWord>pl</FollowPageWord>
+  </LC_INDEX>
+  <LC_CALENDAR>
+    <Calendar unoid="gregorian" default="true">
+      <DaysOfWeek>
+        <Day>
+          <DayID>sun</DayID>
+          <DefaultAbbrvName>Dim</DefaultAbbrvName>
+          <DefaultFullName>Dimanch</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>mon</DayID>
+          <DefaultAbbrvName>Len</DefaultAbbrvName>
+          <DefaultFullName>Lendi</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>tue</DayID>
+          <DefaultAbbrvName>Mad</DefaultAbbrvName>
+          <DefaultFullName>Madi</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>wed</DayID>
+          <DefaultAbbrvName>Mèk</DefaultAbbrvName>
+          <DefaultFullName>Mèkredi</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>thu</DayID>
+          <DefaultAbbrvName>Jed</DefaultAbbrvName>
+          <DefaultFullName>Jedi</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>fri</DayID>
+          <DefaultAbbrvName>Van</DefaultAbbrvName>
+          <DefaultFullName>Vandredi</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>sat</DayID>
+          <DefaultAbbrvName>Sam</DefaultAbbrvName>
+          <DefaultFullName>Samdi</DefaultFullName>
+        </Day>
+      </DaysOfWeek>
+      <MonthsOfYear>
+        <Month>
+          <MonthID>jan</MonthID>
+          <DefaultAbbrvName>Jan</DefaultAbbrvName>
+          <DefaultFullName>Janvye</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>feb</MonthID>
+          <DefaultAbbrvName>Fev</DefaultAbbrvName>
+          <DefaultFullName>Fevriye</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>mar</MonthID>
+          <DefaultAbbrvName>Mas</DefaultAbbrvName>
+          <DefaultFullName>Mas</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>apr</MonthID>
+          <DefaultAbbrvName>Avr</DefaultAbbrvName>
+          <DefaultFullName>Avril</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>may</MonthID>
+          <DefaultAbbrvName>Me</DefaultAbbrvName>
+          <DefaultFullName>Me</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jun</MonthID>
+          <DefaultAbbrvName>Jen</DefaultAbbrvName>
+          <DefaultFullName>Jen</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jul</MonthID>
+          <DefaultAbbrvName>Jiy</DefaultAbbrvName>
+          <DefaultFullName>Jiyè</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>aug</MonthID>
+          <DefaultAbbrvName>Dao</DefaultAbbrvName>
+          <DefaultFullName>Daout</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>sep</MonthID>
+          <DefaultAbbrvName>Sep</DefaultAbbrvName>
+          <DefaultFullName>Septanm</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>oct</MonthID>
+          <DefaultAbbrvName>Okt</DefaultAbbrvName>
+          <DefaultFullName>Oktòb</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>nov</MonthID>
+          <DefaultAbbrvName>Nov</DefaultAbbrvName>
+          <DefaultFullName>Novanm</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>dec</MonthID>
+          <DefaultAbbrvName>Des</DefaultAbbrvName>
+          <DefaultFullName>Desanm</DefaultFullName>
+        </Month>
+      </MonthsOfYear>
+      <Eras>
+        <Era>
+          <EraID>bc</EraID>
+          <DefaultAbbrvName>AJ</DefaultAbbrvName>
+          <DefaultFullName>Avan Jezikri</DefaultFullName>
+        </Era>
+        <Era>
+          <EraID>ad</EraID>
+          <DefaultAbbrvName>AP</DefaultAbbrvName>
+          <DefaultFullName>Apre Jezikri</DefaultFullName>
+        </Era>
+      </Eras>
+      <StartDayOfWeek>
+        <DayID>sun</DayID>
+      </StartDayOfWeek>
+      <MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
+    </Calendar>
+  </LC_CALENDAR>
+  <LC_CURRENCY>
+    <Currency default="true" usedInCompatibleFormatCodes="true">
+      <CurrencyID>HTG</CurrencyID>
+      <CurrencySymbol>G</CurrencySymbol>
+      <BankSymbol>HTG</BankSymbol>
+      <CurrencyName>Goud</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+  </LC_CURRENCY>
+  <LC_TRANSLITERATION>
+    <Transliteration unoid="LOWERCASE_UPPERCASE"/>
+    <Transliteration unoid="UPPERCASE_LOWERCASE"/>
+    <Transliteration unoid="IGNORE_CASE"/>
+  </LC_TRANSLITERATION>
+  <LC_MISC>
+    <ReservedWords>
+      <trueWord>Vre</trueWord>
+      <falseWord>Fo</falseWord>
+      <quarter1Word>Trimès 1</quarter1Word>
+      <quarter2Word>Trimès 2</quarter2Word>
+      <quarter3Word>Trimès 3</quarter3Word>
+      <quarter4Word>Trimès 4</quarter4Word>
+      <aboveWord>Anwo</aboveWord>
+      <belowWord>Anba</belowWord>
+      <quarter1Abbreviation>Trimès 1</quarter1Abbreviation>
+      <quarter2Abbreviation>Trimès 2</quarter2Abbreviation>
+      <quarter3Abbreviation>Trimès 3</quarter3Abbreviation>
+      <quarter4Abbreviation>Trimès 4</quarter4Abbreviation>
+    </ReservedWords>
+  </LC_MISC>
+  <LC_NumberingLevel>
+    <NumberingLevel NumType="4" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="4" Prefix=" "  Suffix="."/>
+    <NumberingLevel NumType="4" Prefix="("  Suffix=")"/>
+    <NumberingLevel NumType="2" Prefix=" "  Suffix="."/>
+    <NumberingLevel NumType="0" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="1" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="1" Prefix="("  Suffix=")"/>
+    <NumberingLevel NumType="3" Prefix=" "  Suffix="."/>
+  </LC_NumberingLevel>
+  <LC_OutLineNumberingLevel ref="en_US"/>
+</Locale>
+<!--Version 1.0  -->
diff --git a/i18npool/source/localedata/data/jbo.xml b/i18npool/source/localedata/data/jbo.xml
new file mode 100644
index 000000000000..403442638bd0
--- /dev/null
+++ b/i18npool/source/localedata/data/jbo.xml
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+  <LC_INFO>
+    <Language>
+      <LangID>jbo</LangID>
+      <DefaultName>Lojban</DefaultName>
+    </Language>
+    <Country>
+      <CountryID></CountryID>
+      <DefaultName></DefaultName>
+    </Country>
+  </LC_INFO>
+  <LC_CTYPE unoid="generic">
+    <Separators>
+      <DateSeparator>/</DateSeparator>
+      <ThousandSeparator>,</ThousandSeparator>
+      <DecimalSeparator>.</DecimalSeparator>
+      <TimeSeparator>:</TimeSeparator>
+      <Time100SecSeparator>.</Time100SecSeparator>
+      <ListSeparator>;</ListSeparator>
+      <LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
+      <LongDateDaySeparator>, </LongDateDaySeparator>
+      <LongDateMonthSeparator> </LongDateMonthSeparator>
+      <LongDateYearSeparator> </LongDateYearSeparator>
+    </Separators>
+    <Markers>
+      <QuotationStart>‘</QuotationStart>
+      <QuotationEnd>’</QuotationEnd>
+      <DoubleQuotationStart>“</DoubleQuotationStart>
+      <DoubleQuotationEnd>”</DoubleQuotationEnd>
+    </Markers>
+    <TimeAM>PDM</TimeAM>
+    <TimePM>BDM</TimePM>
+    <MeasurementSystem>metric</MeasurementSystem>
+  </LC_CTYPE>
+  <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-658]">
+    <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
+      <FormatCode>General</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
+      <FormatCode>0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
+      <FormatCode>0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
+      <FormatCode>#,##0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
+      <FormatCode>#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
+      <FormatCode>#,###.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
+      <FormatCode>0.00E+00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
+      <FormatCode>0.00E+000</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
+      <FormatCode>0%</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
+      <FormatCode>0.00%</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
+      <FormatCode>[CURRENCY]#,##0;-[CURRENCY]#,##0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
+      <FormatCode>[CURRENCY]#,##0.00;-[CURRENCY]#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
+      <FormatCode>[CURRENCY]#,##0;[RED]-[CURRENCY]#,##0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
+      <FormatCode>[CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
+      <FormatCode>CCC#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
+      <FormatCode>[CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey11" default="true" type="short" usage="DATE" formatindex="18">
+      <FormatCode>D/MM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
+      <FormatCode>NNNNDD, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
+      <FormatCode>DD/MM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="21">
+      <FormatCode>DD/MM/YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="22">
+      <FormatCode>D, MMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="23">
+      <FormatCode>D, MMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey21" default="false" type="long" usage="DATE" formatindex="24">
+      <FormatCode>D, MMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="25">
+      <FormatCode>D, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey22" default="false" type="long" usage="DATE" formatindex="26">
+      <FormatCode>D, MMMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey10" default="false" type="medium" usage="DATE" formatindex="27">
+      <FormatCode>NN, DD/MMM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey18" default="false" type="long" usage="DATE" formatindex="28">
+      <FormatCode>NN, D, MMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey19" default="false" type="long" usage="DATE" formatindex="29">
+      <FormatCode>NN, D, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
+      <FormatCode>NNNND, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
+      <FormatCode>DD/MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="32">
+      <FormatCode>YY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="33">
+      <FormatCode>YYYY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey1" default="false" type="medium" usage="DATE" formatindex="34">
+      <FormatCode>MM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="35">
+      <FormatCode>MMM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="36">
+      <FormatCode>MMMM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="37">
+      <FormatCode>QQ YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey9" default="false" type="medium" usage="DATE" formatindex="38">
+      <FormatCode>WW</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39">
+      <FormatCode>HH:MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME" formatindex="40">
+      <FormatCode>HH:MM:SS</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME" formatindex="41">
+      <FormatCode>HH:MM AM/PM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME" formatindex="42">
+      <FormatCode>HH:MM:SS AM/PM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
+      <FormatCode>[HH]:MM:SS</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
+      <FormatCode>MM:SS.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
+      <FormatCode>[HH]:MM:SS.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
+      <FormatCode>DD/MM/YY HH:MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
+      <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode>
+    </FormatElement>
+  </LC_FORMAT>
+  <LC_COLLATION>
+    <Collator default="true" unoid="alphanumeric"/>
+    <CollationOptions>
+      <TransliterationModules>IGNORE_CASE</TransliterationModules>
+    </CollationOptions>
+  </LC_COLLATION>
+  <LC_SEARCH>
+    <SearchOptions>
+      <TransliterationModules>IGNORE_CASE</TransliterationModules>
+    </SearchOptions>
+  </LC_SEARCH>
+  <LC_INDEX>
+    <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-Z</IndexKey>
+    <UnicodeScript>0</UnicodeScript>
+    <UnicodeScript>1</UnicodeScript>
+    <FollowPageWord>BP</FollowPageWord>
+    <FollowPageWord>BP</FollowPageWord>
+  </LC_INDEX>
+  <LC_CALENDAR>
+    <Calendar unoid="gregorian" default="true">
+      <DaysOfWeek>
+        <Day>
+          <DayID>sun</DayID>
+          <DefaultAbbrvName>nondei</DefaultAbbrvName>
+          <DefaultFullName>nondei</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>mon</DayID>
+          <DefaultAbbrvName>pavdei</DefaultAbbrvName>
+          <DefaultFullName>pavdei</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>tue</DayID>
+          <DefaultAbbrvName>reldei</DefaultAbbrvName>
+          <DefaultFullName>reldei</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>wed</DayID>
+          <DefaultAbbrvName>cibdei</DefaultAbbrvName>
+          <DefaultFullName>cibdei</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>thu</DayID>
+          <DefaultAbbrvName>vondei</DefaultAbbrvName>
+          <DefaultFullName>vondei</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>fri</DayID>
+          <DefaultAbbrvName>mumdei</DefaultAbbrvName>
+          <DefaultFullName>mumdei</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>sat</DayID>
+          <DefaultAbbrvName>xavdei</DefaultAbbrvName>
+          <DefaultFullName>xavdei</DefaultFullName>
+        </Day>
+      </DaysOfWeek>
+      <MonthsOfYear>
+        <Month>
+          <MonthID>jan</MonthID>
+          <DefaultAbbrvName>pavma'i</DefaultAbbrvName>
+          <DefaultFullName>pavmasti</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>feb</MonthID>
+          <DefaultAbbrvName>relma'i</DefaultAbbrvName>
+          <DefaultFullName>relmasti</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>mar</MonthID>
+          <DefaultAbbrvName>cibma'i</DefaultAbbrvName>
+          <DefaultFullName>cibmasti</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>apr</MonthID>
+          <DefaultAbbrvName>vonma'i</DefaultAbbrvName>
+          <DefaultFullName>vonmasti</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>may</MonthID>
+          <DefaultAbbrvName>mumyma'i</DefaultAbbrvName>
+          <DefaultFullName>mumymasti</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jun</MonthID>
+          <DefaultAbbrvName>xavma'i</DefaultAbbrvName>
+          <DefaultFullName>xavmasti</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jul</MonthID>
+          <DefaultAbbrvName>zelma'i</DefaultAbbrvName>
+          <DefaultFullName>zelmasti</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>aug</MonthID>
+          <DefaultAbbrvName>bivma'i</DefaultAbbrvName>
+          <DefaultFullName>bivmasti</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>sep</MonthID>
+          <DefaultAbbrvName>sozma'i</DefaultAbbrvName>
+          <DefaultFullName>sozmasti</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>oct</MonthID>
+          <DefaultAbbrvName>daurma'i</DefaultAbbrvName>
+          <DefaultFullName>daurmasti</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>nov</MonthID>
+          <DefaultAbbrvName>feirma'i</DefaultAbbrvName>
+          <DefaultFullName>feirmasti</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>dec</MonthID>
+          <DefaultAbbrvName>gairma'i</DefaultAbbrvName>
+          <DefaultFullName>gairmasti</DefaultFullName>
+        </Month>
+      </MonthsOfYear>
+      <Eras>
+        <Era>
+          <EraID>bc</EraID>
+          <DefaultAbbrvName>PLK</DefaultAbbrvName>
+          <DefaultFullName>purci la .kraist.</DefaultFullName>
+        </Era>
+        <Era>
+          <EraID>ad</EraID>
+          <DefaultAbbrvName>NLK</DefaultAbbrvName>
+          <DefaultFullName>nanca la .kraist.</DefaultFullName>
+        </Era>
+      </Eras>
+      <StartDayOfWeek>
+        <DayID>mon</DayID>
+      </StartDayOfWeek>
+      <MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
+    </Calendar>
+  </LC_CALENDAR>
+  <LC_CURRENCY>
+    <Currency default="true" usedInCompatibleFormatCodes="true">
+      <CurrencyID>EUR</CurrencyID>
+      <CurrencySymbol>€</CurrencySymbol>
+      <BankSymbol>EUR</BankSymbol>
+      <CurrencyName>jdini</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+  </LC_CURRENCY>
+  <LC_TRANSLITERATION>
+    <Transliteration unoid="LOWERCASE_UPPERCASE"/>
+    <Transliteration unoid="UPPERCASE_LOWERCASE"/>
+    <Transliteration unoid="IGNORE_CASE"/>
+  </LC_TRANSLITERATION>
+  <LC_MISC>
+    <ReservedWords>
+      <trueWord>jetnu</trueWord>
+      <falseWord>jitfa</falseWord>
+      <quarter1Word>pa moi vo si'e</quarter1Word>
+      <quarter2Word>re moi vo si'e</quarter2Word>
+      <quarter3Word>ci moi vo si'e</quarter3Word>
+      <quarter4Word>vo moi vo si'e</quarter4Word>
+      <aboveWord>gapru</aboveWord>
+      <belowWord>cnita</belowWord>
+      <quarter1Abbreviation>1MVS</quarter1Abbreviation>
+      <quarter2Abbreviation>2MVS</quarter2Abbreviation>
+      <quarter3Abbreviation>3MVS</quarter3Abbreviation>
+      <quarter4Abbreviation>4MVS</quarter4Abbreviation>
+    </ReservedWords>
+  </LC_MISC>
+  <LC_NumberingLevel>
+    <NumberingLevel NumType="4" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="4" Prefix=" "  Suffix="."/>
+    <NumberingLevel NumType="4" Prefix="("  Suffix=")"/>
+    <NumberingLevel NumType="2" Prefix=" "  Suffix="."/>
+    <NumberingLevel NumType="0" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="1" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="1" Prefix="("  Suffix=")"/>
+    <NumberingLevel NumType="3" Prefix=" "  Suffix="."/>
+  </LC_NumberingLevel>
+  <LC_OutLineNumberingLevel ref="en_US"/>
+</Locale>
+<!--Version 1.0  -->
diff --git a/i18npool/source/localedata/data/lif_NP.xml b/i18npool/source/localedata/data/lif_NP.xml
new file mode 100644
index 000000000000..fadbfad11ff3
--- /dev/null
+++ b/i18npool/source/localedata/data/lif_NP.xml
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+  <LC_INFO>
+    <Language>
+      <LangID>lif</LangID>
+      <DefaultName>Limbu</DefaultName>
+    </Language>
+    <Country>
+      <CountryID>NP</CountryID>
+      <DefaultName>Nepal</DefaultName>
+    </Country>
+  </LC_INFO>
+  <LC_CTYPE unoid="generic">
+    <Separators>
+      <DateSeparator>/</DateSeparator>
+      <ThousandSeparator>,</ThousandSeparator>
+      <DecimalSeparator>.</DecimalSeparator>
+      <TimeSeparator>:</TimeSeparator>
+      <Time100SecSeparator>.</Time100SecSeparator>
+      <ListSeparator>;</ListSeparator>
+      <LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
+      <LongDateDaySeparator>, </LongDateDaySeparator>
+      <LongDateMonthSeparator> </LongDateMonthSeparator>
+      <LongDateYearSeparator> </LongDateYearSeparator>
+    </Separators>
+    <Markers>
+      <QuotationStart>‘</QuotationStart>
+      <QuotationEnd>’</QuotationEnd>
+      <DoubleQuotationStart>“</DoubleQuotationStart>
+      <DoubleQuotationEnd>”</DoubleQuotationEnd>
+    </Markers>
+    <TimeAM>पूर्वान्ह</TimeAM>
+    <TimePM>अपरान्ह</TimePM>
+    <MeasurementSystem>metric</MeasurementSystem>
+  </LC_CTYPE>
+  <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$रू-657]">
+    <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
+      <FormatCode>General</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
+      <FormatCode>0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
+      <FormatCode>0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
+      <FormatCode>#,##0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
+      <FormatCode>#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
+      <FormatCode>#,###.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
+      <FormatCode>0.00E+00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
+      <FormatCode>0.00E+000</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
+      <FormatCode>0%</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
+      <FormatCode>0.00%</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
+      <FormatCode>[CURRENCY] #,##0;-[CURRENCY] #,##0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
+      <FormatCode>[CURRENCY] #,##0.00;-[CURRENCY] #,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
+      <FormatCode>[CURRENCY] #,##0;[RED]-[CURRENCY] #,##0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
+      <FormatCode>[CURRENCY] #,##0.00;[RED]-[CURRENCY] #,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
+      <FormatCode>CCC#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
+      <FormatCode>[CURRENCY] #,##0.--;[RED]-[CURRENCY] #,##0.--</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey11" default="true" type="short" usage="DATE" formatindex="18">
+      <FormatCode>YY/MM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
+      <FormatCode>NNNNDD, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
+      <FormatCode>YY/MM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="21">
+      <FormatCode>YYYY/MM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="22">
+      <FormatCode>D, MMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="23">
+      <FormatCode>D, MMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey21" default="false" type="long" usage="DATE" formatindex="24">
+      <FormatCode>D, MMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="25">
+      <FormatCode>D, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey22" default="false" type="long" usage="DATE" formatindex="26">
+      <FormatCode>D, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey10" default="false" type="medium" usage="DATE" formatindex="27">
+      <FormatCode>NN, DD/MMM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey18" default="false" type="long" usage="DATE" formatindex="28">
+      <FormatCode>NN, D, MMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey19" default="false" type="long" usage="DATE" formatindex="29">
+      <FormatCode>NN, D, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
+      <FormatCode>NNNND, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
+      <FormatCode>MM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="32">
+      <FormatCode>YY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="33">
+      <FormatCode>YYYY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey1" default="false" type="medium" usage="DATE" formatindex="34">
+      <FormatCode>YY/MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="35">
+      <FormatCode>MMM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="36">
+      <FormatCode>MMMM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="37">
+      <FormatCode>QQ YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey9" default="false" type="medium" usage="DATE" formatindex="38">
+      <FormatCode>WW</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39">
+      <FormatCode>HH:MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME" formatindex="40">
+      <FormatCode>HH:MM:SS</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME" formatindex="41">
+      <FormatCode>HH:MM AM/PM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME" formatindex="42">
+      <FormatCode>HH:MM:SS AM/PM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
+      <FormatCode>[HH]:MM:SS</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
+      <FormatCode>MM:SS.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
+      <FormatCode>[HH]:MM:SS.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
+      <FormatCode>YY/MM/DD HH:MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
+      <FormatCode>YYYY/MM/DD HH:MM:SS AM/PM</FormatCode>
+    </FormatElement>
+  </LC_FORMAT>
+  <LC_COLLATION>
+    <Collator default="true" unoid="alphanumeric"/>
+    <CollationOptions>
+      <TransliterationModules>IGNORE_CASE</TransliterationModules>
+    </CollationOptions>
+  </LC_COLLATION>
+  <LC_SEARCH>
+    <SearchOptions>
+      <TransliterationModules>IGNORE_CASE</TransliterationModules>
+    </SearchOptions>
+  </LC_SEARCH>
+  <LC_INDEX>
+    <IndexKey phonetic="false" default="true" unoid="alphanumeric">ᤁ-ᤜ</IndexKey>
+    <UnicodeScript>85</UnicodeScript>
+    <FollowPageWord>p.</FollowPageWord>
+    <FollowPageWord>pp.</FollowPageWord>
+  </LC_INDEX>
+  <LC_CALENDAR>
+    <Calendar unoid="gregorian" default="true">
+      <DaysOfWeek>
+        <Day>
+          <DayID>sun</DayID>
+          <DefaultAbbrvName>ᤋᤧᤏᤧᤒᤠ</DefaultAbbrvName>
+          <DefaultFullName>ᤋᤧᤏᤧᤒᤠ</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>mon</DayID>
+          <DefaultAbbrvName>ᤑᤥᤖᤠᤒᤠ</DefaultAbbrvName>
+          <DefaultFullName>ᤑᤥᤖᤠᤒᤠ</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>tue</DayID>
+          <DefaultAbbrvName>ᤔᤡᤰᤜᤠᤱᤒᤠ</DefaultAbbrvName>
+          <DefaultFullName>ᤔᤡᤰᤜᤠᤱᤒᤠ</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>wed</DayID>
+          <DefaultAbbrvName>ᤂᤧᤰᤛᤢᤒᤠ</DefaultAbbrvName>
+          <DefaultFullName>ᤂᤧᤰᤛᤢᤒᤠ</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>thu</DayID>
+          <DefaultAbbrvName>ᤁᤢᤖᤢ᤺ᤵᤐᤠ</DefaultAbbrvName>
+          <DefaultFullName>ᤁᤢᤖᤢ᤺ᤵᤐᤠ</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>fri</DayID>
+          <DefaultAbbrvName>ᤑᤛᤢ᤺ᤵᤐᤠ</DefaultAbbrvName>
+          <DefaultFullName>ᤑᤛᤢ᤺ᤵᤐᤠ</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>sat</DayID>
+          <DefaultAbbrvName>ᤛᤧᤴᤇᤪᤧᤱᤒᤠ</DefaultAbbrvName>
+          <DefaultFullName>ᤛᤧᤴᤇᤪᤧᤱᤒᤠ</DefaultFullName>
+        </Day>
+      </DaysOfWeek>
+      <MonthsOfYear>
+        <Month>
+          <MonthID>jan</MonthID>
+          <DefaultAbbrvName>जन</DefaultAbbrvName>
+          <DefaultFullName>जनवरी</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>feb</MonthID>
+          <DefaultAbbrvName>फेब</DefaultAbbrvName>
+          <DefaultFullName>फेब्रुअरी</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>mar</MonthID>
+          <DefaultAbbrvName>मार्च</DefaultAbbrvName>
+          <DefaultFullName>मार्च</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>apr</MonthID>
+          <DefaultAbbrvName>अप्रि</DefaultAbbrvName>
+          <DefaultFullName>अप्रिल</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>may</MonthID>
+          <DefaultAbbrvName>मे</DefaultAbbrvName>
+          <DefaultFullName>मे</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jun</MonthID>
+          <DefaultAbbrvName>जुन</DefaultAbbrvName>
+          <DefaultFullName>जुन</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jul</MonthID>
+          <DefaultAbbrvName>जुला</DefaultAbbrvName>
+          <DefaultFullName>जुलाई</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>aug</MonthID>
+          <DefaultAbbrvName>अग</DefaultAbbrvName>
+          <DefaultFullName>अगस्त</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>sep</MonthID>
+          <DefaultAbbrvName>सेप्ट</DefaultAbbrvName>
+          <DefaultFullName>सेप्टेम्बर</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>oct</MonthID>
+          <DefaultAbbrvName>अक्टो</DefaultAbbrvName>
+          <DefaultFullName>अक्टोबर</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>nov</MonthID>
+          <DefaultAbbrvName>नोभे</DefaultAbbrvName>
+          <DefaultFullName>नोभेम्बर</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>dec</MonthID>
+          <DefaultAbbrvName>डिसे</DefaultAbbrvName>
+          <DefaultFullName>डिसेम्बर</DefaultFullName>
+        </Month>
+      </MonthsOfYear>
+      <Eras>
+        <Era>
+          <EraID>bc</EraID>
+          <DefaultAbbrvName>ईसापूर्व</DefaultAbbrvName>
+          <DefaultFullName>ईसापूर्व</DefaultFullName>
+        </Era>
+        <Era>
+          <EraID>ad</EraID>
+          <DefaultAbbrvName>सन्</DefaultAbbrvName>
+          <DefaultFullName>सन्</DefaultFullName>
+        </Era>
+      </Eras>
+      <StartDayOfWeek>
+        <DayID>sun</DayID>
+      </StartDayOfWeek>
+      <MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
+    </Calendar>
+  </LC_CALENDAR>
+  <LC_CURRENCY>
+    <Currency default="true" usedInCompatibleFormatCodes="true">
+      <CurrencyID>NPR</CurrencyID>
+      <CurrencySymbol>रू</CurrencySymbol>
+      <BankSymbol>NPR</BankSymbol>
+      <CurrencyName>Nepalese Rupee</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+  </LC_CURRENCY>
+  <LC_TRANSLITERATION>
+    <Transliteration unoid="LOWERCASE_UPPERCASE"/>
+    <Transliteration unoid="UPPERCASE_LOWERCASE"/>
+    <Transliteration unoid="IGNORE_CASE"/>
+  </LC_TRANSLITERATION>
+  <LC_MISC>
+    <ReservedWords>
+      <trueWord>ठीक</trueWord>
+      <falseWord>बेठीक</falseWord>
+      <quarter1Word>पहिलो सत्र</quarter1Word>
+      <quarter2Word>दोस्रो सत्र</quarter2Word>
+      <quarter3Word>तेस्रो सत्र</quarter3Word>
+      <quarter4Word>चौथो सत्र</quarter4Word>
+      <aboveWord>माथि</aboveWord>
+      <belowWord>तल</belowWord>
+      <quarter1Abbreviation>Q1</quarter1Abbreviation>
+      <quarter2Abbreviation>Q2</quarter2Abbreviation>
+      <quarter3Abbreviation>Q3</quarter3Abbreviation>
+      <quarter4Abbreviation>Q4</quarter4Abbreviation>
+    </ReservedWords>
+  </LC_MISC>
+  <LC_NumberingLevel>
+    <NumberingLevel NumType="12" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="12" Prefix=" "  Suffix="."/>
+    <NumberingLevel NumType="12" Prefix="("  Suffix=")"/>
+    <NumberingLevel NumType="2" Prefix=" "  Suffix="."/>
+    <NumberingLevel NumType="2" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="3" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="3" Prefix="("  Suffix=")"/>
+    <NumberingLevel NumType="12" Prefix=" "  Suffix="."/>
+  </LC_NumberingLevel>
+  <LC_OutLineNumberingLevel ref="en_US"/>
+</Locale>
+<!--Version 1.0  -->
diff --git a/i18npool/source/localedata/data/localedata_euro.map b/i18npool/source/localedata/data/localedata_euro.map
index e0564b85ea25..b9dd20c724d7 100644
--- a/i18npool/source/localedata/data/localedata_euro.map
+++ b/i18npool/source/localedata/data/localedata_euro.map
@@ -16,6 +16,7 @@ getAllCalendars_de_CH;
 getAllCalendars_de_DE;
 getAllCalendars_de_LI;
 getAllCalendars_de_LU;
+getAllCalendars_dsb_DE;
 getAllCalendars_el_GR;
 getAllCalendars_et_EE;
 getAllCalendars_eu;
@@ -86,6 +87,7 @@ getAllCurrencies_de_CH;
 getAllCurrencies_de_DE;
 getAllCurrencies_de_LI;
 getAllCurrencies_de_LU;
+getAllCurrencies_dsb_DE;
 getAllCurrencies_el_GR;
 getAllCurrencies_et_EE;
 getAllCurrencies_eu;
@@ -156,6 +158,7 @@ getAllFormats0_de_CH;
 getAllFormats0_de_DE;
 getAllFormats0_de_LI;
 getAllFormats0_de_LU;
+getAllFormats0_dsb_DE;
 getAllFormats0_el_GR;
 getAllFormats0_et_EE;
 getAllFormats0_eu;
@@ -226,6 +229,7 @@ getBreakIteratorRules_de_CH;
 getBreakIteratorRules_de_DE;
 getBreakIteratorRules_de_LI;
 getBreakIteratorRules_de_LU;
+getBreakIteratorRules_dsb_DE;
 getBreakIteratorRules_el_GR;
 getBreakIteratorRules_et_EE;
 getBreakIteratorRules_eu;
@@ -296,6 +300,7 @@ getCollationOptions_de_CH;
 getCollationOptions_de_DE;
 getCollationOptions_de_LI;
 getCollationOptions_de_LU;
+getCollationOptions_dsb_DE;
 getCollationOptions_el_GR;
 getCollationOptions_et_EE;
 getCollationOptions_eu;
@@ -366,6 +371,7 @@ getCollatorImplementation_de_CH;
 getCollatorImplementation_de_DE;
 getCollatorImplementation_de_LI;
 getCollatorImplementation_de_LU;
+getCollatorImplementation_dsb_DE;
 getCollatorImplementation_el_GR;
 getCollatorImplementation_et_EE;
 getCollatorImplementation_eu;
@@ -436,6 +442,7 @@ getContinuousNumberingLevels_de_CH;
 getContinuousNumberingLevels_de_DE;
 getContinuousNumberingLevels_de_LI;
 getContinuousNumberingLevels_de_LU;
+getContinuousNumberingLevels_dsb_DE;
 getContinuousNumberingLevels_el_GR;
 getContinuousNumberingLevels_et_EE;
 getContinuousNumberingLevels_eu;
@@ -506,6 +513,7 @@ getFollowPageWords_de_CH;
 getFollowPageWords_de_DE;
 getFollowPageWords_de_LI;
 getFollowPageWords_de_LU;
+getFollowPageWords_dsb_DE;
 getFollowPageWords_el_GR;
 getFollowPageWords_et_EE;
 getFollowPageWords_eu;
@@ -576,6 +584,7 @@ getForbiddenCharacters_de_CH;
 getForbiddenCharacters_de_DE;
 getForbiddenCharacters_de_LI;
 getForbiddenCharacters_de_LU;
+getForbiddenCharacters_dsb_DE;
 getForbiddenCharacters_el_GR;
 getForbiddenCharacters_et_EE;
 getForbiddenCharacters_eu;
@@ -646,6 +655,7 @@ getIndexAlgorithm_de_CH;
 getIndexAlgorithm_de_DE;
 getIndexAlgorithm_de_LI;
 getIndexAlgorithm_de_LU;
+getIndexAlgorithm_dsb_DE;
 getIndexAlgorithm_el_GR;
 getIndexAlgorithm_et_EE;
 getIndexAlgorithm_eu;
@@ -716,6 +726,7 @@ getLCInfo_de_CH;
 getLCInfo_de_DE;
 getLCInfo_de_LI;
 getLCInfo_de_LU;
+getLCInfo_dsb_DE;
 getLCInfo_el_GR;
 getLCInfo_et_EE;
 getLCInfo_eu;
@@ -786,6 +797,7 @@ getLocaleItem_de_CH;
 getLocaleItem_de_DE;
 getLocaleItem_de_LI;
 getLocaleItem_de_LU;
+getLocaleItem_dsb_DE;
 getLocaleItem_el_GR;
 getLocaleItem_et_EE;
 getLocaleItem_eu;
@@ -856,6 +868,7 @@ getOutlineNumberingLevels_de_CH;
 getOutlineNumberingLevels_de_DE;
 getOutlineNumberingLevels_de_LI;
 getOutlineNumberingLevels_de_LU;
+getOutlineNumberingLevels_dsb_DE;
 getOutlineNumberingLevels_el_GR;
 getOutlineNumberingLevels_et_EE;
 getOutlineNumberingLevels_eu;
@@ -926,6 +939,7 @@ getReservedWords_de_CH;
 getReservedWords_de_DE;
 getReservedWords_de_LI;
 getReservedWords_de_LU;
+getReservedWords_dsb_DE;
 getReservedWords_el_GR;
 getReservedWords_et_EE;
 getReservedWords_eu;
@@ -996,6 +1010,7 @@ getSearchOptions_de_CH;
 getSearchOptions_de_DE;
 getSearchOptions_de_LI;
 getSearchOptions_de_LU;
+getSearchOptions_dsb_DE;
 getSearchOptions_el_GR;
 getSearchOptions_et_EE;
 getSearchOptions_eu;
@@ -1066,6 +1081,7 @@ getTransliterations_de_CH;
 getTransliterations_de_DE;
 getTransliterations_de_LI;
 getTransliterations_de_LU;
+getTransliterations_dsb_DE;
 getTransliterations_el_GR;
 getTransliterations_et_EE;
 getTransliterations_eu;
@@ -1136,6 +1152,7 @@ getUnicodeScripts_de_CH;
 getUnicodeScripts_de_DE;
 getUnicodeScripts_de_LI;
 getUnicodeScripts_de_LU;
+getUnicodeScripts_dsb_DE;
 getUnicodeScripts_el_GR;
 getUnicodeScripts_et_EE;
 getUnicodeScripts_eu;
diff --git a/i18npool/source/localedata/data/localedata_others.map b/i18npool/source/localedata/data/localedata_others.map
index 5a77adff0244..5e9d81eaf31c 100644
--- a/i18npool/source/localedata/data/localedata_others.map
+++ b/i18npool/source/localedata/data/localedata_others.map
@@ -1,5 +1,6 @@
 UDK_3_0_0 {
 global:
+GetVersionInfo;
 getAllCalendars_af_NA;
 getAllCalendars_af_ZA;
 getAllCalendars_ak_GH;
@@ -21,14 +22,17 @@ getAllCalendars_fa_IR;
 getAllCalendars_gug_PY;
 getAllCalendars_gu_IN;
 getAllCalendars_ha_GH;
+getAllCalendars_haw_US;
 getAllCalendars_he_IL;
 getAllCalendars_hi_IN;
 getAllCalendars_hil_PH;
+getAllCalendars_ht_HT;
 getAllCalendars_hu_HU;
 getAllCalendars_hy_AM;
 getAllCalendars_ia;
 getAllCalendars_id_ID;
 getAllCalendars_ja_JP;
+getAllCalendars_jbo;
 getAllCalendars_kab_DZ;
 getAllCalendars_kk_KZ;
 getAllCalendars_km_KH;
@@ -37,6 +41,7 @@ getAllCalendars_ko_KR;
 getAllCalendars_ku_TR;
 getAllCalendars_ky_KG;
 getAllCalendars_lg_UG;
+getAllCalendars_lif_NP;
 getAllCalendars_ln_CD;
 getAllCalendars_lo_LA;
 getAllCalendars_mai_IN;
@@ -69,10 +74,12 @@ getAllCalendars_tn_ZA;
 getAllCalendars_tpi_PG;
 getAllCalendars_ts_ZA;
 getAllCalendars_ug_CN;
+getAllCalendars_ur_PK;
 getAllCalendars_uz_UZ;
 getAllCalendars_ve_ZA;
 getAllCalendars_vi_VN;
 getAllCalendars_xh_ZA;
+getAllCalendars_yi_US;
 getAllCalendars_zh_CN;
 getAllCalendars_zh_HK;
 getAllCalendars_zh_MO;
@@ -100,14 +107,17 @@ getAllCurrencies_fa_IR;
 getAllCurrencies_gug_PY;
 getAllCurrencies_gu_IN;
 getAllCurrencies_ha_GH;
+getAllCurrencies_haw_US;
 getAllCurrencies_he_IL;
 getAllCurrencies_hi_IN;
 getAllCurrencies_hil_PH;
+getAllCurrencies_ht_HT;
 getAllCurrencies_hu_HU;
 getAllCurrencies_hy_AM;
 getAllCurrencies_ia;
 getAllCurrencies_id_ID;
 getAllCurrencies_ja_JP;
+getAllCurrencies_jbo;
 getAllCurrencies_kab_DZ;
 getAllCurrencies_kk_KZ;
 getAllCurrencies_km_KH;
@@ -116,6 +126,7 @@ getAllCurrencies_ko_KR;
 getAllCurrencies_ku_TR;
 getAllCurrencies_ky_KG;
 getAllCurrencies_lg_UG;
+getAllCurrencies_lif_NP;
 getAllCurrencies_ln_CD;
 getAllCurrencies_lo_LA;
 getAllCurrencies_mai_IN;
@@ -148,10 +159,12 @@ getAllCurrencies_tn_ZA;
 getAllCurrencies_tpi_PG;
 getAllCurrencies_ts_ZA;
 getAllCurrencies_ug_CN;
+getAllCurrencies_ur_PK;
 getAllCurrencies_uz_UZ;
 getAllCurrencies_ve_ZA;
 getAllCurrencies_vi_VN;
 getAllCurrencies_xh_ZA;
+getAllCurrencies_yi_US;
 getAllCurrencies_zh_CN;
 getAllCurrencies_zh_HK;
 getAllCurrencies_zh_MO;
@@ -179,14 +192,17 @@ getAllFormats0_fa_IR;
 getAllFormats0_gug_PY;
 getAllFormats0_gu_IN;
 getAllFormats0_ha_GH;
+getAllFormats0_haw_US;
 getAllFormats0_he_IL;
 getAllFormats0_hi_IN;
 getAllFormats0_hil_PH;
+getAllFormats0_ht_HT;
 getAllFormats0_hu_HU;
 getAllFormats0_hy_AM;
 getAllFormats0_ia;
 getAllFormats0_id_ID;
 getAllFormats0_ja_JP;
+getAllFormats0_jbo;
 getAllFormats0_kab_DZ;
 getAllFormats0_kk_KZ;
 getAllFormats0_km_KH;
@@ -195,6 +211,7 @@ getAllFormats0_ko_KR;
 getAllFormats0_ku_TR;
 getAllFormats0_ky_KG;
 getAllFormats0_lg_UG;
+getAllFormats0_lif_NP;
 getAllFormats0_ln_CD;
 getAllFormats0_lo_LA;
 getAllFormats0_mai_IN;
@@ -227,10 +244,12 @@ getAllFormats0_tn_ZA;
 getAllFormats0_tpi_PG;
 getAllFormats0_ts_ZA;
 getAllFormats0_ug_CN;
+getAllFormats0_ur_PK;
 getAllFormats0_uz_UZ;
 getAllFormats0_ve_ZA;
 getAllFormats0_vi_VN;
 getAllFormats0_xh_ZA;
+getAllFormats0_yi_US;
 getAllFormats0_zh_CN;
 getAllFormats0_zh_HK;
 getAllFormats0_zh_MO;
@@ -258,14 +277,17 @@ getBreakIteratorRules_fa_IR;
 getBreakIteratorRules_gug_PY;
 getBreakIteratorRules_gu_IN;
 getBreakIteratorRules_ha_GH;
+getBreakIteratorRules_haw_US;
 getBreakIteratorRules_he_IL;
 getBreakIteratorRules_hi_IN;
 getBreakIteratorRules_hil_PH;
+getBreakIteratorRules_ht_HT;
 getBreakIteratorRules_hu_HU;
 getBreakIteratorRules_hy_AM;
 getBreakIteratorRules_ia;
 getBreakIteratorRules_id_ID;
 getBreakIteratorRules_ja_JP;
+getBreakIteratorRules_jbo;
 getBreakIteratorRules_kab_DZ;
 getBreakIteratorRules_kk_KZ;
 getBreakIteratorRules_km_KH;
@@ -274,6 +296,7 @@ getBreakIteratorRules_ko_KR;
 getBreakIteratorRules_ku_TR;
 getBreakIteratorRules_ky_KG;
 getBreakIteratorRules_lg_UG;
+getBreakIteratorRules_lif_NP;
 getBreakIteratorRules_ln_CD;
 getBreakIteratorRules_lo_LA;
 getBreakIteratorRules_mai_IN;
@@ -306,10 +329,12 @@ getBreakIteratorRules_tn_ZA;
 getBreakIteratorRules_tpi_PG;
 getBreakIteratorRules_ts_ZA;
 getBreakIteratorRules_ug_CN;
+getBreakIteratorRules_ur_PK;
 getBreakIteratorRules_uz_UZ;
 getBreakIteratorRules_ve_ZA;
 getBreakIteratorRules_vi_VN;
 getBreakIteratorRules_xh_ZA;
+getBreakIteratorRules_yi_US;
 getBreakIteratorRules_zh_CN;
 getBreakIteratorRules_zh_HK;
 getBreakIteratorRules_zh_MO;
@@ -337,14 +362,17 @@ getCollationOptions_fa_IR;
 getCollationOptions_gug_PY;
 getCollationOptions_gu_IN;
 getCollationOptions_ha_GH;
+getCollationOptions_haw_US;
 getCollationOptions_he_IL;
 getCollationOptions_hi_IN;
 getCollationOptions_hil_PH;
+getCollationOptions_ht_HT;
 getCollationOptions_hu_HU;
 getCollationOptions_hy_AM;
 getCollationOptions_ia;
 getCollationOptions_id_ID;
 getCollationOptions_ja_JP;
+getCollationOptions_jbo;
 getCollationOptions_kab_DZ;
 getCollationOptions_kk_KZ;
 getCollationOptions_km_KH;
@@ -353,6 +381,7 @@ getCollationOptions_ko_KR;
 getCollationOptions_ku_TR;
 getCollationOptions_ky_KG;
 getCollationOptions_lg_UG;
+getCollationOptions_lif_NP;
 getCollationOptions_ln_CD;
 getCollationOptions_lo_LA;
 getCollationOptions_mai_IN;
@@ -385,10 +414,12 @@ getCollationOptions_tn_ZA;
 getCollationOptions_tpi_PG;
 getCollationOptions_ts_ZA;
 getCollationOptions_ug_CN;
+getCollationOptions_ur_PK;
 getCollationOptions_uz_UZ;
 getCollationOptions_ve_ZA;
 getCollationOptions_vi_VN;
 getCollationOptions_xh_ZA;
+getCollationOptions_yi_US;
 getCollationOptions_zh_CN;
 getCollationOptions_zh_HK;
 getCollationOptions_zh_MO;
@@ -416,14 +447,17 @@ getCollatorImplementation_fa_IR;
 getCollatorImplementation_gug_PY;
 getCollatorImplementation_gu_IN;
 getCollatorImplementation_ha_GH;
+getCollatorImplementation_haw_US;
 getCollatorImplementation_he_IL;
 getCollatorImplementation_hi_IN;
 getCollatorImplementation_hil_PH;
+getCollatorImplementation_ht_HT;
 getCollatorImplementation_hu_HU;
 getCollatorImplementation_hy_AM;
 getCollatorImplementation_ia;
 getCollatorImplementation_id_ID;
 getCollatorImplementation_ja_JP;
+getCollatorImplementation_jbo;
 getCollatorImplementation_kab_DZ;
 getCollatorImplementation_kk_KZ;
 getCollatorImplementation_km_KH;
@@ -432,6 +466,7 @@ getCollatorImplementation_ko_KR;
 getCollatorImplementation_ku_TR;
 getCollatorImplementation_ky_KG;
 getCollatorImplementation_lg_UG;
+getCollatorImplementation_lif_NP;
 getCollatorImplementation_ln_CD;
 getCollatorImplementation_lo_LA;
 getCollatorImplementation_mai_IN;
@@ -464,10 +499,12 @@ getCollatorImplementation_tn_ZA;
 getCollatorImplementation_tpi_PG;
 getCollatorImplementation_ts_ZA;
 getCollatorImplementation_ug_CN;
+getCollatorImplementation_ur_PK;
 getCollatorImplementation_uz_UZ;
 getCollatorImplementation_ve_ZA;
 getCollatorImplementation_vi_VN;
 getCollatorImplementation_xh_ZA;
+getCollatorImplementation_yi_US;
 getCollatorImplementation_zh_CN;
 getCollatorImplementation_zh_HK;
 getCollatorImplementation_zh_MO;
@@ -495,14 +532,17 @@ getContinuousNumberingLevels_fa_IR;
 getContinuousNumberingLevels_gug_PY;
 getContinuousNumberingLevels_gu_IN;
 getContinuousNumberingLevels_ha_GH;
+getContinuousNumberingLevels_haw_US;
 getContinuousNumberingLevels_he_IL;
 getContinuousNumberingLevels_hi_IN;
 getContinuousNumberingLevels_hil_PH;
+getContinuousNumberingLevels_ht_HT;
 getContinuousNumberingLevels_hu_HU;
 getContinuousNumberingLevels_hy_AM;
 getContinuousNumberingLevels_ia;
 getContinuousNumberingLevels_id_ID;
 getContinuousNumberingLevels_ja_JP;
+getContinuousNumberingLevels_jbo;
 getContinuousNumberingLevels_kab_DZ;
 getContinuousNumberingLevels_kk_KZ;
 getContinuousNumberingLevels_km_KH;
@@ -511,6 +551,7 @@ getContinuousNumberingLevels_ko_KR;
 getContinuousNumberingLevels_ku_TR;
 getContinuousNumberingLevels_ky_KG;
 getContinuousNumberingLevels_lg_UG;
+getContinuousNumberingLevels_lif_NP;
 getContinuousNumberingLevels_ln_CD;
 getContinuousNumberingLevels_lo_LA;
 getContinuousNumberingLevels_mai_IN;
@@ -543,10 +584,12 @@ getContinuousNumberingLevels_tn_ZA;
 getContinuousNumberingLevels_tpi_PG;
 getContinuousNumberingLevels_ts_ZA;
 getContinuousNumberingLevels_ug_CN;
+getContinuousNumberingLevels_ur_PK;
 getContinuousNumberingLevels_uz_UZ;
 getContinuousNumberingLevels_ve_ZA;
 getContinuousNumberingLevels_vi_VN;
 getContinuousNumberingLevels_xh_ZA;
+getContinuousNumberingLevels_yi_US;
 getContinuousNumberingLevels_zh_CN;
 getContinuousNumberingLevels_zh_HK;
 getContinuousNumberingLevels_zh_MO;
@@ -574,14 +617,17 @@ getFollowPageWords_fa_IR;
 getFollowPageWords_gug_PY;
 getFollowPageWords_gu_IN;
 getFollowPageWords_ha_GH;
+getFollowPageWords_haw_US;
 getFollowPageWords_he_IL;
 getFollowPageWords_hi_IN;
 getFollowPageWords_hil_PH;
+getFollowPageWords_ht_HT;
 getFollowPageWords_hu_HU;
 getFollowPageWords_hy_AM;
 getFollowPageWords_ia;
 getFollowPageWords_id_ID;
 getFollowPageWords_ja_JP;
+getFollowPageWords_jbo;
 getFollowPageWords_kab_DZ;
 getFollowPageWords_kk_KZ;
 getFollowPageWords_km_KH;
@@ -590,6 +636,7 @@ getFollowPageWords_ko_KR;
 getFollowPageWords_ku_TR;
 getFollowPageWords_ky_KG;
 getFollowPageWords_lg_UG;
+getFollowPageWords_lif_NP;
 getFollowPageWords_ln_CD;
 getFollowPageWords_lo_LA;
 getFollowPageWords_mai_IN;
@@ -622,10 +669,12 @@ getFollowPageWords_tn_ZA;
 getFollowPageWords_tpi_PG;
 getFollowPageWords_ts_ZA;
 getFollowPageWords_ug_CN;
+getFollowPageWords_ur_PK;
 getFollowPageWords_uz_UZ;
 getFollowPageWords_ve_ZA;
 getFollowPageWords_vi_VN;
 getFollowPageWords_xh_ZA;
+getFollowPageWords_yi_US;
 getFollowPageWords_zh_CN;
 getFollowPageWords_zh_HK;
 getFollowPageWords_zh_MO;
@@ -653,14 +702,17 @@ getForbiddenCharacters_fa_IR;
 getForbiddenCharacters_gug_PY;
 getForbiddenCharacters_gu_IN;
 getForbiddenCharacters_ha_GH;
+getForbiddenCharacters_haw_US;
 getForbiddenCharacters_he_IL;
 getForbiddenCharacters_hi_IN;
 getForbiddenCharacters_hil_PH;
+getForbiddenCharacters_ht_HT;
 getForbiddenCharacters_hu_HU;
 getForbiddenCharacters_hy_AM;
 getForbiddenCharacters_ia;
 getForbiddenCharacters_id_ID;
 getForbiddenCharacters_ja_JP;
+getForbiddenCharacters_jbo;
 getForbiddenCharacters_kab_DZ;
 getForbiddenCharacters_kk_KZ;
 getForbiddenCharacters_km_KH;
@@ -669,6 +721,7 @@ getForbiddenCharacters_ko_KR;
 getForbiddenCharacters_ku_TR;
 getForbiddenCharacters_ky_KG;
 getForbiddenCharacters_lg_UG;
+getForbiddenCharacters_lif_NP;
 getForbiddenCharacters_ln_CD;
 getForbiddenCharacters_lo_LA;
 getForbiddenCharacters_mai_IN;
@@ -701,10 +754,12 @@ getForbiddenCharacters_tn_ZA;
 getForbiddenCharacters_tpi_PG;
 getForbiddenCharacters_ts_ZA;
 getForbiddenCharacters_ug_CN;
+getForbiddenCharacters_ur_PK;
 getForbiddenCharacters_uz_UZ;
 getForbiddenCharacters_ve_ZA;
 getForbiddenCharacters_vi_VN;
 getForbiddenCharacters_xh_ZA;
+getForbiddenCharacters_yi_US;
 getForbiddenCharacters_zh_CN;
 getForbiddenCharacters_zh_HK;
 getForbiddenCharacters_zh_MO;
@@ -732,14 +787,17 @@ getIndexAlgorithm_fa_IR;
 getIndexAlgorithm_gug_PY;
 getIndexAlgorithm_gu_IN;
 getIndexAlgorithm_ha_GH;
+getIndexAlgorithm_haw_US;
 getIndexAlgorithm_he_IL;
 getIndexAlgorithm_hi_IN;
 getIndexAlgorithm_hil_PH;
+getIndexAlgorithm_ht_HT;
 getIndexAlgorithm_hu_HU;
 getIndexAlgorithm_hy_AM;
 getIndexAlgorithm_ia;
 getIndexAlgorithm_id_ID;
 getIndexAlgorithm_ja_JP;
+getIndexAlgorithm_jbo;
 getIndexAlgorithm_kab_DZ;
 getIndexAlgorithm_kk_KZ;
 getIndexAlgorithm_km_KH;
@@ -748,6 +806,7 @@ getIndexAlgorithm_ko_KR;
 getIndexAlgorithm_ku_TR;
 getIndexAlgorithm_ky_KG;
 getIndexAlgorithm_lg_UG;
+getIndexAlgorithm_lif_NP;
 getIndexAlgorithm_ln_CD;
 getIndexAlgorithm_lo_LA;
 getIndexAlgorithm_mai_IN;
@@ -780,10 +839,12 @@ getIndexAlgorithm_tn_ZA;
 getIndexAlgorithm_tpi_PG;
 getIndexAlgorithm_ts_ZA;
 getIndexAlgorithm_ug_CN;
+getIndexAlgorithm_ur_PK;
 getIndexAlgorithm_uz_UZ;
 getIndexAlgorithm_ve_ZA;
 getIndexAlgorithm_vi_VN;
 getIndexAlgorithm_xh_ZA;
+getIndexAlgorithm_yi_US;
 getIndexAlgorithm_zh_CN;
 getIndexAlgorithm_zh_HK;
 getIndexAlgorithm_zh_MO;
@@ -811,14 +872,17 @@ getLCInfo_fa_IR;
 getLCInfo_gug_PY;
 getLCInfo_gu_IN;
 getLCInfo_ha_GH;
+getLCInfo_haw_US;
 getLCInfo_he_IL;
 getLCInfo_hi_IN;
 getLCInfo_hil_PH;
+getLCInfo_ht_HT;
 getLCInfo_hu_HU;
 getLCInfo_hy_AM;
 getLCInfo_ia;
 getLCInfo_id_ID;
 getLCInfo_ja_JP;
+getLCInfo_jbo;
 getLCInfo_kab_DZ;
 getLCInfo_kk_KZ;
 getLCInfo_km_KH;
@@ -827,6 +891,7 @@ getLCInfo_ko_KR;
 getLCInfo_ku_TR;
 getLCInfo_ky_KG;
 getLCInfo_lg_UG;
+getLCInfo_lif_NP;
 getLCInfo_ln_CD;
 getLCInfo_lo_LA;
 getLCInfo_mai_IN;
@@ -859,10 +924,12 @@ getLCInfo_tn_ZA;
 getLCInfo_tpi_PG;
 getLCInfo_ts_ZA;
 getLCInfo_ug_CN;
+getLCInfo_ur_PK;
 getLCInfo_uz_UZ;
 getLCInfo_ve_ZA;
 getLCInfo_vi_VN;
 getLCInfo_xh_ZA;
+getLCInfo_yi_US;
 getLCInfo_zh_CN;
 getLCInfo_zh_HK;
 getLCInfo_zh_MO;
@@ -890,14 +957,17 @@ getLocaleItem_fa_IR;
 getLocaleItem_gug_PY;
 getLocaleItem_gu_IN;
 getLocaleItem_ha_GH;
+getLocaleItem_haw_US;
 getLocaleItem_he_IL;
 getLocaleItem_hi_IN;
 getLocaleItem_hil_PH;
+getLocaleItem_ht_HT;
 getLocaleItem_hu_HU;
 getLocaleItem_hy_AM;
 getLocaleItem_ia;
 getLocaleItem_id_ID;
 getLocaleItem_ja_JP;
+getLocaleItem_jbo;
 getLocaleItem_kab_DZ;
 getLocaleItem_kk_KZ;
 getLocaleItem_km_KH;
@@ -906,6 +976,7 @@ getLocaleItem_ko_KR;
 getLocaleItem_ku_TR;
 getLocaleItem_ky_KG;
 getLocaleItem_lg_UG;
+getLocaleItem_lif_NP;
 getLocaleItem_ln_CD;
 getLocaleItem_lo_LA;
 getLocaleItem_mai_IN;
@@ -938,10 +1009,12 @@ getLocaleItem_tn_ZA;
 getLocaleItem_tpi_PG;
 getLocaleItem_ts_ZA;
 getLocaleItem_ug_CN;
+getLocaleItem_ur_PK;
 getLocaleItem_uz_UZ;
 getLocaleItem_ve_ZA;
 getLocaleItem_vi_VN;
 getLocaleItem_xh_ZA;
+getLocaleItem_yi_US;
 getLocaleItem_zh_CN;
 getLocaleItem_zh_HK;
 getLocaleItem_zh_MO;
@@ -969,14 +1042,17 @@ getOutlineNumberingLevels_fa_IR;
 getOutlineNumberingLevels_gug_PY;
 getOutlineNumberingLevels_gu_IN;
 getOutlineNumberingLevels_ha_GH;
+getOutlineNumberingLevels_haw_US;
 getOutlineNumberingLevels_he_IL;
 getOutlineNumberingLevels_hi_IN;
 getOutlineNumberingLevels_hil_PH;
+getOutlineNumberingLevels_ht_HT;
 getOutlineNumberingLevels_hu_HU;
 getOutlineNumberingLevels_hy_AM;
 getOutlineNumberingLevels_ia;
 getOutlineNumberingLevels_id_ID;
 getOutlineNumberingLevels_ja_JP;
+getOutlineNumberingLevels_jbo;
 getOutlineNumberingLevels_kab_DZ;
 getOutlineNumberingLevels_kk_KZ;
 getOutlineNumberingLevels_km_KH;
@@ -985,6 +1061,7 @@ getOutlineNumberingLevels_ko_KR;
 getOutlineNumberingLevels_ku_TR;
 getOutlineNumberingLevels_ky_KG;
 getOutlineNumberingLevels_lg_UG;
+getOutlineNumberingLevels_lif_NP;
 getOutlineNumberingLevels_ln_CD;
 getOutlineNumberingLevels_lo_LA;
 getOutlineNumberingLevels_mai_IN;
@@ -1017,10 +1094,12 @@ getOutlineNumberingLevels_tn_ZA;
 getOutlineNumberingLevels_tpi_PG;
 getOutlineNumberingLevels_ts_ZA;
 getOutlineNumberingLevels_ug_CN;
+getOutlineNumberingLevels_ur_PK;
 getOutlineNumberingLevels_uz_UZ;
 getOutlineNumberingLevels_ve_ZA;
 getOutlineNumberingLevels_vi_VN;
 getOutlineNumberingLevels_xh_ZA;
+getOutlineNumberingLevels_yi_US;
 getOutlineNumberingLevels_zh_CN;
 getOutlineNumberingLevels_zh_HK;
 getOutlineNumberingLevels_zh_MO;
@@ -1048,14 +1127,17 @@ getReservedWords_fa_IR;
 getReservedWords_gug_PY;
 getReservedWords_gu_IN;
 getReservedWords_ha_GH;
+getReservedWords_haw_US;
 getReservedWords_he_IL;
 getReservedWords_hi_IN;
 getReservedWords_hil_PH;
+getReservedWords_ht_HT;
 getReservedWords_hu_HU;
 getReservedWords_hy_AM;
 getReservedWords_ia;
 getReservedWords_id_ID;
 getReservedWords_ja_JP;
+getReservedWords_jbo;
 getReservedWords_kab_DZ;
 getReservedWords_kk_KZ;
 getReservedWords_km_KH;
@@ -1064,6 +1146,7 @@ getReservedWords_ko_KR;
 getReservedWords_ku_TR;
 getReservedWords_ky_KG;
 getReservedWords_lg_UG;
+getReservedWords_lif_NP;
 getReservedWords_ln_CD;
 getReservedWords_lo_LA;
 getReservedWords_mai_IN;
@@ -1096,10 +1179,12 @@ getReservedWords_tn_ZA;
 getReservedWords_tpi_PG;
 getReservedWords_ts_ZA;
 getReservedWords_ug_CN;
+getReservedWords_ur_PK;
 getReservedWords_uz_UZ;
 getReservedWords_ve_ZA;
 getReservedWords_vi_VN;
 getReservedWords_xh_ZA;
+getReservedWords_yi_US;
 getReservedWords_zh_CN;
 getReservedWords_zh_HK;
 getReservedWords_zh_MO;
@@ -1127,14 +1212,17 @@ getSearchOptions_fa_IR;
 getSearchOptions_gug_PY;
 getSearchOptions_gu_IN;
 getSearchOptions_ha_GH;
+getSearchOptions_haw_US;
 getSearchOptions_he_IL;
 getSearchOptions_hi_IN;
 getSearchOptions_hil_PH;
+getSearchOptions_ht_HT;
 getSearchOptions_hu_HU;
 getSearchOptions_hy_AM;
 getSearchOptions_ia;
 getSearchOptions_id_ID;
 getSearchOptions_ja_JP;
+getSearchOptions_jbo;
 getSearchOptions_kab_DZ;
 getSearchOptions_kk_KZ;
 getSearchOptions_km_KH;
@@ -1143,6 +1231,7 @@ getSearchOptions_ko_KR;
 getSearchOptions_ku_TR;
 getSearchOptions_ky_KG;
 getSearchOptions_lg_UG;
+getSearchOptions_lif_NP;
 getSearchOptions_ln_CD;
 getSearchOptions_lo_LA;
 getSearchOptions_mai_IN;
@@ -1175,10 +1264,12 @@ getSearchOptions_tn_ZA;
 getSearchOptions_tpi_PG;
 getSearchOptions_ts_ZA;
 getSearchOptions_ug_CN;
+getSearchOptions_ur_PK;
 getSearchOptions_uz_UZ;
 getSearchOptions_ve_ZA;
 getSearchOptions_vi_VN;
 getSearchOptions_xh_ZA;
+getSearchOptions_yi_US;
 getSearchOptions_zh_CN;
 getSearchOptions_zh_HK;
 getSearchOptions_zh_MO;
@@ -1206,14 +1297,17 @@ getTransliterations_fa_IR;
 getTransliterations_gug_PY;
 getTransliterations_gu_IN;
 getTransliterations_ha_GH;
+getTransliterations_haw_US;
 getTransliterations_he_IL;
 getTransliterations_hi_IN;
 getTransliterations_hil_PH;
+getTransliterations_ht_HT;
 getTransliterations_hu_HU;
 getTransliterations_hy_AM;
 getTransliterations_ia;
 getTransliterations_id_ID;
 getTransliterations_ja_JP;
+getTransliterations_jbo;
 getTransliterations_kab_DZ;
 getTransliterations_kk_KZ;
 getTransliterations_km_KH;
@@ -1222,6 +1316,7 @@ getTransliterations_ko_KR;
 getTransliterations_ku_TR;
 getTransliterations_ky_KG;
 getTransliterations_lg_UG;
+getTransliterations_lif_NP;
 getTransliterations_ln_CD;
 getTransliterations_lo_LA;
 getTransliterations_mai_IN;
@@ -1254,10 +1349,12 @@ getTransliterations_tn_ZA;
 getTransliterations_tpi_PG;
 getTransliterations_ts_ZA;
 getTransliterations_ug_CN;
+getTransliterations_ur_PK;
 getTransliterations_uz_UZ;
 getTransliterations_ve_ZA;
 getTransliterations_vi_VN;
 getTransliterations_xh_ZA;
+getTransliterations_yi_US;
 getTransliterations_zh_CN;
 getTransliterations_zh_HK;
 getTransliterations_zh_MO;
@@ -1285,14 +1382,17 @@ getUnicodeScripts_fa_IR;
 getUnicodeScripts_gug_PY;
 getUnicodeScripts_gu_IN;
 getUnicodeScripts_ha_GH;
+getUnicodeScripts_haw_US;
 getUnicodeScripts_he_IL;
 getUnicodeScripts_hi_IN;
 getUnicodeScripts_hil_PH;
+getUnicodeScripts_ht_HT;
 getUnicodeScripts_hu_HU;
 getUnicodeScripts_hy_AM;
 getUnicodeScripts_ia;
 getUnicodeScripts_id_ID;
 getUnicodeScripts_ja_JP;
+getUnicodeScripts_jbo;
 getUnicodeScripts_kab_DZ;
 getUnicodeScripts_kk_KZ;
 getUnicodeScripts_km_KH;
@@ -1301,6 +1401,7 @@ getUnicodeScripts_ko_KR;
 getUnicodeScripts_ku_TR;
 getUnicodeScripts_ky_KG;
 getUnicodeScripts_lg_UG;
+getUnicodeScripts_lif_NP;
 getUnicodeScripts_ln_CD;
 getUnicodeScripts_lo_LA;
 getUnicodeScripts_mai_IN;
@@ -1333,17 +1434,18 @@ getUnicodeScripts_tn_ZA;
 getUnicodeScripts_tpi_PG;
 getUnicodeScripts_ts_ZA;
 getUnicodeScripts_ug_CN;
+getUnicodeScripts_ur_PK;
 getUnicodeScripts_uz_UZ;
 getUnicodeScripts_ve_ZA;
 getUnicodeScripts_vi_VN;
 getUnicodeScripts_xh_ZA;
+getUnicodeScripts_yi_US;
 getUnicodeScripts_zh_CN;
 getUnicodeScripts_zh_HK;
 getUnicodeScripts_zh_MO;
 getUnicodeScripts_zh_SG;
 getUnicodeScripts_zh_TW;
 getUnicodeScripts_zu_ZA;
-GetVersionInfo;
 
 local:
     *;
diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk
index 284bf07bb15b..ddf597d780d7 100644
--- a/i18npool/source/localedata/data/makefile.mk
+++ b/i18npool/source/localedata/data/makefile.mk
@@ -39,6 +39,14 @@ LIBTARGET=NO
 debug!=
 .ENDIF
 
+.IF "$(OS)" == "WNT"
+my_file = file:///
+.ELSE
+my_file = file://
+.END
+
+my_components = sax.inbuild
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
@@ -62,191 +70,6 @@ LINK_LOCALEDATA_ES_LIB=-l$(SHL2TARGET)
 
 # --- Files --------------------------------------------------------
 
-# Interim files generated by the saxparser executable, for dependencies
-MY_MISC_CXXFILES = \
-    $(MISC)$/localedata_af_NA.cxx  \
-    $(MISC)$/localedata_af_ZA.cxx  \
-    $(MISC)$/localedata_ak_GH.cxx  \
-    $(MISC)$/localedata_am_ET.cxx  \
-    $(MISC)$/localedata_ar_DZ.cxx  \
-    $(MISC)$/localedata_ar_EG.cxx  \
-    $(MISC)$/localedata_ar_LB.cxx  \
-    $(MISC)$/localedata_ar_SA.cxx  \
-    $(MISC)$/localedata_ar_TN.cxx  \
-    $(MISC)$/localedata_ast_ES.cxx  \
-    $(MISC)$/localedata_az_AZ.cxx  \
-    $(MISC)$/localedata_be_BY.cxx  \
-    $(MISC)$/localedata_bg_BG.cxx  \
-    $(MISC)$/localedata_bn_IN.cxx  \
-    $(MISC)$/localedata_bn_BD.cxx  \
-    $(MISC)$/localedata_br_FR.cxx  \
-    $(MISC)$/localedata_bs_BA.cxx  \
-    $(MISC)$/localedata_ca_ES.cxx  \
-    $(MISC)$/localedata_cs_CZ.cxx  \
-    $(MISC)$/localedata_cv_RU.cxx  \
-    $(MISC)$/localedata_cy_GB.cxx  \
-    $(MISC)$/localedata_da_DK.cxx  \
-    $(MISC)$/localedata_de_AT.cxx  \
-    $(MISC)$/localedata_de_CH.cxx  \
-    $(MISC)$/localedata_de_DE.cxx  \
-    $(MISC)$/localedata_de_LI.cxx  \
-    $(MISC)$/localedata_de_LU.cxx  \
-    $(MISC)$/localedata_dz_BT.cxx  \
-    $(MISC)$/localedata_ee_GH.cxx  \
-    $(MISC)$/localedata_el_GR.cxx  \
-    $(MISC)$/localedata_en_AU.cxx  \
-    $(MISC)$/localedata_en_BZ.cxx  \
-    $(MISC)$/localedata_en_CA.cxx  \
-    $(MISC)$/localedata_en_GB.cxx  \
-    $(MISC)$/localedata_en_GH.cxx  \
-    $(MISC)$/localedata_en_IE.cxx  \
-    $(MISC)$/localedata_en_IN.cxx  \
-    $(MISC)$/localedata_en_JM.cxx  \
-    $(MISC)$/localedata_en_NA.cxx  \
-    $(MISC)$/localedata_en_NZ.cxx  \
-    $(MISC)$/localedata_en_PH.cxx  \
-    $(MISC)$/localedata_en_TT.cxx  \
-    $(MISC)$/localedata_en_US.cxx  \
-    $(MISC)$/localedata_en_ZA.cxx  \
-    $(MISC)$/localedata_en_ZW.cxx  \
-    $(MISC)$/localedata_eo.cxx     \
-    $(MISC)$/localedata_es_AR.cxx  \
-    $(MISC)$/localedata_es_BO.cxx  \
-    $(MISC)$/localedata_es_CL.cxx  \
-    $(MISC)$/localedata_es_CO.cxx  \
-    $(MISC)$/localedata_es_CR.cxx  \
-    $(MISC)$/localedata_es_DO.cxx  \
-    $(MISC)$/localedata_es_EC.cxx  \
-    $(MISC)$/localedata_es_ES.cxx  \
-    $(MISC)$/localedata_es_GT.cxx  \
-    $(MISC)$/localedata_es_HN.cxx  \
-    $(MISC)$/localedata_es_MX.cxx  \
-    $(MISC)$/localedata_es_NI.cxx  \
-    $(MISC)$/localedata_es_PA.cxx  \
-    $(MISC)$/localedata_es_PE.cxx  \
-    $(MISC)$/localedata_es_PR.cxx  \
-    $(MISC)$/localedata_es_PY.cxx  \
-    $(MISC)$/localedata_es_SV.cxx  \
-    $(MISC)$/localedata_es_UY.cxx  \
-    $(MISC)$/localedata_es_VE.cxx  \
-    $(MISC)$/localedata_et_EE.cxx  \
-    $(MISC)$/localedata_eu.cxx     \
-    $(MISC)$/localedata_fa_IR.cxx  \
-    $(MISC)$/localedata_fi_FI.cxx  \
-    $(MISC)$/localedata_fo_FO.cxx  \
-    $(MISC)$/localedata_fr_BE.cxx  \
-    $(MISC)$/localedata_fr_CA.cxx  \
-    $(MISC)$/localedata_fr_CH.cxx  \
-    $(MISC)$/localedata_fr_FR.cxx  \
-    $(MISC)$/localedata_fr_LU.cxx  \
-    $(MISC)$/localedata_fr_MC.cxx  \
-    $(MISC)$/localedata_fur_IT.cxx  \
-    $(MISC)$/localedata_fy_NL.cxx  \
-    $(MISC)$/localedata_ga_IE.cxx  \
-    $(MISC)$/localedata_gl_ES.cxx  \
-    $(MISC)$/localedata_gsc_FR.cxx \
-    $(MISC)$/localedata_gu_IN.cxx  \
-    $(MISC)$/localedata_gug_PY.cxx  \
-    $(MISC)$/localedata_ha_GH.cxx  \
-    $(MISC)$/localedata_he_IL.cxx  \
-    $(MISC)$/localedata_hi_IN.cxx  \
-    $(MISC)$/localedata_hil_PH.cxx  \
-    $(MISC)$/localedata_hr_HR.cxx  \
-    $(MISC)$/localedata_hsb_DE.cxx  \
-    $(MISC)$/localedata_hu_HU.cxx  \
-    $(MISC)$/localedata_hy_AM.cxx  \
-    $(MISC)$/localedata_ia.cxx     \
-    $(MISC)$/localedata_id_ID.cxx  \
-    $(MISC)$/localedata_is_IS.cxx  \
-    $(MISC)$/localedata_it_CH.cxx  \
-    $(MISC)$/localedata_it_IT.cxx  \
-    $(MISC)$/localedata_ja_JP.cxx  \
-    $(MISC)$/localedata_ka_GE.cxx  \
-    $(MISC)$/localedata_kab_DZ.cxx  \
-    $(MISC)$/localedata_kk_KZ.cxx  \
-    $(MISC)$/localedata_kl_GL.cxx  \
-    $(MISC)$/localedata_km_KH.cxx  \
-    $(MISC)$/localedata_kn_IN.cxx  \
-    $(MISC)$/localedata_ko_KR.cxx  \
-    $(MISC)$/localedata_ku_TR.cxx  \
-    $(MISC)$/localedata_ky_KG.cxx  \
-    $(MISC)$/localedata_la_VA.cxx  \
-    $(MISC)$/localedata_lb_LU.cxx  \
-    $(MISC)$/localedata_lg_UG.cxx  \
-    $(MISC)$/localedata_ln_CD.cxx  \
-    $(MISC)$/localedata_lo_LA.cxx  \
-    $(MISC)$/localedata_lt_LT.cxx  \
-    $(MISC)$/localedata_ltg_LV.cxx  \
-    $(MISC)$/localedata_lv_LV.cxx  \
-    $(MISC)$/localedata_mai_IN.cxx \
-    $(MISC)$/localedata_mk_MK.cxx  \
-    $(MISC)$/localedata_ml_IN.cxx  \
-    $(MISC)$/localedata_mn_MN.cxx  \
-    $(MISC)$/localedata_mr_IN.cxx  \
-    $(MISC)$/localedata_ms_MY.cxx  \
-    $(MISC)$/localedata_mt_MT.cxx  \
-    $(MISC)$/localedata_my_MM.cxx  \
-    $(MISC)$/localedata_nb_NO.cxx  \
-    $(MISC)$/localedata_ne_NP.cxx  \
-    $(MISC)$/localedata_nl_BE.cxx  \
-    $(MISC)$/localedata_nl_NL.cxx  \
-    $(MISC)$/localedata_nn_NO.cxx  \
-    $(MISC)$/localedata_no_NO.cxx  \
-    $(MISC)$/localedata_nr_ZA.cxx  \
-    $(MISC)$/localedata_nso_ZA.cxx \
-    $(MISC)$/localedata_oc_FR.cxx  \
-    $(MISC)$/localedata_om_ET.cxx  \
-    $(MISC)$/localedata_or_IN.cxx  \
-    $(MISC)$/localedata_pa_IN.cxx  \
-    $(MISC)$/localedata_pl_PL.cxx  \
-    $(MISC)$/localedata_plt_MG.cxx  \
-    $(MISC)$/localedata_pt_BR.cxx  \
-    $(MISC)$/localedata_pt_PT.cxx  \
-    $(MISC)$/localedata_ro_RO.cxx  \
-    $(MISC)$/localedata_rue_SK.cxx  \
-    $(MISC)$/localedata_ru_RU.cxx  \
-    $(MISC)$/localedata_rw_RW.cxx  \
-    $(MISC)$/localedata_sg_CF.cxx  \
-    $(MISC)$/localedata_sh_ME.cxx  \
-    $(MISC)$/localedata_sh_RS.cxx  \
-    $(MISC)$/localedata_sh_YU.cxx  \
-    $(MISC)$/localedata_shs_CA.cxx  \
-    $(MISC)$/localedata_sk_SK.cxx  \
-    $(MISC)$/localedata_sl_SI.cxx  \
-    $(MISC)$/localedata_so_SO.cxx  \
-    $(MISC)$/localedata_sr_ME.cxx  \
-    $(MISC)$/localedata_sr_RS.cxx  \
-    $(MISC)$/localedata_sr_YU.cxx  \
-    $(MISC)$/localedata_ss_ZA.cxx  \
-    $(MISC)$/localedata_st_ZA.cxx  \
-    $(MISC)$/localedata_sv_FI.cxx  \
-    $(MISC)$/localedata_sv_SE.cxx  \
-    $(MISC)$/localedata_sw_TZ.cxx  \
-    $(MISC)$/localedata_ta_IN.cxx  \
-    $(MISC)$/localedata_te_IN.cxx  \
-    $(MISC)$/localedata_tg_TJ.cxx  \
-    $(MISC)$/localedata_th_TH.cxx  \
-    $(MISC)$/localedata_ti_ER.cxx  \
-    $(MISC)$/localedata_tk_TM.cxx  \
-    $(MISC)$/localedata_tn_ZA.cxx  \
-    $(MISC)$/localedata_tpi_PG.cxx  \
-    $(MISC)$/localedata_tr_TR.cxx  \
-    $(MISC)$/localedata_ts_ZA.cxx  \
-    $(MISC)$/localedata_ug_CN.cxx  \
-    $(MISC)$/localedata_uk_UA.cxx  \
-    $(MISC)$/localedata_uz_UZ.cxx  \
-    $(MISC)$/localedata_ve_ZA.cxx  \
-    $(MISC)$/localedata_vi_VN.cxx  \
-    $(MISC)$/localedata_wa_BE.cxx  \
-    $(MISC)$/localedata_xh_ZA.cxx  \
-    $(MISC)$/localedata_zh_CN.cxx  \
-    $(MISC)$/localedata_zh_HK.cxx  \
-    $(MISC)$/localedata_zh_MO.cxx  \
-    $(MISC)$/localedata_zh_SG.cxx  \
-    $(MISC)$/localedata_zh_TW.cxx  \
-    $(MISC)$/localedata_zu_ZA.cxx
-
-
 # English Locales
 SHL1TARGET=localedata_en
 .IF "$(GUI)" == "OS2"
@@ -344,6 +167,7 @@ SHL3OBJS=	\
     $(SLO)$/localedata_de_DE.obj	\
     $(SLO)$/localedata_de_LI.obj	\
     $(SLO)$/localedata_de_LU.obj	\
+    $(SLO)$/localedata_dsb_DE.obj	\
     $(SLO)$/localedata_el_GR.obj	\
     $(SLO)$/localedata_et_EE.obj	\
     $(SLO)$/localedata_eu.obj	\
@@ -437,15 +261,18 @@ SHL4OBJS= \
     $(SLO)$/localedata_fa_IR.obj \
     $(SLO)$/localedata_gu_IN.obj \
     $(SLO)$/localedata_gug_PY.obj \
+    $(SLO)$/localedata_haw_US.obj \
     $(SLO)$/localedata_ha_GH.obj \
     $(SLO)$/localedata_he_IL.obj \
     $(SLO)$/localedata_hi_IN.obj \
     $(SLO)$/localedata_hil_PH.obj \
+    $(SLO)$/localedata_ht_HT.obj \
     $(SLO)$/localedata_hu_HU.obj \
     $(SLO)$/localedata_hy_AM.obj \
     $(SLO)$/localedata_ia.obj    \
     $(SLO)$/localedata_id_ID.obj \
     $(SLO)$/localedata_ja_JP.obj \
+    $(SLO)$/localedata_jbo.obj \
     $(SLO)$/localedata_kab_DZ.obj \
     $(SLO)$/localedata_kk_KZ.obj \
     $(SLO)$/localedata_km_KH.obj \
@@ -454,6 +281,7 @@ SHL4OBJS= \
     $(SLO)$/localedata_ku_TR.obj \
     $(SLO)$/localedata_ky_KG.obj \
     $(SLO)$/localedata_lg_UG.obj \
+    $(SLO)$/localedata_lif_NP.obj \
     $(SLO)$/localedata_ln_CD.obj \
     $(SLO)$/localedata_lo_LA.obj \
     $(SLO)$/localedata_mai_IN.obj \
@@ -486,10 +314,12 @@ SHL4OBJS= \
     $(SLO)$/localedata_tpi_PG.obj \
     $(SLO)$/localedata_ts_ZA.obj \
     $(SLO)$/localedata_ug_CN.obj \
+    $(SLO)$/localedata_ur_PK.obj \
     $(SLO)$/localedata_uz_UZ.obj \
     $(SLO)$/localedata_ve_ZA.obj \
     $(SLO)$/localedata_vi_VN.obj \
     $(SLO)$/localedata_xh_ZA.obj \
+    $(SLO)$/localedata_yi_US.obj \
     $(SLO)$/localedata_zh_CN.obj \
     $(SLO)$/localedata_zh_HK.obj \
     $(SLO)$/localedata_zh_MO.obj \
@@ -506,13 +336,28 @@ DEPOBJFILES= \
     $(SHL3OBJS) \
     $(SHL4OBJS)
 
+# Interim files generated by the saxparser executable, for dependencies
+MY_MISC_CXXFILES := $(foreach,i,$(DEPOBJFILES) $(MISC)/$(i:b).cxx)
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
 
-$(MY_MISC_CXXFILES) : $(BIN)$/saxparser$(EXECPOST)
+$(MY_MISC_CXXFILES) : $(BIN)$/saxparser$(EXECPOST) $(MISC)/saxparser.rdb
 
 $(MISC)$/localedata_%.cxx : %.xml
-    $(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(BIN)$/saxparser $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb
+    $(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(BIN)$/saxparser $* $< $@ \
+        $(my_file)$(PWD)/$(MISC)/saxparser.rdb $(SOLARBINDIR)$/types.rdb \
+        -env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)$(SOLARSHAREDBIN)
     $(RM) $(BIN)$/$(@:b).rdb
 
+$(MISC)/saxparser.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/saxparser.input \
+        $(my_components:^"$(SOLARXMLDIR)/":+".component")
+    $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
+        $(SOLARENV)/bin/packcomponents.xslt $(MISC)/saxparser.input
+
+$(MISC)/saxparser.input :
+    echo \
+        '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
+        > $@
diff --git a/i18npool/source/localedata/data/no_NO.xml b/i18npool/source/localedata/data/no_NO.xml
index 21ac49181020..6df7b5e2d018 100644
--- a/i18npool/source/localedata/data/no_NO.xml
+++ b/i18npool/source/localedata/data/no_NO.xml
@@ -232,7 +232,7 @@
 </SearchOptions>
 </LC_SEARCH>
 <LC_INDEX>
-<IndexKey unoid="alphanumeric" default="true" phonetic="false">A-V X-Z Æ Ø Å</IndexKey>
+<IndexKey unoid="alphanumeric" default="true" phonetic="false">A-Z Æ Ø Å</IndexKey>
 <UnicodeScript>0</UnicodeScript>
 <UnicodeScript>1</UnicodeScript>
 <FollowPageWord>p.</FollowPageWord>
diff --git a/i18npool/source/localedata/data/sv_SE.xml b/i18npool/source/localedata/data/sv_SE.xml
index 211f95c3e894..4afefebfa661 100644
--- a/i18npool/source/localedata/data/sv_SE.xml
+++ b/i18npool/source/localedata/data/sv_SE.xml
@@ -179,7 +179,7 @@
   <LC_COLLATION ref="en_US" />
   <LC_SEARCH ref="en_US"/>
   <LC_INDEX>
-    <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-V X-Z Å Ä Ö</IndexKey>
+    <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-Z Å Ä Ö</IndexKey>
     <UnicodeScript>0</UnicodeScript>
     <UnicodeScript>1</UnicodeScript>
     <FollowPageWord>f.</FollowPageWord>
diff --git a/i18npool/source/localedata/data/ur_PK.xml b/i18npool/source/localedata/data/ur_PK.xml
new file mode 100644
index 000000000000..53002e931068
--- /dev/null
+++ b/i18npool/source/localedata/data/ur_PK.xml
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+  <LC_INFO>
+    <Language>
+      <LangID>ur</LangID>
+      <DefaultName>Urdu</DefaultName>
+    </Language>
+    <Country>
+      <CountryID>PK</CountryID>
+      <DefaultName>Pakistan</DefaultName>
+    </Country>
+  </LC_INFO>
+  <LC_CTYPE unoid="generic">
+    <Separators>
+      <DateSeparator>/</DateSeparator>
+      <ThousandSeparator>,</ThousandSeparator>
+      <DecimalSeparator>.</DecimalSeparator>
+      <TimeSeparator>:</TimeSeparator>
+      <Time100SecSeparator>.</Time100SecSeparator>
+      <ListSeparator>;</ListSeparator>
+      <LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
+      <LongDateDaySeparator>, </LongDateDaySeparator>
+      <LongDateMonthSeparator> </LongDateMonthSeparator>
+      <LongDateYearSeparator> </LongDateYearSeparator>
+    </Separators>
+    <Markers>
+      <QuotationStart>‘</QuotationStart>
+      <QuotationEnd>’</QuotationEnd>
+      <DoubleQuotationStart>“</DoubleQuotationStart>
+      <DoubleQuotationEnd>”</DoubleQuotationEnd>
+    </Markers>
+    <TimeAM>قبل دوپہر</TimeAM>
+    <TimePM>بعد دوپہر</TimePM>
+    <MeasurementSystem>metric</MeasurementSystem>
+  </LC_CTYPE>
+  <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₨-420]">
+    <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
+      <FormatCode>General</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
+      <FormatCode>0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
+      <FormatCode>0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
+      <FormatCode>#,##0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
+      <FormatCode>#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
+      <FormatCode>#,###.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
+      <FormatCode>0.00E+00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
+      <FormatCode>0.00E+000</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
+      <FormatCode>0%</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
+      <FormatCode>0.00%</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
+      <FormatCode>[CURRENCY]#,##0;-[CURRENCY]#,##0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
+      <FormatCode>[CURRENCY]#,##0.00;-[CURRENCY]#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
+      <FormatCode>[CURRENCY]#,##0;[RED]-[CURRENCY]#,##0</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
+      <FormatCode>[CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
+      <FormatCode>CCC#,##0.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
+      <FormatCode>[CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey11" default="true" type="short" usage="DATE" formatindex="18">
+      <FormatCode>D/MM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
+      <FormatCode>NNNNDD, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
+      <FormatCode>DD/MM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="21">
+      <FormatCode>DD/MM/YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="22">
+      <FormatCode>D, MMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="23">
+      <FormatCode>D, MMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey21" default="false" type="long" usage="DATE" formatindex="24">
+      <FormatCode>D, MMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="25">
+      <FormatCode>D, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey22" default="false" type="long" usage="DATE" formatindex="26">
+      <FormatCode>D, MMMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey10" default="false" type="medium" usage="DATE" formatindex="27">
+      <FormatCode>NN, DD/MMM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey18" default="false" type="long" usage="DATE" formatindex="28">
+      <FormatCode>NN, D, MMM YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey19" default="false" type="long" usage="DATE" formatindex="29">
+      <FormatCode>NN, D, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
+      <FormatCode>NNNND, MMMM YYYY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
+      <FormatCode>MM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="32">
+      <FormatCode>YY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="33">
+      <FormatCode>YYYY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey1" default="false" type="medium" usage="DATE" formatindex="34">
+      <FormatCode>MM/YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="35">
+      <FormatCode>MMM/DD</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="36">
+      <FormatCode>MMMM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="37">
+      <FormatCode>QQ YY</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateFormatskey9" default="false" type="medium" usage="DATE" formatindex="38">
+      <FormatCode>WW</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39">
+      <FormatCode>HH:MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME" formatindex="40">
+      <FormatCode>HH:MM:SS</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME" formatindex="41">
+      <FormatCode>HH:MM AM/PM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME" formatindex="42">
+      <FormatCode>HH:MM:SS AM/PM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
+      <FormatCode>[HH]:MM:SS</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
+      <FormatCode>MM:SS.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
+      <FormatCode>[HH]:MM:SS.00</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
+      <FormatCode>DD/MM/YY HH:MM</FormatCode>
+    </FormatElement>
+    <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
+      <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode>
+    </FormatElement>
+  </LC_FORMAT>
+  <LC_COLLATION>
+    <Collator default="true" unoid="alphanumeric"/>
+    <CollationOptions>
+      <TransliterationModules>IGNORE_CASE</TransliterationModules>
+    </CollationOptions>
+  </LC_COLLATION>
+  <LC_SEARCH>
+    <SearchOptions>
+      <TransliterationModules>IGNORE_CASE</TransliterationModules>
+    </SearchOptions>
+  </LC_SEARCH>
+  <LC_INDEX>
+    <IndexKey phonetic="false" default="true" unoid="alphanumeric">أ ؤ ا آ ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ں و ہ ی ء ئ ے ٻ ة ٺ ټ ٽ ه ھ ي</IndexKey>
+    <UnicodeScript>0</UnicodeScript>
+    <UnicodeScript>1</UnicodeScript>
+    <FollowPageWord>صفحہ</FollowPageWord>
+    <FollowPageWord>صفحے</FollowPageWord>
+  </LC_INDEX>
+  <LC_CALENDAR>
+    <Calendar unoid="gregorian" default="true">
+      <DaysOfWeek>
+        <Day>
+          <DayID>sun</DayID>
+          <DefaultAbbrvName>ا</DefaultAbbrvName>
+          <DefaultFullName>اتوار</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>mon</DayID>
+          <DefaultAbbrvName>پ</DefaultAbbrvName>
+          <DefaultFullName>پير</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>tue</DayID>
+          <DefaultAbbrvName>م</DefaultAbbrvName>
+          <DefaultFullName>منگل</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>wed</DayID>
+          <DefaultAbbrvName>ب</DefaultAbbrvName>
+          <DefaultFullName>بده</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>thu</DayID>
+          <DefaultAbbrvName>ج</DefaultAbbrvName>
+          <DefaultFullName>جمعرات</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>fri</DayID>
+          <DefaultAbbrvName>ج</DefaultAbbrvName>
+          <DefaultFullName>جمعہ</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>sat</DayID>
+          <DefaultAbbrvName>ہ</DefaultAbbrvName>
+          <DefaultFullName>ہفتہ</DefaultFullName>
+        </Day>
+      </DaysOfWeek>
+      <MonthsOfYear>
+        <Month>
+          <MonthID>jan</MonthID>
+          <DefaultAbbrvName>ج</DefaultAbbrvName>
+          <DefaultFullName>جنوری</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>feb</MonthID>
+          <DefaultAbbrvName>ف</DefaultAbbrvName>
+          <DefaultFullName>فروری</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>mar</MonthID>
+          <DefaultAbbrvName>م</DefaultAbbrvName>
+          <DefaultFullName>مار چ</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>apr</MonthID>
+          <DefaultAbbrvName>ا</DefaultAbbrvName>
+          <DefaultFullName>اپريل</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>may</MonthID>
+          <DefaultAbbrvName>م</DefaultAbbrvName>
+          <DefaultFullName>مئ</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jun</MonthID>
+          <DefaultAbbrvName>ج</DefaultAbbrvName>
+          <DefaultFullName>جون</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jul</MonthID>
+          <DefaultAbbrvName>ج</DefaultAbbrvName>
+          <DefaultFullName>جولائ</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>aug</MonthID>
+          <DefaultAbbrvName>ا</DefaultAbbrvName>
+          <DefaultFullName>اگست</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>sep</MonthID>
+          <DefaultAbbrvName>س</DefaultAbbrvName>
+          <DefaultFullName>ستمبر</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>oct</MonthID>
+          <DefaultAbbrvName>ا</DefaultAbbrvName>
+          <DefaultFullName>اکتوبر</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>nov</MonthID>
+          <DefaultAbbrvName>ن</DefaultAbbrvName>
+          <DefaultFullName>نومبر</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>dec</MonthID>
+          <DefaultAbbrvName>د</DefaultAbbrvName>
+          <DefaultFullName>دسمبر</DefaultFullName>
+        </Month>
+      </MonthsOfYear>
+      <Eras>
+        <Era>
+          <EraID>bc</EraID>
+          <DefaultAbbrvName>ق م</DefaultAbbrvName>
+          <DefaultFullName>قبل مسيح</DefaultFullName>
+        </Era>
+        <Era>
+          <EraID>ad</EraID>
+          <DefaultAbbrvName>ء</DefaultAbbrvName>
+          <DefaultFullName>عيسوی سن</DefaultFullName>
+        </Era>
+      </Eras>
+      <StartDayOfWeek>
+        <DayID>sun</DayID>
+      </StartDayOfWeek>
+      <MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
+    </Calendar>
+  </LC_CALENDAR>
+  <LC_CURRENCY>
+    <Currency default="true" usedInCompatibleFormatCodes="true">
+      <CurrencyID>PKR</CurrencyID>
+      <CurrencySymbol>₨</CurrencySymbol>
+      <BankSymbol>PKR</BankSymbol>
+      <CurrencyName>پاکستانی روپیہ</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+  </LC_CURRENCY>
+  <LC_TRANSLITERATION>
+    <Transliteration unoid="LOWERCASE_UPPERCASE"/>
+    <Transliteration unoid="UPPERCASE_LOWERCASE"/>
+    <Transliteration unoid="IGNORE_CASE"/>
+  </LC_TRANSLITERATION>
+  <LC_MISC>
+    <ReservedWords>
+      <trueWord>راست</trueWord>
+      <falseWord>غلط</falseWord>
+      <quarter1Word>ایک چوتھائی</quarter1Word>
+      <quarter2Word>دو چوتھائی</quarter2Word>
+      <quarter3Word>تین چوتھائی</quarter3Word>
+      <quarter4Word>چار چوتھائی</quarter4Word>
+      <aboveWord>اوپر</aboveWord>
+      <belowWord>نیچے</belowWord>
+      <quarter1Abbreviation>چوتھائی 1</quarter1Abbreviation>
+      <quarter2Abbreviation>چوتھائی 2 </quarter2Abbreviation>
+      <quarter3Abbreviation>چوتھائی 3</quarter3Abbreviation>
+      <quarter4Abbreviation>چوتھائی 4</quarter4Abbreviation>
+    </ReservedWords>
+  </LC_MISC>
+  <LC_NumberingLevel>
+    <NumberingLevel NumType="4" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="4" Prefix=" "  Suffix="."/>
+    <NumberingLevel NumType="4" Prefix="("  Suffix=")"/>
+    <NumberingLevel NumType="2" Prefix=" "  Suffix="."/>
+    <NumberingLevel NumType="0" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="1" Prefix=" "  Suffix=")"/>
+    <NumberingLevel NumType="1" Prefix="("  Suffix=")"/>
+    <NumberingLevel NumType="3" Prefix=" "  Suffix="."/>
+  </LC_NumberingLevel>
+  <LC_OutLineNumberingLevel ref="en_US"/>
+</Locale>
+<!--Version 1.0  -->
diff --git a/i18npool/source/localedata/data/yi_US.xml b/i18npool/source/localedata/data/yi_US.xml
new file mode 100644
index 000000000000..cf52c1ae1fdf
--- /dev/null
+++ b/i18npool/source/localedata/data/yi_US.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+  <LC_INFO>
+    <Language>
+      <LangID>yi</LangID>
+      <DefaultName>Yiddish</DefaultName>
+    </Language>
+    <Country>
+      <CountryID>US</CountryID>
+      <DefaultName>United States</DefaultName>
+    </Country>
+  </LC_INFO>
+  <LC_CTYPE ref="en_US"/>
+  <LC_FORMAT ref="en_US" replaceTo="[$$-83D]"/>
+  <LC_COLLATION ref="en_US"/>
+  <LC_SEARCH ref="en_US"/>
+  <LC_INDEX>
+    <IndexKey phonetic="false" default="true" unoid="alphanumeric">א-י כ ל מ נ ס ע פ צ-ת</IndexKey>
+    <UnicodeScript>10</UnicodeScript>
+    <FollowPageWord>ז“</FollowPageWord>
+    <FollowPageWord>ז“</FollowPageWord>
+  </LC_INDEX>
+  <LC_CALENDAR>
+    <Calendar unoid="gregorian" default="true">
+      <DaysOfWeek>
+        <Day>
+          <DayID>sun</DayID>
+          <DefaultAbbrvName>זונ'</DefaultAbbrvName>
+          <DefaultFullName>זונטיק</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>mon</DayID>
+          <DefaultAbbrvName>מאָנ'</DefaultAbbrvName>
+          <DefaultFullName>מאָנטיק</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>tue</DayID>
+          <DefaultAbbrvName>דינ'</DefaultAbbrvName>
+          <DefaultFullName>דינסטיק</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>wed</DayID>
+          <DefaultAbbrvName>מיט'</DefaultAbbrvName>
+          <DefaultFullName>מיטװאָך</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>thu</DayID>
+          <DefaultAbbrvName>דאָנ'</DefaultAbbrvName>
+          <DefaultFullName>דאָנערשטיק</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>fri</DayID>
+          <DefaultAbbrvName>פֿרײַ'</DefaultAbbrvName>
+          <DefaultFullName>פֿרײַטיק</DefaultFullName>
+        </Day>
+        <Day>
+          <DayID>sat</DayID>
+          <DefaultAbbrvName>שבת</DefaultAbbrvName>
+          <DefaultFullName>שבת</DefaultFullName>
+        </Day>
+      </DaysOfWeek>
+      <MonthsOfYear>
+        <Month>
+          <MonthID>jan</MonthID>
+          <DefaultAbbrvName>יאַנ</DefaultAbbrvName>
+          <DefaultFullName>יאַנואַר</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>feb</MonthID>
+          <DefaultAbbrvName>פֿעב</DefaultAbbrvName>
+          <DefaultFullName>פֿעברואַר</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>mar</MonthID>
+          <DefaultAbbrvName>מאַר</DefaultAbbrvName>
+          <DefaultFullName>מאַרץ</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>apr</MonthID>
+          <DefaultAbbrvName>אַפּר</DefaultAbbrvName>
+          <DefaultFullName>אַפּריל</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>may</MonthID>
+          <DefaultAbbrvName>מײַ</DefaultAbbrvName>
+          <DefaultFullName>מײַ</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jun</MonthID>
+          <DefaultAbbrvName>יונ</DefaultAbbrvName>
+          <DefaultFullName>יוני</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>jul</MonthID>
+          <DefaultAbbrvName>יול</DefaultAbbrvName>
+          <DefaultFullName>יולי</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>aug</MonthID>
+          <DefaultAbbrvName>אױג</DefaultAbbrvName>
+          <DefaultFullName>אױגוסט</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>sep</MonthID>
+          <DefaultAbbrvName>סעפּ</DefaultAbbrvName>
+          <DefaultFullName>סעפּטעמבער</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>oct</MonthID>
+          <DefaultAbbrvName>אָקט</DefaultAbbrvName>
+          <DefaultFullName>אָקטאָבער</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>nov</MonthID>
+          <DefaultAbbrvName>נאָװ</DefaultAbbrvName>
+          <DefaultFullName>נאָװעמבער</DefaultFullName>
+        </Month>
+        <Month>
+          <MonthID>dec</MonthID>
+          <DefaultAbbrvName>דעצ</DefaultAbbrvName>
+          <DefaultFullName>דעצעמבער</DefaultFullName>
+        </Month>
+      </MonthsOfYear>
+      <Eras>
+        <Era>
+          <EraID>bc</EraID>
+          <DefaultAbbrvName>פֿ"ק</DefaultAbbrvName>
+          <DefaultFullName>פֿ"ק</DefaultFullName>
+        </Era>
+        <Era>
+          <EraID>ad</EraID>
+          <DefaultAbbrvName>אצ“ר</DefaultAbbrvName>
+          <DefaultFullName>אצ“ר</DefaultFullName>
+        </Era>
+      </Eras>
+      <StartDayOfWeek>
+        <DayID>sun</DayID>
+      </StartDayOfWeek>
+      <MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
+    </Calendar>
+  </LC_CALENDAR>
+  <LC_CURRENCY ref="en_US"/>
+  <LC_TRANSLITERATION ref="en_US"/>
+  <LC_MISC>
+    <ReservedWords>
+      <trueWord>אמת</trueWord>
+      <falseWord>פֿאַלש</falseWord>
+      <quarter1Word>ערשט יאָרפֿערטל</quarter1Word>
+      <quarter2Word>צװײט יאָרפֿערטל</quarter2Word>
+      <quarter3Word>דריט  יאָרפֿערטל</quarter3Word>
+      <quarter4Word>פֿערט יאָרפֿערטל</quarter4Word>
+      <aboveWord>אױבן</aboveWord>
+      <belowWord>אונטן</belowWord>
+      <quarter1Abbreviation>י“פֿ1</quarter1Abbreviation>
+      <quarter2Abbreviation>י“פֿ2</quarter2Abbreviation>
+      <quarter3Abbreviation>י“פֿ3</quarter3Abbreviation>
+      <quarter4Abbreviation>י“פֿ4</quarter4Abbreviation>
+    </ReservedWords>
+  </LC_MISC>
+  <LC_NumberingLevel ref="en_US"/>
+  <LC_OutLineNumberingLevel ref="en_US"/>
+</Locale>
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 19f425bdab56..64f5c975374b 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -173,6 +173,7 @@ static const struct {
     { "ast_ES", lcl_DATA_EURO },
     { "ltg_LV", lcl_DATA_EURO },
     { "hsb_DE", lcl_DATA_EURO },
+    { "dsb_DE", lcl_DATA_EURO },
     { "rue_SK", lcl_DATA_EURO },
 
     { "ja_JP",  lcl_DATA_OTHERS },
@@ -255,6 +256,12 @@ static const struct {
     { "om_ET",  lcl_DATA_OTHERS },
     { "plt_MG", lcl_DATA_OTHERS },
     { "mai_IN", lcl_DATA_OTHERS },
+    { "yi_US",  lcl_DATA_OTHERS },
+    { "haw_US", lcl_DATA_OTHERS },
+    { "lif_NP", lcl_DATA_OTHERS },
+    { "ur_PK",  lcl_DATA_OTHERS },
+    { "ht_HT",  lcl_DATA_OTHERS },
+    { "jbo",    lcl_DATA_OTHERS },
     { "kab_DZ", lcl_DATA_OTHERS }
 };
 
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index baa71abab278..1b6ddf47bd1f 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -35,7 +35,6 @@
 
 #include "sal/main.h"
 
-#include <com/sun/star/registry/XImplementationRegistration.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 
 #include <com/sun/star/xml/sax/SAXParseException.hpp>
@@ -321,7 +320,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     {
         xSMgr = createRegistryServiceFactory(
             ::rtl::OUString::createFromAscii(argv[4]),
-            ::rtl::OUString::createFromAscii(argv[5]) );
+            ::rtl::OUString::createFromAscii(argv[5]), true );
     }
     catch ( Exception &e )
     {
@@ -330,37 +329,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         exit(1);
     }
 
-    Reference < XImplementationRegistration > xReg;
-    try
-    {
-        // Create registration service
-        Reference < XInterface > x = xSMgr->createInstance(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) );
-        xReg = Reference<  XImplementationRegistration > ( x , UNO_QUERY );
-    }
-    catch( Exception & ) {
-        printf( "Couldn't create ImplementationRegistration service\n" );
-        exit(1);
-    }
-
-    OString sTestName;
-    try
-    {
-        // Load dll for the tested component
-        OUString aDllName(RTL_CONSTASCII_USTRINGPARAM( "sax.uno" SAL_DLLEXTENSION ));
-        xReg->registerImplementation(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
-            aDllName,
-            Reference< XSimpleRegistry > ()  );
-    }
-    catch( Exception &e ) {
-        printf( "Couldn't raise sax.uno library!\n" );
-        printf( "%s\n" , OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ).getStr() );
-
-        exit(1);
-    }
-
-
     //--------------------------------
     // parser demo
     // read xml from a file and count elements
diff --git a/i18npool/source/paper/paper.cxx b/i18npool/source/paper/paper.cxx
index 98e0ea230cb9..9d9ac886a22e 100644
--- a/i18npool/source/paper/paper.cxx
+++ b/i18npool/source/paper/paper.cxx
@@ -28,6 +28,8 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_i18npool.hxx"
+
+#include <osl/diagnose.h>
 #include <sal/config.h>
 #include <sal/macros.h>
 #include <rtl/ustring.hxx>
@@ -131,7 +133,6 @@ static PageDesc aDinTab[] =
     { MM2MM100( 227 ),   MM2MM100( 356 ),    "SuperA",  NULL },
     { MM2MM100( 305 ),   MM2MM100( 487 ),    "SuperB",  NULL },
     { IN2MM100( 8.5 ),   IN2MM100( 12.69 ),  "LetterPlus",  NULL },
-    { IN2MM100( 8.5 ),   IN2MM100( 12.69 ),  "LetterPlus",  NULL },
     { MM2MM100( 210 ),   MM2MM100( 330 ),    "A4Plus",  NULL },
     { MM2MM100( 200 ),   MM2MM100( 148 ),    "DoublePostcard",  NULL },
     { MM2MM100( 105 ),   MM2MM100( 148 ),    "A6",  NULL },
@@ -392,6 +393,9 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
 
 PaperInfo::PaperInfo(Paper eType) : m_eType(eType)
 {
+    OSL_ENSURE( sizeof(aDinTab) / sizeof(aDinTab[0]) == NUM_PAPER_ENTRIES,
+            "mismatch between array entries and enum values" );
+
     m_nPaperWidth = aDinTab[m_eType].m_nWidth;
     m_nPaperHeight = aDinTab[m_eType].m_nHeight;
 }
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index 8e84bf0081be..8183b46d76cf 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -581,29 +581,6 @@ void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvType
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-sal_Bool SAL_CALL component_writeInfo( void* /*_pServiceManager*/, void* _pRegistryKey )
-{
-    if (_pRegistryKey)
-    {
-        ::com::sun::star::registry::XRegistryKey * pRegistryKey =
-            reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >(
-                                _pRegistryKey );
-        ::com::sun::star::uno::Reference<
-                        ::com::sun::star::registry::XRegistryKey > xNewKey;
-
-        for( const InstancesArray* pArr = aInstances; pArr->pServiceNm; ++pArr )
-        {
-            xNewKey = pRegistryKey->createKey(
-                    ::rtl::OUString::createFromAscii( pArr->pImplementationNm )  );
-            xNewKey = xNewKey->createKey(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
-            xNewKey->createKey(
-                    ::rtl::OUString::createFromAscii( pArr->pServiceNm ) );
-        }
-    }
-    return sal_True;
-}
-
 void* SAL_CALL component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, void* /*_pRegistryKey*/ )
 {
     void* pRet = NULL;
diff --git a/i18npool/source/search/i18nsearch.component b/i18npool/source/search/i18nsearch.component
new file mode 100644
index 000000000000..6288bcd7c840
--- /dev/null
+++ b/i18npool/source/search/i18nsearch.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.util.TextSearch_i18n">
+    <service name="com.sun.star.util.TextSearch"/>
+  </implementation>
+</component>
diff --git a/i18npool/source/search/makefile.mk b/i18npool/source/search/makefile.mk
index aed976edd896..372b32a216d1 100644
--- a/i18npool/source/search/makefile.mk
+++ b/i18npool/source/search/makefile.mk
@@ -76,3 +76,11 @@ DEF1NAME=		$(SHL1TARGET)
 
 .INCLUDE :	target.mk
 
+
+ALLTAR : $(MISC)/i18nsearch.component
+
+$(MISC)/i18nsearch.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        i18nsearch.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt i18nsearch.component
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index ab4d50f7397f..ce8e7b15bfea 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -988,25 +988,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-sal_Bool SAL_CALL component_writeInfo(
-        void* /*_pServiceManager*/, void* _pRegistryKey )
-{
-    if (_pRegistryKey)
-    {
-        ::com::sun::star::registry::XRegistryKey * pRegistryKey =
-            reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >(
-                                _pRegistryKey );
-        ::com::sun::star::uno::Reference<
-                        ::com::sun::star::registry::XRegistryKey > xNewKey;
-
-        xNewKey = pRegistryKey->createKey( getImplementationName_Static() );
-        xNewKey = xNewKey->createKey(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
-        xNewKey->createKey( getServiceName_Static() );
-    }
-    return sal_True;
-}
-
 void* SAL_CALL component_getFactory( const sal_Char* sImplementationName,
         void* _pServiceManager, void* /*_pRegistryKey*/ )
 {
diff --git a/i18npool/util/i18npool.component b/i18npool/util/i18npool.component
new file mode 100644
index 000000000000..d11606efb6d4
--- /dev/null
+++ b/i18npool/util/i18npool.component
@@ -0,0 +1,484 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.i18n.BreakIterator">
+    <service name="com.sun.star.i18n.BreakIterator"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.BreakIterator_Unicode">
+    <service name="com.sun.star.i18n.BreakIterator_Unicode"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.BreakIterator_ja">
+    <service name="com.sun.star.i18n.BreakIterator_ja"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.BreakIterator_ko">
+    <service name="com.sun.star.i18n.BreakIterator_ko"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.BreakIterator_th">
+    <service name="com.sun.star.i18n.BreakIterator_th"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.BreakIterator_zh">
+    <service name="com.sun.star.i18n.BreakIterator_zh"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.BreakIterator_zh_TW">
+    <service name="com.sun.star.i18n.BreakIterator_zh_TW"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.CalendarImpl">
+    <service name="com.sun.star.i18n.LocaleCalendar"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Calendar_ROC">
+    <service name="com.sun.star.i18n.Calendar_ROC"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Calendar_buddhist">
+    <service name="com.sun.star.i18n.Calendar_buddhist"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Calendar_gengou">
+    <service name="com.sun.star.i18n.Calendar_gengou"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Calendar_gregorian">
+    <service name="com.sun.star.i18n.Calendar_gregorian"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Calendar_hanja">
+    <service name="com.sun.star.i18n.Calendar_hanja"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Calendar_hanja_yoil">
+    <service name="com.sun.star.i18n.Calendar_hanja_yoil"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Calendar_hijri">
+    <service name="com.sun.star.i18n.Calendar_hijri"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Calendar_jewish">
+    <service name="com.sun.star.i18n.Calendar_jewish"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.ChapterCollator">
+    <service name="com.sun.star.i18n.ChapterCollator"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.CharacterClassification">
+    <service name="com.sun.star.i18n.CharacterClassification"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.CharacterClassification_Unicode">
+    <service name="com.sun.star.i18n.CharacterClassification_Unicode"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Collator">
+    <service name="com.sun.star.i18n.Collator"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Collator_Unicode">
+    <service name="com.sun.star.i18n.Collator_Unicode"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.IndexEntrySupplier">
+    <service name="com.sun.star.i18n.IndexEntrySupplier"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.IndexEntrySupplier_Unicode">
+    <service name="com.sun.star.i18n.IndexEntrySupplier_Unicode"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.IndexEntrySupplier_asian">
+    <service name="com.sun.star.i18n.IndexEntrySupplier_asian"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric first)">
+    <service name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric first)"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric first) (grouped by consonant)">
+    <service name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric first) (grouped by consonant)"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric first) (grouped by syllable)">
+    <service name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric first) (grouped by syllable)"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric last)">
+    <service name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric last)"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric last) (grouped by consonant)">
+    <service name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric last) (grouped by consonant)"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric last) (grouped by syllable)">
+    <service name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric last) (grouped by syllable)"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.InputSequenceChecker">
+    <service name="com.sun.star.i18n.InputSequenceChecker"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.InputSequenceChecker_hi">
+    <service name="com.sun.star.i18n.InputSequenceChecker_hi"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.InputSequenceChecker_th">
+    <service name="com.sun.star.i18n.InputSequenceChecker_th"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.LocaleData">
+    <service name="com.sun.star.i18n.LocaleData"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.NativeNumberSupplier">
+    <service name="com.sun.star.i18n.NativeNumberSupplier"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.NumberFormatCodeMapper">
+    <service name="com.sun.star.i18n.NumberFormatMapper"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.OrdinalSuffix">
+    <service name="com.sun.star.i18n.OrdinalSuffix"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.ScriptTypeDetector">
+    <service name="com.sun.star.i18n.ScriptTypeDetector"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.TextConversion">
+    <service name="com.sun.star.i18n.TextConversion"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.TextConversion_ko">
+    <service name="com.sun.star.i18n.TextConversion_ko"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.TextConversion_zh">
+    <service name="com.sun.star.i18n.TextConversion_zh"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration">
+    <service name="com.sun.star.i18n.Transliteration"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNumEastIndic_ar">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNumFullwidth">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNumHangul_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNumIndic_ar">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNumIndic_hi">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNumKanjiShort_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNumKanjiTraditional_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNumLower_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNumLower_zh_CN">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNumLower_zh_TW">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNumUpper_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNumUpper_zh_CN">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNumUpper_zh_TW">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.CharToNum_th">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.FULLWIDTHKATAKANA_HALFWIDTHKATAKANA">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH_LIKE_ASC">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.HALFWIDTHKATAKANA_FULLWIDTHKATAKANA">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH_LIKE_JIS">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.HIRAGANA_KATAKANA">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.IGNORE_CASE">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.IGNORE_KANA">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.IGNORE_WIDTH">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.KATAKANA_HIRAGANA">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.LOWERCASE_UPPERCASE">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharEastIndic_ar">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharFullwidth">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharHalfwidth">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharHangul_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharIndic_ar">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharIndic_hi">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharKanjiShort_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharKanjiTraditional_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharLower_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharLower_zh_CN">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharLower_zh_TW">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharUpper_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharUpper_zh_CN">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToCharUpper_zh_TW">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToChar_th">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextAIUFullWidth_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextAIUHalfWidth_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextCircledNumber">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextDate_zh">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextDiZi_zh">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextFormalHangul_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextFormalLower_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextFormalUpper_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextFullwidth_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextFullwidth_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextFullwidth_zh_CN">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextFullwidth_zh_TW">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextHangulCircledJamo_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextHangulCircledSyllable_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextHangulJamo_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextHangulSyllable_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextIROHAFullWidth_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextIROHAHalfWidth_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextInformalHangul_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextInformalLower_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextInformalUpper_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextKanjiLongModern_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextKanjiLongTraditional_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextKanjiShortModern_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextKanjiShortTraditional_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextLower_zh_CN">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextLower_zh_TW">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextTianGan_zh">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextUpper_zh_CN">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.NumToTextUpper_zh_TW">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.SENTENCE_CASE">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TITLE_CASE">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TOGGLE_CASE">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToChuyin_zh_TW">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToNumFormalHangul_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToNumFormalLower_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToNumFormalUpper_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToNumInformalHangul_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToNumInformalLower_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToNumInformalUpper_ko">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToNumKanjiLongModern_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToNumKanjiLongTraditional_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToNumLower_zh_CN">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToNumLower_zh_TW">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToNumUpper_zh_CN">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToNumUpper_zh_TW">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.TextToPinyin_zh_CN">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.UPPERCASE_LOWERCASE">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreBaFa_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreHyuByu_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreIandEfollowedByYa_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreIterationMark_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreKana">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreKiKuFollowedBySa_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreMiddleDot_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreMinusSign_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreProlongedSoundMark_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreSeZe_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreSeparator_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreSize_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreSpace_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreTiJi_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreTraditionalKana_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreTraditionalKanji_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.ignoreZiZu_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.largeToSmall_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.i18n.Transliteration.smallToLarge_ja_JP">
+    <service name="com.sun.star.i18n.Transliteration.l10n"/>
+  </implementation>
+  <implementation name="com.sun.star.text.DefaultNumberingProvider">
+    <service name="com.sun.star.text.DefaultNumberingProvider"/>
+  </implementation>
+</component>
diff --git a/i18npool/util/makefile.mk b/i18npool/util/makefile.mk
index 57f802be62fe..8c9f1a83b2c0 100644
--- a/i18npool/util/makefile.mk
+++ b/i18npool/util/makefile.mk
@@ -79,3 +79,11 @@ SHL1STDLIBS= \
 # --- Targets ------------------------------------------------------------
 
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/i18npool.component
+
+$(MISC)/i18npool.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        i18npool.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt i18npool.component
author	Jan Holesovsky <kendy@suse.cz>	2011-03-18 15:55:08 +0100
committer	Jan Holesovsky <kendy@suse.cz>	2011-03-18 15:55:08 +0100
commit	4fdd55226d2972e3a256426db3122ac23b0615c6 (patch)
tree	23f5b3a68382d6d3b8db0cb5e2537ed74a228d7c /i18npool
parent	c3d5444d84e18fa82235bb9d419861ac5e54f544 (diff)
parent	e1028d9225bc47922c387aa462887c7643bc6c40 (diff)