[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - l10ntools/source scp2/source solenv/inc

[Christian Lohmaier]

 l10ntools/source/ulfconv/msi-encodinglist.txt |    1 +
 scp2/source/ooo/module_langpack.ulf           |    6 ++++++
 solenv/inc/langlist.mk                        |    1 +
 3 files changed, 8 insertions(+)

New commits:
commit 9bf385b15439f25b89fe7c53a967a0941440226e
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed May 23 11:12:23 2018 +0200

    tdf#117729 add Frisian (fy) UI langauge
    
    Change-Id: I46f75e969b1252a95118888507c116f44578dfbd
    Reviewed-on: https://gerrit.libreoffice.org/54699
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    (cherry picked from commit f8fb04d0af7b1d21b8638e92922d0965e507c5d9)

diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt
index 9670f9ea0af6..44d7f91b2650 100644
--- a/l10ntools/source/ulfconv/msi-encodinglist.txt
+++ b/l10ntools/source/ulfconv/msi-encodinglist.txt
@@ -58,6 +58,7 @@ fi       0  1035
 fo       0  1080   # Faroese
 fr       0  1036
 fr-CA    0  3084
+fy       0  1122   # Frisian
 fur      0  1585
 ga       0  2108   # Irish
 gd       0  1084   # Gaelic (Scotland)
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 113f01906c5a..ca1c40b2a7db 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -40,6 +40,12 @@ en-US = "French"
 [STR_DESC_MODULE_LANGPACK_FR]
 en-US = "Installs the French user interface"
 
+[STR_NAME_MODULE_LANGPACK_FY]
+en-US = "Frisian"
+
+[STR_DESC_MODULE_LANGPACK_FY]
+en-US = "Installs the Frisian user interface"
+
 [STR_NAME_MODULE_LANGPACK_IT]
 en-US = "Italian"
 
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 41b557a420c4..d0c5cb5cba78 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -49,6 +49,7 @@ eu \
 fa \
 fi \
 fr \
+fy \
 ga \
 gd \
 gl \