[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - 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 22f53c0630661270ea8a4ca5864e03be96296ea1
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sun May 28 18:22:19 2017 +0200

    rdm#2247 enable Upper Sorbian for languagepack/UI
    
    Change-Id: Id497d8032668823c6db07eb179ad4484241b7285
    (cherry picked from commit 826f1bca40a01f0a249d5b6cbb7c39c11638a060)
    Reviewed-on: https://gerrit.libreoffice.org/38113
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt
index 9c85d9db78ff..9670f9ea0af6 100644
--- a/l10ntools/source/ulfconv/msi-encodinglist.txt
+++ b/l10ntools/source/ulfconv/msi-encodinglist.txt
@@ -70,6 +70,7 @@ hi       0  1081
 hr       0  1050   # Croatian
 ht       0  1626   # Haitian
 hu       0  1038
+hsb      0  1070   # Upper Sorbian
 hy       0  1067   # Armenian
 id       0  1057   # Indonesian
 is       0  1039   # Icelandic
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index de03f39267bf..113f01906c5a 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -100,6 +100,12 @@ en-US = "Dutch"
 [STR_DESC_MODULE_LANGPACK_NL]
 en-US = "Installs the Dutch user interface"
 
+[STR_NAME_MODULE_LANGPACK_HSB]
+en-US = "Upper Sorbian"
+
+[STR_DESC_MODULE_LANGPACK_HSB]
+en-US = "Installs the Upper Sorbian user interface"
+
 [STR_NAME_MODULE_LANGPACK_HU]
 en-US = "Hungarian"
 
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 2a1566e19fcb..41b557a420c4 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -55,6 +55,7 @@ gl \
 gu \
 gug \
 he \
+hsb \
 hi \
 hr \
 hu \