[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - config_host/config_locales.h.in extras/CustomTarget_autocorr.mk extras/Package_autocorr.mk extras/source i18npool/CustomTarget_collator.mk i18npool/Library_localedata_euro.mk i18npool/source
Mihkel Tõnnov (via logerrit)
logerrit at kemper.freedesktop.org
Sat Oct 10 20:01:04 UTC 2020
config_host/config_locales.h.in | 1
extras/CustomTarget_autocorr.mk | 3
extras/Package_autocorr.mk | 1
extras/source/autocorr/lang/vro/DocumentList.xml | 2
extras/source/autocorr/lang/vro/META-INF/manifest.xml | 5
i18npool/CustomTarget_collator.mk | 2
i18npool/Library_localedata_euro.mk | 1
i18npool/source/collator/collator_unicode.cxx | 10
i18npool/source/collator/data/vro_alphanumeric.txt | 73 ++
i18npool/source/localedata/data/vro_EE.xml | 448 ++++++++++++++++++
i18npool/source/localedata/localedata.cxx | 1
11 files changed, 547 insertions(+)
New commits:
commit eb8025ccc96688c8d43ebc3d1901058a2039d47b
Author: Mihkel Tõnnov <mihhkel at gmail.com>
AuthorDate: Mon Sep 21 19:56:30 2020 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Sat Oct 10 22:00:30 2020 +0200
tdf#136951: Add Võro (vro-EE) locale data and rudimentary autocorrect list
Change-Id: Id5a5d71b7f457d18b9d0982f9b4df95566c09be9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103122
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack at redhat.com>
(cherry picked from commit 568ee718bb217f4ecbebc962557ef659b9f6e624)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103584
diff --git a/config_host/config_locales.h.in b/config_host/config_locales.h.in
index a5f1e65b7dbe..b9b6988cc891 100644
--- a/config_host/config_locales.h.in
+++ b/config_host/config_locales.h.in
@@ -49,6 +49,7 @@
#define WITH_LOCALE_th 0
#define WITH_LOCALE_tr 0
#define WITH_LOCALE_uk 0
+#define WITH_LOCALE_vro 0
#define WITH_LOCALE_zh 0
#define WITH_LOCALE_FOR_SCRIPT_Cyrl 0
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index 63165f267f52..8ac2dd86502a 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -55,6 +55,7 @@ extras_AUTOCORR_LANGS := \
sv:sv-SE \
tr:tr-TR \
vi:vi-VN \
+ vro:vro-EE \
zh-CN:zh-CN \
zh-TW:zh-TW \
@@ -224,6 +225,8 @@ extras_AUTOCORR_XMLFILES := \
vi/DocumentList.xml \
vi/META-INF/manifest.xml \
vi/WordExceptList.xml \
+ vro/DocumentList.xml \
+ vro/META-INF/manifest.xml \
zh-CN/DocumentList.xml \
zh-CN/META-INF/manifest.xml \
zh-CN/SentenceExceptList.xml \
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index 877b26b5a235..cc14860637ee 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr
acor_sv-SE.dat \
acor_tr-TR.dat \
acor_vi-VN.dat \
+ acor_vro-EE.dat \
acor_zh-CN.dat \
acor_zh-TW.dat \
))
diff --git a/extras/source/autocorr/lang/vro/DocumentList.xml b/extras/source/autocorr/lang/vro/DocumentList.xml
new file mode 100644
index 000000000000..81ff2ece1f55
--- /dev/null
+++ b/extras/source/autocorr/lang/vro/DocumentList.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<block-list:block-list xmlns:block-list="http://openoffice.org/2001/block-list"><block-list:block block-list:abbreviated-name=".*ḃ.*" block-list:name="b́"/><block-list:block block-list:abbreviated-name=".*Ḃ.*" block-list:name="B́"/><block-list:block block-list:abbreviated-name=".*b´.*" block-list:name="b́"/><block-list:block block-list:abbreviated-name=".*B´.*" block-list:name="B́"/><block-list:block block-list:abbreviated-name=".*Ď.*" block-list:name="D́"/><block-list:block block-list:abbreviated-name=".*d´.*" block-list:name="ď"/><block-list:block block-list:abbreviated-name=".*D´.*" block-list:name="D́"/><block-list:block block-list:abbreviated-name=".*ḟ.*" block-list:name="f́"/><block-list:block block-list:abbreviated-name=".*Ḟ.*" block-list:name="F́"/><block-list:block block-list:abbreviated-name=".*f´.*" block-list:name="f́"/><block-list:block block-list:abbreviated-name=".*F´.*" block-list:name="F́"/><block-list:block block-list:abbreviated-name=".*g
´.*" block-list:name="ǵ"/><block-list:block block-list:abbreviated-name=".*G´.*" block-list:name="Ǵ"/><block-list:block block-list:abbreviated-name=".*ḣ.*" block-list:name="h́"/><block-list:block block-list:abbreviated-name=".*Ḣ.*" block-list:name="H́"/><block-list:block block-list:abbreviated-name=".*h´.*" block-list:name="h́"/><block-list:block block-list:abbreviated-name=".*H´.*" block-list:name="H́"/><block-list:block block-list:abbreviated-name=".*k´.*" block-list:name="ḱ"/><block-list:block block-list:abbreviated-name=".*K´.*" block-list:name="Ḱ"/><block-list:block block-list:abbreviated-name=".*l´.*" block-list:name="ľ"/><block-list:block block-list:abbreviated-name=".*L´.*" block-list:name="Ľ"/><block-list:block block-list:abbreviated-name=".*m´.*" block-list:name="ḿ"/><block-list:block block-list:abbreviated-name=".*M´.*" block-list:name="Ḿ"/><block-list:block block-list:abbreviated-name=".*n´.*" block-list:name="ń"/><block-list:block block-l
ist:abbreviated-name=".*N´.*" block-list:name="Ń"/><block-list:block block-list:abbreviated-name=".*p´.*" block-list:name="ṕ"/><block-list:block block-list:abbreviated-name=".*P´.*" block-list:name="Ṕ"/><block-list:block block-list:abbreviated-name=".*r´.*" block-list:name="ŕ"/><block-list:block block-list:abbreviated-name=".*R´.*" block-list:name="Ŕ"/><block-list:block block-list:abbreviated-name=".*s´.*" block-list:name="ś"/><block-list:block block-list:abbreviated-name=".*S´.*" block-list:name="Ś"/><block-list:block block-list:abbreviated-name=".*Ť.*" block-list:name="T́"/><block-list:block block-list:abbreviated-name=".*t´.*" block-list:name="ť"/><block-list:block block-list:abbreviated-name=".*T´.*" block-list:name="T́"/><block-list:block block-list:abbreviated-name=".*v´.*" block-list:name="v́"/><block-list:block block-list:abbreviated-name=".*V´.*" block-list:name="V́"/></block-list:block-list>
\ No newline at end of file
diff --git a/extras/source/autocorr/lang/vro/META-INF/manifest.xml b/extras/source/autocorr/lang/vro/META-INF/manifest.xml
new file mode 100644
index 000000000000..bd8de6e3524c
--- /dev/null
+++ b/extras/source/autocorr/lang/vro/META-INF/manifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest:manifest>
+ <manifest:file-entry manifest:full-path="/" manifest:media-type=""/>
+ <manifest:file-entry manifest:full-path="DocumentList.xml" manifest:media-type="text/xml"/>
+</manifest:manifest>
\ No newline at end of file
diff --git a/extras/source/autocorr/lang/vro/mimetype b/extras/source/autocorr/lang/vro/mimetype
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk
index 2e64e2043dce..4cf7b953573f 100644
--- a/i18npool/CustomTarget_collator.mk
+++ b/i18npool/CustomTarget_collator.mk
@@ -36,6 +36,8 @@ i18npool_COTXTS := \
ne_charset.txt) \
$(call gb_Helper_optional_locale,sid, \
sid_charset.txt) \
+ $(call gb_Helper_optional_locale,vro, \
+ vro_alphanumeric.txt) \
$(call gb_Helper_optional_locale,zh, \
zh_charset.txt \
zh_pinyin.txt \
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index 5a110bbe03fd..14909ac59539 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -104,6 +104,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
CustomTarget/i18npool/localedata/localedata_tt_RU \
CustomTarget/i18npool/localedata/localedata_uk_UA \
CustomTarget/i18npool/localedata/localedata_vec_IT \
+ CustomTarget/i18npool/localedata/localedata_vro_EE \
CustomTarget/i18npool/localedata/localedata_wa_BE \
))
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 673f5c35d3c7..9b8a64adc3e2 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -80,6 +80,7 @@ const sal_uInt8* get_collator_data_ln_charset();
const sal_uInt8* get_collator_data_my_dictionary();
const sal_uInt8* get_collator_data_ne_charset();
const sal_uInt8* get_collator_data_sid_charset();
+const sal_uInt8* get_collator_data_vro_alphanumeric();
const sal_uInt8* get_collator_data_zh_TW_charset();
const sal_uInt8* get_collator_data_zh_TW_radical();
const sal_uInt8* get_collator_data_zh_TW_stroke();
@@ -102,6 +103,7 @@ size_t get_collator_data_ln_charset_length();
size_t get_collator_data_my_dictionary_length();
size_t get_collator_data_ne_charset_length();
size_t get_collator_data_sid_charset_length();
+size_t get_collator_data_vro_alphanumeric_length();
size_t get_collator_data_zh_TW_charset_length();
size_t get_collator_data_zh_TW_radical_length();
size_t get_collator_data_zh_TW_stroke_length();
@@ -300,6 +302,14 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
funclen = get_collator_data_sid_charset_length;
}
#endif
+#if WITH_LOCALE_ALL || WITH_LOCALE_vro
+ } else if ( rLocale.Language == "vro" ) {
+ if ( rAlgorithm == "alphanumeric" )
+ {
+ func = get_collator_data_vro_alphanumeric;
+ funclen = get_collator_data_vro_alphanumeric_length;
+ }
+#endif
#if WITH_LOCALE_ALL || WITH_LOCALE_zh
} else if ( rLocale.Language == "zh" && (rLocale.Country == "TW" || rLocale.Country == "HK" || rLocale.Country == "MO") ) {
if ( rAlgorithm == "charset" )
diff --git a/i18npool/source/collator/data/vro_alphanumeric.txt b/i18npool/source/collator/data/vro_alphanumeric.txt
new file mode 100644
index 000000000000..203e3765d666
--- /dev/null
+++ b/i18npool/source/collator/data/vro_alphanumeric.txt
@@ -0,0 +1,73 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Võro sort order
+
+# There is notable inconsistency between publications/users concerning:
+# palatalisation marker:
+# a) acute above (or slightly after) the letter (preferred)
+# b) apostrophe (or non-combining acute) after the letter
+# c) nothing
+# glottal stop letter:
+# a) q
+# b) apostrophe
+# c) nothing
+# d) in dictionaries also ˀ or ʔ (usually superscripted to look like ˀ)
+
+# Some typographical notes
+#
+# Several letters don't have precomposed glyphs: B́, D́, F́, H́, T́, V́.
+# The online Võro-Estonian dictionary uses a font where dot-above is
+# rendered as acute for b, f, h; combining acute accent is used for v.
+#
+# Lowercase ď, ľ, ť and uppercase Ľ are in principle composed with
+# caron, not acute, however those forms are used more than d́, ĺ, t́, Ĺ
+# (uppercase Ď and Ť with obvious caron are not used, but are included
+# here for case insensitivity's sake).
+#
+# Non-combining acute accent ´ (\u00b4) after the letter makes the text
+# look jagged, so those combinations are not included in the collation
+# rules below - instead, we provide autocorrect rules to replace them
+# with precomposed glyphs (if available) or with letter plus combining
+# acute accent.
+
+# Palatalized consonants
+#
+# Precomposed letter (with either acute or dot-above (see notes above),
+# or in case of L, with acute and caron (see notes above);
+# with combining acute accent ́ (\u0301) if there's no precomposed glyph;
+# with apostrophe ' (straight/ASCII; \u0027; NB: has to be escaped: '');
+# with right single quotation mark ’ (typographic apostrophe; \u2019).
+
+& b << ḃ = b́ = b'' = b’ <<< B << Ḃ = B́ = B'' = B’
+& d << ď = d́ = d'' = d’ <<< D << Ď = D́ = D'' = D’
+& f << ḟ = f́ = f'' = f’ <<< F << Ḟ = F́ = F'' = F’
+& g << ǵ = g'' = g’ <<< G << Ǵ = G'' = G’
+& h << ḣ = h́ = h'' = h’ <<< H << Ḣ = H́ = H'' = H’
+& k << ḱ = k'' = k’ <<< K << Ḱ = K'' = K’
+& l << ĺ = ľ = l'' = l’ <<< L << Ĺ = Ľ = L'' = L’
+& m << ḿ = m'' = m’ <<< M << Ḿ = M'' = M’
+& n << ń = n'' = n’ <<< N << Ń = N'' = N’
+& p << ṕ = p'' = p’ <<< P << Ṕ = P'' = P’
+& r << ŕ = r'' = r’ <<< R << Ŕ = R'' = R’
+& s << ś = s'' = s’ <<< S << Ś = S'' = S’ < š <<< Š
+& t << ť = t́ = t'' = t’ <<< T << Ť = T́ = T'' = T’
+& v << v́ = v'' = v’ <<< V << V́ = V'' = V’
+
+# Glottal stop
+#
+# After a vowel, apostrophe is used as a glottal stop marker, as is Q.
+# NB: straight/ASCII apostrophe has to be escaped: ''
+
+& q = ˀ = a|'' = a|’ = e|'' = e|’ = i|'' = i|’ = o|'' = o|’ = u|'' = u|’ = õ|'' = õ|’ = ä|'' = ä|’ = ö|'' = ö|’ = ü|'' = ü|’ = y|'' = y|’ <<< Q = ʔ = A|'' = A|’ = E|'' = E|’ = I|'' = I|’ = O|'' = O|’ = U|'' = U|’ = Õ|'' = Õ|’ = Ä|'' = Ä|’ = Ö|'' = Ö|’ = Ü|'' = Ü|’ = Y|'' = Y|’
+
+# Final letters of the alphabet
+#
+# Just like in Estonian (et), except that Z & Ž are at the very end
+
+& W < õ <<< Õ < ä <<< Ä < ö <<< Ö < ü <<< Ü
+& Z < ž <<< Ž
diff --git a/i18npool/source/localedata/data/vro_EE.xml b/i18npool/source/localedata/data/vro_EE.xml
new file mode 100644
index 000000000000..88885e20b41b
--- /dev/null
+++ b/i18npool/source/localedata/data/vro_EE.xml
@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
+ <LC_INFO>
+ <Language>
+ <LangID>vro</LangID>
+ <DefaultName>Võro</DefaultName>
+ </Language>
+ <Country>
+ <CountryID>EE</CountryID>
+ <DefaultName>Estonia</DefaultName>
+ </Country>
+ </LC_INFO>
+ <LC_CTYPE>
+ <Separators>
+ <DateSeparator>.</DateSeparator>
+ <ThousandSeparator> </ThousandSeparator>
+ <DecimalSeparator>,</DecimalSeparator>
+ <TimeSeparator>:</TimeSeparator>
+ <Time100SecSeparator>,</Time100SecSeparator>
+ <ListSeparator>;</ListSeparator>
+ <LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
+ <LongDateDaySeparator>. </LongDateDaySeparator>
+ <LongDateMonthSeparator> </LongDateMonthSeparator>
+ <LongDateYearSeparator> </LongDateYearSeparator>
+ </Separators>
+ <Markers>
+ <QuotationStart>’</QuotationStart>
+ <QuotationEnd>’</QuotationEnd>
+ <DoubleQuotationStart>„</DoubleQuotationStart>
+ <DoubleQuotationEnd>”</DoubleQuotationEnd>
+ </Markers>
+ <TimeAM>i.l</TimeAM>
+ <TimePM>p.l</TimePM>
+ <MeasurementSystem>metric</MeasurementSystem>
+ </LC_CTYPE>
+ <LC_FORMAT>
+ <DateAcceptancePattern>D.M</DateAcceptancePattern>
+ <DateAcceptancePattern>D. M</DateAcceptancePattern>
+ <DateAcceptancePattern>D.M.</DateAcceptancePattern>
+ <DateAcceptancePattern>D. M.</DateAcceptancePattern>
+ <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
+ <FormatCode>General</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1">
+ <FormatCode>0</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
+ <FormatCode>0,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
+ <FormatCode># ##0</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
+ <FormatCode># ##0,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
+ <FormatCode># ###,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="ScientificFormatskey1" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
+ <FormatCode>0,00E+000</FormatCode>
+ </FormatElement>
+ <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">
+ <FormatCode>##0,00E+00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
+ <FormatCode>0%</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
+ <FormatCode>0,00%</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
+ <FormatCode># ##0 [$kr-675];-# ##0 [$kr-675]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
+ <FormatCode># ##0,00 [$kr-675];-# ##0,00 [$kr-675]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
+ <FormatCode># ##0 [$kr-675];[RED]-# ##0 [$kr-675]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
+ <FormatCode># ##0,00 [$kr-675];[RED]-# ##0,00 [$kr-675]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
+ <FormatCode># ##0,00 CCC</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
+ <FormatCode># ##0,-- [$kr-675];[RED]-# ##0,-- [$kr-675]</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
+ <FormatCode>DD.MM.YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey15" default="true" type="long" usage="DATE" formatindex="19">
+ <FormatCode>NNNND. MMMM" päiv "YYYY". a"</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey22" default="false" type="short" usage="DATE" formatindex="20">
+ <FormatCode>D.M.YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey7" default="true" type="medium" usage="DATE" formatindex="21">
+ <FormatCode>DD.MM.YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey10" default="false" type="short" usage="DATE" formatindex="22">
+ <FormatCode>D. MMMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="23">
+ <FormatCode>D. MMM" p "YYYY". a"</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey11" default="false" type="medium" usage="DATE" formatindex="24">
+ <FormatCode>D. MMM" p "YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="25">
+ <FormatCode>D. MMMM" päiv "YYYY". a"</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="26">
+ <FormatCode>D. MMMM" päiv "YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="27">
+ <FormatCode>NN, D. MMMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey13" default="false" type="medium" usage="DATE" formatindex="28">
+ <FormatCode>NN, D. MMM" p "YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey2" default="false" type="long" usage="DATE" formatindex="29">
+ <FormatCode>NN, D. MMMM" päiv "YYYY". a"</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey9" default="false" type="long" usage="DATE" formatindex="30">
+ <FormatCode>NNNNDD. MMMM" päiv "YYYY". a"</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
+ <FormatCode>MM-DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey19" default="false" type="short" usage="DATE" formatindex="32">
+ <FormatCode>YY-MM-DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33">
+ <FormatCode>YYYY-MM-DD</FormatCode>
+ <DefaultName>ISO 8601</DefaultName>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey24" default="false" type="short" usage="DATE" formatindex="34">
+ <FormatCode>MMMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey4" default="false" type="short" usage="DATE" formatindex="35">
+ <FormatCode>D. MMM" p"</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36">
+ <FormatCode>MMMM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37">
+ <FormatCode>QQ YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey21" default="false" type="short" usage="DATE" formatindex="38">
+ <FormatCode>WW</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey25" default="false" type="medium" usage="DATE" formatindex="66">
+ <FormatCode>WW". nätäľ"</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey26" default="false" type="long" usage="DATE" formatindex="67">
+ <FormatCode>WW". nätäľ "YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey34" default="false" type="long" usage="DATE" formatindex="79">
+ <FormatCode>D. MMMM"d "YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey35" default="false" type="medium" usage="DATE" formatindex="80">
+ <FormatCode>D. MMMM"d"</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey36" default="false" type="long" usage="DATE" formatindex="81">
+ <FormatCode>D. MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey37" default="false" type="medium" usage="DATE" formatindex="82">
+ <FormatCode>D. MMMM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey38" default="false" type="long" usage="DATE" formatindex="83">
+ <FormatCode>MMMM D". päiv "YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey39" default="false" type="medium" usage="DATE" formatindex="84">
+ <FormatCode>MMMM D". päiv"</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey40" default="false" type="medium" usage="DATE" formatindex="85">
+ <FormatCode>MMM D". p "YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey41" default="false" type="short" usage="DATE" formatindex="86">
+ <FormatCode>MMM D". p"</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="68">
+ <FormatCode>NN, D. MMMM" päiv "YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey27" default="false" type="short" usage="DATE" formatindex="69">
+ <FormatCode>D.MM.YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey8" default="false" type="short" usage="DATE" formatindex="70">
+ <FormatCode>D.M.YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey28" default="false" type="medium" usage="DATE" formatindex="71">
+ <FormatCode>D. MMMM" päiv"</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey29" default="false" type="short" usage="DATE" formatindex="72">
+ <FormatCode>DD.MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey30" default="false" type="short" usage="DATE" formatindex="73">
+ <FormatCode>D.MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey31" default="false" type="medium" usage="DATE" formatindex="74">
+ <FormatCode>MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey3" default="false" type="short" usage="DATE" formatindex="75">
+ <FormatCode>MMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey32" default="false" type="short" usage="DATE" formatindex="76">
+ <FormatCode>YYYY Q</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey33" default="false" type="short" usage="DATE" formatindex="77">
+ <FormatCode>Q YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39">
+ <FormatCode>HH:MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME" formatindex="40">
+ <FormatCode>HH:MM:SS</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME" formatindex="41">
+ <FormatCode>HH:MM AM/PM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME" formatindex="42">
+ <FormatCode>HH:MM:SS AM/PM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
+ <FormatCode>[HH]:MM:SS</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
+ <FormatCode>MM:SS,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
+ <FormatCode>[HH]:MM:SS,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
+ <FormatCode>HH:MM DD.MM.YY</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="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"/>
+ <CollationOptions>
+ <TransliterationModules>IGNORE_CASE</TransliterationModules>
+ </CollationOptions>
+ </LC_COLLATION>
+ <LC_SEARCH ref="et_EE"/>
+ <LC_INDEX>
+ <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-S Š T U V W Õ Ä Ö Ü X Y Z Ž</IndexKey>
+ <UnicodeScript>0</UnicodeScript>
+ <UnicodeScript>1</UnicodeScript>
+ <UnicodeScript>2</UnicodeScript> <!-- LatinExtendedA, for Ďď Ĺĺ/Ľľ Ńń Ŕŕ Śś Ťť -->
+ <UnicodeScript>3</UnicodeScript> <!-- LatinExtendedB, for Ǵǵ -->
+ <UnicodeScript>37</UnicodeScript><!-- LatinExtendedAdditional, for Ḱḱ Ḿḿ Ṕṕ -->
+ <FollowPageWord> jj</FollowPageWord>
+ <FollowPageWord> jj</FollowPageWord>
+ </LC_INDEX>
+ <LC_CALENDAR>
+ <Calendar unoid="gregorian" default="true">
+ <DaysOfWeek>
+ <Day>
+ <DayID>sun</DayID>
+ <DefaultAbbrvName>Pü</DefaultAbbrvName>
+ <DefaultFullName>pühäpäiv</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>mon</DayID>
+ <DefaultAbbrvName>I</DefaultAbbrvName>
+ <DefaultFullName>iispäiv</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>tue</DayID>
+ <DefaultAbbrvName>T</DefaultAbbrvName>
+ <DefaultFullName>tõsõpäiv</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>wed</DayID>
+ <DefaultAbbrvName>K</DefaultAbbrvName>
+ <DefaultFullName>kolmapäiv</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>thu</DayID>
+ <DefaultAbbrvName>N</DefaultAbbrvName>
+ <DefaultFullName>neläpäiv</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>fri</DayID>
+ <DefaultAbbrvName>R</DefaultAbbrvName>
+ <DefaultFullName>riidi</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>sat</DayID>
+ <DefaultAbbrvName>Pu</DefaultAbbrvName>
+ <DefaultFullName>puuľpäiv</DefaultFullName>
+ </Day>
+ </DaysOfWeek>
+ <MonthsOfYear>
+ <Month>
+ <MonthID>jan</MonthID>
+ <DefaultAbbrvName>vahtsk</DefaultAbbrvName>
+ <DefaultFullName>vahtsõaastagakuu</DefaultFullName>
+ <DefaultNarrowName>I</DefaultNarrowName>
+ </Month>
+ <Month>
+ <MonthID>feb</MonthID>
+ <DefaultAbbrvName>radok</DefaultAbbrvName>
+ <DefaultFullName>radokuu</DefaultFullName>
+ <DefaultNarrowName>II</DefaultNarrowName>
+ </Month>
+ <Month>
+ <MonthID>mar</MonthID>
+ <DefaultAbbrvName>urbõk</DefaultAbbrvName>
+ <DefaultFullName>urbõkuu</DefaultFullName>
+ <DefaultNarrowName>III</DefaultNarrowName>
+ </Month>
+ <Month>
+ <MonthID>apr</MonthID>
+ <DefaultAbbrvName>mahlak</DefaultAbbrvName>
+ <DefaultFullName>mahlakuu</DefaultFullName>
+ <DefaultNarrowName>IV</DefaultNarrowName>
+ </Month>
+ <Month>
+ <MonthID>may</MonthID>
+ <DefaultAbbrvName>lehek</DefaultAbbrvName>
+ <DefaultFullName>lehekuu</DefaultFullName>
+ <DefaultNarrowName>V</DefaultNarrowName>
+ </Month>
+ <Month>
+ <MonthID>jun</MonthID>
+ <DefaultAbbrvName>piimäk</DefaultAbbrvName>
+ <DefaultFullName>piimäkuu</DefaultFullName>
+ <DefaultNarrowName>VI</DefaultNarrowName>
+ </Month>
+ <Month>
+ <MonthID>jul</MonthID>
+ <DefaultAbbrvName>hainak</DefaultAbbrvName>
+ <DefaultFullName>hainakuu</DefaultFullName>
+ <DefaultNarrowName>VII</DefaultNarrowName>
+ </Month>
+ <Month>
+ <MonthID>aug</MonthID>
+ <DefaultAbbrvName>põimuk</DefaultAbbrvName>
+ <DefaultFullName>põimukuu</DefaultFullName>
+ <DefaultNarrowName>VIII</DefaultNarrowName>
+ </Month>
+ <Month>
+ <MonthID>sep</MonthID>
+ <DefaultAbbrvName>süküsk</DefaultAbbrvName>
+ <DefaultFullName>süküskuu</DefaultFullName>
+ <DefaultNarrowName>IX</DefaultNarrowName>
+ </Month>
+ <Month>
+ <MonthID>oct</MonthID>
+ <DefaultAbbrvName>rehek</DefaultAbbrvName>
+ <DefaultFullName>rehekuu</DefaultFullName>
+ <DefaultNarrowName>X</DefaultNarrowName>
+ </Month>
+ <Month>
+ <MonthID>nov</MonthID>
+ <DefaultAbbrvName>märtek</DefaultAbbrvName>
+ <DefaultFullName>märtekuu</DefaultFullName>
+ <DefaultNarrowName>XI</DefaultNarrowName>
+ </Month>
+ <Month>
+ <MonthID>dec</MonthID>
+ <DefaultAbbrvName>jouluk</DefaultAbbrvName>
+ <DefaultFullName>joulukuu</DefaultFullName>
+ <DefaultNarrowName>XII</DefaultNarrowName>
+ </Month>
+ </MonthsOfYear>
+ <Eras>
+ <Era>
+ <EraID>bc</EraID>
+ <DefaultAbbrvName>i.m.a</DefaultAbbrvName>
+ <DefaultFullName>inne miiq aigo</DefaultFullName>
+ </Era>
+ <Era>
+ <EraID>ad</EraID>
+ <DefaultAbbrvName>m.a.p</DefaultAbbrvName>
+ <DefaultFullName>miiq ao perrä</DefaultFullName>
+ </Era>
+ </Eras>
+ <StartDayOfWeek>
+ <DayID>mon</DayID>
+ </StartDayOfWeek>
+ <MinimalDaysInFirstWeek>4</MinimalDaysInFirstWeek>
+ </Calendar>
+ </LC_CALENDAR>
+ <LC_CURRENCY>
+ <Currency default="true" usedInCompatibleFormatCodes="false">
+ <CurrencyID>EUR</CurrencyID>
+ <CurrencySymbol>€</CurrencySymbol>
+ <BankSymbol>EUR</BankSymbol>
+ <CurrencyName>Euro</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ <Currency default="false" usedInCompatibleFormatCodes="true">
+ <CurrencyID>EEK</CurrencyID>
+ <CurrencySymbol>kr</CurrencySymbol>
+ <BankSymbol>EEK</BankSymbol>
+ <CurrencyName>kruuń</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ </LC_CURRENCY>
+ <LC_TRANSLITERATION ref="et_EE"/>
+ <LC_MISC>
+ <ReservedWords>
+ <trueWord>tõtõ</trueWord>
+ <falseWord>võlsś</falseWord>
+ <quarter1Word>1. aastagaveerändik</quarter1Word>
+ <quarter2Word>2. aastagaveerändik</quarter2Word>
+ <quarter3Word>3. aastagaveerändik</quarter3Word>
+ <quarter4Word>4. aastagaveerändik</quarter4Word>
+ <aboveWord>iinpuul</aboveWord>
+ <belowWord>allpuul</belowWord>
+ <quarter1Abbreviation>AV1</quarter1Abbreviation>
+ <quarter2Abbreviation>AV2</quarter2Abbreviation>
+ <quarter3Abbreviation>AV3</quarter3Abbreviation>
+ <quarter4Abbreviation>AV4</quarter4Abbreviation>
+ </ReservedWords>
+ </LC_MISC>
+ <LC_NumberingLevel ref="et_EE"/>
+ <LC_OutLineNumberingLevel ref="et_EE"/>
+</Locale>
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index a25c391ac927..7b114140567b 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -148,6 +148,7 @@ static const struct {
{ "tr_TR", lcl_DATA_EURO },
{ "tt_RU", lcl_DATA_EURO },
{ "et_EE", lcl_DATA_EURO },
+ { "vro_EE", lcl_DATA_EURO },
{ "lb_LU", lcl_DATA_EURO },
{ "lt_LT", lcl_DATA_EURO },
{ "lv_LV", lcl_DATA_EURO },
More information about the Libreoffice-commits
mailing list