summaryrefslogtreecommitdiff
path: root/setup_native/source/win32/msi-encodinglist.txt
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-04-22 15:08:05 +0200
committerJan Holesovsky <kendy@suse.cz>2011-04-22 15:08:05 +0200
commit2554b31146823b9850d1e0c437bc75a2e8c95033 (patch)
tree106d014f2a58792ec1e258f5e5baddecb6adcf9f /setup_native/source/win32/msi-encodinglist.txt
parent0be571d9a673ab48fc7d3a94541c5720e0845016 (diff)
parente19358aa28e2a43134b49d1c37a27b6fa33ecc2f (diff)
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts: extensions/source/svg/svgaction.cxx extensions/source/svg/svgaction.hxx extensions/source/svg/svgcom.hxx extensions/source/svg/svgprinter.cxx extensions/source/svg/svgprinter.hxx extensions/source/svg/svguno.cxx extensions/source/svg/svgwriter.cxx extensions/source/svg/svgwriter.hxx javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java package/inc/ZipFile.hxx package/inc/ZipOutputStream.hxx package/inc/ZipPackage.hxx package/inc/ZipPackageStream.hxx package/source/manifest/ManifestExport.cxx package/source/manifest/ManifestImport.cxx package/source/manifest/UnoRegister.cxx package/source/xstor/owriteablestream.cxx package/source/xstor/xstorage.cxx package/source/xstor/xstorage.hxx package/source/zipapi/EntryInputStream.cxx package/source/zipapi/EntryInputStream.hxx package/source/zipapi/XFileStream.cxx package/source/zipapi/XFileStream.hxx package/source/zipapi/XMemoryStream.cxx package/source/zipapi/XUnbufferedStream.cxx package/source/zipapi/XUnbufferedStream.hxx package/source/zipapi/ZipFile.cxx package/source/zipapi/ZipOutputStream.cxx package/source/zipapi/sha1context.hxx package/source/zippackage/ZipPackage.cxx package/source/zippackage/ZipPackageFolder.cxx package/source/zippackage/ZipPackageStream.cxx setup_native/source/win32/customactions/shellextensions/registerextensions.cxx wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java xmlsecurity/prj/build.lst xmlsecurity/source/helper/xmlsignaturehelper.cxx xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
Diffstat (limited to 'setup_native/source/win32/msi-encodinglist.txt')
-rw-r--r--setup_native/source/win32/msi-encodinglist.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt
index 123339c3d9c5..fa99da814fe6 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -87,7 +87,6 @@ nl 1252 1043
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
@@ -134,6 +133,7 @@ ti-ER 0 1139 # Tigrinya
tn 0 1074 # Setsuana
tr 1254 1055 # Turkish
ts 0 1073 # Tsonga
+tk 0 1090
tt 1251 1092 # Tatar
ug 0 2200
uk 1251 1058 # Ukrainian