[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - l10ntools/source

[Mike Kaganski (via logerrit)]

 l10ntools/source/ulfconv/msi-encodinglist.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 086701be50e9d95c67f6fdee97b4080419b55e61
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Apr 24 16:22:59 2019 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Thu Apr 25 03:05:26 2019 +0200

    tdf#124791: Fix Gaelic (Scotland) (gd-GB) LCID in MSI installer
    
    ... which was obviously omitted in commit
    6b678c135da07f34da1bf7b19562366361e95085, which introduced the correct
    value of 0x0491 (1169) in addition to the pre-existing 0x043C (1084).
    The new value is used when user sets relevant entry in Region and
    Language control panel applet (intl.cpl); having the old value in MSI
    summary information blocks auto-detection of proper installer language.
    
    [MS-LCID] Appendix A mentions that the new code is available since Win7,
    so we are good with the fix.
    
    [MS-LCID] https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/a9eac961-e77d-41a6-90a5-ce1a8b0cdb9c
    
    Co-authored-by: Eike Rathke <erack at redhat.com>
    
    Change-Id: Ic03b0e8eaf145c662fde48846cd5307e362d4d63
    Reviewed-on: https://gerrit.libreoffice.org/71242
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 5dea045b87a923654d6876acec947d973e0df4bc)
    Reviewed-on: https://gerrit.libreoffice.org/71250
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins

diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt
index 4116eca69a1e..96f87341ae13 100644
--- a/l10ntools/source/ulfconv/msi-encodinglist.txt
+++ b/l10ntools/source/ulfconv/msi-encodinglist.txt
@@ -62,7 +62,7 @@ fr-CA    0  3084
 fy       0  1122   # Frisian
 fur      0  1585
 ga       0  2108   # Irish
-gd       0  1084   # Gaelic (Scotland)
+gd       0  1169   # Gaelic (Scotland)
 gl       0  1110   # Galician
 gu       0  1095   # Gujarati
 gu-IN    0  1095   # Gujarati