diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:47:31 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:47:31 +0200 |
| commit | 9e5584a82633442467a53ccc08c3380070178a38 (patch) | |
| tree | 03ecad6d69523ff70217dd583ac757500135697d /i18npool/inc | |
| parent | Remove all traces of SvLongsSort (diff) | |
| parent | Add forgotten vcl/source/app/brand.cxx. (diff) | |
| download | core-9e5584a82633442467a53ccc08c3380070178a38.tar.gz core-9e5584a82633442467a53ccc08c3380070178a38.zip | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
cppcanvas/source/mtfrenderer/implrenderer.cxx
i18npool/inc/i18npool/lang.h
i18npool/source/isolang/isolang.cxx
svtools/source/filter/exportdialog.cxx
svtools/source/graphic/grfmgr.cxx
vcl/aqua/source/dtrans/aqua_service.cxx
vcl/aqua/source/window/salframe.cxx
vcl/inc/sft.hxx
vcl/inc/unx/pspgraphics.h
vcl/inc/vcl/cursor.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/settings.hxx
vcl/prj/d.lst
vcl/source/app/settings.cxx
vcl/source/control/edit.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/window/cursor.cxx
vcl/source/window/window.cxx
vcl/unx/generic/fontmanager/fontconfig.cxx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
vcl/unx/kde4/KDESalGraphics.cxx
Diffstat (limited to 'i18npool/inc')
| -rw-r--r-- | i18npool/inc/i18npool/lang.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h index 5d8066cc4e31..4f21704875fb 100644 --- a/i18npool/inc/i18npool/lang.h +++ b/i18npool/inc/i18npool/lang.h @@ -522,8 +522,16 @@ typedef unsigned short LanguageType; #define LANGUAGE_USER_LOJBAN 0x0658 /* no locale */ #define LANGUAGE_USER_KABYLE 0x0659 #define LANGUAGE_USER_HAITIAN 0x065A -#define LANGUAGE_USER_MANX 0x065B - +#define LANGUAGE_USER_BEEMBE 0x065B +#define LANGUAGE_USER_BEKWEL 0x065C +#define LANGUAGE_USER_KITUBA 0x065D +#define LANGUAGE_USER_LARI 0x065E +#define LANGUAGE_USER_MBOCHI 0x065F +#define LANGUAGE_USER_TEKE_IBALI 0x0660 +#define LANGUAGE_USER_TEKE_TYEE 0x0661 +#define LANGUAGE_USER_VILI 0x0662 +#define LANGUAGE_USER_PORTUGUESE_ANGOLA 0x8016 /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_PORTUGUESE)) */ +#define LANGUAGE_USER_MANX 0x0663 #endif /* INCLUDED_I18NPOOL_LANG_H */ |