diff options
177 files changed, 944 insertions, 384 deletions
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index fe627d343767..f056eefd9252 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -620,8 +620,8 @@ void LCFormatNode::generateCode (const OFileWriter &of) const aFormatIndex = currNodeAttr.getValueByName("formatindex"); sal_Int16 formatindex = static_cast<sal_Int16>(aFormatIndex.toInt32()); // Ensure the new reserved range is not used anymore, free usage start - // was up'ed from 50 to 60. - if (50 <= formatindex && formatindex < i18npool::nFirstFreeFormatIndex) + // was up'ed from 50 to 60 (and more later). + if (i18npool::nStopPredefinedFormatIndex <= formatindex && formatindex < i18npool::nFirstFreeFormatIndex) { incErrorInt( "Error: Reserved formatindex=\"%d\" in FormatElement.\n", formatindex); bShowNextFreeFormatIndex = true; @@ -862,14 +862,15 @@ void LCFormatNode::generateCode (const OFileWriter &of) const incError( "No abbreviated DateAcceptancePattern present. For example M/D or D.M.\n"); } - // 0..47 MUST be present, 48,49 MUST NOT be present + // 0..9 MUST be present, 10,11 MUST NOT be present, 12..47 MUST be + // present, 48,49 MUST NOT be present, 50 MUST be present. ValueSet::const_iterator aIter( aFormatIndexSet.begin()); for (sal_Int16 nNext = cssi::NumberFormatIndex::NUMBER_START; - nNext < cssi::NumberFormatIndex::INDEX_TABLE_ENTRIES; ++nNext) + nNext < i18npool::nStopPredefinedFormatIndex; ++nNext) { sal_Int16 nHere = ::std::min( (aIter != aFormatIndexSet.end() ? *aIter : - cssi::NumberFormatIndex::INDEX_TABLE_ENTRIES), - cssi::NumberFormatIndex::INDEX_TABLE_ENTRIES); + i18npool::nStopPredefinedFormatIndex), + i18npool::nStopPredefinedFormatIndex); if (aIter != aFormatIndexSet.end()) ++aIter; for ( ; nNext < nHere; ++nNext) { @@ -887,6 +888,12 @@ void LCFormatNode::generateCode (const OFileWriter &of) const } switch (nHere) { + case cssi::NumberFormatIndex::FRACTION_1 : + incErrorInt( "Error: FormatElement formatindex=\"%d\" reserved for internal ``# ?/?''.\n", nNext); + break; + case cssi::NumberFormatIndex::FRACTION_2 : + incErrorInt( "Error: FormatElement formatindex=\"%d\" reserved for internal ``# ?\?/?\?''.\n", nNext); + break; case cssi::NumberFormatIndex::BOOLEAN : incErrorInt( "Error: FormatElement formatindex=\"%d\" reserved for internal ``BOOLEAN''.\n", nNext); break; diff --git a/i18npool/source/localedata/data/ak_GH.xml b/i18npool/source/localedata/data/ak_GH.xml index 41d7eab145de..8a380241adf3 100644 --- a/i18npool/source/localedata/data/ak_GH.xml +++ b/i18npool/source/localedata/data/ak_GH.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>MM/DD/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>MM/DD/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/an_ES.xml b/i18npool/source/localedata/data/an_ES.xml index d943edbfc25f..f6063c06e206 100644 --- a/i18npool/source/localedata/data/an_ES.xml +++ b/i18npool/source/localedata/data/an_ES.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/ar_DZ.xml b/i18npool/source/localedata/data/ar_DZ.xml index 4cb4d155018b..c04ff8bc31a8 100644 --- a/i18npool/source/localedata/data/ar_DZ.xml +++ b/i18npool/source/localedata/data/ar_DZ.xml @@ -190,22 +190,25 @@ <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"> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> <FormatCode>[~hijri]AM/PMHH:MM YYYY/MM/D</FormatCode> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> - <FormatCode>[NatNum1][~hijri]AM/PMHH:MM YYYY/MM/D</FormatCode> + <FormatCode>[NatNum1][~hijri]AM/PMHH:MM:SS YYYY/MM/D</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="60"> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>[~hijri]AM/PMHH:MM YYYY/MM/D</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="66"> <FormatCode>AM/PMHH:MM YYYY/MM/D</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="61"> + <FormatElement msgid="DateTimeFormatskey5" default="false" type="medium" usage="DATE_TIME" formatindex="67"> <FormatCode>[NatNum1]AM/PMHH:MM YYYY/MM/D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="62"> + <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="68"> <FormatCode>[NatNum1]YYYY/MM/DD</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey7" default="false" type="medium" usage="FIXED_NUMBER" formatindex="63"> + <FormatElement msgid="FixedFormatskey7" default="false" type="medium" usage="FIXED_NUMBER" formatindex="69"> <FormatCode>[NatNum1]General</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/ar_EG.xml b/i18npool/source/localedata/data/ar_EG.xml index 5bcb4b689c30..260fc27a76b6 100644 --- a/i18npool/source/localedata/data/ar_EG.xml +++ b/i18npool/source/localedata/data/ar_EG.xml @@ -190,22 +190,25 @@ <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"> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> <FormatCode>[~hijri]AM/PMHH:MM YYYY/MM/D</FormatCode> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> - <FormatCode>[NatNum1][~hijri]AM/PMHH:MM YYYY/MM/D</FormatCode> + <FormatCode>[NatNum1][~hijri]AM/PMHH:MM:SS YYYY/MM/D</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="60"> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>[~hijri]AM/PMHH:MM YYYY/MM/D</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="66"> <FormatCode>AM/PMHH:MM YYYY/MM/D</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="61"> + <FormatElement msgid="DateTimeFormatskey5" default="false" type="medium" usage="DATE_TIME" formatindex="67"> <FormatCode>[NatNum1]AM/PMHH:MM YYYY/MM/D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="62"> + <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="68"> <FormatCode>[NatNum1]YYYY/MM/DD</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey7" default="false" type="medium" usage="FIXED_NUMBER" formatindex="63"> + <FormatElement msgid="FixedFormatskey7" default="false" type="medium" usage="FIXED_NUMBER" formatindex="69"> <FormatCode>[NatNum1]General</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/ar_OM.xml b/i18npool/source/localedata/data/ar_OM.xml index 51a9eceb1a3d..66ca11d818ed 100644 --- a/i18npool/source/localedata/data/ar_OM.xml +++ b/i18npool/source/localedata/data/ar_OM.xml @@ -195,7 +195,10 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey7" default="false" type="medium" usage="FIXED_NUMBER" formatindex="60"> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> + <FormatElement msgid="FixedFormatskey7" default="false" type="medium" usage="FIXED_NUMBER" formatindex="66"> <FormatCode>[NatNum1]General</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/ast_ES.xml b/i18npool/source/localedata/data/ast_ES.xml index 4fcde3a3096e..2cfaf1594ea8 100644 --- a/i18npool/source/localedata/data/ast_ES.xml +++ b/i18npool/source/localedata/data/ast_ES.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/az_AZ.xml b/i18npool/source/localedata/data/az_AZ.xml index 1bb700bca928..33bacc538ef5 100644 --- a/i18npool/source/localedata/data/az_AZ.xml +++ b/i18npool/source/localedata/data/az_AZ.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/be_BY.xml b/i18npool/source/localedata/data/be_BY.xml index 68f964219942..8b9974ead19a 100644 --- a/i18npool/source/localedata/data/be_BY.xml +++ b/i18npool/source/localedata/data/be_BY.xml @@ -196,6 +196,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US"/> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/bg_BG.xml b/i18npool/source/localedata/data/bg_BG.xml index fa6b8afc8261..a4569ccfac36 100644 --- a/i18npool/source/localedata/data/bg_BG.xml +++ b/i18npool/source/localedata/data/bg_BG.xml @@ -193,12 +193,15 @@ <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>D.MM.YYYY" г.", H:MM" ч."</FormatCode> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> + <FormatCode>D.MM.YY" г.", H:MM" ч."</FormatCode> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>D.MM.YYYY" г.", H:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>D.MM.YYYY" г.", H:MM" ч."</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/bm_ML.xml b/i18npool/source/localedata/data/bm_ML.xml index e958bf9a9df6..63e68f2dd6a2 100644 --- a/i18npool/source/localedata/data/bm_ML.xml +++ b/i18npool/source/localedata/data/bm_ML.xml @@ -187,6 +187,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/bn_IN.xml b/i18npool/source/localedata/data/bn_IN.xml index f443511822c9..081a87cb79ad 100644 --- a/i18npool/source/localedata/data/bn_IN.xml +++ b/i18npool/source/localedata/data/bn_IN.xml @@ -197,6 +197,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>MM-DD-YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>MM-DD-YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/bo_CN.xml b/i18npool/source/localedata/data/bo_CN.xml index ba01d817d226..f72031999208 100644 --- a/i18npool/source/localedata/data/bo_CN.xml +++ b/i18npool/source/localedata/data/bo_CN.xml @@ -140,12 +140,15 @@ <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>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM</FormatCode> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> + <FormatCode>[NatNum1]"སྤྱི་ལོ" YY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM</FormatCode> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>[NatNum1]DD-MM-YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>General</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/bo_IN.xml b/i18npool/source/localedata/data/bo_IN.xml index b1dd81824776..8d9133ae988d 100644 --- a/i18npool/source/localedata/data/bo_IN.xml +++ b/i18npool/source/localedata/data/bo_IN.xml @@ -140,12 +140,15 @@ <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>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM</FormatCode> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> + <FormatCode>[NatNum1]"སྤྱི་ལོ" YY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM</FormatCode> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>[NatNum1]DD-MM-YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>General</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/br_FR.xml b/i18npool/source/localedata/data/br_FR.xml index 9c60659ad2de..cd66941ea6a6 100644 --- a/i18npool/source/localedata/data/br_FR.xml +++ b/i18npool/source/localedata/data/br_FR.xml @@ -197,6 +197,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/bs_BA.xml b/i18npool/source/localedata/data/bs_BA.xml index 8084ebf55353..fd80e6a21d80 100644 --- a/i18npool/source/localedata/data/bs_BA.xml +++ b/i18npool/source/localedata/data/bs_BA.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM AM/PM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>General</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/ca_ES.xml b/i18npool/source/localedata/data/ca_ES.xml index c8d8de2d9632..41ba34851c30 100644 --- a/i18npool/source/localedata/data/ca_ES.xml +++ b/i18npool/source/localedata/data/ca_ES.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator unoid="charset" default="true"/> diff --git a/i18npool/source/localedata/data/cs_CZ.xml b/i18npool/source/localedata/data/cs_CZ.xml index a67a9f55baba..52d98cb4f10e 100644 --- a/i18npool/source/localedata/data/cs_CZ.xml +++ b/i18npool/source/localedata/data/cs_CZ.xml @@ -148,6 +148,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/cu_RU.xml b/i18npool/source/localedata/data/cu_RU.xml index 5dcfe38feecf..0b84d287ce26 100644 --- a/i18npool/source/localedata/data/cu_RU.xml +++ b/i18npool/source/localedata/data/cu_RU.xml @@ -200,6 +200,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator unoid="charset" default="true"/> diff --git a/i18npool/source/localedata/data/cv_RU.xml b/i18npool/source/localedata/data/cv_RU.xml index 7b09492fd816..68973a292757 100644 --- a/i18npool/source/localedata/data/cv_RU.xml +++ b/i18npool/source/localedata/data/cv_RU.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/da_DK.xml b/i18npool/source/localedata/data/da_DK.xml index 8a9b9bff1cdf..540e2ca7365d 100644 --- a/i18npool/source/localedata/data/da_DK.xml +++ b/i18npool/source/localedata/data/da_DK.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD-MM-YYYY TT:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD-MM-YYYY TT:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/de_AT.xml b/i18npool/source/localedata/data/de_AT.xml index 9d0b8670414d..ebb90a77781a 100644 --- a/i18npool/source/localedata/data/de_AT.xml +++ b/i18npool/source/localedata/data/de_AT.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>TT.MM.JJJJ HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>TT.MM.JJJJ HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="de_DE" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/de_CH.xml b/i18npool/source/localedata/data/de_CH.xml index 1c0d6454f6ad..7be0d6c3a1c1 100644 --- a/i18npool/source/localedata/data/de_CH.xml +++ b/i18npool/source/localedata/data/de_CH.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>TT.MM.JJJJ HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>TT.MM.JJJJ HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="de_DE" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/de_DE.xml b/i18npool/source/localedata/data/de_DE.xml index 46f89a2a3be4..6eb8307d3c13 100644 --- a/i18npool/source/localedata/data/de_DE.xml +++ b/i18npool/source/localedata/data/de_DE.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>TT.MM.JJJJ HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>TT.MM.JJJJ HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/de_LI.xml b/i18npool/source/localedata/data/de_LI.xml index d368c0589bcd..7274462cea1a 100644 --- a/i18npool/source/localedata/data/de_LI.xml +++ b/i18npool/source/localedata/data/de_LI.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>TT.MM.JJJJ HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>TT.MM.JJJJ HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="de_DE" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/de_LU.xml b/i18npool/source/localedata/data/de_LU.xml index 9d12a26885cf..3dcf21c6b616 100644 --- a/i18npool/source/localedata/data/de_LU.xml +++ b/i18npool/source/localedata/data/de_LU.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>TT.MM.JJJJ HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>TT.MM.JJJJ HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="de_DE" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/dsb_DE.xml b/i18npool/source/localedata/data/dsb_DE.xml index 4bad6889ef56..bd96a17d8ab5 100644 --- a/i18npool/source/localedata/data/dsb_DE.xml +++ b/i18npool/source/localedata/data/dsb_DE.xml @@ -168,16 +168,16 @@ <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"> + <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39"> <FormatCode>H:MM</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey2" default="false" type="medium" usage="TIME" formatindex="40"> + <FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME" formatindex="40"> <FormatCode>H:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey3" default="true" type="short" usage="TIME" formatindex="41"> + <FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME" formatindex="41"> <FormatCode>H:MM AM/PM</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey4" default="true" type="medium" usage="TIME" formatindex="42"> + <FormatElement msgid="TimeFormatskey4" default="false" 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"> @@ -193,7 +193,10 @@ <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) --> + <FormatCode>DD.MM.YYYY H:MM:SS</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY H:MM</FormatCode> </FormatElement> </LC_FORMAT> <LC_COLLATION> diff --git a/i18npool/source/localedata/data/dz_BT.xml b/i18npool/source/localedata/data/dz_BT.xml index 0f6a0673746b..d2a926d95254 100644 --- a/i18npool/source/localedata/data/dz_BT.xml +++ b/i18npool/source/localedata/data/dz_BT.xml @@ -140,12 +140,15 @@ <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>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM</FormatCode> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> + <FormatCode>[NatNum1]"སྤྱི་ལོ" YY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM</FormatCode> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>[NatNum1]DD-MM-YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>General</FormatCode> </FormatElement> @@ -164,19 +167,19 @@ <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5"> <FormatCode>[NatNum1]#,###.00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="69"> + <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="75"> <FormatCode>0</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="70"> + <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="76"> <FormatCode>0.00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey9" default="false" type="short" usage="FIXED_NUMBER" formatindex="71"> + <FormatElement msgid="FixedFormatskey9" default="false" type="short" usage="FIXED_NUMBER" formatindex="77"> <FormatCode>#,##0</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey10" default="false" type="medium" usage="FIXED_NUMBER" formatindex="72"> + <FormatElement msgid="FixedFormatskey10" default="false" type="medium" usage="FIXED_NUMBER" formatindex="78"> <FormatCode>#,##0.00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey11" default="false" type="medium" usage="FIXED_NUMBER" formatindex="73"> + <FormatElement msgid="FixedFormatskey11" default="false" type="medium" usage="FIXED_NUMBER" formatindex="79"> <FormatCode>#,###.00</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12"> @@ -197,22 +200,22 @@ <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17"> <FormatCode>[NatNum1][CURRENCY]#,##0.--;[NatNum1][RED]-[CURRENCY]#,##0.--</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey7" default="false" type="short" usage="CURRENCY" formatindex="60"> + <FormatElement msgid="CurrencyFormatskey7" default="false" type="short" usage="CURRENCY" formatindex="66"> <FormatCode>[CURRENCY]#,##0;-[CURRENCY]#,##0</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey8" default="false" type="medium" usage="CURRENCY" formatindex="61"> + <FormatElement msgid="CurrencyFormatskey8" default="false" type="medium" usage="CURRENCY" formatindex="67"> <FormatCode>[CURRENCY]#,##0.00;-[CURRENCY]#,##0.00</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey9" default="false" type="medium" usage="CURRENCY" formatindex="62"> + <FormatElement msgid="CurrencyFormatskey9" default="false" type="medium" usage="CURRENCY" formatindex="68"> <FormatCode>[CURRENCY]#,##0;[RED]-[CURRENCY]#,##0</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey10" default="false" type="medium" usage="CURRENCY" formatindex="63"> + <FormatElement msgid="CurrencyFormatskey10" default="false" type="medium" usage="CURRENCY" formatindex="69"> <FormatCode>[CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey11" default="false" type="medium" usage="CURRENCY" formatindex="64"> + <FormatElement msgid="CurrencyFormatskey11" default="false" type="medium" usage="CURRENCY" formatindex="70"> <FormatCode>#,##0.00 CCC</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey12" default="false" type="medium" usage="CURRENCY" formatindex="65"> + <FormatElement msgid="CurrencyFormatskey12" default="false" type="medium" usage="CURRENCY" formatindex="71"> <FormatCode>[CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--</FormatCode> </FormatElement> <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8"> @@ -222,10 +225,10 @@ <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9"> <FormatCode>[NatNum1]0.00%</FormatCode> </FormatElement> - <FormatElement msgid="PercentFormatskey3" default="false" type="short" usage="PERCENT_NUMBER" formatindex="66"> + <FormatElement msgid="PercentFormatskey3" default="false" type="short" usage="PERCENT_NUMBER" formatindex="72"> <FormatCode>0%</FormatCode> </FormatElement> - <FormatElement msgid="PercentFormatskey4" default="false" type="long" usage="PERCENT_NUMBER" formatindex="67"> + <FormatElement msgid="PercentFormatskey4" default="false" type="long" usage="PERCENT_NUMBER" formatindex="73"> <FormatCode>0.00%</FormatCode> </FormatElement> <FormatElement msgid="ScientificFormatskey1" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6"> @@ -234,10 +237,10 @@ <FormatElement msgid="ScientificFormatskey2" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7"> <FormatCode>0.00E+00</FormatCode> </FormatElement> - <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="68"> + <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="74"> <FormatCode>[NatNum1]0.00E+00</FormatCode> </FormatElement> - <FormatElement msgid="ScientificFormatskey4" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="78"> + <FormatElement msgid="ScientificFormatskey4" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="80"> <FormatCode>##0.00E+00</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/ee_GH.xml b/i18npool/source/localedata/data/ee_GH.xml index 3c0d8df74402..26ecfedf322c 100644 --- a/i18npool/source/localedata/data/ee_GH.xml +++ b/i18npool/source/localedata/data/ee_GH.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>MM/DD/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>MM/DD/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/el_GR.xml b/i18npool/source/localedata/data/el_GR.xml index 9867a1bf2e94..2316e67c8593 100644 --- a/i18npool/source/localedata/data/el_GR.xml +++ b/i18npool/source/localedata/data/el_GR.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/en_AU.xml b/i18npool/source/localedata/data/en_AU.xml index 4d21aa4ca438..e0122b128dda 100644 --- a/i18npool/source/localedata/data/en_AU.xml +++ b/i18npool/source/localedata/data/en_AU.xml @@ -201,6 +201,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/en_CA.xml b/i18npool/source/localedata/data/en_CA.xml index de8ff1f81d37..9e637a7530d0 100644 --- a/i18npool/source/localedata/data/en_CA.xml +++ b/i18npool/source/localedata/data/en_CA.xml @@ -197,12 +197,15 @@ <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"> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> <FormatCode>YYYY-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</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY-MM-DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/en_GB.xml b/i18npool/source/localedata/data/en_GB.xml index e81cfedf433f..f12fad0dc56e 100644 --- a/i18npool/source/localedata/data/en_GB.xml +++ b/i18npool/source/localedata/data/en_GB.xml @@ -145,6 +145,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>General</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/en_GH.xml b/i18npool/source/localedata/data/en_GH.xml index 888fae7738a5..ccda3d203d24 100644 --- a/i18npool/source/localedata/data/en_GH.xml +++ b/i18npool/source/localedata/data/en_GH.xml @@ -201,6 +201,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY/MM/DD HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY/MM/DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/en_JM.xml b/i18npool/source/localedata/data/en_JM.xml index c7ba05ea69b2..51dc9fb80f5c 100644 --- a/i18npool/source/localedata/data/en_JM.xml +++ b/i18npool/source/localedata/data/en_JM.xml @@ -201,6 +201,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/en_NA.xml b/i18npool/source/localedata/data/en_NA.xml index 0cae87b734fd..4322f2bb5afa 100644 --- a/i18npool/source/localedata/data/en_NA.xml +++ b/i18npool/source/localedata/data/en_NA.xml @@ -201,6 +201,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY/MM/DD HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY/MM/DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/en_US.xml b/i18npool/source/localedata/data/en_US.xml index f10f4e66dfb7..bed196f3cee7 100644 --- a/i18npool/source/localedata/data/en_US.xml +++ b/i18npool/source/localedata/data/en_US.xml @@ -207,36 +207,39 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>MM/DD/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>MM/DD/YYYY HH:MM AM/PM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_FORMAT_1> - <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="60"> + <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="66"> <FormatCode>[~jewish]NNNND MMMM YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey23" default="false" type="long" usage="DATE" formatindex="61"> + <FormatElement msgid="DateFormatskey23" default="false" type="long" usage="DATE" formatindex="67"> <FormatCode>[~jewish]NNNNMMMM D YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey24" default="false" type="long" usage="DATE" formatindex="62"> + <FormatElement msgid="DateFormatskey24" default="false" type="long" usage="DATE" formatindex="68"> <FormatCode>[~jewish]NN MMMM D YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey25" default="false" type="long" usage="DATE" formatindex="63"> + <FormatElement msgid="DateFormatskey25" default="false" type="long" usage="DATE" formatindex="69"> <FormatCode>[~jewish]NN D MMMM YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey26" default="false" type="long" usage="DATE" formatindex="64"> + <FormatElement msgid="DateFormatskey26" default="false" type="long" usage="DATE" formatindex="70"> <FormatCode>[~jewish]D MMMM YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey27" default="false" type="long" usage="DATE" formatindex="65"> + <FormatElement msgid="DateFormatskey27" default="false" type="long" usage="DATE" formatindex="71"> <FormatCode>[~jewish]MMMM D YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey28" default="false" type="medium" usage="DATE" formatindex="66"> + <FormatElement msgid="DateFormatskey28" default="false" type="medium" usage="DATE" formatindex="72"> <FormatCode>[~jewish]D MMMM</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey29" default="false" type="medium" usage="DATE" formatindex="67"> + <FormatElement msgid="DateFormatskey29" default="false" type="medium" usage="DATE" formatindex="73"> <FormatCode>[~jewish]MMMM D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey30" default="false" type="medium" usage="DATE" formatindex="68"> + <FormatElement msgid="DateFormatskey30" default="false" type="medium" usage="DATE" formatindex="74"> <FormatCode>[~jewish]MMMM YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey31" default="false" type="medium" usage="DATE" formatindex="69"> + <FormatElement msgid="DateFormatskey31" default="false" type="medium" usage="DATE" formatindex="75"> <FormatCode>[~jewish]MMMM</FormatCode> </FormatElement> </LC_FORMAT_1> diff --git a/i18npool/source/localedata/data/en_ZA.xml b/i18npool/source/localedata/data/en_ZA.xml index 3807110cda43..ec3990a72135 100644 --- a/i18npool/source/localedata/data/en_ZA.xml +++ b/i18npool/source/localedata/data/en_ZA.xml @@ -176,10 +176,10 @@ <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38"> <FormatCode>WW</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="60"> + <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="66"> <FormatCode>YY/MM/DD</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="61"> + <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="67"> <FormatCode>YYYY/MM/DD</FormatCode> </FormatElement> <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39"> @@ -209,10 +209,13 @@ <FormatElement msgid="DateTimeFormatskey2" default="true" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY-MM-DD HH:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="62"> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY-MM-DD HH:MM</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="68"> <FormatCode>YY/MM/DD HH:MM</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="63"> + <FormatElement msgid="DateTimeFormatskey5" default="false" type="medium" usage="DATE_TIME" formatindex="69"> <FormatCode>YYYY/MM/DD HH:MM:SS</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/eo.xml b/i18npool/source/localedata/data/eo.xml index 24463821429f..4fb04f908328 100644 --- a/i18npool/source/localedata/data/eo.xml +++ b/i18npool/source/localedata/data/eo.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY-MM-DD HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY-MM-DD HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/es_AR.xml b/i18npool/source/localedata/data/es_AR.xml index 9dfcf760d6e1..84cc34e3bb70 100644 --- a/i18npool/source/localedata/data/es_AR.xml +++ b/i18npool/source/localedata/data/es_AR.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/AAAA HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/es_BO.xml b/i18npool/source/localedata/data/es_BO.xml index f45676480292..317ab9406abc 100644 --- a/i18npool/source/localedata/data/es_BO.xml +++ b/i18npool/source/localedata/data/es_BO.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/AAAA HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/es_CL.xml b/i18npool/source/localedata/data/es_CL.xml index 18d21394a528..3b1605b98ed3 100644 --- a/i18npool/source/localedata/data/es_CL.xml +++ b/i18npool/source/localedata/data/es_CL.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/AAAA HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/es_CO.xml b/i18npool/source/localedata/data/es_CO.xml index 5a1212f02a15..f7962ec6f169 100644 --- a/i18npool/source/localedata/data/es_CO.xml +++ b/i18npool/source/localedata/data/es_CO.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/AAAA HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/es_CR.xml b/i18npool/source/localedata/data/es_CR.xml index 0fcd25ad3675..23c204fac6c8 100644 --- a/i18npool/source/localedata/data/es_CR.xml +++ b/i18npool/source/localedata/data/es_CR.xml @@ -139,12 +139,15 @@ <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>D/MM/AAAA HH:MM</FormatCode> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> + <FormatCode>D/MM/AA HH:MM</FormatCode> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>D/MM/AAAA HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Estandar</FormatCode> <DefaultName>Estandar</DefaultName> diff --git a/i18npool/source/localedata/data/es_DO.xml b/i18npool/source/localedata/data/es_DO.xml index e4f792cf4ee1..446219719b8a 100644 --- a/i18npool/source/localedata/data/es_DO.xml +++ b/i18npool/source/localedata/data/es_DO.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/AAAA HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Estandar</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/es_EC.xml b/i18npool/source/localedata/data/es_EC.xml index adec918e9ec1..eea5b1b73173 100644 --- a/i18npool/source/localedata/data/es_EC.xml +++ b/i18npool/source/localedata/data/es_EC.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/AAAA HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/es_ES.xml b/i18npool/source/localedata/data/es_ES.xml index ebbbcae1015e..15b25d937aab 100644 --- a/i18npool/source/localedata/data/es_ES.xml +++ b/i18npool/source/localedata/data/es_ES.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/AAAA HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/es_GT.xml b/i18npool/source/localedata/data/es_GT.xml index 935ea69710d2..5ef3985d0d30 100644 --- a/i18npool/source/localedata/data/es_GT.xml +++ b/i18npool/source/localedata/data/es_GT.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/AAAA HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Estandar</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/es_PE.xml b/i18npool/source/localedata/data/es_PE.xml index 2a2f0bd9e631..cf50595b913f 100644 --- a/i18npool/source/localedata/data/es_PE.xml +++ b/i18npool/source/localedata/data/es_PE.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/AAAA HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Estandar</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/es_SV.xml b/i18npool/source/localedata/data/es_SV.xml index 472e754cf007..af6a52c96e22 100644 --- a/i18npool/source/localedata/data/es_SV.xml +++ b/i18npool/source/localedata/data/es_SV.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/AAAA HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US"/> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/et_EE.xml b/i18npool/source/localedata/data/et_EE.xml index 22a3403eae8f..219faf3990f4 100644 --- a/i18npool/source/localedata/data/et_EE.xml +++ b/i18npool/source/localedata/data/et_EE.xml @@ -198,6 +198,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric">&[before 1]T<š<<<Š<z<<<Z<ž<<<Ž&v<<<V<w<<<W&[before 1]X<õ<<<Õ<ä<<<Ä<ö<<<Ö<ü<<<Ü</Collator> diff --git a/i18npool/source/localedata/data/eu_ES.xml b/i18npool/source/localedata/data/eu_ES.xml index d445a352be64..d10f385e04ef 100644 --- a/i18npool/source/localedata/data/eu_ES.xml +++ b/i18npool/source/localedata/data/eu_ES.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY/MM/DD HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY/MM/DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/fa_IR.xml b/i18npool/source/localedata/data/fa_IR.xml index 10157072450e..5199c1efdaf3 100644 --- a/i18npool/source/localedata/data/fa_IR.xml +++ b/i18npool/source/localedata/data/fa_IR.xml @@ -190,12 +190,15 @@ <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45"> <FormatCode>[NatNum1][HH]:MM:SS٫00</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46"> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> <FormatCode>[NatNum1][~persian]D MMM YYYY، ساعت HH:MM</FormatCode> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>[NatNum1][~persian]D MMM YYYY، ساعت HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>[NatNum1][~persian]D MMM YYYY، ساعت HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/fi_FI.xml b/i18npool/source/localedata/data/fi_FI.xml index a1fd1a40c834..cace5bcba575 100644 --- a/i18npool/source/localedata/data/fi_FI.xml +++ b/i18npool/source/localedata/data/fi_FI.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>PP.KK.VVVV TT:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>PP.KK.VVVV TT:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/fo_FO.xml b/i18npool/source/localedata/data/fo_FO.xml index 69492ed7b88d..3b43a6a93099 100644 --- a/i18npool/source/localedata/data/fo_FO.xml +++ b/i18npool/source/localedata/data/fo_FO.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD-MM-YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD-MM-YYYY HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/fr_BE.xml b/i18npool/source/localedata/data/fr_BE.xml index ab44284a7494..d71c2410e3c9 100644 --- a/i18npool/source/localedata/data/fr_BE.xml +++ b/i18npool/source/localedata/data/fr_BE.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>JJ/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>JJ/MM/AAAA HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="fr_FR" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/fr_BF.xml b/i18npool/source/localedata/data/fr_BF.xml index c442a93ceea7..72ccc852f0da 100644 --- a/i18npool/source/localedata/data/fr_BF.xml +++ b/i18npool/source/localedata/data/fr_BF.xml @@ -189,6 +189,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/fr_CA.xml b/i18npool/source/localedata/data/fr_CA.xml index ece903391d59..25e81ab7462b 100644 --- a/i18npool/source/localedata/data/fr_CA.xml +++ b/i18npool/source/localedata/data/fr_CA.xml @@ -191,12 +191,15 @@ <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"> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> <FormatCode>AAAA-MM-JJ HH:MM</FormatCode> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>AAAA-MM-JJ HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>AAAA-MM-JJ HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="fr_FR" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/fr_CH.xml b/i18npool/source/localedata/data/fr_CH.xml index 09e2656ae525..d6c0ac34b024 100644 --- a/i18npool/source/localedata/data/fr_CH.xml +++ b/i18npool/source/localedata/data/fr_CH.xml @@ -196,6 +196,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>JJ.MM.AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>JJ.MM.AAAA HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="fr_FR" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/fr_FR.xml b/i18npool/source/localedata/data/fr_FR.xml index 9720eac24300..ac7e17710cf9 100644 --- a/i18npool/source/localedata/data/fr_FR.xml +++ b/i18npool/source/localedata/data/fr_FR.xml @@ -197,6 +197,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>JJ/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>JJ/MM/AAAA HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/fr_LU.xml b/i18npool/source/localedata/data/fr_LU.xml index 63118c3e425f..d470fc64a930 100644 --- a/i18npool/source/localedata/data/fr_LU.xml +++ b/i18npool/source/localedata/data/fr_LU.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>JJ/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>JJ/MM/AAAA HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="fr_FR" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/fur_IT.xml b/i18npool/source/localedata/data/fur_IT.xml index 58aee59db349..24d92f5d1f87 100644 --- a/i18npool/source/localedata/data/fur_IT.xml +++ b/i18npool/source/localedata/data/fur_IT.xml @@ -189,12 +189,15 @@ <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"> + <FormatElement msgid="DateTimeFormatskey1" default="false" 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> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/fy_NL.xml b/i18npool/source/localedata/data/fy_NL.xml index 801edbd15190..8e144eb4f9ae 100644 --- a/i18npool/source/localedata/data/fy_NL.xml +++ b/i18npool/source/localedata/data/fy_NL.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD-MM-YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD-MM-YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/gd_GB.xml b/i18npool/source/localedata/data/gd_GB.xml index f0f95fc3263e..13c07a017ca3 100644 --- a/i18npool/source/localedata/data/gd_GB.xml +++ b/i18npool/source/localedata/data/gd_GB.xml @@ -203,6 +203,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/gl_ES.xml b/i18npool/source/localedata/data/gl_ES.xml index f3b4671a4af9..8693ae6e36ce 100644 --- a/i18npool/source/localedata/data/gl_ES.xml +++ b/i18npool/source/localedata/data/gl_ES.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/gsc_FR.xml b/i18npool/source/localedata/data/gsc_FR.xml index bf8ba5dccb7e..795a1bba4df4 100644 --- a/i18npool/source/localedata/data/gsc_FR.xml +++ b/i18npool/source/localedata/data/gsc_FR.xml @@ -197,6 +197,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/gug_PY.xml b/i18npool/source/localedata/data/gug_PY.xml index 4b78649d06bb..4734ac522a47 100644 --- a/i18npool/source/localedata/data/gug_PY.xml +++ b/i18npool/source/localedata/data/gug_PY.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/ha_Latn_GH.xml b/i18npool/source/localedata/data/ha_Latn_GH.xml index be2dff3095ac..3cbffc23b017 100644 --- a/i18npool/source/localedata/data/ha_Latn_GH.xml +++ b/i18npool/source/localedata/data/ha_Latn_GH.xml @@ -196,6 +196,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>MM/DD/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>MM/DD/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/ha_Latn_NG.xml b/i18npool/source/localedata/data/ha_Latn_NG.xml index cfb635b756d7..b2bf24b164ce 100644 --- a/i18npool/source/localedata/data/ha_Latn_NG.xml +++ b/i18npool/source/localedata/data/ha_Latn_NG.xml @@ -196,6 +196,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="ha_Latn_GH"/> <LC_SEARCH ref="ha_Latn_GH"/> diff --git a/i18npool/source/localedata/data/haw_US.xml b/i18npool/source/localedata/data/haw_US.xml index 97d1558257a5..2fb5d01c0ed0 100644 --- a/i18npool/source/localedata/data/haw_US.xml +++ b/i18npool/source/localedata/data/haw_US.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY/MM/DD HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY/MM/DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/he_IL.xml b/i18npool/source/localedata/data/he_IL.xml index 3793796327f6..277485badef4 100644 --- a/i18npool/source/localedata/data/he_IL.xml +++ b/i18npool/source/localedata/data/he_IL.xml @@ -117,13 +117,13 @@ <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38"> <FormatCode>WW</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="60"> + <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="66"> <FormatCode>[NatNum2][~jewish]YY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="61"> + <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="67"> <FormatCode>[NatNum2][~jewish]NNN DD MMMM YY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey24" default="false" type="medium" usage="DATE" formatindex="62"> + <FormatElement msgid="DateFormatskey24" default="false" type="medium" usage="DATE" formatindex="68"> <FormatCode>[NatNum2][~jewish]"יום "NN"׳ "DD MMMM YY</FormatCode> </FormatElement> <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39"> @@ -153,6 +153,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>General</FormatCode> </FormatElement> @@ -171,10 +174,10 @@ <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5"> <FormatCode>#,###.00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="63"> + <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="69"> <FormatCode>[natnum1]0</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey8" default="false" type="short" usage="FIXED_NUMBER" formatindex="64"> + <FormatElement msgid="FixedFormatskey8" default="false" type="short" usage="FIXED_NUMBER" formatindex="70"> <FormatCode>[natnum2]0</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12"> diff --git a/i18npool/source/localedata/data/hi_IN.xml b/i18npool/source/localedata/data/hi_IN.xml index 6a6d89e88fdb..eaf88ca57364 100644 --- a/i18npool/source/localedata/data/hi_IN.xml +++ b/i18npool/source/localedata/data/hi_IN.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>MM-DD-YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>MM-DD-YYYY HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/hil_PH.xml b/i18npool/source/localedata/data/hil_PH.xml index 3c11f9c29119..acd73bc1aea8 100644 --- a/i18npool/source/localedata/data/hil_PH.xml +++ b/i18npool/source/localedata/data/hil_PH.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>MM/DD/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>MM/DD/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml index cc121dd90400..0c493131e16b 100644 --- a/i18npool/source/localedata/data/hr_HR.xml +++ b/i18npool/source/localedata/data/hr_HR.xml @@ -198,16 +198,19 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey7" default="false" type="medium" usage="FIXED_NUMBER" formatindex="60"> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> + <FormatElement msgid="FixedFormatskey7" default="false" type="medium" usage="FIXED_NUMBER" formatindex="66"> <FormatCode>#.##0,00;[RED]-#.##0,00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="61"> + <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="67"> <FormatCode>#.###,00;[RED]-#.###,00</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey24" default="false" type="medium" usage="DATE" formatindex="62"> + <FormatElement msgid="DateFormatskey24" default="false" type="medium" usage="DATE" formatindex="68"> <FormatCode>DD. MM. YYYY.</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey25" default="false" type="short" usage="DATE" formatindex="63"> + <FormatElement msgid="DateFormatskey25" default="false" type="short" usage="DATE" formatindex="69"> <FormatCode>MM/YY</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/hsb_DE.xml b/i18npool/source/localedata/data/hsb_DE.xml index 92e4eaeb01d7..3e150e96096a 100644 --- a/i18npool/source/localedata/data/hsb_DE.xml +++ b/i18npool/source/localedata/data/hsb_DE.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/ht_HT.xml b/i18npool/source/localedata/data/ht_HT.xml index af400152a813..5a5e1464c4bf 100644 --- a/i18npool/source/localedata/data/ht_HT.xml +++ b/i18npool/source/localedata/data/ht_HT.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/hu_HU.xml b/i18npool/source/localedata/data/hu_HU.xml index e494c6404566..fcab23dd3646 100644 --- a/i18npool/source/localedata/data/hu_HU.xml +++ b/i18npool/source/localedata/data/hu_HU.xml @@ -83,7 +83,7 @@ <FormatElement msgid="ScientificFormatskey2" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7"> <FormatCode>0,00E+00</FormatCode> </FormatElement> - <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="78"> + <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="84"> <FormatCode>##0,00E+00</FormatCode> </FormatElement> <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8"> @@ -174,106 +174,106 @@ <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38"> <FormatCode>WW.</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey22" default="false" type="long" usage="DATE" formatindex="60"> + <FormatElement msgid="DateFormatskey22" default="false" type="long" usage="DATE" formatindex="66"> <FormatCode>[NatNum12 MMMM=abbreviation]YYYY". "MMMM D.</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey23" default="false" type="long" usage="DATE" formatindex="61"> + <FormatElement msgid="DateFormatskey23" default="false" type="long" usage="DATE" formatindex="67"> <FormatCode>[NatNum12 D=possessive]YYYY". "MMMM D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey24" default="false" type="long" usage="DATE" formatindex="62"> + <FormatElement msgid="DateFormatskey24" default="false" type="long" usage="DATE" formatindex="68"> <FormatCode>[NatNum12 D=possessive-superessive]YYYY". "MMMM D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey25" default="false" type="long" usage="DATE" formatindex="63"> + <FormatElement msgid="DateFormatskey25" default="false" type="long" usage="DATE" formatindex="69"> <FormatCode>[NatNum12 D=possessive-ablative]YYYY". "MMMM D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey26" default="false" type="long" usage="DATE" formatindex="64"> + <FormatElement msgid="DateFormatskey26" default="false" type="long" usage="DATE" formatindex="70"> <FormatCode>[NatNum12 D=possessive-terminative]YYYY". "MMMM D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey27" default="false" type="long" usage="DATE" formatindex="65"> + <FormatElement msgid="DateFormatskey27" default="false" type="long" usage="DATE" formatindex="71"> <FormatCode>[NatNum12 D=possessive-adjective]YYYY". "MMMM D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey28" default="false" type="long" usage="DATE" formatindex="66"> + <FormatElement msgid="DateFormatskey28" default="false" type="long" usage="DATE" formatindex="72"> <FormatCode>[NatNum12 D=possessive-superessive,NNN=superessive]YYYY". "MMMM D, NNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey29" default="false" type="medium" usage="DATE" formatindex="67"> + <FormatElement msgid="DateFormatskey29" default="false" type="medium" usage="DATE" formatindex="73"> <FormatCode>[NatNum12 D=possessive]MMMM" "D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey30" default="false" type="medium" usage="DATE" formatindex="68"> + <FormatElement msgid="DateFormatskey30" default="false" type="medium" usage="DATE" formatindex="74"> <FormatCode>[NatNum12 D=possessive-superessive]MMMM" "D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey31" default="false" type="medium" usage="DATE" formatindex="69"> + <FormatElement msgid="DateFormatskey31" default="false" type="medium" usage="DATE" formatindex="75"> <FormatCode>[NatNum12 D=possessive-ablative]MMMM" "D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey32" default="false" type="medium" usage="DATE" formatindex="70"> + <FormatElement msgid="DateFormatskey32" default="false" type="medium" usage="DATE" formatindex="76"> <FormatCode>[NatNum12 D=possessive-terminative]MMMM" "D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey33" default="false" type="long" usage="DATE" formatindex="71"> + <FormatElement msgid="DateFormatskey33" default="false" type="long" usage="DATE" formatindex="77"> <FormatCode>[NatNum12 MMMM=article,D=possessive-adjective]MMMM" "D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey34" default="false" type="medium" usage="DATE" formatindex="72"> + <FormatElement msgid="DateFormatskey34" default="false" type="medium" usage="DATE" formatindex="78"> <FormatCode>[NatNum12 MMMM=capitalize article,D=possessive-adjective]MMMM" "D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey35" default="false" type="long" usage="DATE" formatindex="73"> + <FormatElement msgid="DateFormatskey35" default="false" type="long" usage="DATE" formatindex="79"> <FormatCode>[NatNum12 MMMM=article,D=adjective]MMMM" "D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey36" default="false" type="medium" usage="DATE" formatindex="74"> + <FormatElement msgid="DateFormatskey36" default="false" type="medium" usage="DATE" formatindex="80"> <FormatCode>[NatNum12 MMMM=capitalize article,D=adjective]MMMM" "D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey37" default="false" type="long" usage="DATE" formatindex="75"> + <FormatElement msgid="DateFormatskey37" default="false" type="long" usage="DATE" formatindex="81"> <FormatCode>[NatNum12 MMMM=article]MMMM"i"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey38" default="false" type="medium" usage="DATE" formatindex="76"> + <FormatElement msgid="DateFormatskey38" default="false" type="medium" usage="DATE" formatindex="82"> <FormatCode>[NatNum12 MMMM=capitalize article]MMMM"i"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey39" default="false" type="medium" usage="DATE" formatindex="77"> + <FormatElement msgid="DateFormatskey39" default="false" type="medium" usage="DATE" formatindex="83"> <FormatCode>[NatNum12 superessive]NNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey40" default="false" type="medium" usage="DATE" formatindex="79"> + <FormatElement msgid="DateFormatskey40" default="false" type="medium" usage="DATE" formatindex="85"> <FormatCode>[NatNum12 ablative]NNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey41" default="false" type="medium" usage="DATE" formatindex="80"> + <FormatElement msgid="DateFormatskey41" default="false" type="medium" usage="DATE" formatindex="86"> <FormatCode>[NatNum12 terminative]NNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey42" default="false" type="medium" usage="DATE" formatindex="81"> + <FormatElement msgid="DateFormatskey42" default="false" type="medium" usage="DATE" formatindex="87"> <FormatCode>[NatNum12 inessive]YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey43" default="false" type="medium" usage="DATE" formatindex="82"> + <FormatElement msgid="DateFormatskey43" default="false" type="medium" usage="DATE" formatindex="88"> <FormatCode>[NatNum12 ablative]YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey44" default="false" type="medium" usage="DATE" formatindex="83"> + <FormatElement msgid="DateFormatskey44" default="false" type="medium" usage="DATE" formatindex="89"> <FormatCode>[NatNum12 article]MMMM</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey45" default="false" type="medium" usage="DATE" formatindex="84"> + <FormatElement msgid="DateFormatskey45" default="false" type="medium" usage="DATE" formatindex="90"> <FormatCode>[NatNum12 capitalize article]MMMM</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey46" default="false" type="medium" usage="DATE" formatindex="85"> + <FormatElement msgid="DateFormatskey46" default="false" type="medium" usage="DATE" formatindex="91"> <FormatCode>[NatNum12 inessive]MMMM</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey47" default="false" type="medium" usage="DATE" formatindex="86"> + <FormatElement msgid="DateFormatskey47" default="false" type="medium" usage="DATE" formatindex="92"> <FormatCode>[NatNum12 article inessive]MMMM</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey48" default="false" type="medium" usage="DATE" formatindex="87"> + <FormatElement msgid="DateFormatskey48" default="false" type="medium" usage="DATE" formatindex="93"> <FormatCode>[NatNum12 capitalize article inessive]MMMM</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey49" default="false" type="medium" usage="DATE" formatindex="88"> + <FormatElement msgid="DateFormatskey49" default="false" type="medium" usage="DATE" formatindex="94"> <FormatCode>[NatNum12 ablative]MMMM</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey50" default="false" type="medium" usage="DATE" formatindex="89"> + <FormatElement msgid="DateFormatskey50" default="false" type="medium" usage="DATE" formatindex="95"> <FormatCode>[NatNum12 article ablative]MMMM</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey51" default="false" type="medium" usage="DATE" formatindex="90"> + <FormatElement msgid="DateFormatskey51" default="false" type="medium" usage="DATE" formatindex="96"> <FormatCode>[NatNum12 capitalize article ablative]MMMM</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey52" default="false" type="medium" usage="DATE" formatindex="91"> + <FormatElement msgid="DateFormatskey52" default="false" type="medium" usage="DATE" formatindex="97"> <FormatCode>[NatNum12 MMMM=possessive-inessive]YYYY" "MMMM</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey53" default="false" type="medium" usage="DATE" formatindex="92"> + <FormatElement msgid="DateFormatskey53" default="false" type="medium" usage="DATE" formatindex="98"> <FormatCode>[NatNum12 MMMM=possessive-ablative]YYYY" "MMMM</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey54" default="false" type="medium" usage="DATE" formatindex="93"> + <FormatElement msgid="DateFormatskey54" default="false" type="medium" usage="DATE" formatindex="99"> <FormatCode>[NatNum12 MMMM=possessive-terminative]YYYY" "MMMM</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey55" default="false" type="medium" usage="DATE" formatindex="94"> + <FormatElement msgid="DateFormatskey55" default="false" type="medium" usage="DATE" formatindex="100"> <FormatCode>[NatNum12 ordinal year]YYYY</FormatCode> </FormatElement> <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39"> @@ -303,6 +303,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY.MM.DD. HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY.MM.DD. HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator unoid="charset" default="true"/> diff --git a/i18npool/source/localedata/data/hy_AM.xml b/i18npool/source/localedata/data/hy_AM.xml index 7329a8b3aeb9..48a45026e424 100644 --- a/i18npool/source/localedata/data/hy_AM.xml +++ b/i18npool/source/localedata/data/hy_AM.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator unoid="alphanumeric" default="true"/> diff --git a/i18npool/source/localedata/data/ia.xml b/i18npool/source/localedata/data/ia.xml index fdd9d682cd6a..877d6f2f9cb2 100644 --- a/i18npool/source/localedata/data/ia.xml +++ b/i18npool/source/localedata/data/ia.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/id_ID.xml b/i18npool/source/localedata/data/id_ID.xml index c1a555530a4c..e4024cbf4c13 100644 --- a/i18npool/source/localedata/data/id_ID.xml +++ b/i18npool/source/localedata/data/id_ID.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/ilo_PH.xml b/i18npool/source/localedata/data/ilo_PH.xml index 0c8a96c6c633..109a3be61bf0 100644 --- a/i18npool/source/localedata/data/ilo_PH.xml +++ b/i18npool/source/localedata/data/ilo_PH.xml @@ -208,6 +208,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>MM/DD/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>MM/DD/YYYY HH:MM AM/PM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/is_IS.xml b/i18npool/source/localedata/data/is_IS.xml index 98201f4b1dda..301799d4a5e9 100644 --- a/i18npool/source/localedata/data/is_IS.xml +++ b/i18npool/source/localedata/data/is_IS.xml @@ -181,6 +181,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/it_CH.xml b/i18npool/source/localedata/data/it_CH.xml index 6447d3c6eefb..2da786dd4201 100644 --- a/i18npool/source/localedata/data/it_CH.xml +++ b/i18npool/source/localedata/data/it_CH.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>GG.MM.AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>GG.MM.AAAA HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/it_IT.xml b/i18npool/source/localedata/data/it_IT.xml index 4b1bd5567f7f..ab6822db85c5 100644 --- a/i18npool/source/localedata/data/it_IT.xml +++ b/i18npool/source/localedata/data/it_IT.xml @@ -189,12 +189,15 @@ <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"> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> <FormatCode>GG/MM/AA HH:MM</FormatCode> </FormatElement> <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>GG/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>GG/MM/AAAA HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/ja_JP.xml b/i18npool/source/localedata/data/ja_JP.xml index c15c665f2eab..280094564bd2 100644 --- a/i18npool/source/localedata/data/ja_JP.xml +++ b/i18npool/source/localedata/data/ja_JP.xml @@ -195,22 +195,22 @@ <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45"> <FormatCode>[HH]:MM:SS.00</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey8" default="false" type="short" usage="TIME" formatindex="62"> + <FormatElement msgid="TimeFormatskey8" default="false" type="short" usage="TIME" formatindex="66"> <FormatCode>H時MM分</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey9" default="false" type="medium" usage="TIME" formatindex="63"> + <FormatElement msgid="TimeFormatskey9" default="false" type="medium" usage="TIME" formatindex="67"> <FormatCode>H時MM分SS秒</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey1" default="false" type="long" usage="DATE_TIME" formatindex="46"> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> <FormatCode>YY/MM/DD HH:MM</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey3" default="false" type="long" usage="DATE_TIME" formatindex="47"> + <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY/M/D H:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey2" default="true" type="long" usage="DATE_TIME" formatindex="65"> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> <FormatCode>YYYY/M/D H:MM</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="64"> + <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="68"> <FormatCode>GE.MM.DD</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/jbo.xml b/i18npool/source/localedata/data/jbo.xml index 4ba9aa2c3c31..c95304eb7381 100644 --- a/i18npool/source/localedata/data/jbo.xml +++ b/i18npool/source/localedata/data/jbo.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/ka_GE.xml b/i18npool/source/localedata/data/ka_GE.xml index 1d07b7a59eb5..777936160223 100644 --- a/i18npool/source/localedata/data/ka_GE.xml +++ b/i18npool/source/localedata/data/ka_GE.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator unoid="alphanumeric" default="true"/> diff --git a/i18npool/source/localedata/data/kab_DZ.xml b/i18npool/source/localedata/data/kab_DZ.xml index b61fe80eb847..2c9f6b45bfdd 100644 --- a/i18npool/source/localedata/data/kab_DZ.xml +++ b/i18npool/source/localedata/data/kab_DZ.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/kk_KZ.xml b/i18npool/source/localedata/data/kk_KZ.xml index 88a6bd9fd63d..121ab7ac887e 100644 --- a/i18npool/source/localedata/data/kk_KZ.xml +++ b/i18npool/source/localedata/data/kk_KZ.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/kl_GL.xml b/i18npool/source/localedata/data/kl_GL.xml index e2053807a9b8..4789e090356f 100644 --- a/i18npool/source/localedata/data/kl_GL.xml +++ b/i18npool/source/localedata/data/kl_GL.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD-MM-YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD-MM-YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/km_KH.xml b/i18npool/source/localedata/data/km_KH.xml index d532fc3ba34d..85d54607a22b 100644 --- a/i18npool/source/localedata/data/km_KH.xml +++ b/i18npool/source/localedata/data/km_KH.xml @@ -71,13 +71,13 @@ <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5"> <FormatCode>#.###,00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="62"> + <FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="66"> <FormatCode>[NatNum1]0</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="63"> + <FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="67"> <FormatCode>[NatNum1]0,00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey9" default="false" type="medium" usage="FIXED_NUMBER" formatindex="64"> + <FormatElement msgid="FixedFormatskey9" default="false" type="medium" usage="FIXED_NUMBER" formatindex="68"> <FormatCode>[NatNum1]#.###,00</FormatCode> </FormatElement> <FormatElement msgid="ScientificFormatskey1" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6"> @@ -89,10 +89,10 @@ <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="78"> <FormatCode>##0,00E+00</FormatCode> </FormatElement> - <FormatElement msgid="PercentFormatskey3" default="false" type="short" usage="PERCENT_NUMBER" formatindex="68"> + <FormatElement msgid="PercentFormatskey3" default="false" type="short" usage="PERCENT_NUMBER" formatindex="72"> <FormatCode>[NatNum1]0%</FormatCode> </FormatElement> - <FormatElement msgid="PercentFormatskey4" default="false" type="long" usage="PERCENT_NUMBER" formatindex="69"> + <FormatElement msgid="PercentFormatskey4" default="false" type="long" usage="PERCENT_NUMBER" formatindex="73"> <FormatCode>[NatNum1]0,00%</FormatCode> </FormatElement> <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8"> @@ -119,13 +119,13 @@ <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17"> <FormatCode>#.##0[CURRENCY].--;[RED]-#.##0[CURRENCY].--</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey7" default="false" type="short" usage="CURRENCY" formatindex="65"> + <FormatElement msgid="CurrencyFormatskey7" default="false" type="short" usage="CURRENCY" formatindex="69"> <FormatCode>[NatNum1]#.##0[CURRENCY];-#.##0[CURRENCY]</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey8" default="false" type="medium" usage="CURRENCY" formatindex="66"> + <FormatElement msgid="CurrencyFormatskey8" default="false" type="medium" usage="CURRENCY" formatindex="70"> <FormatCode>[NatNum1]#.##0[CURRENCY].--;[RED]-#.##0[CURRENCY].--</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey9" default="false" type="medium" usage="CURRENCY" formatindex="67"> + <FormatElement msgid="CurrencyFormatskey9" default="false" type="medium" usage="CURRENCY" formatindex="71"> <FormatCode>[NatNum1]#.##0,00[CURRENCY];[RED]-#.##0,00[CURRENCY]</FormatCode> </FormatElement> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> @@ -219,6 +219,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM AM/PM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="charset">&ោ<ៅ<ុំ<ំ<ាំ<ះ<ាះ<ិះ<ីះ<ឹះ<ឺះ<ុះ<ូះ<ួះ<ើះ<ឿះ<ៀះ<េះ<ែះ<ៃះ<ោះ<ៅះ</Collator> diff --git a/i18npool/source/localedata/data/kmr_Latn_TR.xml b/i18npool/source/localedata/data/kmr_Latn_TR.xml index a566c67170b9..6ac8d1e84d5a 100644 --- a/i18npool/source/localedata/data/kmr_Latn_TR.xml +++ b/i18npool/source/localedata/data/kmr_Latn_TR.xml @@ -196,6 +196,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD-MM-YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>MM/DD/YYYY HH:MM AM/PM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/kng_CG.xml b/i18npool/source/localedata/data/kng_CG.xml index e77af6924c4d..a897a11f050e 100644 --- a/i18npool/source/localedata/data/kng_CG.xml +++ b/i18npool/source/localedata/data/kng_CG.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/ko_KR.xml b/i18npool/source/localedata/data/ko_KR.xml index 9d5e397ee43b..a3e6121ba832 100644 --- a/i18npool/source/localedata/data/ko_KR.xml +++ b/i18npool/source/localedata/data/ko_KR.xml @@ -77,7 +77,7 @@ <FormatElement msgid="ScientificFormatskey2" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7"> <FormatCode>0.00E+00</FormatCode> </FormatElement> - <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="101"> + <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="107"> <FormatCode>##0.00E+00</FormatCode> </FormatElement> <FormatElement msgid="PercentFormatskey1" default="true" type="medium" usage="PERCENT_NUMBER" formatindex="8"> @@ -168,88 +168,88 @@ <FormatElement msgid="DataFormatskey21" default="false" type="medium" usage="DATE" formatindex="38"> <FormatCode>"제"WW"주"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="61"> + <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="67"> <FormatCode>YYYY"년" M"월"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="62"> + <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="68"> <FormatCode>YYYY"년도 제"Q"사분기"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey24" default="false" type="medium" usage="DATE" formatindex="63"> + <FormatElement msgid="DateFormatskey24" default="false" type="medium" usage="DATE" formatindex="69"> <FormatCode>YY"年" M"月"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey25" default="false" type="medium" usage="DATE" formatindex="64"> + <FormatElement msgid="DateFormatskey25" default="false" type="medium" usage="DATE" formatindex="70"> <FormatCode>YYYY"年" M"月"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey26" default="false" type="medium" usage="DATE" formatindex="65"> + <FormatElement msgid="DateFormatskey26" default="false" type="medium" usage="DATE" formatindex="71"> <FormatCode>[NatNum1]YYYY"年度 第"QQ"四分期"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey27" default="false" type="medium" usage="DATE" formatindex="66"> + <FormatElement msgid="DateFormatskey27" default="false" type="medium" usage="DATE" formatindex="72"> <FormatCode>[NatNum1]YY"年度 第"QQ"四分期"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey28" default="false" type="medium" usage="DATE" formatindex="67"> + <FormatElement msgid="DateFormatskey28" default="false" type="medium" usage="DATE" formatindex="73"> <FormatCode>M"月"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey29" default="false" type="medium" usage="DATE" formatindex="68"> + <FormatElement msgid="DateFormatskey29" default="false" type="medium" usage="DATE" formatindex="74"> <FormatCode>"第"WW"週"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey30" default="false" type="medium" usage="DATE" formatindex="69"> + <FormatElement msgid="DateFormatskey30" default="false" type="medium" usage="DATE" formatindex="75"> <FormatCode>YY-M</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey31" default="false" type="long" usage="DATE" formatindex="70"> + <FormatElement msgid="DateFormatskey31" default="false" type="long" usage="DATE" formatindex="76"> <FormatCode>YYYY-M</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey33" default="false" type="long" usage="DATE" formatindex="71"> + <FormatElement msgid="DateFormatskey33" default="false" type="long" usage="DATE" formatindex="77"> <FormatCode>YY/M/D NNNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey34" default="true" type="long" usage="DATE" formatindex="72"> + <FormatElement msgid="DateFormatskey34" default="true" type="long" usage="DATE" formatindex="78"> <FormatCode>YYYY/M/D NNNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey35" default="false" type="long" usage="DATE" formatindex="73"> + <FormatElement msgid="DateFormatskey35" default="false" type="long" usage="DATE" formatindex="79"> <FormatCode>YY/M</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey36" default="false" type="long" usage="DATE" formatindex="74"> + <FormatElement msgid="DateFormatskey36" default="false" type="long" usage="DATE" formatindex="80"> <FormatCode>M/D</FormatCode> </FormatElement> - <FormatElement msgid="DataFormatskey37" default="false" type="medium" usage="DATE" formatindex="87"> + <FormatElement msgid="DataFormatskey37" default="false" type="medium" usage="DATE" formatindex="93"> <FormatCode>YYYY. M. D.</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey38" default="false" type="medium" usage="DATE" formatindex="88"> + <FormatElement msgid="DateFormatskey38" default="false" type="medium" usage="DATE" formatindex="94"> <FormatCode>YYYY. M. D. (NN)</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey39" default="false" type="medium" usage="DATE" formatindex="89"> + <FormatElement msgid="DateFormatskey39" default="false" type="medium" usage="DATE" formatindex="95"> <FormatCode>YYYY. M. D. NNNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey40" default="false" type="medium" usage="DATE" formatindex="90"> + <FormatElement msgid="DateFormatskey40" default="false" type="medium" usage="DATE" formatindex="96"> <FormatCode>[~hanja]YYYY. M. D. (NN)</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey41" default="false" type="medium" usage="DATE" formatindex="91"> + <FormatElement msgid="DateFormatskey41" default="false" type="medium" usage="DATE" formatindex="97"> <FormatCode>[~hanja]YYYY. M. D. NNNN</FormatCode> </FormatElement> - <FormatElement msgid="DataFormatskey42" default="false" type="medium" usage="DATE" formatindex="92"> + <FormatElement msgid="DataFormatskey42" default="false" type="medium" usage="DATE" formatindex="98"> <FormatCode>YY. M. D.</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey43" default="false" type="medium" usage="DATE" formatindex="93"> + <FormatElement msgid="DateFormatskey43" default="false" type="medium" usage="DATE" formatindex="99"> <FormatCode>YY. M. D. (NN)</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey44" default="false" type="medium" usage="DATE" formatindex="94"> + <FormatElement msgid="DateFormatskey44" default="false" type="medium" usage="DATE" formatindex="100"> <FormatCode>YY. M. D. NNNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey45" default="false" type="medium" usage="DATE" formatindex="95"> + <FormatElement msgid="DateFormatskey45" default="false" type="medium" usage="DATE" formatindex="101"> <FormatCode>[~hanja]YY. M. D. (NN)</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey46" default="false" type="medium" usage="DATE" formatindex="96"> + <FormatElement msgid="DateFormatskey46" default="false" type="medium" usage="DATE" formatindex="102"> <FormatCode>[~hanja]YY. M. D. NNNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey47" default="false" type="medium" usage="DATE" formatindex="97"> + <FormatElement msgid="DateFormatskey47" default="false" type="medium" usage="DATE" formatindex="103"> <FormatCode>YY"년" M"월" D"일" (NN)</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey48" default="false" type="medium" usage="DATE" formatindex="98"> + <FormatElement msgid="DateFormatskey48" default="false" type="medium" usage="DATE" formatindex="104"> <FormatCode>YYYY"년" M"월" D"일" (NN)</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey49" default="false" type="medium" usage="DATE" formatindex="99"> + <FormatElement msgid="DateFormatskey49" default="false" type="medium" usage="DATE" formatindex="105"> <FormatCode>[~hanja]YYYY"年" M"月" D"日" (NN)</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey50" default="false" type="medium" usage="DATE" formatindex="100"> + <FormatElement msgid="DateFormatskey50" default="false" type="medium" usage="DATE" formatindex="106"> <FormatCode>[~hanja]YY"年" M"月" D"日" (NN)</FormatCode> </FormatElement> <FormatElement msgid="TimeFormatskey1" default="false" type="medium" usage="TIME" formatindex="39"> @@ -273,28 +273,28 @@ <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45"> <FormatCode>[H]:M:S.00</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey8" default="false" type="medium" usage="TIME" formatindex="75"> + <FormatElement msgid="TimeFormatskey8" default="false" type="medium" usage="TIME" formatindex="81"> <FormatCode>H"時" M"分"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey9" default="false" type="medium" usage="TIME" formatindex="76"> + <FormatElement msgid="TimeFormatskey9" default="false" type="medium" usage="TIME" formatindex="82"> <FormatCode>H:M</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="77"> + <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="83"> <FormatCode>H"時" M"分" S"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey11" default="false" type="medium" usage="TIME" formatindex="78"> + <FormatElement msgid="TimeFormatskey11" default="false" type="medium" usage="TIME" formatindex="84"> <FormatCode>H:M:S</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="79"> + <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="85"> <FormatCode>[~hanja]AM/PM H"時" M"分" S"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey13" default="false" type="medium" usage="TIME" formatindex="80"> + <FormatElement msgid="TimeFormatskey13" default="false" type="medium" usage="TIME" formatindex="86"> <FormatCode>AM/PM H:M:S</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey14" default="false" type="medium" usage="TIME" formatindex="81"> + <FormatElement msgid="TimeFormatskey14" default="false" type="medium" usage="TIME" formatindex="87"> <FormatCode>[~hanja]AM/PM H"時" M"分"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey15" default="false" type="medium" usage="TIME" formatindex="82"> + <FormatElement msgid="TimeFormatskey15" default="false" type="medium" usage="TIME" formatindex="88"> <FormatCode>AM/PM H:M</FormatCode> </FormatElement> <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> @@ -303,19 +303,22 @@ <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY. M. D. H:M:S</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey2" default="true" type="medium" usage="DATE_TIME" formatindex="60"> + <FormatElement msgid="DateTimeFormatskey8" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY"년" M"월" D"일" H"시" M"분"</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey2" default="true" type="medium" usage="DATE_TIME" formatindex="66"> <FormatCode>YYYY"년" M"월" D"일" H"시" M"분" S"초"</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="83"> + <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="89"> <FormatCode>YY"年" M"月" D"日" H"時" M"分" S"秒"</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey5" default="false" type="medium" usage="DATE_TIME" formatindex="84"> + <FormatElement msgid="DateTimeFormatskey5" default="false" type="medium" usage="DATE_TIME" formatindex="90"> <FormatCode>YY/M/D H:M</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey6" default="false" type="medium" usage="DATE_TIME" formatindex="85"> + <FormatElement msgid="DateTimeFormatskey6" default="false" type="medium" usage="DATE_TIME" formatindex="91"> <FormatCode>YY. M. D. H:M</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey7" default="false" type="medium" usage="DATE_TIME" formatindex="86"> + <FormatElement msgid="DateTimeFormatskey7" default="false" type="medium" usage="DATE_TIME" formatindex="92"> <FormatCode>YYYY"年" M"月" D"日" H"時" M"分" S"秒"</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/ky_KG.xml b/i18npool/source/localedata/data/ky_KG.xml index 222e0e3a7ba0..6198c30478ec 100644 --- a/i18npool/source/localedata/data/ky_KG.xml +++ b/i18npool/source/localedata/data/ky_KG.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/la_VA.xml b/i18npool/source/localedata/data/la_VA.xml index ee71bf2666e3..920dfb6df671 100644 --- a/i18npool/source/localedata/data/la_VA.xml +++ b/i18npool/source/localedata/data/la_VA.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/lb_LU.xml b/i18npool/source/localedata/data/lb_LU.xml index 753beb8f0200..7f44bad128d7 100644 --- a/i18npool/source/localedata/data/lb_LU.xml +++ b/i18npool/source/localedata/data/lb_LU.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/lg_UG.xml b/i18npool/source/localedata/data/lg_UG.xml index dab014cbedff..9108f9230468 100644 --- a/i18npool/source/localedata/data/lg_UG.xml +++ b/i18npool/source/localedata/data/lg_UG.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY/MM/DD HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY/MM/DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/lgr_SB.xml b/i18npool/source/localedata/data/lgr_SB.xml index f1803479131f..30696798d362 100644 --- a/i18npool/source/localedata/data/lgr_SB.xml +++ b/i18npool/source/localedata/data/lgr_SB.xml @@ -179,6 +179,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY-MM-DD HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY-MM-DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/lif_NP.xml b/i18npool/source/localedata/data/lif_NP.xml index b48ec7855c85..fb73e3586006 100644 --- a/i18npool/source/localedata/data/lif_NP.xml +++ b/i18npool/source/localedata/data/lif_NP.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY/MM/DD HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY/MM/DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/lij_IT.xml b/i18npool/source/localedata/data/lij_IT.xml index 0744e808031e..3eb20e9f14fb 100644 --- a/i18npool/source/localedata/data/lij_IT.xml +++ b/i18npool/source/localedata/data/lij_IT.xml @@ -189,12 +189,15 @@ <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"> + <FormatElement msgid="DateTimeFormatskey1" default="false" 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</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US"/> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/lld_IT.xml b/i18npool/source/localedata/data/lld_IT.xml index d6be649f9591..361d72367425 100644 --- a/i18npool/source/localedata/data/lld_IT.xml +++ b/i18npool/source/localedata/data/lld_IT.xml @@ -190,12 +190,15 @@ <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"> + <FormatElement msgid="DateTimeFormatskey1" default="false" 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> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/ln_CD.xml b/i18npool/source/localedata/data/ln_CD.xml index 70480cbae6ad..375d781a61af 100644 --- a/i18npool/source/localedata/data/ln_CD.xml +++ b/i18npool/source/localedata/data/ln_CD.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD-MM-YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD-MM-YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator unoid="charset" default="true"/> diff --git a/i18npool/source/localedata/data/lo_LA.xml b/i18npool/source/localedata/data/lo_LA.xml index 698e34c35820..a449a87605f3 100644 --- a/i18npool/source/localedata/data/lo_LA.xml +++ b/i18npool/source/localedata/data/lo_LA.xml @@ -168,7 +168,7 @@ <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="38"> <FormatCode>WW</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey10" default="true" type="long" usage="DATE" formatindex="60"> + <FormatElement msgid="DateFormatskey10" default="true" type="long" usage="DATE" formatindex="66"> <FormatCode>NNNN"ວັນທີ" DD "ເດືອນ" MMMM "ປີ" YYYY</FormatCode> </FormatElement> <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39"> @@ -198,6 +198,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>MM/DD/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY "ວັນທີ" "ເດືອນ" "ປີ" HH"ໂມງ":MM"ນາທີ"</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/locale.dtd b/i18npool/source/localedata/data/locale.dtd index e348fdc1905a..103ab1721c4e 100644 --- a/i18npool/source/localedata/data/locale.dtd +++ b/i18npool/source/localedata/data/locale.dtd @@ -156,8 +156,9 @@ <!-- The LC_FORMAT element contains number format codes and may actually appear twice (with the second occurrence named LC_FORMAT_1). One section is mandatory and MUST contain at least all required format codes - formatindex="0" to formatindex="47", MUST NOT contain formatindex 48 and - 49, and MAY contain other format codes. See below ATTLIST FormatElement + formatindex="0" to formatindex="47" (except 10 and 11 MUST NOT be + defined), MUST NOT contain formatindex 48 and 49, MUST contain formatindex + 50, and MAY contain other format codes. See below ATTLIST FormatElement formatindex. A second LC_FORMAT_1 section may follow containing other format codes. The @@ -223,7 +224,7 @@ The following FormatElements must follow specific rules: All: - The format indices 0..59 are reserved and, for backwards compatibility, + The format indices 0..65 are reserved and, for backwards compatibility, indices 0..49 MUST be used as stated in offapi/com/sun/star/i18n/NumberFormatIndex.idl ( https://opengrok.libreoffice.org/xref/core/offapi/com/sun/star/i18n/NumberFormatIndex.idl ) @@ -254,7 +255,7 @@ If you want to define yet more formats than the preset and reserved 0..49 range that's fine, only make sure those formatindex="..." values - are each >=60 and all values are unique within one locale. + are each >=66 and all values are unique within one locale. Of usage="FIXED_NUMBER": formatindex="0" MUST be the format containing the 'General' keyword. @@ -273,13 +274,20 @@ separators, and the YMD default order is determined from the order encountered in this format. TODO: Future versions should make use of an edit="true" attribute - instead of relying on this special requirement. + instead of relying on this special index requirement. formatindex="33" must be ISO 8601 YYYY-MM-DD format code. Of usage="DATE_TIME": + formatindex="46" should contain a short year YY code and only HH and MM + without SS seconds. + formatindex="47" is used to edit already existing combined date/time - data. The requirements are the same as for formatindex="21" above. + data. The requirements are the same as for formatindex="21" above, plus + HH and MM and SS codes. + + formatindex="50" must contain a long year YYYY code and only HH and MM + without SS seconds. Of usage="TIME": * The FormatElement with default="true" type="medium" is used to edit diff --git a/i18npool/source/localedata/data/lt_LT.xml b/i18npool/source/localedata/data/lt_LT.xml index 5ffa73d38fe9..914e51614e01 100644 --- a/i18npool/source/localedata/data/lt_LT.xml +++ b/i18npool/source/localedata/data/lt_LT.xml @@ -169,7 +169,7 @@ <FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="38"> <FormatCode>WW</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="60"> + <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="66"> <FormatCode>YYYY MMMM DD NN</FormatCode> </FormatElement> <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39"> @@ -193,19 +193,19 @@ <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45"> <FormatCode>[HH]:MM:SS,00</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey8" default="false" type="short" usage="TIME" formatindex="61"> + <FormatElement msgid="TimeFormatskey8" default="false" type="short" usage="TIME" formatindex="67"> <FormatCode>H"."MM "val."</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey9" default="false" type="medium" usage="TIME" formatindex="62"> + <FormatElement msgid="TimeFormatskey9" default="false" type="medium" usage="TIME" formatindex="68"> <FormatCode>H "val." M "min."</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="63"> + <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="69"> <FormatCode>H "val." MM "min." SS "sek."</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey11" default="false" type="short" usage="TIME" formatindex="64"> + <FormatElement msgid="TimeFormatskey11" default="false" type="short" usage="TIME" formatindex="70"> <FormatCode>H "h" M "min"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="65"> + <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="71"> <FormatCode>H "h" M "min" S "s"</FormatCode> </FormatElement> <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46"> @@ -214,6 +214,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY-MM-DD HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY-MM-DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/ltg_LV.xml b/i18npool/source/localedata/data/ltg_LV.xml index 02295513f752..90901b399b3a 100644 --- a/i18npool/source/localedata/data/ltg_LV.xml +++ b/i18npool/source/localedata/data/ltg_LV.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/lv_LV.xml b/i18npool/source/localedata/data/lv_LV.xml index 8bd16c0231c5..80ca4b8c3d18 100644 --- a/i18npool/source/localedata/data/lv_LV.xml +++ b/i18npool/source/localedata/data/lv_LV.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator unoid="alphanumeric" default="true"/> diff --git a/i18npool/source/localedata/data/mai_IN.xml b/i18npool/source/localedata/data/mai_IN.xml index 5195c312a447..30a965652ffc 100644 --- a/i18npool/source/localedata/data/mai_IN.xml +++ b/i18npool/source/localedata/data/mai_IN.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/mk_MK.xml b/i18npool/source/localedata/data/mk_MK.xml index 3686f7751969..0361499d925b 100644 --- a/i18npool/source/localedata/data/mk_MK.xml +++ b/i18npool/source/localedata/data/mk_MK.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM AM/PM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/ml_IN.xml b/i18npool/source/localedata/data/ml_IN.xml index 3800c8d083af..b2484457b239 100644 --- a/i18npool/source/localedata/data/ml_IN.xml +++ b/i18npool/source/localedata/data/ml_IN.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>MM-DD-YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>MM-DD-YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/mn_Cyrl_MN.xml b/i18npool/source/localedata/data/mn_Cyrl_MN.xml index f5945c0d10f9..0be2124ea3cc 100644 --- a/i18npool/source/localedata/data/mn_Cyrl_MN.xml +++ b/i18npool/source/localedata/data/mn_Cyrl_MN.xml @@ -145,6 +145,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY.MM.DD HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY.MM.DD HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/mos_BF.xml b/i18npool/source/localedata/data/mos_BF.xml index 7ce464306134..633d309b0984 100644 --- a/i18npool/source/localedata/data/mos_BF.xml +++ b/i18npool/source/localedata/data/mos_BF.xml @@ -187,6 +187,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY/MM/DD HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY/MM/DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/mt_MT.xml b/i18npool/source/localedata/data/mt_MT.xml index 712c245589b8..e75950d7b37a 100644 --- a/i18npool/source/localedata/data/mt_MT.xml +++ b/i18npool/source/localedata/data/mt_MT.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/my_MM.xml b/i18npool/source/localedata/data/my_MM.xml index c78b9497e71a..630441f662b5 100644 --- a/i18npool/source/localedata/data/my_MM.xml +++ b/i18npool/source/localedata/data/my_MM.xml @@ -71,22 +71,22 @@ <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5"> <FormatCode>[NatNum1]#,###.00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey7" default="false" type="medium" usage="FIXED_NUMBER" formatindex="60"> + <FormatElement msgid="FixedFormatskey7" default="false" type="medium" usage="FIXED_NUMBER" formatindex="66"> <FormatCode>General</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey8" default="false" type="short" usage="FIXED_NUMBER" formatindex="61"> + <FormatElement msgid="FixedFormatskey8" default="false" type="short" usage="FIXED_NUMBER" formatindex="67"> <FormatCode>0</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey9" default="false" type="medium" usage="FIXED_NUMBER" formatindex="62"> + <FormatElement msgid="FixedFormatskey9" default="false" type="medium" usage="FIXED_NUMBER" formatindex="68"> <FormatCode>0.00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey10" default="false" type="short" usage="FIXED_NUMBER" formatindex="63"> + <FormatElement msgid="FixedFormatskey10" default="false" type="short" usage="FIXED_NUMBER" formatindex="69"> <FormatCode>#,##0</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey11" default="false" type="medium" usage="FIXED_NUMBER" formatindex="64"> + <FormatElement msgid="FixedFormatskey11" default="false" type="medium" usage="FIXED_NUMBER" formatindex="70"> <FormatCode>#,##0.00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey12" default="false" type="medium" usage="FIXED_NUMBER" formatindex="65"> + <FormatElement msgid="FixedFormatskey12" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71"> <FormatCode>#,###.00</FormatCode> </FormatElement> <FormatElement msgid="ScientificFormatskey1" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6"> @@ -98,10 +98,10 @@ <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="78"> <FormatCode>##0.00E+00</FormatCode> </FormatElement> - <FormatElement msgid="PercentFormatskey3" default="false" type="short" usage="PERCENT_NUMBER" formatindex="68"> + <FormatElement msgid="PercentFormatskey3" default="false" type="short" usage="PERCENT_NUMBER" formatindex="72"> <FormatCode>[NatNum1]0%</FormatCode> </FormatElement> - <FormatElement msgid="PercentFormatskey4" default="false" type="long" usage="PERCENT_NUMBER" formatindex="69"> + <FormatElement msgid="PercentFormatskey4" default="false" type="long" usage="PERCENT_NUMBER" formatindex="73"> <FormatCode>[NatNum1]0.00%</FormatCode> </FormatElement> <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8"> @@ -128,13 +128,13 @@ <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17"> <FormatCode>[CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey7" default="true" type="medium" usage="CURRENCY" formatindex="90"> + <FormatElement msgid="CurrencyFormatskey7" default="true" type="medium" usage="CURRENCY" formatindex="88"> <FormatCode>[NatNum1]#,##0[CURRENCY];[NatNum1]-#,##0[CURRENCY]</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey8" default="true" type="long" usage="CURRENCY" formatindex="91"> + <FormatElement msgid="CurrencyFormatskey8" default="true" type="long" usage="CURRENCY" formatindex="89"> <FormatCode>[NatNum1]#,##0 [CURRENCY];[NatNum1]-#,##0 [CURRENCY]</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey9" default="false" type="long" usage="CURRENCY" formatindex="92"> + <FormatElement msgid="CurrencyFormatskey9" default="false" type="long" usage="CURRENCY" formatindex="90"> <FormatCode>[NatNum1]#,##0 [CURRENCY];[RED][NatNum1]-#,##0 [CURRENCY]</FormatCode> </FormatElement> <FormatElement msgid="DateFormatskey1" default="false" type="short" usage="DATE" formatindex="18"> @@ -201,31 +201,31 @@ <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38"> <FormatCode>WW</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey22" default="true" type="medium" usage="DATE" formatindex="70"> + <FormatElement msgid="DateFormatskey22" default="true" type="medium" usage="DATE" formatindex="74"> <FormatCode>[NatNum1]DD/MM/YY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey23" default="true" type="short" usage="DATE" formatindex="71"> + <FormatElement msgid="DateFormatskey23" default="true" type="short" usage="DATE" formatindex="75"> <FormatCode>[NatNum1]D/M/YY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey24" default="false" type="medium" usage="DATE" formatindex="72"> + <FormatElement msgid="DateFormatskey24" default="false" type="medium" usage="DATE" formatindex="76"> <FormatCode>[NatNum1]DD/MM/YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey25" default="false" type="medium" usage="DATE" formatindex="73"> + <FormatElement msgid="DateFormatskey25" default="false" type="medium" usage="DATE" formatindex="77"> <FormatCode>[NatNum1]DD-MM-YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey26" default="false" type="long" usage="DATE" formatindex="74"> + <FormatElement msgid="DateFormatskey26" default="false" type="long" usage="DATE" formatindex="79"> <FormatCode>[NatNum1]D. MMM. YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey27" default="false" type="long" usage="DATE" formatindex="75"> + <FormatElement msgid="DateFormatskey27" default="false" type="long" usage="DATE" formatindex="80"> <FormatCode>[NatNum1]D. MMMM YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey28" default="true" type="long" usage="DATE" formatindex="76"> + <FormatElement msgid="DateFormatskey28" default="true" type="long" usage="DATE" formatindex="81"> <FormatCode>[NatNum1]NNN၊ MMMM D၊ YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey29" default="false" type="long" usage="DATE" formatindex="77"> + <FormatElement msgid="DateFormatskey29" default="false" type="long" usage="DATE" formatindex="82"> <FormatCode>[NatNum1]MMMM D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey30" default="false" type="medium" usage="DATE" formatindex="79"> + <FormatElement msgid="DateFormatskey30" default="false" type="medium" usage="DATE" formatindex="83"> <FormatCode>[NatNum1]YYYYခုနှစ်၊ MMMMလ Dရက် NNNနေ့</FormatCode> </FormatElement> <FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39"> @@ -249,13 +249,13 @@ <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45"> <FormatCode>[HH]:MM:SS.00</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey8" default="true" type="short" usage="TIME" formatindex="80"> + <FormatElement msgid="TimeFormatskey8" default="true" type="short" usage="TIME" formatindex="84"> <FormatCode>[NatNum1]HH:MM</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey9" default="true" type="medium" usage="TIME" formatindex="81"> + <FormatElement msgid="TimeFormatskey9" default="true" type="medium" usage="TIME" formatindex="85"> <FormatCode>[NatNum1]HH:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="82"> + <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="86"> <FormatCode>[NatNum1]HHနာရီ MMမိနစ်</FormatCode> </FormatElement> <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46"> @@ -264,7 +264,10 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="83"> + <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM AM/PM</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="87"> <FormatCode>[NatNum1]DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/myv_RU.xml b/i18npool/source/localedata/data/myv_RU.xml index 3cb6899e6b0d..45ed4d618f48 100644 --- a/i18npool/source/localedata/data/myv_RU.xml +++ b/i18npool/source/localedata/data/myv_RU.xml @@ -196,6 +196,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY/MM/DD HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY/MM/DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/nds_DE.xml b/i18npool/source/localedata/data/nds_DE.xml index 125056bce326..a5f98f5c3265 100644 --- a/i18npool/source/localedata/data/nds_DE.xml +++ b/i18npool/source/localedata/data/nds_DE.xml @@ -196,6 +196,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/ne_NP.xml b/i18npool/source/localedata/data/ne_NP.xml index 8acb9020b590..8b0197957f52 100644 --- a/i18npool/source/localedata/data/ne_NP.xml +++ b/i18npool/source/localedata/data/ne_NP.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>[NatNum1]YYYY/MM/DD HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>[NatNum1]YYYY/MM/DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="charset" /> diff --git a/i18npool/source/localedata/data/nl_BE.xml b/i18npool/source/localedata/data/nl_BE.xml index 465713284c3d..8d2d4b15df7d 100644 --- a/i18npool/source/localedata/data/nl_BE.xml +++ b/i18npool/source/localedata/data/nl_BE.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/JJJJ UU:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/JJJJ UU:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/nl_NL.xml b/i18npool/source/localedata/data/nl_NL.xml index 86db0d6f9945..303cff5cdf19 100644 --- a/i18npool/source/localedata/data/nl_NL.xml +++ b/i18npool/source/localedata/data/nl_NL.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD-MM-JJJJ UU:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD-MM-JJJJ UU:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standaard</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/no_NO.xml b/i18npool/source/localedata/data/no_NO.xml index f04152c76843..0ad1f4b430cc 100644 --- a/i18npool/source/localedata/data/no_NO.xml +++ b/i18npool/source/localedata/data/no_NO.xml @@ -147,6 +147,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY TT:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY TT:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/ny_MW.xml b/i18npool/source/localedata/data/ny_MW.xml index c8ed46427526..b98d372b3065 100644 --- a/i18npool/source/localedata/data/ny_MW.xml +++ b/i18npool/source/localedata/data/ny_MW.xml @@ -179,6 +179,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/oc_FR.xml b/i18npool/source/localedata/data/oc_FR.xml index 5da8a773e20b..c90d6b8f7753 100644 --- a/i18npool/source/localedata/data/oc_FR.xml +++ b/i18npool/source/localedata/data/oc_FR.xml @@ -197,6 +197,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/om_ET.xml b/i18npool/source/localedata/data/om_ET.xml index f5dc2462ad2a..e4ec0be5e32c 100644 --- a/i18npool/source/localedata/data/om_ET.xml +++ b/i18npool/source/localedata/data/om_ET.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/or_IN.xml b/i18npool/source/localedata/data/or_IN.xml index ccbbaecc3ee2..bc7109a2e72e 100644 --- a/i18npool/source/localedata/data/or_IN.xml +++ b/i18npool/source/localedata/data/or_IN.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM AM/PM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/pap_CW.xml b/i18npool/source/localedata/data/pap_CW.xml index 56a23201a6c5..bdba3aeab9bd 100644 --- a/i18npool/source/localedata/data/pap_CW.xml +++ b/i18npool/source/localedata/data/pap_CW.xml @@ -196,6 +196,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY-MM-DD HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY-MM-DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/pjt_AU.xml b/i18npool/source/localedata/data/pjt_AU.xml index c8d1d98688f3..936b39632630 100644 --- a/i18npool/source/localedata/data/pjt_AU.xml +++ b/i18npool/source/localedata/data/pjt_AU.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/pl_PL.xml b/i18npool/source/localedata/data/pl_PL.xml index 4beab12f6ee4..0249bab37616 100644 --- a/i18npool/source/localedata/data/pl_PL.xml +++ b/i18npool/source/localedata/data/pl_PL.xml @@ -195,7 +195,7 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY-MM-DD HH:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="60"> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> <FormatCode>YYYY-MM-DD HH:MM</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/plt_MG.xml b/i18npool/source/localedata/data/plt_MG.xml index c489aaf28602..36b8245e6f47 100644 --- a/i18npool/source/localedata/data/plt_MG.xml +++ b/i18npool/source/localedata/data/plt_MG.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/pt_AO.xml b/i18npool/source/localedata/data/pt_AO.xml index 8c9e3278b1f7..24d7bf2c1685 100644 --- a/i18npool/source/localedata/data/pt_AO.xml +++ b/i18npool/source/localedata/data/pt_AO.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD-MM-AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD-MM-AAAA HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Geral</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/pt_BR.xml b/i18npool/source/localedata/data/pt_BR.xml index 2a3948eebdf1..344c2cef4913 100644 --- a/i18npool/source/localedata/data/pt_BR.xml +++ b/i18npool/source/localedata/data/pt_BR.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/AAAA HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Geral</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/pt_PT.xml b/i18npool/source/localedata/data/pt_PT.xml index a8bb011a15bf..1aab8a2dee7b 100644 --- a/i18npool/source/localedata/data/pt_PT.xml +++ b/i18npool/source/localedata/data/pt_PT.xml @@ -117,43 +117,43 @@ <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38"> <FormatCode>WW</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="60"> + <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="66"> <FormatCode>QQ "de" AAAA</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="61"> + <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="67"> <FormatCode>Q "de" AA</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey24" default="false" type="medium" usage="DATE" formatindex="62"> + <FormatElement msgid="DateFormatskey24" default="false" type="medium" usage="DATE" formatindex="68"> <FormatCode>Q "de" AAAA</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey25" default="false" type="medium" usage="DATE" formatindex="63"> + <FormatElement msgid="DateFormatskey25" default="false" type="medium" usage="DATE" formatindex="69"> <FormatCode>DD-MMM-AA</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey26" default="false" type="medium" usage="DATE" formatindex="64"> + <FormatElement msgid="DateFormatskey26" default="false" type="medium" usage="DATE" formatindex="70"> <FormatCode>DD-MMM-AAAA</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey27" default="false" type="medium" usage="DATE" formatindex="66"> + <FormatElement msgid="DateFormatskey27" default="false" type="medium" usage="DATE" formatindex="72"> <FormatCode>MMMM-AAAA</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey28" default="false" type="medium" usage="DATE" formatindex="67"> + <FormatElement msgid="DateFormatskey28" default="false" type="medium" usage="DATE" formatindex="73"> <FormatCode>MMM-AAAA</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey29" default="false" type="medium" usage="DATE" formatindex="68"> + <FormatElement msgid="DateFormatskey29" default="false" type="medium" usage="DATE" formatindex="74"> <FormatCode>MMMM-AA</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey30" default="false" type="medium" usage="DATE" formatindex="69"> + <FormatElement msgid="DateFormatskey30" default="false" type="medium" usage="DATE" formatindex="75"> <FormatCode>MMM-AA</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey31" default="false" type="medium" usage="DATE" formatindex="70"> + <FormatElement msgid="DateFormatskey31" default="false" type="medium" usage="DATE" formatindex="76"> <FormatCode>D-MMMM-AAAA</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey32" default="false" type="medium" usage="DATE" formatindex="71"> + <FormatElement msgid="DateFormatskey32" default="false" type="medium" usage="DATE" formatindex="77"> <FormatCode>D-MMMM-AA</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey33" default="false" type="long" usage="DATE" formatindex="72"> + <FormatElement msgid="DateFormatskey33" default="false" type="long" usage="DATE" formatindex="78"> <FormatCode>MMMM "de" AAAA</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey34" default="false" type="long" usage="DATE" formatindex="73"> + <FormatElement msgid="DateFormatskey34" default="false" type="long" usage="DATE" formatindex="79"> <FormatCode>MMM "de" AAAA</FormatCode> </FormatElement> <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39"> @@ -183,7 +183,10 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD-MM-AAAA HH:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="65"> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD-MM-AAAA HH:MM</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="71"> <FormatCode>AAAA-MM-DD HH:MM</FormatCode> </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> @@ -234,7 +237,7 @@ <FormatElement msgid="ScientificFormatskey2" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7"> <FormatCode>0,00E+00</FormatCode> </FormatElement> - <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="78"> + <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="84"> <FormatCode>##0,00E+00</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/pui_CO.xml b/i18npool/source/localedata/data/pui_CO.xml index 13e3025fe880..5b58aa453741 100644 --- a/i18npool/source/localedata/data/pui_CO.xml +++ b/i18npool/source/localedata/data/pui_CO.xml @@ -179,6 +179,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD-MM-YYYY HH:MM:SS pc/cp</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD-MM-YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/ro_RO.xml b/i18npool/source/localedata/data/ro_RO.xml index 2bcdbd297c0a..928f4cd59daa 100644 --- a/i18npool/source/localedata/data/ro_RO.xml +++ b/i18npool/source/localedata/data/ro_RO.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/ru_RU.xml b/i18npool/source/localedata/data/ru_RU.xml index b0ddb3352689..594731af3e1f 100644 --- a/i18npool/source/localedata/data/ru_RU.xml +++ b/i18npool/source/localedata/data/ru_RU.xml @@ -196,6 +196,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/rue_SK.xml b/i18npool/source/localedata/data/rue_SK.xml index cad8cc4ed980..004ab4c7168a 100644 --- a/i18npool/source/localedata/data/rue_SK.xml +++ b/i18npool/source/localedata/data/rue_SK.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/rw_RW.xml b/i18npool/source/localedata/data/rw_RW.xml index b8ca4d2ce362..b6f0fd55c685 100644 --- a/i18npool/source/localedata/data/rw_RW.xml +++ b/i18npool/source/localedata/data/rw_RW.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/sc_IT.xml b/i18npool/source/localedata/data/sc_IT.xml index 5193cc5e8dbb..94f3892f4f26 100644 --- a/i18npool/source/localedata/data/sc_IT.xml +++ b/i18npool/source/localedata/data/sc_IT.xml @@ -189,12 +189,15 @@ <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"> + <FormatElement msgid="DateTimeFormatskey1" default="false" 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> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/sg_CF.xml b/i18npool/source/localedata/data/sg_CF.xml index f6015f78e11f..c9fb686e93a7 100644 --- a/i18npool/source/localedata/data/sg_CF.xml +++ b/i18npool/source/localedata/data/sg_CF.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/shs_CA.xml b/i18npool/source/localedata/data/shs_CA.xml index 398b73d10b8e..b98f19b44366 100644 --- a/i18npool/source/localedata/data/shs_CA.xml +++ b/i18npool/source/localedata/data/shs_CA.xml @@ -191,12 +191,15 @@ <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"> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> <FormatCode>YYYY-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</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY-MM-DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/sid_ET.xml b/i18npool/source/localedata/data/sid_ET.xml index 9dd5021c08e4..082570767b0c 100644 --- a/i18npool/source/localedata/data/sid_ET.xml +++ b/i18npool/source/localedata/data/sid_ET.xml @@ -179,6 +179,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY/MM/DD HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY/MM/DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="charset"/> diff --git a/i18npool/source/localedata/data/sk_SK.xml b/i18npool/source/localedata/data/sk_SK.xml index f126fa8bbc41..474ed3949357 100644 --- a/i18npool/source/localedata/data/sk_SK.xml +++ b/i18npool/source/localedata/data/sk_SK.xml @@ -153,6 +153,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/sl_SI.xml b/i18npool/source/localedata/data/sl_SI.xml index 352433aad646..0e1299d23201 100644 --- a/i18npool/source/localedata/data/sl_SI.xml +++ b/i18npool/source/localedata/data/sl_SI.xml @@ -197,6 +197,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric">&C<č<<<Č<ć<<<Ć&D<đ<<<Đ&S<š<<<Š&Z<ž<<<Ž</Collator> diff --git a/i18npool/source/localedata/data/so_SO.xml b/i18npool/source/localedata/data/so_SO.xml index 70131878f807..d58f389edab5 100644 --- a/i18npool/source/localedata/data/so_SO.xml +++ b/i18npool/source/localedata/data/so_SO.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/sr_RS.xml b/i18npool/source/localedata/data/sr_RS.xml index bd0c2622e479..fe8c503de3ea 100644 --- a/i18npool/source/localedata/data/sr_RS.xml +++ b/i18npool/source/localedata/data/sr_RS.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/sv_FI.xml b/i18npool/source/localedata/data/sv_FI.xml index b728cf7f6a91..953bdedf0cdd 100644 --- a/i18npool/source/localedata/data/sv_FI.xml +++ b/i18npool/source/localedata/data/sv_FI.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY TT:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY TT:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/sv_SE.xml b/i18npool/source/localedata/data/sv_SE.xml index 449a42076f32..51cea4568d4b 100644 --- a/i18npool/source/localedata/data/sv_SE.xml +++ b/i18npool/source/localedata/data/sv_SE.xml @@ -196,6 +196,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY-MM-DD TT:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY-MM-DD TT:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/sw_TZ.xml b/i18npool/source/localedata/data/sw_TZ.xml index d67a25ccbad4..8a92c7899db1 100644 --- a/i18npool/source/localedata/data/sw_TZ.xml +++ b/i18npool/source/localedata/data/sw_TZ.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric" /> diff --git a/i18npool/source/localedata/data/tg_TJ.xml b/i18npool/source/localedata/data/tg_TJ.xml index b4124c2edeac..b59722ceb79b 100644 --- a/i18npool/source/localedata/data/tg_TJ.xml +++ b/i18npool/source/localedata/data/tg_TJ.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/th_TH.xml b/i18npool/source/localedata/data/th_TH.xml index a3a94e02c120..c845edf3b72a 100644 --- a/i18npool/source/localedata/data/th_TH.xml +++ b/i18npool/source/localedata/data/th_TH.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> </FormatElement> @@ -192,115 +195,115 @@ <FormatElement msgid="ScientificFormatskey2" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7"> <FormatCode>0.00E+00</FormatCode> </FormatElement> - <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="98"> + <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="104"> <FormatCode>##0.00E+00</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="61"> + <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="67"> <FormatCode>[~buddhist]DD/MM/YY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="62"> + <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="68"> <FormatCode>[~buddhist]DD/MM/YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="63"> + <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="69"> <FormatCode>[~buddhist]DD/MM/YY HH:MM</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="64"> + <FormatElement msgid="DateTimeFormatskey5" default="false" type="medium" usage="DATE_TIME" formatindex="70"> <FormatCode>[~buddhist]DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey24" default="false" type="short" usage="DATE" formatindex="65"> + <FormatElement msgid="DateFormatskey24" default="false" type="short" usage="DATE" formatindex="71"> <FormatCode>D/M/YY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey25" default="false" type="long" usage="DATE" formatindex="66"> + <FormatElement msgid="DateFormatskey25" default="false" type="long" usage="DATE" formatindex="72"> <FormatCode>D MMM YY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey26" default="false" type="short" usage="DATE" formatindex="67"> + <FormatElement msgid="DateFormatskey26" default="false" type="short" usage="DATE" formatindex="73"> <FormatCode>[NatNum1][~buddhist]D/M/YY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey27" default="false" type="medium" usage="DATE" formatindex="68"> + <FormatElement msgid="DateFormatskey27" default="false" type="medium" usage="DATE" formatindex="74"> <FormatCode>[NatNum1][~buddhist]DD/MM/YY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey28" default="false" type="medium" usage="DATE" formatindex="69"> + <FormatElement msgid="DateFormatskey28" default="false" type="medium" usage="DATE" formatindex="75"> <FormatCode>[NatNum1][~buddhist]DD/MM/YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey29" default="false" type="long" usage="DATE" formatindex="70"> + <FormatElement msgid="DateFormatskey29" default="false" type="long" usage="DATE" formatindex="76"> <FormatCode>[NatNum1][~buddhist]D MMM YY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey30" default="false" type="long" usage="DATE" formatindex="71"> + <FormatElement msgid="DateFormatskey30" default="false" type="long" usage="DATE" formatindex="77"> <FormatCode>[NatNum1][~buddhist]NN D MMM YY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey31" default="false" type="long" usage="DATE" formatindex="72"> + <FormatElement msgid="DateFormatskey31" default="false" type="long" usage="DATE" formatindex="78"> <FormatCode>[NatNum1][~buddhist]D MMM YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey32" default="false" type="long" usage="DATE" formatindex="73"> + <FormatElement msgid="DateFormatskey32" default="false" type="long" usage="DATE" formatindex="79"> <FormatCode>[NatNum1][~buddhist]D MMMM YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey33" default="false" type="long" usage="DATE" formatindex="74"> + <FormatElement msgid="DateFormatskey33" default="false" type="long" usage="DATE" formatindex="80"> <FormatCode>[NatNum1][~buddhist]NN D MMMM YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey34" default="false" type="long" usage="DATE" formatindex="75"> + <FormatElement msgid="DateFormatskey34" default="false" type="long" usage="DATE" formatindex="81"> <FormatCode>[NatNum1][~buddhist]วันNNNNที่ D MMMM GG YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey35" default="false" type="long" usage="DATE" formatindex="76"> + <FormatElement msgid="DateFormatskey35" default="false" type="long" usage="DATE" formatindex="82"> <FormatCode>[NatNum1][~buddhist]วันNNNNที่ D MMMM YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey5" default="false" type="medium" usage="DATE_TIME" formatindex="77"> + <FormatElement msgid="DateTimeFormatskey6" default="false" type="medium" usage="DATE_TIME" formatindex="83"> <FormatCode>[NatNum1][~buddhist]DD/MM/YY HH:MM</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey6" default="false" type="medium" usage="DATE_TIME" formatindex="78"> + <FormatElement msgid="DateTimeFormatskey7" default="false" type="medium" usage="DATE_TIME" formatindex="84"> <FormatCode>[NatNum1][~buddhist]DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey8" default="false" type="short" usage="TIME" formatindex="79"> + <FormatElement msgid="TimeFormatskey8" default="false" type="short" usage="TIME" formatindex="85"> <FormatCode>[NatNum1]HH:MM</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatsKey9" default="false" type="medium" usage="TIME" formatindex="80"> + <FormatElement msgid="TimeFormatsKey9" default="false" type="medium" usage="TIME" formatindex="86"> <FormatCode>[NatNum1]HH:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="PercentFormatskey3" default="false" type="short" usage="PERCENT_NUMBER" formatindex="81"> + <FormatElement msgid="PercentFormatskey3" default="false" type="short" usage="PERCENT_NUMBER" formatindex="87"> <FormatCode>[NatNum1]0%</FormatCode> </FormatElement> - <FormatElement msgid="PercentFormatskey4" default="false" type="long" usage="PERCENT_NUMBER" formatindex="82"> + <FormatElement msgid="PercentFormatskey4" default="false" type="long" usage="PERCENT_NUMBER" formatindex="88"> <FormatCode>[NatNum1]0.00%</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey7" default="false" type="medium" usage="FIXED_NUMBER" formatindex="60"> + <FormatElement msgid="FixedFormatskey7" default="false" type="medium" usage="FIXED_NUMBER" formatindex="66"> <FormatCode>[NatNum1]Standard</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey8" default="false" type="short" usage="FIXED_NUMBER" formatindex="83"> + <FormatElement msgid="FixedFormatskey8" default="false" type="short" usage="FIXED_NUMBER" formatindex="89"> <FormatCode>[NatNum1]0</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey9" default="false" type="medium" usage="FIXED_NUMBER" formatindex="84"> + <FormatElement msgid="FixedFormatskey9" default="false" type="medium" usage="FIXED_NUMBER" formatindex="90"> <FormatCode>[NatNum1]0.00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey10" default="false" type="short" usage="FIXED_NUMBER" formatindex="85"> + <FormatElement msgid="FixedFormatskey10" default="false" type="short" usage="FIXED_NUMBER" formatindex="91"> <FormatCode>[NatNum1]#,##0</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey11" default="false" type="medium" usage="FIXED_NUMBER" formatindex="86"> + <FormatElement msgid="FixedFormatskey11" default="false" type="medium" usage="FIXED_NUMBER" formatindex="92"> <FormatCode>[NatNum1]#,##0.00</FormatCode> </FormatElement> - <FormatElement msgid="FixedFormatskey12" default="false" type="medium" usage="FIXED_NUMBER" formatindex="87"> + <FormatElement msgid="FixedFormatskey12" default="false" type="medium" usage="FIXED_NUMBER" formatindex="93"> <FormatCode>[NatNum1]#,###.00</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey7" default="false" type="short" usage="CURRENCY" formatindex="88"> + <FormatElement msgid="CurrencyFormatskey7" default="false" type="short" usage="CURRENCY" formatindex="94"> <FormatCode>#,##0 [$บาท-41E];-#,##0 [$บาท-41E]</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey8" default="false" type="medium" usage="CURRENCY" formatindex="89"> + <FormatElement msgid="CurrencyFormatskey8" default="false" type="medium" usage="CURRENCY" formatindex="95"> <FormatCode>#,##0.00 [$บาท-41E];-#,##0.00 [$บาท-41E]</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey9" default="false" type="medium" usage="CURRENCY" formatindex="90"> + <FormatElement msgid="CurrencyFormatskey9" default="false" type="medium" usage="CURRENCY" formatindex="96"> <FormatCode>#,##0 [$บาท-41E];[RED]-#,##0 [$บาท-41E]</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey10" default="false" type="medium" usage="CURRENCY" formatindex="91"> + <FormatElement msgid="CurrencyFormatskey10" default="false" type="medium" usage="CURRENCY" formatindex="97"> <FormatCode>#,##0.00 [$บาท-41E];[RED]-#,##0.00 [$บาท-41E]</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey11" default="false" type="short" usage="CURRENCY" formatindex="92"> + <FormatElement msgid="CurrencyFormatskey11" default="false" type="short" usage="CURRENCY" formatindex="98"> <FormatCode>[NatNum1]#,##0 [$บาท-41E];[NatNum1]-#,##0 [$บาท-41E]</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey12" default="false" type="medium" usage="CURRENCY" formatindex="93"> + <FormatElement msgid="CurrencyFormatskey12" default="false" type="medium" usage="CURRENCY" formatindex="99"> <FormatCode>[NatNum1]#,##0.00 [$บาท-41E];[NatNum1]-#,##0.00 [$บาท-41E]</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey13" default="false" type="medium" usage="CURRENCY" formatindex="94"> + <FormatElement msgid="CurrencyFormatskey13" default="false" type="medium" usage="CURRENCY" formatindex="100"> <FormatCode>[NatNum1]#,##0 [$บาท-41E];[NatNum1][RED]-#,##0 [$บาท-41E]</FormatCode> </FormatElement> - <FormatElement msgid="CurrencyFormatskey14" default="false" type="medium" usage="CURRENCY" formatindex="95"> + <FormatElement msgid="CurrencyFormatskey14" default="false" type="medium" usage="CURRENCY" formatindex="101"> <FormatCode>[NatNum1]#,##0.00 [$บาท-41E];[NatNum1][RED]-#,##0.00 [$บาท-41E]</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/ti_ER.xml b/i18npool/source/localedata/data/ti_ER.xml index e77db3eab547..54b9282f40eb 100644 --- a/i18npool/source/localedata/data/ti_ER.xml +++ b/i18npool/source/localedata/data/ti_ER.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>MM/DD/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>MM/DD/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US"/> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/ti_ET.xml b/i18npool/source/localedata/data/ti_ET.xml index 141db0f2ff29..ad26ee39a1e8 100644 --- a/i18npool/source/localedata/data/ti_ET.xml +++ b/i18npool/source/localedata/data/ti_ET.xml @@ -179,6 +179,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/tk_TM.xml b/i18npool/source/localedata/data/tk_TM.xml index ad7a76325cf6..5bb975c7cf3f 100644 --- a/i18npool/source/localedata/data/tk_TM.xml +++ b/i18npool/source/localedata/data/tk_TM.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/tpi_PG.xml b/i18npool/source/localedata/data/tpi_PG.xml index 5344d6b3c5fe..54968d179ef5 100644 --- a/i18npool/source/localedata/data/tpi_PG.xml +++ b/i18npool/source/localedata/data/tpi_PG.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/tr_TR.xml b/i18npool/source/localedata/data/tr_TR.xml index a1b9ba901606..85e02854082a 100644 --- a/i18npool/source/localedata/data/tr_TR.xml +++ b/i18npool/source/localedata/data/tr_TR.xml @@ -199,16 +199,19 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="61"> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> + <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="66"> <FormatCode>DD/MM/YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey23" default="false" type="short" usage="DATE" formatindex="62"> + <FormatElement msgid="DateFormatskey23" default="false" type="short" usage="DATE" formatindex="67"> <FormatCode>DD/MM/YY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey24" default="false" type="long" usage="DATE" formatindex="63"> + <FormatElement msgid="DateFormatskey24" default="false" type="long" usage="DATE" formatindex="68"> <FormatCode>DD/MMM/YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="64"> + <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="69"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/tt_RU.xml b/i18npool/source/localedata/data/tt_RU.xml index e3118f8f1a53..c206e6f5f1a4 100644 --- a/i18npool/source/localedata/data/tt_RU.xml +++ b/i18npool/source/localedata/data/tt_RU.xml @@ -196,6 +196,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/ug_CN.xml b/i18npool/source/localedata/data/ug_CN.xml index 506aed3c8132..24d989af4906 100644 --- a/i18npool/source/localedata/data/ug_CN.xml +++ b/i18npool/source/localedata/data/ug_CN.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY-MM-DD HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY-MM-DD HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/uk_UA.xml b/i18npool/source/localedata/data/uk_UA.xml index 65e623e53031..daa025407b81 100644 --- a/i18npool/source/localedata/data/uk_UA.xml +++ b/i18npool/source/localedata/data/uk_UA.xml @@ -144,6 +144,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> </FormatElement> diff --git a/i18npool/source/localedata/data/ur_PK.xml b/i18npool/source/localedata/data/ur_PK.xml index aaa76858beee..2b7097a63591 100644 --- a/i18npool/source/localedata/data/ur_PK.xml +++ b/i18npool/source/localedata/data/ur_PK.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS AM/PM</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/uz_UZ.xml b/i18npool/source/localedata/data/uz_UZ.xml index f04ba9f8a3ab..e00f19d9b9a3 100644 --- a/i18npool/source/localedata/data/uz_UZ.xml +++ b/i18npool/source/localedata/data/uz_UZ.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD.MM.YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="en_US" /> <LC_SEARCH ref="en_US"/> diff --git a/i18npool/source/localedata/data/vec_IT.xml b/i18npool/source/localedata/data/vec_IT.xml index 44c14332d461..bd447746bd41 100644 --- a/i18npool/source/localedata/data/vec_IT.xml +++ b/i18npool/source/localedata/data/vec_IT.xml @@ -189,12 +189,15 @@ <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"> + <FormatElement msgid="DateTimeFormatskey1" default="false" 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</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator default="true" unoid="alphanumeric"/> diff --git a/i18npool/source/localedata/data/vi_VN.xml b/i18npool/source/localedata/data/vi_VN.xml index 86f149dba1ca..c2ee30b98bbc 100644 --- a/i18npool/source/localedata/data/vi_VN.xml +++ b/i18npool/source/localedata/data/vi_VN.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM AM/PM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION> <Collator unoid="charset" default="true">&̀<<̉<<̃<<́<<̣ &a<ă<<<Ă<â<<<Â &d<đ<<<Đ &e<ê<<<Ê &o<ô<<<Ô<ơ<<<Ơ &u<ư<<<Ư</Collator> diff --git a/i18npool/source/localedata/data/wa_BE.xml b/i18npool/source/localedata/data/wa_BE.xml index 6812230f0fea..1dfb5d493d69 100644 --- a/i18npool/source/localedata/data/wa_BE.xml +++ b/i18npool/source/localedata/data/wa_BE.xml @@ -195,6 +195,9 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> </LC_FORMAT> <LC_COLLATION ref="fr_BE" /> <LC_SEARCH ref="fr_BE"/> diff --git a/i18npool/source/localedata/data/zh_CN.xml b/i18npool/source/localedata/data/zh_CN.xml index 0a159324c817..8b2b93b82d27 100644 --- a/i18npool/source/localedata/data/zh_CN.xml +++ b/i18npool/source/localedata/data/zh_CN.xml @@ -202,25 +202,25 @@ <FormatCode>[HH]:MM:SS.00</FormatCode> </FormatElement> <!-- Time format extension. --> - <FormatElement msgid="TimeFormatskey8" default="false" type="medium" usage="TIME" formatindex="60"> + <FormatElement msgid="TimeFormatskey8" default="false" type="medium" usage="TIME" formatindex="66"> <FormatCode>HH"时"MM"分"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey9" default="false" type="long" usage="TIME" formatindex="61"> + <FormatElement msgid="TimeFormatskey9" default="false" type="long" usage="TIME" formatindex="67"> <FormatCode>HH"时"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="62"> + <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="68"> <FormatCode>AM/PM HH"时"MM"分"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey11" default="false" type="long" usage="TIME" formatindex="63"> + <FormatElement msgid="TimeFormatskey11" default="false" type="long" usage="TIME" formatindex="69"> <FormatCode>AM/PM HH"时"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="64"> + <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="70"> <FormatCode>[HH]"时"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey13" default="false" type="medium" usage="TIME" formatindex="65"> + <FormatElement msgid="TimeFormatskey13" default="false" type="medium" usage="TIME" formatindex="71"> <FormatCode>MM"分"SS"秒"00</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey14" default="false" type="long" usage="TIME" formatindex="66"> + <FormatElement msgid="TimeFormatskey14" default="false" type="long" usage="TIME" formatindex="72"> <FormatCode>[HH]"时"MM"分"SS"秒"00</FormatCode> </FormatElement> <!-- Date_Time formats. Index range is from 46 to 47. --> @@ -230,10 +230,13 @@ <FormatElement msgid="DateTimeFormatskey3" default="true" type="long" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY/MM/DD HH:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey1" default="false" type="long" usage="DATE_TIME" formatindex="68"> + <FormatElement msgid="DateTimeFormatskey5" default="false" type="long" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY"年"MM"月"D"日" HH"时"MM"分"</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="long" usage="DATE_TIME" formatindex="74"> <FormatCode>M/D/YY HH:MM</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey2" default="false" type="long" usage="DATE_TIME" formatindex="69"> + <FormatElement msgid="DateTimeFormatskey2" default="false" type="long" usage="DATE_TIME" formatindex="75"> <FormatCode>MM/DD/YYYY HH:MM:SS</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/zh_HK.xml b/i18npool/source/localedata/data/zh_HK.xml index ade663f6b3de..9b183028d00c 100644 --- a/i18npool/source/localedata/data/zh_HK.xml +++ b/i18npool/source/localedata/data/zh_HK.xml @@ -174,22 +174,22 @@ <FormatElement msgid="TimeFormatskey7" default="true" type="long" usage="TIME" formatindex="45"> <FormatCode>[HH]:MM:SS.00</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey8" default="false" type="short" usage="TIME" formatindex="60"> + <FormatElement msgid="TimeFormatskey8" default="false" type="short" usage="TIME" formatindex="66"> <FormatCode>HH"時"MM"分"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey9" default="false" type="medium" usage="TIME" formatindex="61"> + <FormatElement msgid="TimeFormatskey9" default="false" type="medium" usage="TIME" formatindex="67"> <FormatCode>HH"時"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="62"> + <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="68"> <FormatCode>AM/PM HH"時"MM"分"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey11" default="false" type="medium" usage="TIME" formatindex="63"> + <FormatElement msgid="TimeFormatskey11" default="false" type="medium" usage="TIME" formatindex="69"> <FormatCode>AM/PM HH"時"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="64"> + <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="70"> <FormatCode>[HH] "時"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey13" default="false" type="medium" usage="TIME" formatindex="65"> + <FormatElement msgid="TimeFormatskey13" default="false" type="medium" usage="TIME" formatindex="71"> <FormatCode>MM"分"SS"秒"00</FormatCode> </FormatElement> <!-- DateTime formats. Index range is 46-47. --> @@ -200,10 +200,13 @@ <FormatElement msgid="DateTimeFormatskey4" default="false" type="long" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey2" default="false" type="long" usage="DATE_TIME" formatindex="67"> + <FormatElement msgid="DateTimeFormatskey5" default="false" type="long" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY"年"M"月"D"日" HH"時"MM"分"</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey2" default="false" type="long" usage="DATE_TIME" formatindex="73"> <FormatCode>YY"年"M"月"D"日" HH"時"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey3" default="false" type="long" usage="DATE_TIME" formatindex="66"> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="long" usage="DATE_TIME" formatindex="72"> <FormatCode>D/M/YY HH:MM</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/zh_MO.xml b/i18npool/source/localedata/data/zh_MO.xml index 055136725050..92b7ff15eb88 100644 --- a/i18npool/source/localedata/data/zh_MO.xml +++ b/i18npool/source/localedata/data/zh_MO.xml @@ -173,22 +173,22 @@ <FormatElement msgid="TimeFormatskey7" default="true" type="long" usage="TIME" formatindex="45"> <FormatCode>[HH]:MM:SS.00</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey8" default="false" type="short" usage="TIME" formatindex="60"> + <FormatElement msgid="TimeFormatskey8" default="false" type="short" usage="TIME" formatindex="66"> <FormatCode>HH"時"MM"分"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey9" default="false" type="medium" usage="TIME" formatindex="61"> + <FormatElement msgid="TimeFormatskey9" default="false" type="medium" usage="TIME" formatindex="67"> <FormatCode>HH"時"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="62"> + <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="68"> <FormatCode>AM/PM HH"時"MM"分"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey11" default="true" type="medium" usage="TIME" formatindex="63"> + <FormatElement msgid="TimeFormatskey11" default="true" type="medium" usage="TIME" formatindex="69"> <FormatCode>AM/PM HH"時"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="64"> + <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="70"> <FormatCode>[HH] "時"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey13" default="false" type="medium" usage="TIME" formatindex="65"> + <FormatElement msgid="TimeFormatskey13" default="false" type="medium" usage="TIME" formatindex="71"> <FormatCode>MM"分"SS"秒"00</FormatCode> </FormatElement> <!-- DateTime formats. Index range is 46-47. --> @@ -198,13 +198,16 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="long" usage="DATE_TIME" formatindex="47"> <FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey3" default="true" type="long" usage="DATE_TIME" formatindex="66"> + <FormatElement msgid="DateTimeFormatskey5" default="false" type="long" usage="DATE_TIME" formatindex="50"> + <FormatCode>DD/MM/YYYY HH:MM</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="long" usage="DATE_TIME" formatindex="72"> <FormatCode>YYYY"年"M"月"D"日" HH"時"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey4" default="false" type="long" usage="DATE_TIME" formatindex="67"> + <FormatElement msgid="DateTimeFormatskey4" default="false" type="long" usage="DATE_TIME" formatindex="73"> <FormatCode>YY"年"M"月"D"日" HH"時"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="68"> + <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="74"> <FormatCode>D-M-YYYY</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/zh_SG.xml b/i18npool/source/localedata/data/zh_SG.xml index 6e51e2b029e0..646d1d35dee3 100644 --- a/i18npool/source/localedata/data/zh_SG.xml +++ b/i18npool/source/localedata/data/zh_SG.xml @@ -173,25 +173,25 @@ <FormatElement msgid="TimeFormatskey7" default="true" type="long" usage="TIME" formatindex="45"> <FormatCode>[HH]:MM:SS.00</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey8" default="false" type="medium" usage="TIME" formatindex="60"> + <FormatElement msgid="TimeFormatskey8" default="false" type="medium" usage="TIME" formatindex="66"> <FormatCode>HH"时"MM"分"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey9" default="false" type="long" usage="TIME" formatindex="61"> + <FormatElement msgid="TimeFormatskey9" default="false" type="long" usage="TIME" formatindex="67"> <FormatCode>HH"时"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="62"> + <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="68"> <FormatCode>AM/PM HH"时"MM"分"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey11" default="false" type="long" usage="TIME" formatindex="63"> + <FormatElement msgid="TimeFormatskey11" default="false" type="long" usage="TIME" formatindex="69"> <FormatCode>AM/PM HH"时"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="64"> + <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="70"> <FormatCode>[HH]"时"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey13" default="false" type="medium" usage="TIME" formatindex="65"> + <FormatElement msgid="TimeFormatskey13" default="false" type="medium" usage="TIME" formatindex="71"> <FormatCode>MM"分"SS"秒"00</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey14" default="false" type="long" usage="TIME" formatindex="66"> + <FormatElement msgid="TimeFormatskey14" default="false" type="long" usage="TIME" formatindex="72"> <FormatCode>[HH]"时"MM"分"SS"秒"00</FormatCode> </FormatElement> <!-- Date_Timeformats. Index range is 46-47. --> @@ -201,10 +201,13 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="long" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY"年"MM"月"D"日"HH"时"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey3" default="false" type="long" usage="DATE_TIME" formatindex="67"> + <FormatElement msgid="DateTimeFormatskey5" default="false" type="long" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY"年"M"月"D"日"HH"时"MM"分"</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="long" usage="DATE_TIME" formatindex="73"> <FormatCode>M/D/YY HH:MM</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey4" default="false" type="long" usage="DATE_TIME" formatindex="68"> + <FormatElement msgid="DateTimeFormatskey4" default="false" type="long" usage="DATE_TIME" formatindex="74"> <FormatCode>MM/DD/YYYY HH:MM:SS</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/i18npool/source/localedata/data/zh_TW.xml b/i18npool/source/localedata/data/zh_TW.xml index 164a664850a5..ae790e516f3f 100644 --- a/i18npool/source/localedata/data/zh_TW.xml +++ b/i18npool/source/localedata/data/zh_TW.xml @@ -83,7 +83,7 @@ <FormatElement msgid="ScientificFormatskey2" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7"> <FormatCode>0.00E+00</FormatCode> </FormatElement> - <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="90"> + <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="96"> <FormatCode>##0.00E+00</FormatCode> </FormatElement> <!-- Percent Number formats. Index range is 8-9. --> @@ -177,61 +177,61 @@ <FormatElement msgid="DateFormatskey21" default="false" type="short" usage="DATE" formatindex="38"> <FormatCode>"第"WW"週"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey22" default="false" type="short" usage="DATE" formatindex="60"> + <FormatElement msgid="DateFormatskey22" default="false" type="short" usage="DATE" formatindex="66"> <FormatCode>E/M/D</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="61"> + <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="67"> <FormatCode>GGEE"年"M"月"D"日"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey24" default="false" type="long" usage="DATE" formatindex="62"> + <FormatElement msgid="DateFormatskey24" default="false" type="long" usage="DATE" formatindex="68"> <FormatCode>[NatNum1]GGEE"年"M"月"D"日"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey25" default="false" type="medium" usage="DATE" formatindex="63"> + <FormatElement msgid="DateFormatskey25" default="false" type="medium" usage="DATE" formatindex="69"> <FormatCode>GGGEE"年"M"月"D"日"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey26" default="false" type="long" usage="DATE" formatindex="64"> + <FormatElement msgid="DateFormatskey26" default="false" type="long" usage="DATE" formatindex="70"> <FormatCode>[NatNum1]GGGEE"年"M"月"D"日"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey27" default="false" type="medium" usage="DATE" formatindex="65"> + <FormatElement msgid="DateFormatskey27" default="false" type="medium" usage="DATE" formatindex="71"> <FormatCode>GGEE"年"M"月"D"日 ("DDD")"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey28" default="false" type="long" usage="DATE" formatindex="66"> + <FormatElement msgid="DateFormatskey28" default="false" type="long" usage="DATE" formatindex="72"> <FormatCode>GGGEE"年"M"月"D"日 ("DDD")"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey29" default="false" type="long" usage="DATE" formatindex="67"> + <FormatElement msgid="DateFormatskey29" default="false" type="long" usage="DATE" formatindex="73"> <FormatCode>YYYY"年"M"月"D"日 ("DDD")"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey30" default="false" type="long" usage="DATE" formatindex="68"> + <FormatElement msgid="DateFormatskey30" default="false" type="long" usage="DATE" formatindex="74"> <FormatCode>YYYY"年"M"月"D"日 "NNNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey31" default="false" type="long" usage="DATE" formatindex="69"> + <FormatElement msgid="DateFormatskey31" default="false" type="long" usage="DATE" formatindex="75"> <FormatCode>GGEE"年"M"月"D"日 "NNNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey32" default="false" type="long" usage="DATE" formatindex="70"> + <FormatElement msgid="DateFormatskey32" default="false" type="long" usage="DATE" formatindex="76"> <FormatCode>[NatNum1]GGEE"年"M"月"D"日 "NNNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey33" default="false" type="long" usage="DATE" formatindex="71"> + <FormatElement msgid="DateFormatskey33" default="false" type="long" usage="DATE" formatindex="77"> <FormatCode>GGGEE"年"M"月"D"日 "NNNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey34" default="false" type="long" usage="DATE" formatindex="72"> + <FormatElement msgid="DateFormatskey34" default="false" type="long" usage="DATE" formatindex="78"> <FormatCode>[NatNum1]GGGEE"年"M"月"D"日 "NNNN</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey35" default="false" type="medium" usage="DATE" formatindex="73"> + <FormatElement msgid="DateFormatskey35" default="false" type="medium" usage="DATE" formatindex="79"> <FormatCode>[NatNum1]EE"年"M"月"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey36" default="false" type="medium" usage="DATE" formatindex="74"> + <FormatElement msgid="DateFormatskey36" default="false" type="medium" usage="DATE" formatindex="80"> <FormatCode>[NatNum1]GGEE"年"M"月"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey37" default="false" type="medium" usage="DATE" formatindex="75"> + <FormatElement msgid="DateFormatskey37" default="false" type="medium" usage="DATE" formatindex="81"> <FormatCode>[NatNum1]GGGEE"年"M"月"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey38" default="false" type="medium" usage="DATE" formatindex="76"> + <FormatElement msgid="DateFormatskey38" default="false" type="medium" usage="DATE" formatindex="82"> <FormatCode>YYYY"年"MM"月"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey39" default="false" type="medium" usage="DATE" formatindex="77"> + <FormatElement msgid="DateFormatskey39" default="false" type="medium" usage="DATE" formatindex="83"> <FormatCode>[NatNum1]YYYY"年"MM"月"</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey40" default="false" type="short" usage="DATE" formatindex="78"> + <FormatElement msgid="DateFormatskey40" default="false" type="short" usage="DATE" formatindex="84"> <FormatCode>M"."D</FormatCode> </FormatElement> <!-- Time formats. Index range is 39-45. --> @@ -256,22 +256,22 @@ <FormatElement msgid="TimeFormatskey7" default="true" type="long" usage="TIME" formatindex="45"> <FormatCode>[HH]:MM:SS.00</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey8" default="false" type="short" usage="TIME" formatindex="79"> + <FormatElement msgid="TimeFormatskey8" default="false" type="short" usage="TIME" formatindex="85"> <FormatCode>HH"時"MM"分"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey9" default="false" type="medium" usage="TIME" formatindex="80"> + <FormatElement msgid="TimeFormatskey9" default="false" type="medium" usage="TIME" formatindex="86"> <FormatCode>HH"時"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="81"> + <FormatElement msgid="TimeFormatskey10" default="false" type="medium" usage="TIME" formatindex="87"> <FormatCode>AM/PM HH"時"MM"分"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey11" default="false" type="medium" usage="TIME" formatindex="82"> + <FormatElement msgid="TimeFormatskey11" default="false" type="medium" usage="TIME" formatindex="88"> <FormatCode>AM/PM HH"時"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="83"> + <FormatElement msgid="TimeFormatskey12" default="false" type="medium" usage="TIME" formatindex="89"> <FormatCode>[HH] "時"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="TimeFormatskey13" default="false" type="medium" usage="TIME" formatindex="84"> + <FormatElement msgid="TimeFormatskey13" default="false" type="medium" usage="TIME" formatindex="90"> <FormatCode>MM"分"SS"秒"00</FormatCode> </FormatElement> <!-- Date_Time formats. Index range is 46-47. --> @@ -281,19 +281,22 @@ <FormatElement msgid="DateTimeFormatskey2" default="false" type="long" usage="DATE_TIME" formatindex="47"> <FormatCode>YYYY/MM/DD HH:MM:SS</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey3" default="true" type="long" usage="DATE_TIME" formatindex="85"> + <FormatElement msgid="DateTimeFormatskey8" default="false" type="long" usage="DATE_TIME" formatindex="50"> + <FormatCode>YYYY/M/D HH:MM</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="true" type="long" usage="DATE_TIME" formatindex="91"> <FormatCode>YYYY"年"M"月"D"日" HH"時"MM"分"</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey4" default="false" type="long" usage="DATE_TIME" formatindex="86"> + <FormatElement msgid="DateTimeFormatskey4" default="false" type="long" usage="DATE_TIME" formatindex="92"> <FormatCode>YYYY"年"M"月"D"日" HH"時"MM"分"SS"秒"</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey5" default="false" type="long" usage="DATE_TIME" formatindex="87"> + <FormatElement msgid="DateTimeFormatskey5" default="false" type="long" usage="DATE_TIME" formatindex="93"> <FormatCode>EE"年"M"月"D"日" HH"時"MM"分"</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey6" default="false" type="long" usage="DATE_TIME" formatindex="88"> + <FormatElement msgid="DateTimeFormatskey6" default="false" type="long" usage="DATE_TIME" formatindex="94"> <FormatCode>GGEE"年"M"月"D"日" HH"時"MM"分"</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey7" default="false" type="long" usage="DATE_TIME" formatindex="89"> + <FormatElement msgid="DateTimeFormatskey7" default="false" type="long" usage="DATE_TIME" formatindex="95"> <FormatCode>GGGEE"年"M"月"D"日" HH"時"MM"分"</FormatCode> </FormatElement> </LC_FORMAT> diff --git a/include/i18npool/reservedconstants.hxx b/include/i18npool/reservedconstants.hxx index 400344ce5a8d..6f707f83ac3d 100644 --- a/include/i18npool/reservedconstants.hxx +++ b/include/i18npool/reservedconstants.hxx @@ -12,10 +12,18 @@ /** Constant values shared between i18npool and, for example, the number formatter. */ namespace i18npool { +/** The number of predefined format code indices that must be defined by + locale data, except BOOLEAN and TEXT, exclusive. + This later in the build is static asserted to be equal to + NfIndexTableOffset::NF_INDEX_TABLE_RESERVED_START. */ +constexpr sal_Int16 nStopPredefinedFormatIndex = 51; + /** The number of reserved (with defined meaning) built-in format code indices, additional locale data format codes can be defined starting at this index - value. */ -constexpr sal_Int16 nFirstFreeFormatIndex = 60; + value. + This later in the build is static asserted to be greater or equal to + NfIndexTableOffset::NF_INDEX_TABLE_ENTRIES */ +constexpr sal_Int16 nFirstFreeFormatIndex = 66; } /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index adbde81c9315..22689aa88c3d 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -136,7 +136,7 @@ namespace o3tl { Do NOT insert any new values! The values here correspond with those in offapi/com/sun/star/i18n/NumberFormatIndex.idl - You may append values though. + You may append values though after NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS. */ enum NfIndexTableOffset { @@ -222,8 +222,8 @@ enum NfIndexTableOffset NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS, // == 50, old number of predefined entries, i18npool locale data additions start after this - // From here on are values of new built-in formats that are not in the - // original NumberFormatIndex.idl + // From here on are values of new predefined and built-in formats that are + // not in the original NumberFormatIndex.idl // XXX Values appended here must also get a corresponding entry in // svl/source/numbers/zforlist.cxx indexTable[] in the same order. @@ -233,8 +233,16 @@ enum NfIndexTableOffset // formats, make new formats known to svx/source/items/numfmtsh.cxx // SvxNumberFormatShell::FillEListWithStd_Impl(), otherwise they will not // be listed at all. Yes that is ugly. + // DATETIME formats need to be added to + // SvxNumberFormatShell::FillEListWithDateTime_Impl(). - NF_FRACTION_3D = NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS, // # ???/??? + // New predefined format added to i18npool locale data. + NF_DATETIME_SYS_DDMMYYYY_HHMM = NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS, // 08.10.1997 01:23 formatindex="50" + + // No i18npool defined locale data between here and NF_INDEX_TABLE_ENTRIES. + NF_INDEX_TABLE_RESERVED_START, + + NF_FRACTION_3D = NF_INDEX_TABLE_RESERVED_START, // # ???/??? NF_FRACTION_2, // # ?/2 NF_FRACTION_4, // # ?/4 NF_FRACTION_8, // # ?/8 @@ -248,7 +256,7 @@ enum NfIndexTableOffset // XXX When adding values here, follow the comment above about // svx/source/items/numfmtsh.cxx - NF_INDEX_TABLE_ENTRIES // == 59, reserved up to #59 to not be used in i18npool locale data. + NF_INDEX_TABLE_ENTRIES // == 60, reserved to not be used in i18npool locale data. // XXX Adding values above may increment the reserved area that can't be // used by i18npool's locale data FormatCode definitions, see the diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx index 9dc0b2b5c598..fe1193aee5a3 100644 --- a/include/svx/numfmtsh.hxx +++ b/include/svx/numfmtsh.hxx @@ -203,6 +203,8 @@ private: bool bSuppressDuplicates ); SVX_DLLPRIVATE short FillEListWithDateTime_Impl( std::vector<OUString>& rList,short nSelPos, bool bSuppressDuplicates ); + SVX_DLLPRIVATE void FillEListWithOneDateTime_Impl( std::vector<OUString>& rList, short & nSelPos, + bool bSuppressDuplicates, NfIndexTableOffset nOffset ); SVX_DLLPRIVATE short FillEListWithCurrency_Impl( std::vector<OUString>& rList,short nSelPos); SVX_DLLPRIVATE short FillEListWithSysCurrencys( std::vector<OUString>& rList,short nSelPos); SVX_DLLPRIVATE short FillEListWithUserCurrencys( std::vector<OUString>& rList,short nSelPos); diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index df67f6cde921..dd03b0c9084e 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2237,6 +2237,7 @@ void getFormatString(SvNumberFormatter* pFormatter, sal_uLong nFormat, OUString& case NF_DATE_SYS_DDMMM: rFmtStr = "D2"; break; case NF_DATE_SYS_MMYY: rFmtStr = "D3"; break; case NF_DATETIME_SYSTEM_SHORT_HHMM: + case NF_DATETIME_SYS_DDMMYYYY_HHMM: case NF_DATETIME_SYS_DDMMYYYY_HHMMSS: rFmtStr = "D4"; break; case NF_DATE_DIN_MMDD: rFmtStr = "D5"; break; diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 8eb3cf4b6dfa..707754ac920f 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -220,6 +220,19 @@ void Test::testNumberFormat() nullptr }; +// Following aren't in range of NF_DATETIME_START and NF_DATETIME_END +// see enum NfIndexTableOffset in svl/inc/svl/zforlist.hxx + const char* pDateTimeExt1[] = { + "MM/DD/YYYY HH:MM AM/PM", + nullptr + }; + + const char* pDateTimeExt2[] = { + "YYYY-MM-DD HH:MM:SS", + "YYYY-MM-DD\"T\"HH:MM:SS", + nullptr + }; + const char* pBoolean[] = { "BOOLEAN", nullptr @@ -240,13 +253,15 @@ void Test::testNumberFormat() { NF_SCIENTIFIC_START, NF_SCIENTIFIC_END, 2, pScientific }, { NF_PERCENT_START, NF_PERCENT_END, 2, pPercent }, { NF_FRACTION_START, NF_FRACTION_END, 2, pFraction }, - { NF_FRACTION_3D, NF_FRACTION_100, 7, pFractionExt }, { NF_CURRENCY_START, NF_CURRENCY_END, 6, pCurrency }, { NF_DATE_START, NF_DATE_END, 21, pDate }, { NF_TIME_START, NF_TIME_END, 7, pTime }, { NF_DATETIME_START, NF_DATETIME_END, 2, pDateTime }, { NF_BOOLEAN, NF_BOOLEAN, 1, pBoolean }, - { NF_TEXT, NF_TEXT, 1, pText } + { NF_TEXT, NF_TEXT, 1, pText }, + { NF_DATETIME_SYS_DDMMYYYY_HHMM, NF_DATETIME_SYS_DDMMYYYY_HHMM, 1, pDateTimeExt1 }, + { NF_FRACTION_3D, NF_FRACTION_100, 7, pFractionExt }, + { NF_DATETIME_ISO_YYYYMMDD_HHMMSS, NF_DATETIME_ISO_YYYYMMDDTHHMMSS, 2, pDateTimeExt2 } }; SvNumberFormatter aFormatter(m_xContext, eLang); @@ -267,7 +282,7 @@ void Test::testNumberFormat() CPPUNIT_ASSERT_MESSAGE("Number format entry is expected, but doesn't exist.", p); OUString aCode = p->GetFormatstring(); - CPPUNIT_ASSERT_EQUAL( aCode.toUtf8() , OString( aTests[i].pCodes[j-nStart] ) ); + CPPUNIT_ASSERT_EQUAL( OString( aTests[i].pCodes[j-nStart] ), aCode.toUtf8()); } } diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 7243d0f7105c..1e7738caaf20 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -93,11 +93,14 @@ using namespace ::std; static_assert( ZF_STANDARD_TEXT == NF_STANDARD_FORMAT_TEXT, "definition mismatch" ); +static_assert( NF_INDEX_TABLE_RESERVED_START == i18npool::nStopPredefinedFormatIndex, + "NfIndexTableOffset does not match i18npool's locale data predefined format code index bounds."); + static_assert( NF_INDEX_TABLE_ENTRIES <= i18npool::nFirstFreeFormatIndex, "NfIndexTableOffset crosses i18npool's locale data reserved format code index bounds.\n" "You will need to adapt all locale data files defining index values " "(formatIndex=\"...\") in that range and increment those and when done " - "adjust nFirstFreeFormatIndex in i18npool/reservedconstants.hxx"); + "adjust nFirstFreeFormatIndex in include/i18npool/reservedconstants.hxx"); /* Locale that is set if an unknown locale (from another system) is loaded of * legacy documents. Can not be SYSTEM because else, for example, a German "DM" @@ -156,6 +159,7 @@ static sal_uInt32 const indexTable[NF_INDEX_TABLE_ENTRIES] = { ZF_STANDARD_DATETIME + 1, // NF_DATETIME_SYS_DDMMYYYY_HHMMSS ZF_STANDARD_LOGICAL, // NF_BOOLEAN ZF_STANDARD_TEXT, // NF_TEXT + ZF_STANDARD_DATETIME + 4, // NF_DATETIME_SYS_DDMMYYYY_HHMM ZF_STANDARD_FRACTION + 2, // NF_FRACTION_3D ZF_STANDARD_FRACTION + 3, // NF_FRACTION_2 ZF_STANDARD_FRACTION + 4, // NF_FRACTION_4 @@ -1954,15 +1958,15 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const css::i18n::NumberForma sal_uInt32 nPos, bool bAfterChangingSystemCL, sal_Int16 nOrgIndex ) { - SAL_WARN_IF( NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS <= rCode.Index && rCode.Index < NF_INDEX_TABLE_ENTRIES, + SAL_WARN_IF( NF_INDEX_TABLE_RESERVED_START <= rCode.Index && rCode.Index < NF_INDEX_TABLE_ENTRIES, "svl.numbers", "i18npool locale '" << maLanguageTag.getBcp47() << "' uses reserved formatIndex value " << rCode.Index << ", next free: " << NF_INDEX_TABLE_ENTRIES << " Please see description in include/svl/zforlist.hxx at end of enum NfIndexTableOffset"); - assert( (rCode.Index < NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS || NF_INDEX_TABLE_ENTRIES <= rCode.Index) && + assert( (rCode.Index < NF_INDEX_TABLE_RESERVED_START || NF_INDEX_TABLE_ENTRIES <= rCode.Index) && "reserved formatIndex, see warning above"); OUString aCodeStr( rCode.Code ); - if ( rCode.Index < NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS && + if ( rCode.Index < NF_INDEX_TABLE_RESERVED_START && rCode.Usage == css::i18n::KNumberFormatUsage::CURRENCY && rCode.Index != NF_CURRENCY_1000DEC2_CCC ) { // strip surrounding [$...] on automatic currency @@ -1999,7 +2003,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const css::i18n::NumberForma } return nullptr; } - if ( rCode.Index >= NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS ) + if ( rCode.Index >= NF_INDEX_TABLE_RESERVED_START ) { sal_uInt32 nCLOffset = nPos - (nPos % SV_COUNTRY_LANGUAGE_OFFSET); sal_uInt32 nKey = ImpIsEntry( aCodeStr, nCLOffset, ActLnge ); @@ -2717,6 +2721,11 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio ImpInsertFormat( aFormatSeq[nIdx], CLOffset + ZF_STANDARD_DATETIME+1 /* NF_DATETIME_SYS_DDMMYYYY_HHMMSS */ ); + // DD.MM.YYYY HH:MM System + nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATETIME_SYS_DDMMYYYY_HHMM ); + ImpInsertFormat( aFormatSeq[nIdx], + CLOffset + ZF_STANDARD_DATETIME+4 /* NF_DATETIME_SYS_DDMMYYYY_HHMM */ ); + const NfKeywordTable & rKeyword = pFormatScanner->GetKeywords(); i18n::NumberFormatCode aSingleFormatCode; aSingleFormatCode.Usage = i18n::KNumberFormatUsage::DATE_TIME; @@ -2855,7 +2864,7 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset, SAL_WARN( "svl.numbers", "ImpGenerateAdditionalFormats: too many formats" ); break; // for } - if ( rFormat.Index < NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS && + if ( rFormat.Index < NF_INDEX_TABLE_RESERVED_START && rFormat.Index != NF_CURRENCY_1000DEC2_CCC ) { // Insert only if not already inserted, but internal index must be // above so ImpInsertFormat can distinguish it. @@ -2890,7 +2899,7 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset, SAL_WARN( "svl.numbers", "ImpGenerateAdditionalFormats: too many formats" ); break; // for } - if ( rFormat.Index >= NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS ) + if ( rFormat.Index >= NF_INDEX_TABLE_RESERVED_START ) { if ( SvNumberformat* pNewFormat = ImpInsertFormat( rFormat, nPos+1, bAfterChangingSystemCL ) ) diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 3a329b7181a4..e169319df799 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -661,41 +661,14 @@ short SvxNumberFormatShell::FillEListWithFormats_Impl(std::vector<OUString>& rLi short SvxNumberFormatShell::FillEListWithDateTime_Impl(std::vector<OUString>& rList, short nSelPos, bool bSuppressDuplicates) { - sal_uInt16 nMyType; - - sal_uInt32 nNFEntry; - OUString aNewFormNInfo; + // Add first, so a NF_DATETIME_SYSTEM_SHORT_HHMM may be suppressed in + // locales that do not use 2-digit years there and this here is the + // default. + FillEListWithOneDateTime_Impl( rList, nSelPos, bSuppressDuplicates, NF_DATETIME_SYS_DDMMYYYY_HHMM); for (long nIndex = NF_DATETIME_START; nIndex <= NF_DATETIME_END; ++nIndex) { - nNFEntry = pFormatter->GetFormatIndex(static_cast<NfIndexTableOffset>(nIndex), eCurLanguage); - - const SvNumberformat* pNumEntry = pFormatter->GetEntry(nNFEntry); - if (pNumEntry != nullptr) - { - SvNumFormatType nMyCat = pNumEntry->GetMaskedType(); - CategoryToPos_Impl(nMyCat, nMyType); - aNewFormNInfo = pNumEntry->GetFormatstring(); - - if (nNFEntry == nCurFormatKey) - { - nSelPos = (!IsRemoved_Impl(nNFEntry)) ? aCurEntryList.size() : SELPOS_NONE; - } - - if (!bSuppressDuplicates || IsEssentialFormat_Impl(nMyCat, nNFEntry) - || std::find(rList.begin(), rList.end(), aNewFormNInfo) == rList.end()) - { - // Ugly hack to suppress an ISO date+time format that is the - // default date+time format of the locale and identical to the - // internally generated one to be added below. - if (!bSuppressDuplicates || (aNewFormNInfo != "YYYY-MM-DD HH:MM:SS" - && aNewFormNInfo != "YYYY-MM-DD\"T\"HH:MM:SS")) - { - rList.push_back(aNewFormNInfo); - aCurEntryList.push_back(nNFEntry); - } - } - } + FillEListWithOneDateTime_Impl( rList, nSelPos, bSuppressDuplicates, static_cast<NfIndexTableOffset>(nIndex)); } // Always add the internally generated ISO formats. @@ -705,6 +678,40 @@ short SvxNumberFormatShell::FillEListWithDateTime_Impl(std::vector<OUString>& rL return nSelPos; } +void SvxNumberFormatShell::FillEListWithOneDateTime_Impl(std::vector<OUString>& rList, short & nSelPos, + bool bSuppressDuplicates, NfIndexTableOffset nOffset) +{ + sal_uInt32 nNFEntry = pFormatter->GetFormatIndex(nOffset, eCurLanguage); + + const SvNumberformat* pNumEntry = pFormatter->GetEntry(nNFEntry); + if (pNumEntry == nullptr) + return; + + SvNumFormatType nMyCat = pNumEntry->GetMaskedType(); + sal_uInt16 nMyType; + CategoryToPos_Impl(nMyCat, nMyType); + OUString aNewFormNInfo = pNumEntry->GetFormatstring(); + + if (nNFEntry == nCurFormatKey) + { + nSelPos = (!IsRemoved_Impl(nNFEntry)) ? aCurEntryList.size() : SELPOS_NONE; + } + + if (!bSuppressDuplicates || IsEssentialFormat_Impl(nMyCat, nNFEntry) + || std::find(rList.begin(), rList.end(), aNewFormNInfo) == rList.end()) + { + // Ugly hack to suppress an ISO date+time format that is the + // default date+time format of the locale and identical to the + // internally generated one to be added after/below. + if (!bSuppressDuplicates || (aNewFormNInfo != "YYYY-MM-DD HH:MM:SS" + && aNewFormNInfo != "YYYY-MM-DD\"T\"HH:MM:SS")) + { + rList.push_back(aNewFormNInfo); + aCurEntryList.push_back(nNFEntry); + } + } +} + bool SvxNumberFormatShell::IsEssentialFormat_Impl(SvNumFormatType eType, sal_uInt32 nKey) { if (nKey == nCurFormatKey) @@ -719,6 +726,7 @@ bool SvxNumberFormatShell::IsEssentialFormat_Impl(SvNumFormatType eType, sal_uIn case NF_TIME_HH_MMSS: case NF_TIME_MMSS00: case NF_TIME_HH_MMSS00: + case NF_DATETIME_SYS_DDMMYYYY_HHMM: case NF_DATETIME_SYS_DDMMYYYY_HHMMSS: case NF_DATETIME_ISO_YYYYMMDD_HHMMSS: case NF_DATETIME_ISO_YYYYMMDDTHHMMSS: diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 7fc07dbb8120..569cc072231c 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -1125,7 +1125,8 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt eBuiltIn == NF_DATE_SYS_DMMMYY || eBuiltIn == NF_DATE_SYS_DMMMYYYY || eBuiltIn == NF_DATE_SYS_DMMMMYYYY || eBuiltIn == NF_DATE_SYS_NNDMMMYY || eBuiltIn == NF_DATE_SYS_NNDMMMMYYYY || eBuiltIn == NF_DATE_SYS_NNNNDMMMMYYYY || - eBuiltIn == NF_DATETIME_SYSTEM_SHORT_HHMM || eBuiltIn == NF_DATETIME_SYS_DDMMYYYY_HHMMSS ); + eBuiltIn == NF_DATETIME_SYSTEM_SHORT_HHMM || eBuiltIn == NF_DATETIME_SYS_DDMMYYYY_HHMM || + eBuiltIn == NF_DATETIME_SYS_DDMMYYYY_HHMMSS ); // format source (for date and time formats) // only used for some built-in formats diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index d0b6a053aff6..5edbb3055201 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -338,6 +338,7 @@ static const SvXMLDefaultDateFormat aDefaultDateFormats[] = { NF_DATE_SYS_NNDMMMYY, XML_DEA_SHORT, XML_DEA_SHORT, XML_DEA_TEXTSHORT, XML_DEA_SHORT, XML_DEA_NONE, XML_DEA_NONE, XML_DEA_NONE, false }, { NF_DATE_SYS_NNDMMMMYYYY, XML_DEA_SHORT, XML_DEA_SHORT, XML_DEA_TEXTLONG, XML_DEA_LONG, XML_DEA_NONE, XML_DEA_NONE, XML_DEA_NONE, false }, { NF_DATE_SYS_NNNNDMMMMYYYY, XML_DEA_LONG, XML_DEA_SHORT, XML_DEA_TEXTLONG, XML_DEA_LONG, XML_DEA_NONE, XML_DEA_NONE, XML_DEA_NONE, false }, + { NF_DATETIME_SYS_DDMMYYYY_HHMM, XML_DEA_NONE, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_LONG, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_NONE, false }, { NF_DATETIME_SYSTEM_SHORT_HHMM, XML_DEA_NONE, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_NONE, true }, { NF_DATETIME_SYS_DDMMYYYY_HHMMSS, XML_DEA_NONE, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, false } }; @@ -1690,7 +1691,7 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter) NfIndexTableOffset eFormat = static_cast<NfIndexTableOffset>(SvXMLNumFmtDefaults::GetDefaultDateFormat( eDateDOW, eDateDay, eDateMonth, eDateYear, eDateHours, eDateMins, eDateSecs, bFromSystem )); - if ( eFormat < NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS ) + if ( eFormat < NF_INDEX_TABLE_RESERVED_START ) { // #109651# if a date format has the automatic-order attribute and // contains exactly the elements of one of the default date formats, |