summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-03-23 16:58:53 +0100
committerJan Holesovsky <kendy@suse.cz>2011-03-23 16:58:53 +0100
commite8216218859b2a01a4e9b7f6ff07d79c06d8f444 (patch)
tree8bad69041e6324593f25224f01bcb15aea0876e4 /setup_native
parent227745b536e12358db1d92369ca5321ac53f44ef (diff)
parent7f9327e90e1e04325ad091f1e20995da4cb2e929 (diff)
Merge commit 'ooo/DEV300_m103'
Conflicts: package/source/zippackage/ZipPackageFolder.cxx
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/win32/msi-encodinglist.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt
index 27fbc9da68bf..f0b88cdf5369 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -36,6 +36,7 @@ fi 1252 1035
fo 1252 1080 # Faroese
fr 1252 1036
fr-CA 1252 3084
+fur 0 1585
ga 0 2108 # Irish
gd 0 1084 # Gaelic (Scotland)
gl 1252 1110 # Galician
@@ -51,7 +52,9 @@ id 1252 1057 # Indonesian
is 1252 1039 # Icelandic
it 1252 1040
ja 932 1041
+jbo 0 1624
ka 0 1079 # Georgian
+kab 0 1625
kid 1252 1033 # key id pseudo language
kk 0 1087
km 0 1107 # Khmer
@@ -84,6 +87,8 @@ nn 1252 2068
no 1252 1044
nr 0 1580 # Ndebele South
ns 0 1132 # Northern Sotho (Sepedi)
+nso 0 1132
+ny 0 1598
oc 1252 1154 # Occitan-lengadocian
om 0 2162
or 0 1096 # Oriya
@@ -116,6 +121,7 @@ st 0 1072 # Southern Sotho, Sutu
sv 1252 1053
sw 1252 1089 # Swahili
sw-TZ 1252 1089 # Swahili
+so 0 1143
ta 0 1097 # Tamil
ta-IN 0 1097 # Tamil
te 0 1098