Split intl.h into intl.h, language.h and translation.h.

To make the code more manageable, intl.h now contains wxLocale and translation.h all translations-related stuff (wxTranslations, _() etc.). Code generated by genlang.py was moved into its own files (language.h, languageinfo.cpp). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-24 07:06:32 +00:00
parent 18e065b48d
commit ea14492351
24 changed files with 4002 additions and 3557 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -389,6 +389,7 @@ ALL_BASE_HEADERS =  \
 	wx/ipc.h \
 	wx/ipcbase.h \
 	wx/kbdstate.h \
 	wx/language.h \
 	wx/link.h \
 	wx/list.h \
 	wx/listimpl.cpp \
@@ -440,6 +441,7 @@ ALL_BASE_HEADERS =  \
 	wx/tls.h \
 	wx/tokenzr.h \
 	wx/tracker.h \
 	wx/translation.h \
 	wx/txtstrm.h \
 	wx/typeinfo.h \
 	wx/types.h \
@@ -554,6 +556,7 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/ipc.h \
 	wx/ipcbase.h \
 	wx/kbdstate.h \
 	wx/language.h \
 	wx/link.h \
 	wx/list.h \
 	wx/listimpl.cpp \
@@ -605,6 +608,7 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/tls.h \
 	wx/tokenzr.h \
 	wx/tracker.h \
 	wx/translation.h \
 	wx/txtstrm.h \
 	wx/typeinfo.h \
 	wx/types.h \
@@ -731,6 +735,7 @@ ALL_BASE_SOURCES =  \
 	src/common/init.cpp \
 	src/common/intl.cpp \
 	src/common/ipcbase.cpp \
 	src/common/languageinfo.cpp \
 	src/common/list.cpp \
 	src/common/log.cpp \
 	src/common/longlong.cpp \
@@ -760,6 +765,7 @@ ALL_BASE_SOURCES =  \
 	src/common/timercmn.cpp \
 	src/common/timerimpl.cpp \
 	src/common/tokenzr.cpp \
 	src/common/translation.cpp \
 	src/common/txtstrm.cpp \
 	src/common/unichar.cpp \
 	src/common/uri.cpp \
@@ -927,6 +933,7 @@ MONODLL_OBJECTS =  \
 	monodll_init.o \
 	monodll_intl.o \
 	monodll_ipcbase.o \
 	monodll_languageinfo.o \
 	monodll_list.o \
 	monodll_log.o \
 	monodll_longlong.o \
@@ -956,6 +963,7 @@ MONODLL_OBJECTS =  \
 	monodll_timercmn.o \
 	monodll_timerimpl.o \
 	monodll_tokenzr.o \
 	monodll_translation.o \
 	monodll_txtstrm.o \
 	monodll_unichar.o \
 	monodll_uri.o \
@@ -1057,6 +1065,7 @@ MONOLIB_OBJECTS =  \
 	monolib_init.o \
 	monolib_intl.o \
 	monolib_ipcbase.o \
 	monolib_languageinfo.o \
 	monolib_list.o \
 	monolib_log.o \
 	monolib_longlong.o \
@@ -1086,6 +1095,7 @@ MONOLIB_OBJECTS =  \
 	monolib_timercmn.o \
 	monolib_timerimpl.o \
 	monolib_tokenzr.o \
 	monolib_translation.o \
 	monolib_txtstrm.o \
 	monolib_unichar.o \
 	monolib_uri.o \
@@ -1182,6 +1192,7 @@ BASEDLL_OBJECTS =  \
 	basedll_init.o \
 	basedll_intl.o \
 	basedll_ipcbase.o \
 	basedll_languageinfo.o \
 	basedll_list.o \
 	basedll_log.o \
 	basedll_longlong.o \
@@ -1211,6 +1222,7 @@ BASEDLL_OBJECTS =  \
 	basedll_timercmn.o \
 	basedll_timerimpl.o \
 	basedll_tokenzr.o \
 	basedll_translation.o \
 	basedll_txtstrm.o \
 	basedll_unichar.o \
 	basedll_uri.o \
@@ -1290,6 +1302,7 @@ BASELIB_OBJECTS =  \
 	baselib_init.o \
 	baselib_intl.o \
 	baselib_ipcbase.o \
 	baselib_languageinfo.o \
 	baselib_list.o \
 	baselib_log.o \
 	baselib_longlong.o \
@@ -1319,6 +1332,7 @@ BASELIB_OBJECTS =  \
 	baselib_timercmn.o \
 	baselib_timerimpl.o \
 	baselib_tokenzr.o \
 	baselib_translation.o \
 	baselib_txtstrm.o \
 	baselib_unichar.o \
 	baselib_uri.o \
@@ -14851,6 +14865,9 @@ monodll_intl.o: $(srcdir)/src/common/intl.cpp $(MONODLL_ODEP)
 monodll_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
 monodll_languageinfo.o: $(srcdir)/src/common/languageinfo.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/languageinfo.cpp
 monodll_list.o: $(srcdir)/src/common/list.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/list.cpp
@@ -14938,6 +14955,9 @@ monodll_timerimpl.o: $(srcdir)/src/common/timerimpl.cpp $(MONODLL_ODEP)
 monodll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
 monodll_translation.o: $(srcdir)/src/common/translation.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/translation.cpp
 monodll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
@@ -19699,6 +19719,9 @@ monolib_intl.o: $(srcdir)/src/common/intl.cpp $(MONOLIB_ODEP)
 monolib_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
 monolib_languageinfo.o: $(srcdir)/src/common/languageinfo.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/languageinfo.cpp
 monolib_list.o: $(srcdir)/src/common/list.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/list.cpp
@@ -19786,6 +19809,9 @@ monolib_timerimpl.o: $(srcdir)/src/common/timerimpl.cpp $(MONOLIB_ODEP)
 monolib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
 monolib_translation.o: $(srcdir)/src/common/translation.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/translation.cpp
 monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
@@ -24547,6 +24573,9 @@ basedll_intl.o: $(srcdir)/src/common/intl.cpp $(BASEDLL_ODEP)
 basedll_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
 basedll_languageinfo.o: $(srcdir)/src/common/languageinfo.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/languageinfo.cpp
 basedll_list.o: $(srcdir)/src/common/list.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/list.cpp
@@ -24634,6 +24663,9 @@ basedll_timerimpl.o: $(srcdir)/src/common/timerimpl.cpp $(BASEDLL_ODEP)
 basedll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
 basedll_translation.o: $(srcdir)/src/common/translation.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/translation.cpp
 basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
@@ -25042,6 +25074,9 @@ baselib_intl.o: $(srcdir)/src/common/intl.cpp $(BASELIB_ODEP)
 baselib_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
 baselib_languageinfo.o: $(srcdir)/src/common/languageinfo.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/languageinfo.cpp
 baselib_list.o: $(srcdir)/src/common/list.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/list.cpp
@@ -25129,6 +25164,9 @@ baselib_timerimpl.o: $(srcdir)/src/common/timerimpl.cpp $(BASELIB_ODEP)
 baselib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
 baselib_translation.o: $(srcdir)/src/common/translation.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/translation.cpp
 baselib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -350,6 +350,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/common/init.cpp
    src/common/intl.cpp
    src/common/ipcbase.cpp
    src/common/languageinfo.cpp
    src/common/list.cpp
    src/common/log.cpp
    src/common/longlong.cpp
@@ -379,6 +380,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/common/timercmn.cpp
    src/common/timerimpl.cpp
    src/common/tokenzr.cpp
    src/common/translation.cpp
    src/common/txtstrm.cpp
    src/common/unichar.cpp
    src/common/uri.cpp
@@ -468,6 +470,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/ipc.h
    wx/ipcbase.h
    wx/kbdstate.h
    wx/language.h
    wx/link.h
    wx/list.h
    wx/listimpl.cpp
@@ -519,6 +522,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/tls.h
    wx/tokenzr.h
    wx/tracker.h
    wx/translation.h
    wx/txtstrm.h
    wx/typeinfo.h
    wx/types.h
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -362,6 +362,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_init.obj \
 	$(OBJS)\monodll_intl.obj \
 	$(OBJS)\monodll_ipcbase.obj \
 	$(OBJS)\monodll_languageinfo.obj \
 	$(OBJS)\monodll_list.obj \
 	$(OBJS)\monodll_log.obj \
 	$(OBJS)\monodll_longlong.obj \
@@ -391,6 +392,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_timercmn.obj \
 	$(OBJS)\monodll_timerimpl.obj \
 	$(OBJS)\monodll_tokenzr.obj \
 	$(OBJS)\monodll_translation.obj \
 	$(OBJS)\monodll_txtstrm.obj \
 	$(OBJS)\monodll_unichar.obj \
 	$(OBJS)\monodll_uri.obj \
@@ -507,6 +509,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_init.obj \
 	$(OBJS)\monolib_intl.obj \
 	$(OBJS)\monolib_ipcbase.obj \
 	$(OBJS)\monolib_languageinfo.obj \
 	$(OBJS)\monolib_list.obj \
 	$(OBJS)\monolib_log.obj \
 	$(OBJS)\monolib_longlong.obj \
@@ -536,6 +539,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_timercmn.obj \
 	$(OBJS)\monolib_timerimpl.obj \
 	$(OBJS)\monolib_tokenzr.obj \
 	$(OBJS)\monolib_translation.obj \
 	$(OBJS)\monolib_txtstrm.obj \
 	$(OBJS)\monolib_unichar.obj \
 	$(OBJS)\monolib_uri.obj \
@@ -650,6 +654,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_init.obj \
 	$(OBJS)\basedll_intl.obj \
 	$(OBJS)\basedll_ipcbase.obj \
 	$(OBJS)\basedll_languageinfo.obj \
 	$(OBJS)\basedll_list.obj \
 	$(OBJS)\basedll_log.obj \
 	$(OBJS)\basedll_longlong.obj \
@@ -679,6 +684,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_timercmn.obj \
 	$(OBJS)\basedll_timerimpl.obj \
 	$(OBJS)\basedll_tokenzr.obj \
 	$(OBJS)\basedll_translation.obj \
 	$(OBJS)\basedll_txtstrm.obj \
 	$(OBJS)\basedll_unichar.obj \
 	$(OBJS)\basedll_uri.obj \
@@ -777,6 +783,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_init.obj \
 	$(OBJS)\baselib_intl.obj \
 	$(OBJS)\baselib_ipcbase.obj \
 	$(OBJS)\baselib_languageinfo.obj \
 	$(OBJS)\baselib_list.obj \
 	$(OBJS)\baselib_log.obj \
 	$(OBJS)\baselib_longlong.obj \
@@ -806,6 +813,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_timercmn.obj \
 	$(OBJS)\baselib_timerimpl.obj \
 	$(OBJS)\baselib_tokenzr.obj \
 	$(OBJS)\baselib_translation.obj \
 	$(OBJS)\baselib_txtstrm.obj \
 	$(OBJS)\baselib_unichar.obj \
 	$(OBJS)\baselib_uri.obj \
@@ -5776,6 +5784,9 @@ $(OBJS)\monodll_intl.obj: ..\..\src\common\intl.cpp
 $(OBJS)\monodll_ipcbase.obj: ..\..\src\common\ipcbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ipcbase.cpp
 $(OBJS)\monodll_languageinfo.obj: ..\..\src\common\languageinfo.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\languageinfo.cpp
 $(OBJS)\monodll_list.obj: ..\..\src\common\list.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\list.cpp
@@ -5863,6 +5874,9 @@ $(OBJS)\monodll_timerimpl.obj: ..\..\src\common\timerimpl.cpp
 $(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tokenzr.cpp
 $(OBJS)\monodll_translation.obj: ..\..\src\common\translation.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\translation.cpp
 $(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\txtstrm.cpp
@@ -7966,6 +7980,9 @@ $(OBJS)\monolib_intl.obj: ..\..\src\common\intl.cpp
 $(OBJS)\monolib_ipcbase.obj: ..\..\src\common\ipcbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp
 $(OBJS)\monolib_languageinfo.obj: ..\..\src\common\languageinfo.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\languageinfo.cpp
 $(OBJS)\monolib_list.obj: ..\..\src\common\list.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\list.cpp
@@ -8053,6 +8070,9 @@ $(OBJS)\monolib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
 $(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp
 $(OBJS)\monolib_translation.obj: ..\..\src\common\translation.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\translation.cpp
 $(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp
@@ -10156,6 +10176,9 @@ $(OBJS)\basedll_intl.obj: ..\..\src\common\intl.cpp
 $(OBJS)\basedll_ipcbase.obj: ..\..\src\common\ipcbase.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ipcbase.cpp
 $(OBJS)\basedll_languageinfo.obj: ..\..\src\common\languageinfo.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\languageinfo.cpp
 $(OBJS)\basedll_list.obj: ..\..\src\common\list.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\list.cpp
@@ -10243,6 +10266,9 @@ $(OBJS)\basedll_timerimpl.obj: ..\..\src\common\timerimpl.cpp
 $(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\tokenzr.cpp
 $(OBJS)\basedll_translation.obj: ..\..\src\common\translation.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\translation.cpp
 $(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\txtstrm.cpp
@@ -10483,6 +10509,9 @@ $(OBJS)\baselib_intl.obj: ..\..\src\common\intl.cpp
 $(OBJS)\baselib_ipcbase.obj: ..\..\src\common\ipcbase.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp
 $(OBJS)\baselib_languageinfo.obj: ..\..\src\common\languageinfo.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\languageinfo.cpp
 $(OBJS)\baselib_list.obj: ..\..\src\common\list.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\list.cpp
@@ -10570,6 +10599,9 @@ $(OBJS)\baselib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
 $(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp
 $(OBJS)\baselib_translation.obj: ..\..\src\common\translation.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\translation.cpp
 $(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -349,6 +349,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_init.o \
 	$(OBJS)\monodll_intl.o \
 	$(OBJS)\monodll_ipcbase.o \
 	$(OBJS)\monodll_languageinfo.o \
 	$(OBJS)\monodll_list.o \
 	$(OBJS)\monodll_log.o \
 	$(OBJS)\monodll_longlong.o \
@@ -378,6 +379,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_timercmn.o \
 	$(OBJS)\monodll_timerimpl.o \
 	$(OBJS)\monodll_tokenzr.o \
 	$(OBJS)\monodll_translation.o \
 	$(OBJS)\monodll_txtstrm.o \
 	$(OBJS)\monodll_unichar.o \
 	$(OBJS)\monodll_uri.o \
@@ -495,6 +497,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_init.o \
 	$(OBJS)\monolib_intl.o \
 	$(OBJS)\monolib_ipcbase.o \
 	$(OBJS)\monolib_languageinfo.o \
 	$(OBJS)\monolib_list.o \
 	$(OBJS)\monolib_log.o \
 	$(OBJS)\monolib_longlong.o \
@@ -524,6 +527,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_timercmn.o \
 	$(OBJS)\monolib_timerimpl.o \
 	$(OBJS)\monolib_tokenzr.o \
 	$(OBJS)\monolib_translation.o \
 	$(OBJS)\monolib_txtstrm.o \
 	$(OBJS)\monolib_unichar.o \
 	$(OBJS)\monolib_uri.o \
@@ -639,6 +643,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_init.o \
 	$(OBJS)\basedll_intl.o \
 	$(OBJS)\basedll_ipcbase.o \
 	$(OBJS)\basedll_languageinfo.o \
 	$(OBJS)\basedll_list.o \
 	$(OBJS)\basedll_log.o \
 	$(OBJS)\basedll_longlong.o \
@@ -668,6 +673,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_timercmn.o \
 	$(OBJS)\basedll_timerimpl.o \
 	$(OBJS)\basedll_tokenzr.o \
 	$(OBJS)\basedll_translation.o \
 	$(OBJS)\basedll_txtstrm.o \
 	$(OBJS)\basedll_unichar.o \
 	$(OBJS)\basedll_uri.o \
@@ -767,6 +773,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_init.o \
 	$(OBJS)\baselib_intl.o \
 	$(OBJS)\baselib_ipcbase.o \
 	$(OBJS)\baselib_languageinfo.o \
 	$(OBJS)\baselib_list.o \
 	$(OBJS)\baselib_log.o \
 	$(OBJS)\baselib_longlong.o \
@@ -796,6 +803,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_timercmn.o \
 	$(OBJS)\baselib_timerimpl.o \
 	$(OBJS)\baselib_tokenzr.o \
 	$(OBJS)\baselib_translation.o \
 	$(OBJS)\baselib_txtstrm.o \
 	$(OBJS)\baselib_unichar.o \
 	$(OBJS)\baselib_uri.o \
@@ -5925,6 +5933,9 @@ $(OBJS)\monodll_intl.o: ../../src/common/intl.cpp
 $(OBJS)\monodll_ipcbase.o: ../../src/common/ipcbase.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\monodll_languageinfo.o: ../../src/common/languageinfo.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\monodll_list.o: ../../src/common/list.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -6012,6 +6023,9 @@ $(OBJS)\monodll_timerimpl.o: ../../src/common/timerimpl.cpp
 $(OBJS)\monodll_tokenzr.o: ../../src/common/tokenzr.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\monodll_translation.o: ../../src/common/translation.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\monodll_txtstrm.o: ../../src/common/txtstrm.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8115,6 +8129,9 @@ $(OBJS)\monolib_intl.o: ../../src/common/intl.cpp
 $(OBJS)\monolib_ipcbase.o: ../../src/common/ipcbase.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\monolib_languageinfo.o: ../../src/common/languageinfo.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\monolib_list.o: ../../src/common/list.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -8202,6 +8219,9 @@ $(OBJS)\monolib_timerimpl.o: ../../src/common/timerimpl.cpp
 $(OBJS)\monolib_tokenzr.o: ../../src/common/tokenzr.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\monolib_translation.o: ../../src/common/translation.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\monolib_txtstrm.o: ../../src/common/txtstrm.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10305,6 +10325,9 @@ $(OBJS)\basedll_intl.o: ../../src/common/intl.cpp
 $(OBJS)\basedll_ipcbase.o: ../../src/common/ipcbase.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\basedll_languageinfo.o: ../../src/common/languageinfo.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\basedll_list.o: ../../src/common/list.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10392,6 +10415,9 @@ $(OBJS)\basedll_timerimpl.o: ../../src/common/timerimpl.cpp
 $(OBJS)\basedll_tokenzr.o: ../../src/common/tokenzr.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\basedll_translation.o: ../../src/common/translation.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\basedll_txtstrm.o: ../../src/common/txtstrm.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10632,6 +10658,9 @@ $(OBJS)\baselib_intl.o: ../../src/common/intl.cpp
 $(OBJS)\baselib_ipcbase.o: ../../src/common/ipcbase.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\baselib_languageinfo.o: ../../src/common/languageinfo.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\baselib_list.o: ../../src/common/list.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10719,6 +10748,9 @@ $(OBJS)\baselib_timerimpl.o: ../../src/common/timerimpl.cpp
 $(OBJS)\baselib_tokenzr.o: ../../src/common/tokenzr.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\baselib_translation.o: ../../src/common/translation.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 $(OBJS)\baselib_txtstrm.o: ../../src/common/txtstrm.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -366,6 +366,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_init.obj \
 	$(OBJS)\monodll_intl.obj \
 	$(OBJS)\monodll_ipcbase.obj \
 	$(OBJS)\monodll_languageinfo.obj \
 	$(OBJS)\monodll_list.obj \
 	$(OBJS)\monodll_log.obj \
 	$(OBJS)\monodll_longlong.obj \
@@ -395,6 +396,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_timercmn.obj \
 	$(OBJS)\monodll_timerimpl.obj \
 	$(OBJS)\monodll_tokenzr.obj \
 	$(OBJS)\monodll_translation.obj \
 	$(OBJS)\monodll_txtstrm.obj \
 	$(OBJS)\monodll_unichar.obj \
 	$(OBJS)\monodll_uri.obj \
@@ -518,6 +520,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_init.obj \
 	$(OBJS)\monolib_intl.obj \
 	$(OBJS)\monolib_ipcbase.obj \
 	$(OBJS)\monolib_languageinfo.obj \
 	$(OBJS)\monolib_list.obj \
 	$(OBJS)\monolib_log.obj \
 	$(OBJS)\monolib_longlong.obj \
@@ -547,6 +550,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_timercmn.obj \
 	$(OBJS)\monolib_timerimpl.obj \
 	$(OBJS)\monolib_tokenzr.obj \
 	$(OBJS)\monolib_translation.obj \
 	$(OBJS)\monolib_txtstrm.obj \
 	$(OBJS)\monolib_unichar.obj \
 	$(OBJS)\monolib_uri.obj \
@@ -666,6 +670,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_init.obj \
 	$(OBJS)\basedll_intl.obj \
 	$(OBJS)\basedll_ipcbase.obj \
 	$(OBJS)\basedll_languageinfo.obj \
 	$(OBJS)\basedll_list.obj \
 	$(OBJS)\basedll_log.obj \
 	$(OBJS)\basedll_longlong.obj \
@@ -695,6 +700,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_timercmn.obj \
 	$(OBJS)\basedll_timerimpl.obj \
 	$(OBJS)\basedll_tokenzr.obj \
 	$(OBJS)\basedll_translation.obj \
 	$(OBJS)\basedll_txtstrm.obj \
 	$(OBJS)\basedll_unichar.obj \
 	$(OBJS)\basedll_uri.obj \
@@ -800,6 +806,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_init.obj \
 	$(OBJS)\baselib_intl.obj \
 	$(OBJS)\baselib_ipcbase.obj \
 	$(OBJS)\baselib_languageinfo.obj \
 	$(OBJS)\baselib_list.obj \
 	$(OBJS)\baselib_log.obj \
 	$(OBJS)\baselib_longlong.obj \
@@ -829,6 +836,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_timercmn.obj \
 	$(OBJS)\baselib_timerimpl.obj \
 	$(OBJS)\baselib_tokenzr.obj \
 	$(OBJS)\baselib_translation.obj \
 	$(OBJS)\baselib_txtstrm.obj \
 	$(OBJS)\baselib_unichar.obj \
 	$(OBJS)\baselib_uri.obj \
@@ -6356,6 +6364,9 @@ $(OBJS)\monodll_intl.obj: ..\..\src\common\intl.cpp
 $(OBJS)\monodll_ipcbase.obj: ..\..\src\common\ipcbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ipcbase.cpp
 $(OBJS)\monodll_languageinfo.obj: ..\..\src\common\languageinfo.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\languageinfo.cpp
 $(OBJS)\monodll_list.obj: ..\..\src\common\list.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\list.cpp
@@ -6443,6 +6454,9 @@ $(OBJS)\monodll_timerimpl.obj: ..\..\src\common\timerimpl.cpp
 $(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tokenzr.cpp
 $(OBJS)\monodll_translation.obj: ..\..\src\common\translation.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\translation.cpp
 $(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\txtstrm.cpp
@@ -8546,6 +8560,9 @@ $(OBJS)\monolib_intl.obj: ..\..\src\common\intl.cpp
 $(OBJS)\monolib_ipcbase.obj: ..\..\src\common\ipcbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp
 $(OBJS)\monolib_languageinfo.obj: ..\..\src\common\languageinfo.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\languageinfo.cpp
 $(OBJS)\monolib_list.obj: ..\..\src\common\list.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\list.cpp
@@ -8633,6 +8650,9 @@ $(OBJS)\monolib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
 $(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp
 $(OBJS)\monolib_translation.obj: ..\..\src\common\translation.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\translation.cpp
 $(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp
@@ -10736,6 +10756,9 @@ $(OBJS)\basedll_intl.obj: ..\..\src\common\intl.cpp
 $(OBJS)\basedll_ipcbase.obj: ..\..\src\common\ipcbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ipcbase.cpp
 $(OBJS)\basedll_languageinfo.obj: ..\..\src\common\languageinfo.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\languageinfo.cpp
 $(OBJS)\basedll_list.obj: ..\..\src\common\list.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\list.cpp
@@ -10823,6 +10846,9 @@ $(OBJS)\basedll_timerimpl.obj: ..\..\src\common\timerimpl.cpp
 $(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\tokenzr.cpp
 $(OBJS)\basedll_translation.obj: ..\..\src\common\translation.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\translation.cpp
 $(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\txtstrm.cpp
@@ -11063,6 +11089,9 @@ $(OBJS)\baselib_intl.obj: ..\..\src\common\intl.cpp
 $(OBJS)\baselib_ipcbase.obj: ..\..\src\common\ipcbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp
 $(OBJS)\baselib_languageinfo.obj: ..\..\src\common\languageinfo.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\languageinfo.cpp
 $(OBJS)\baselib_list.obj: ..\..\src\common\list.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\list.cpp
@@ -11150,6 +11179,9 @@ $(OBJS)\baselib_timerimpl.obj: ..\..\src\common\timerimpl.cpp
 $(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp
 $(OBJS)\baselib_translation.obj: ..\..\src\common\translation.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\translation.cpp
 $(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -3557,6 +3557,7 @@ MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_init.obj &
 	$(OBJS)\monodll_intl.obj &
 	$(OBJS)\monodll_ipcbase.obj &
 	$(OBJS)\monodll_languageinfo.obj &
 	$(OBJS)\monodll_list.obj &
 	$(OBJS)\monodll_log.obj &
 	$(OBJS)\monodll_longlong.obj &
@@ -3586,6 +3587,7 @@ MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_timercmn.obj &
 	$(OBJS)\monodll_timerimpl.obj &
 	$(OBJS)\monodll_tokenzr.obj &
 	$(OBJS)\monodll_translation.obj &
 	$(OBJS)\monodll_txtstrm.obj &
 	$(OBJS)\monodll_unichar.obj &
 	$(OBJS)\monodll_uri.obj &
@@ -3701,6 +3703,7 @@ MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_init.obj &
 	$(OBJS)\monolib_intl.obj &
 	$(OBJS)\monolib_ipcbase.obj &
 	$(OBJS)\monolib_languageinfo.obj &
 	$(OBJS)\monolib_list.obj &
 	$(OBJS)\monolib_log.obj &
 	$(OBJS)\monolib_longlong.obj &
@@ -3730,6 +3733,7 @@ MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_timercmn.obj &
 	$(OBJS)\monolib_timerimpl.obj &
 	$(OBJS)\monolib_tokenzr.obj &
 	$(OBJS)\monolib_translation.obj &
 	$(OBJS)\monolib_txtstrm.obj &
 	$(OBJS)\monolib_unichar.obj &
 	$(OBJS)\monolib_uri.obj &
@@ -3843,6 +3847,7 @@ BASEDLL_OBJECTS =  &
 	$(OBJS)\basedll_init.obj &
 	$(OBJS)\basedll_intl.obj &
 	$(OBJS)\basedll_ipcbase.obj &
 	$(OBJS)\basedll_languageinfo.obj &
 	$(OBJS)\basedll_list.obj &
 	$(OBJS)\basedll_log.obj &
 	$(OBJS)\basedll_longlong.obj &
@@ -3872,6 +3877,7 @@ BASEDLL_OBJECTS =  &
 	$(OBJS)\basedll_timercmn.obj &
 	$(OBJS)\basedll_timerimpl.obj &
 	$(OBJS)\basedll_tokenzr.obj &
 	$(OBJS)\basedll_translation.obj &
 	$(OBJS)\basedll_txtstrm.obj &
 	$(OBJS)\basedll_unichar.obj &
 	$(OBJS)\basedll_uri.obj &
@@ -3970,6 +3976,7 @@ BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_init.obj &
 	$(OBJS)\baselib_intl.obj &
 	$(OBJS)\baselib_ipcbase.obj &
 	$(OBJS)\baselib_languageinfo.obj &
 	$(OBJS)\baselib_list.obj &
 	$(OBJS)\baselib_log.obj &
 	$(OBJS)\baselib_longlong.obj &
@@ -3999,6 +4006,7 @@ BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_timercmn.obj &
 	$(OBJS)\baselib_timerimpl.obj &
 	$(OBJS)\baselib_tokenzr.obj &
 	$(OBJS)\baselib_translation.obj &
 	$(OBJS)\baselib_txtstrm.obj &
 	$(OBJS)\baselib_unichar.obj &
 	$(OBJS)\baselib_uri.obj &
@@ -6183,6 +6191,9 @@ $(OBJS)\monodll_intl.obj :  .AUTODEPEND ..\..\src\common\intl.cpp
 $(OBJS)\monodll_ipcbase.obj :  .AUTODEPEND ..\..\src\common\ipcbase.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 $(OBJS)\monodll_languageinfo.obj :  .AUTODEPEND ..\..\src\common\languageinfo.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 $(OBJS)\monodll_list.obj :  .AUTODEPEND ..\..\src\common\list.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6270,6 +6281,9 @@ $(OBJS)\monodll_timerimpl.obj :  .AUTODEPEND ..\..\src\common\timerimpl.cpp
 $(OBJS)\monodll_tokenzr.obj :  .AUTODEPEND ..\..\src\common\tokenzr.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 $(OBJS)\monodll_translation.obj :  .AUTODEPEND ..\..\src\common\translation.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 $(OBJS)\monodll_txtstrm.obj :  .AUTODEPEND ..\..\src\common\txtstrm.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -8373,6 +8387,9 @@ $(OBJS)\monolib_intl.obj :  .AUTODEPEND ..\..\src\common\intl.cpp
 $(OBJS)\monolib_ipcbase.obj :  .AUTODEPEND ..\..\src\common\ipcbase.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 $(OBJS)\monolib_languageinfo.obj :  .AUTODEPEND ..\..\src\common\languageinfo.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 $(OBJS)\monolib_list.obj :  .AUTODEPEND ..\..\src\common\list.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8460,6 +8477,9 @@ $(OBJS)\monolib_timerimpl.obj :  .AUTODEPEND ..\..\src\common\timerimpl.cpp
 $(OBJS)\monolib_tokenzr.obj :  .AUTODEPEND ..\..\src\common\tokenzr.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 $(OBJS)\monolib_translation.obj :  .AUTODEPEND ..\..\src\common\translation.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 $(OBJS)\monolib_txtstrm.obj :  .AUTODEPEND ..\..\src\common\txtstrm.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -10563,6 +10583,9 @@ $(OBJS)\basedll_intl.obj :  .AUTODEPEND ..\..\src\common\intl.cpp
 $(OBJS)\basedll_ipcbase.obj :  .AUTODEPEND ..\..\src\common\ipcbase.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 $(OBJS)\basedll_languageinfo.obj :  .AUTODEPEND ..\..\src\common\languageinfo.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 $(OBJS)\basedll_list.obj :  .AUTODEPEND ..\..\src\common\list.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
@@ -10650,6 +10673,9 @@ $(OBJS)\basedll_timerimpl.obj :  .AUTODEPEND ..\..\src\common\timerimpl.cpp
 $(OBJS)\basedll_tokenzr.obj :  .AUTODEPEND ..\..\src\common\tokenzr.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 $(OBJS)\basedll_translation.obj :  .AUTODEPEND ..\..\src\common\translation.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 $(OBJS)\basedll_txtstrm.obj :  .AUTODEPEND ..\..\src\common\txtstrm.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
@@ -10890,6 +10916,9 @@ $(OBJS)\baselib_intl.obj :  .AUTODEPEND ..\..\src\common\intl.cpp
 $(OBJS)\baselib_ipcbase.obj :  .AUTODEPEND ..\..\src\common\ipcbase.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 $(OBJS)\baselib_languageinfo.obj :  .AUTODEPEND ..\..\src\common\languageinfo.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 $(OBJS)\baselib_list.obj :  .AUTODEPEND ..\..\src\common\list.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
@@ -10977,6 +11006,9 @@ $(OBJS)\baselib_timerimpl.obj :  .AUTODEPEND ..\..\src\common\timerimpl.cpp
 $(OBJS)\baselib_tokenzr.obj :  .AUTODEPEND ..\..\src\common\tokenzr.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 $(OBJS)\baselib_translation.obj :  .AUTODEPEND ..\..\src\common\translation.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 $(OBJS)\baselib_txtstrm.obj :  .AUTODEPEND ..\..\src\common\txtstrm.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -415,6 +415,10 @@ SOURCE=..\..\src\common\ipcbase.cpp
 # End Source File
 # Begin Source File
 SOURCE=..\..\src\common\languageinfo.cpp
 # End Source File
 # Begin Source File
 SOURCE=..\..\src\common\list.cpp
 # End Source File
 # Begin Source File
@@ -535,6 +539,10 @@ SOURCE=..\..\src\common\tokenzr.cpp
 # End Source File
 # Begin Source File
 SOURCE=..\..\src\common\translation.cpp
 # End Source File
 # Begin Source File
 SOURCE=..\..\src\common\txtstrm.cpp
 # End Source File
 # Begin Source File
@@ -1339,6 +1347,10 @@ SOURCE=..\..\include\wx\kbdstate.h
 # End Source File
 # Begin Source File
 SOURCE=..\..\include\wx\language.h
 # End Source File
 # Begin Source File
 SOURCE=..\..\include\wx\link.h
 # End Source File
 # Begin Source File
@@ -1539,6 +1551,10 @@ SOURCE=..\..\include\wx\tracker.h
 # End Source File
 # Begin Source File
 SOURCE=..\..\include\wx\translation.h
 # End Source File
 # Begin Source File
 SOURCE=..\..\include\wx\txtstrm.h
 # End Source File
 # Begin Source File
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -750,6 +750,9 @@
 			<File
 				RelativePath="..\..\src\common\ipcbase.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\common\languageinfo.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\common\list.cpp">
 			</File>
@@ -840,6 +843,9 @@
 			<File
 				RelativePath="..\..\src\common\tokenzr.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\common\translation.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\common\txtstrm.cpp">
 			</File>
@@ -1436,6 +1442,9 @@
 			<File
 				RelativePath="..\..\include\wx\kbdstate.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\language.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\link.h">
 			</File>
@@ -1586,6 +1595,9 @@
 			<File
 				RelativePath="..\..\include\wx\tracker.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\translation.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\txtstrm.h">
 			</File>
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -1034,6 +1034,10 @@
 				RelativePath="..\..\src\common\ipcbase.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\common\languageinfo.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\common\list.cpp"
 				>
@@ -1154,6 +1158,10 @@
 				RelativePath="..\..\src\common\tokenzr.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\common\translation.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\common\txtstrm.cpp"
 				>
@@ -1933,6 +1941,10 @@
 				RelativePath="..\..\include\wx\kbdstate.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\language.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\link.h"
 				>
@@ -2133,6 +2145,10 @@
 				RelativePath="..\..\include\wx\tracker.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\translation.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\txtstrm.h"
 				>
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -1030,6 +1030,10 @@
 				RelativePath="..\..\src\common\ipcbase.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\common\languageinfo.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\common\list.cpp"
 				>
@@ -1150,6 +1154,10 @@
 				RelativePath="..\..\src\common\tokenzr.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\common\translation.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\common\txtstrm.cpp"
 				>
@@ -1929,6 +1937,10 @@
 				RelativePath="..\..\include\wx\kbdstate.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\language.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\link.h"
 				>
@@ -2129,6 +2141,10 @@
 				RelativePath="..\..\include\wx\tracker.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\translation.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\txtstrm.h"
 				>
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -10,18 +10,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // WARNING: Parts of this file are generated. See misc/languages/README for
 // details.
 #ifndef _WX_INTL_H_
 #define _WX_INTL_H_
 #include "wx/defs.h"
 #include "wx/string.h"
-
+#include "wx/translation.h"
 #if !wxUSE_UNICODE
    #include "wx/hashmap.h"
 #endif
 // Make wxLayoutDirection enum available without need for wxUSE_INTL so wxWindow, wxApp
 // and other classes are not distrubed by wxUSE_INTL
@@ -36,6 +30,7 @@ enum wxLayoutDirection
 #if wxUSE_INTL
 #include "wx/fontenc.h"
 #include "wx/language.h"
 // ============================================================================
 // global decls
@@ -45,289 +40,17 @@ enum wxLayoutDirection
 // macros
 // ----------------------------------------------------------------------------
 // gettext() style macros (notice that xgettext should be invoked with
 // --keyword="_" --keyword="wxPLURAL:1,2" options
 // to extract the strings from the sources)
 #ifndef WXINTL_NO_GETTEXT_MACRO
    #define _(s)                     wxGetTranslation((s))
    #define wxPLURAL(sing, plur, n)  wxGetTranslation((sing), (plur), n)
 #endif
 // another one which just marks the strings for extraction, but doesn't
 // perform the translation (use -kwxTRANSLATE with xgettext!)
 #define wxTRANSLATE(str) str
 // ----------------------------------------------------------------------------
 // forward decls
 // ----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_BASE wxTranslationsLoader;
 class WXDLLIMPEXP_FWD_BASE wxLocale;
 class WXDLLIMPEXP_FWD_BASE wxLanguageInfoArray;
 class wxMsgCatalog;
 // ============================================================================
 // locale support
 // ============================================================================
 // ----------------------------------------------------------------------------
 // wxLanguage: defines all supported languages
 // ----------------------------------------------------------------------------
 // --- --- --- generated code begins here --- --- ---
 /**
    The languages supported by wxLocale.
    This enum is generated by misc/languages/genlang.py
    When making changes, please put them into misc/languages/langtabl.txt
 */
 enum wxLanguage
 {
    /// User's default/preffered language as got from OS.
    wxLANGUAGE_DEFAULT,
    /// Unknown language, returned if wxLocale::GetSystemLanguage fails.
    wxLANGUAGE_UNKNOWN,
    wxLANGUAGE_ABKHAZIAN,
    wxLANGUAGE_AFAR,
    wxLANGUAGE_AFRIKAANS,
    wxLANGUAGE_ALBANIAN,
    wxLANGUAGE_AMHARIC,
    wxLANGUAGE_ARABIC,
    wxLANGUAGE_ARABIC_ALGERIA,
    wxLANGUAGE_ARABIC_BAHRAIN,
    wxLANGUAGE_ARABIC_EGYPT,
    wxLANGUAGE_ARABIC_IRAQ,
    wxLANGUAGE_ARABIC_JORDAN,
    wxLANGUAGE_ARABIC_KUWAIT,
    wxLANGUAGE_ARABIC_LEBANON,
    wxLANGUAGE_ARABIC_LIBYA,
    wxLANGUAGE_ARABIC_MOROCCO,
    wxLANGUAGE_ARABIC_OMAN,
    wxLANGUAGE_ARABIC_QATAR,
    wxLANGUAGE_ARABIC_SAUDI_ARABIA,
    wxLANGUAGE_ARABIC_SUDAN,
    wxLANGUAGE_ARABIC_SYRIA,
    wxLANGUAGE_ARABIC_TUNISIA,
    wxLANGUAGE_ARABIC_UAE,
    wxLANGUAGE_ARABIC_YEMEN,
    wxLANGUAGE_ARMENIAN,
    wxLANGUAGE_ASSAMESE,
    wxLANGUAGE_ASTURIAN,
    wxLANGUAGE_AYMARA,
    wxLANGUAGE_AZERI,
    wxLANGUAGE_AZERI_CYRILLIC,
    wxLANGUAGE_AZERI_LATIN,
    wxLANGUAGE_BASHKIR,
    wxLANGUAGE_BASQUE,
    wxLANGUAGE_BELARUSIAN,
    wxLANGUAGE_BENGALI,
    wxLANGUAGE_BHUTANI,
    wxLANGUAGE_BIHARI,
    wxLANGUAGE_BISLAMA,
    wxLANGUAGE_BRETON,
    wxLANGUAGE_BULGARIAN,
    wxLANGUAGE_BURMESE,
    wxLANGUAGE_CAMBODIAN,
    wxLANGUAGE_CATALAN,
    wxLANGUAGE_CHINESE,
    wxLANGUAGE_CHINESE_SIMPLIFIED,
    wxLANGUAGE_CHINESE_TRADITIONAL,
    wxLANGUAGE_CHINESE_HONGKONG,
    wxLANGUAGE_CHINESE_MACAU,
    wxLANGUAGE_CHINESE_SINGAPORE,
    wxLANGUAGE_CHINESE_TAIWAN,
    wxLANGUAGE_CORSICAN,
    wxLANGUAGE_CROATIAN,
    wxLANGUAGE_CZECH,
    wxLANGUAGE_DANISH,
    wxLANGUAGE_DUTCH,
    wxLANGUAGE_DUTCH_BELGIAN,
    wxLANGUAGE_ENGLISH,
    wxLANGUAGE_ENGLISH_UK,
    wxLANGUAGE_ENGLISH_US,
    wxLANGUAGE_ENGLISH_AUSTRALIA,
    wxLANGUAGE_ENGLISH_BELIZE,
    wxLANGUAGE_ENGLISH_BOTSWANA,
    wxLANGUAGE_ENGLISH_CANADA,
    wxLANGUAGE_ENGLISH_CARIBBEAN,
    wxLANGUAGE_ENGLISH_DENMARK,
    wxLANGUAGE_ENGLISH_EIRE,
    wxLANGUAGE_ENGLISH_JAMAICA,
    wxLANGUAGE_ENGLISH_NEW_ZEALAND,
    wxLANGUAGE_ENGLISH_PHILIPPINES,
    wxLANGUAGE_ENGLISH_SOUTH_AFRICA,
    wxLANGUAGE_ENGLISH_TRINIDAD,
    wxLANGUAGE_ENGLISH_ZIMBABWE,
    wxLANGUAGE_ESPERANTO,
    wxLANGUAGE_ESTONIAN,
    wxLANGUAGE_FAEROESE,
    wxLANGUAGE_FARSI,
    wxLANGUAGE_FIJI,
    wxLANGUAGE_FINNISH,
    wxLANGUAGE_FRENCH,
    wxLANGUAGE_FRENCH_BELGIAN,
    wxLANGUAGE_FRENCH_CANADIAN,
    wxLANGUAGE_FRENCH_LUXEMBOURG,
    wxLANGUAGE_FRENCH_MONACO,
    wxLANGUAGE_FRENCH_SWISS,
    wxLANGUAGE_FRISIAN,
    wxLANGUAGE_GALICIAN,
    wxLANGUAGE_GEORGIAN,
    wxLANGUAGE_GERMAN,
    wxLANGUAGE_GERMAN_AUSTRIAN,
    wxLANGUAGE_GERMAN_BELGIUM,
    wxLANGUAGE_GERMAN_LIECHTENSTEIN,
    wxLANGUAGE_GERMAN_LUXEMBOURG,
    wxLANGUAGE_GERMAN_SWISS,
    wxLANGUAGE_GREEK,
    wxLANGUAGE_GREENLANDIC,
    wxLANGUAGE_GUARANI,
    wxLANGUAGE_GUJARATI,
    wxLANGUAGE_HAUSA,
    wxLANGUAGE_HEBREW,
    wxLANGUAGE_HINDI,
    wxLANGUAGE_HUNGARIAN,
    wxLANGUAGE_ICELANDIC,
    wxLANGUAGE_INDONESIAN,
    wxLANGUAGE_INTERLINGUA,
    wxLANGUAGE_INTERLINGUE,
    wxLANGUAGE_INUKTITUT,
    wxLANGUAGE_INUPIAK,
    wxLANGUAGE_IRISH,
    wxLANGUAGE_ITALIAN,
    wxLANGUAGE_ITALIAN_SWISS,
    wxLANGUAGE_JAPANESE,
    wxLANGUAGE_JAVANESE,
    wxLANGUAGE_KANNADA,
    wxLANGUAGE_KASHMIRI,
    wxLANGUAGE_KASHMIRI_INDIA,
    wxLANGUAGE_KAZAKH,
    wxLANGUAGE_KERNEWEK,
    wxLANGUAGE_KINYARWANDA,
    wxLANGUAGE_KIRGHIZ,
    wxLANGUAGE_KIRUNDI,
    wxLANGUAGE_KONKANI,
    wxLANGUAGE_KOREAN,
    wxLANGUAGE_KURDISH,
    wxLANGUAGE_LAOTHIAN,
    wxLANGUAGE_LATIN,
    wxLANGUAGE_LATVIAN,
    wxLANGUAGE_LINGALA,
    wxLANGUAGE_LITHUANIAN,
    wxLANGUAGE_MACEDONIAN,
    wxLANGUAGE_MALAGASY,
    wxLANGUAGE_MALAY,
    wxLANGUAGE_MALAYALAM,
    wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM,
    wxLANGUAGE_MALAY_MALAYSIA,
    wxLANGUAGE_MALTESE,
    wxLANGUAGE_MANIPURI,
    wxLANGUAGE_MAORI,
    wxLANGUAGE_MARATHI,
    wxLANGUAGE_MOLDAVIAN,
    wxLANGUAGE_MONGOLIAN,
    wxLANGUAGE_NAURU,
    wxLANGUAGE_NEPALI,
    wxLANGUAGE_NEPALI_INDIA,
    wxLANGUAGE_NORWEGIAN_BOKMAL,
    wxLANGUAGE_NORWEGIAN_NYNORSK,
    wxLANGUAGE_OCCITAN,
    wxLANGUAGE_ORIYA,
    wxLANGUAGE_OROMO,
    wxLANGUAGE_PASHTO,
    wxLANGUAGE_POLISH,
    wxLANGUAGE_PORTUGUESE,
    wxLANGUAGE_PORTUGUESE_BRAZILIAN,
    wxLANGUAGE_PUNJABI,
    wxLANGUAGE_QUECHUA,
    wxLANGUAGE_RHAETO_ROMANCE,
    wxLANGUAGE_ROMANIAN,
    wxLANGUAGE_RUSSIAN,
    wxLANGUAGE_RUSSIAN_UKRAINE,
    wxLANGUAGE_SAMI,
    wxLANGUAGE_SAMOAN,
    wxLANGUAGE_SANGHO,
    wxLANGUAGE_SANSKRIT,
    wxLANGUAGE_SCOTS_GAELIC,
    wxLANGUAGE_SERBIAN,
    wxLANGUAGE_SERBIAN_CYRILLIC,
    wxLANGUAGE_SERBIAN_LATIN,
    wxLANGUAGE_SERBO_CROATIAN,
    wxLANGUAGE_SESOTHO,
    wxLANGUAGE_SETSWANA,
    wxLANGUAGE_SHONA,
    wxLANGUAGE_SINDHI,
    wxLANGUAGE_SINHALESE,
    wxLANGUAGE_SISWATI,
    wxLANGUAGE_SLOVAK,
    wxLANGUAGE_SLOVENIAN,
    wxLANGUAGE_SOMALI,
    wxLANGUAGE_SPANISH,
    wxLANGUAGE_SPANISH_ARGENTINA,
    wxLANGUAGE_SPANISH_BOLIVIA,
    wxLANGUAGE_SPANISH_CHILE,
    wxLANGUAGE_SPANISH_COLOMBIA,
    wxLANGUAGE_SPANISH_COSTA_RICA,
    wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC,
    wxLANGUAGE_SPANISH_ECUADOR,
    wxLANGUAGE_SPANISH_EL_SALVADOR,
    wxLANGUAGE_SPANISH_GUATEMALA,
    wxLANGUAGE_SPANISH_HONDURAS,
    wxLANGUAGE_SPANISH_MEXICAN,
    wxLANGUAGE_SPANISH_MODERN,
    wxLANGUAGE_SPANISH_NICARAGUA,
    wxLANGUAGE_SPANISH_PANAMA,
    wxLANGUAGE_SPANISH_PARAGUAY,
    wxLANGUAGE_SPANISH_PERU,
    wxLANGUAGE_SPANISH_PUERTO_RICO,
    wxLANGUAGE_SPANISH_URUGUAY,
    wxLANGUAGE_SPANISH_US,
    wxLANGUAGE_SPANISH_VENEZUELA,
    wxLANGUAGE_SUNDANESE,
    wxLANGUAGE_SWAHILI,
    wxLANGUAGE_SWEDISH,
    wxLANGUAGE_SWEDISH_FINLAND,
    wxLANGUAGE_TAGALOG,
    wxLANGUAGE_TAJIK,
    wxLANGUAGE_TAMIL,
    wxLANGUAGE_TATAR,
    wxLANGUAGE_TELUGU,
    wxLANGUAGE_THAI,
    wxLANGUAGE_TIBETAN,
    wxLANGUAGE_TIGRINYA,
    wxLANGUAGE_TONGA,
    wxLANGUAGE_TSONGA,
    wxLANGUAGE_TURKISH,
    wxLANGUAGE_TURKMEN,
    wxLANGUAGE_TWI,
    wxLANGUAGE_UIGHUR,
    wxLANGUAGE_UKRAINIAN,
    wxLANGUAGE_URDU,
    wxLANGUAGE_URDU_INDIA,
    wxLANGUAGE_URDU_PAKISTAN,
    wxLANGUAGE_UZBEK,
    wxLANGUAGE_UZBEK_CYRILLIC,
    wxLANGUAGE_UZBEK_LATIN,
    wxLANGUAGE_VALENCIAN,
    wxLANGUAGE_VIETNAMESE,
    wxLANGUAGE_VOLAPUK,
    wxLANGUAGE_WELSH,
    wxLANGUAGE_WOLOF,
    wxLANGUAGE_XHOSA,
    wxLANGUAGE_YIDDISH,
    wxLANGUAGE_YORUBA,
    wxLANGUAGE_ZHUANG,
    wxLANGUAGE_ZULU,
    /// For custom, user-defined languages.
    wxLANGUAGE_USER_DEFINED
 };
 // --- --- --- generated code ends here --- --- ---
 // ----------------------------------------------------------------------------
 // wxLanguageInfo: encapsulates wxLanguage to OS native lang.desc.
 //                 translation information
@@ -360,110 +83,6 @@ struct WXDLLIMPEXP_BASE wxLanguageInfo
 inline wxString wxLanguageInfo::GetLocaleName() const { return CanonicalName; }
 #endif // !__WXMSW__
 // ----------------------------------------------------------------------------
 // wxTranslations: message catalogs
 // ----------------------------------------------------------------------------
 // this class allows to get translations for strings
 class WXDLLIMPEXP_BASE wxTranslations
 {
 public:
    wxTranslations();
    ~wxTranslations();
    // returns current translations object, may return NULL
    static wxTranslations *Get();
    // sets current translations object (takes ownership; may be NULL)
    static void Set(wxTranslations *t);
    // changes loader to non-default one; takes ownership of 'loader'
    void SetLoader(wxTranslationsLoader *loader);
    void SetLanguage(wxLanguage lang);
    void SetLanguage(const wxString& lang);
    // add standard wxWidgets catalog ("wxstd")
    bool AddStdCatalog();
    // add catalog with given domain name and language, looking it up via
    // wxTranslationsLoader
    bool AddCatalog(const wxString& domain);
    bool AddCatalog(const wxString& domain, wxLanguage msgIdLanguage);
 #if !wxUSE_UNICODE
    bool AddCatalog(const wxString& domain,
                    wxLanguage msgIdLanguage,
                    const wxString& msgIdCharset);
 #endif
    // check if the given catalog is loaded
    bool IsLoaded(const wxString& domain) const;
    // load catalog data directly from file
    bool LoadCatalogFile(const wxString& filename,
                         const wxString& domain = wxEmptyString);
    // access to translations
    const wxString& GetString(const wxString& origString,
                              const wxString& domain = wxEmptyString) const;
    const wxString& GetString(const wxString& origString,
                              const wxString& origString2,
                              size_t n,
                              const wxString& domain = wxEmptyString) const;
    wxString GetHeaderValue(const wxString& header,
                            const wxString& domain = wxEmptyString) const;
    // this is hack to work around a problem with wxGetTranslation() which
    // returns const wxString& and not wxString, so when it returns untranslated
    // string, it needs to have a copy of it somewhere
    static const wxString& GetUntranslatedString(const wxString& str);
 private:
    // find best translation for given domain
    wxString ChooseLanguageForDomain(const wxString& domain,
                                     const wxString& msgIdLang);
    // find catalog by name in a linked list, return NULL if !found
    wxMsgCatalog *FindCatalog(const wxString& domain) const;
    // same as Set(), without taking ownership; only for wxLocale
    static void SetNonOwned(wxTranslations *t);
    friend class wxLocale;
 private:
    wxString m_lang;
    wxTranslationsLoader *m_loader;
    wxMsgCatalog *m_pMsgCat; // pointer to linked list of catalogs
 #if !wxUSE_UNICODE
    wxStringToStringHashMap m_msgIdCharset;
 #endif
 };
 // abstraction of translations discovery and loading
 class WXDLLIMPEXP_BASE wxTranslationsLoader
 {
 public:
    wxTranslationsLoader() {}
    virtual ~wxTranslationsLoader() {}
    virtual bool LoadCatalog(wxTranslations *translations,
                             const wxString& domain, const wxString& lang) = 0;
 };
 // standard wxTranslationsLoader implementation, using filesystem
 class WXDLLIMPEXP_BASE wxFileTranslationsLoader
    : public wxTranslationsLoader
 {
 public:
    static void AddCatalogLookupPathPrefix(const wxString& prefix);
    virtual bool LoadCatalog(wxTranslations *translations,
                             const wxString& domain, const wxString& lang);
 };
 // ----------------------------------------------------------------------------
 // wxLocaleCategory: the category of locale settings
@@ -749,80 +368,6 @@ private:
 // get the current locale object (note that it may be NULL!)
 extern WXDLLIMPEXP_BASE wxLocale* wxGetLocale();
-// get the translation of the string in the current locale
+#endif // wxUSE_INTL
 inline const wxString& wxGetTranslation(const wxString& str,
                                        const wxString& domain = wxEmptyString)
 {
    wxTranslations *trans = wxTranslations::Get();
    if ( trans )
        return trans->GetString(str, domain);
    else
        // NB: this function returns reference to a string, so we have to keep
        //     a copy of it somewhere
        return wxTranslations::GetUntranslatedString(str);
 }
 inline const wxString& wxGetTranslation(const wxString& str1,
                                        const wxString& str2,
                                        size_t n,
                                        const wxString& domain = wxEmptyString)
 {
    wxTranslations *trans = wxTranslations::Get();
    if ( trans )
        return trans->GetString(str1, str2, n, domain);
    else
        // NB: this function returns reference to a string, so we have to keep
        //     a copy of it somewhere
        return n == 1
               ? wxTranslations::GetUntranslatedString(str1)
               : wxTranslations::GetUntranslatedString(str2);
 }
 #else // !wxUSE_INTL
 // the macros should still be defined - otherwise compilation would fail
 #if !defined(WXINTL_NO_GETTEXT_MACRO)
    #if !defined(_)
        #define _(s)                 (s)
    #endif
    #define wxPLURAL(sing, plur, n)  ((n) == 1 ? (sing) : (plur))
 #endif
 #define wxTRANSLATE(str) str
 // NB: we use a template here in order to avoid using
 //     wxLocale::GetUntranslatedString() above, which would be required if
 //     we returned const wxString&; this way, the compiler should be able to
 //     optimize wxGetTranslation() away
 template<typename TString>
 inline TString wxGetTranslation(TString str)
    { return str; }
 template<typename TString, typename TDomain>
 inline TString wxGetTranslation(TString str, TDomain WXUNUSED(domain))
    { return str; }
 template<typename TString, typename TDomain>
 inline TString wxGetTranslation(TString str1, TString str2, size_t n)
    { return n == 1 ? str1 : str2; }
 template<typename TString, typename TDomain>
 inline TString wxGetTranslation(TString str1, TString str2, size_t n,
                                TDomain WXUNUSED(domain))
    { return n == 1 ? str1 : str2; }
 #endif // wxUSE_INTL/!wxUSE_INTL
 // define this one just in case it occurs somewhere (instead of preferred
 // wxTRANSLATE) too
 #if !defined(WXINTL_NO_GETTEXT_MACRO)
    #if !defined(gettext_noop)
        #define gettext_noop(str) (str)
    #endif
    #if !defined(N_)
        #define N_(s)             (s)
    #endif
 #endif
 #endif // _WX_INTL_H_
--- a/include/wx/language.h
+++ b/include/wx/language.h
@@ -0,0 +1,281 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/language.h
 // Purpose:     wxLanguage enum
 // Author:      Vadim Zeitlin
 // Created:     2010-04-23
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // WARNING: Parts of this file are generated. See misc/languages/README for
 // details.
 #ifndef _WX_LANGUAGE_H_
 #define _WX_LANGUAGE_H_
 #include "wx/defs.h"
 #if wxUSE_INTL
 // ----------------------------------------------------------------------------
 // wxLanguage: defines all supported languages
 // ----------------------------------------------------------------------------
 // --- --- --- generated code begins here --- --- ---
 /**
    The languages supported by wxLocale.
    This enum is generated by misc/languages/genlang.py
    When making changes, please put them into misc/languages/langtabl.txt
 */
 enum wxLanguage
 {
    /// User's default/preffered language as got from OS.
    wxLANGUAGE_DEFAULT,
    /// Unknown language, returned if wxLocale::GetSystemLanguage fails.
    wxLANGUAGE_UNKNOWN,
    wxLANGUAGE_ABKHAZIAN,
    wxLANGUAGE_AFAR,
    wxLANGUAGE_AFRIKAANS,
    wxLANGUAGE_ALBANIAN,
    wxLANGUAGE_AMHARIC,
    wxLANGUAGE_ARABIC,
    wxLANGUAGE_ARABIC_ALGERIA,
    wxLANGUAGE_ARABIC_BAHRAIN,
    wxLANGUAGE_ARABIC_EGYPT,
    wxLANGUAGE_ARABIC_IRAQ,
    wxLANGUAGE_ARABIC_JORDAN,
    wxLANGUAGE_ARABIC_KUWAIT,
    wxLANGUAGE_ARABIC_LEBANON,
    wxLANGUAGE_ARABIC_LIBYA,
    wxLANGUAGE_ARABIC_MOROCCO,
    wxLANGUAGE_ARABIC_OMAN,
    wxLANGUAGE_ARABIC_QATAR,
    wxLANGUAGE_ARABIC_SAUDI_ARABIA,
    wxLANGUAGE_ARABIC_SUDAN,
    wxLANGUAGE_ARABIC_SYRIA,
    wxLANGUAGE_ARABIC_TUNISIA,
    wxLANGUAGE_ARABIC_UAE,
    wxLANGUAGE_ARABIC_YEMEN,
    wxLANGUAGE_ARMENIAN,
    wxLANGUAGE_ASSAMESE,
    wxLANGUAGE_ASTURIAN,
    wxLANGUAGE_AYMARA,
    wxLANGUAGE_AZERI,
    wxLANGUAGE_AZERI_CYRILLIC,
    wxLANGUAGE_AZERI_LATIN,
    wxLANGUAGE_BASHKIR,
    wxLANGUAGE_BASQUE,
    wxLANGUAGE_BELARUSIAN,
    wxLANGUAGE_BENGALI,
    wxLANGUAGE_BHUTANI,
    wxLANGUAGE_BIHARI,
    wxLANGUAGE_BISLAMA,
    wxLANGUAGE_BRETON,
    wxLANGUAGE_BULGARIAN,
    wxLANGUAGE_BURMESE,
    wxLANGUAGE_CAMBODIAN,
    wxLANGUAGE_CATALAN,
    wxLANGUAGE_CHINESE,
    wxLANGUAGE_CHINESE_SIMPLIFIED,
    wxLANGUAGE_CHINESE_TRADITIONAL,
    wxLANGUAGE_CHINESE_HONGKONG,
    wxLANGUAGE_CHINESE_MACAU,
    wxLANGUAGE_CHINESE_SINGAPORE,
    wxLANGUAGE_CHINESE_TAIWAN,
    wxLANGUAGE_CORSICAN,
    wxLANGUAGE_CROATIAN,
    wxLANGUAGE_CZECH,
    wxLANGUAGE_DANISH,
    wxLANGUAGE_DUTCH,
    wxLANGUAGE_DUTCH_BELGIAN,
    wxLANGUAGE_ENGLISH,
    wxLANGUAGE_ENGLISH_UK,
    wxLANGUAGE_ENGLISH_US,
    wxLANGUAGE_ENGLISH_AUSTRALIA,
    wxLANGUAGE_ENGLISH_BELIZE,
    wxLANGUAGE_ENGLISH_BOTSWANA,
    wxLANGUAGE_ENGLISH_CANADA,
    wxLANGUAGE_ENGLISH_CARIBBEAN,
    wxLANGUAGE_ENGLISH_DENMARK,
    wxLANGUAGE_ENGLISH_EIRE,
    wxLANGUAGE_ENGLISH_JAMAICA,
    wxLANGUAGE_ENGLISH_NEW_ZEALAND,
    wxLANGUAGE_ENGLISH_PHILIPPINES,
    wxLANGUAGE_ENGLISH_SOUTH_AFRICA,
    wxLANGUAGE_ENGLISH_TRINIDAD,
    wxLANGUAGE_ENGLISH_ZIMBABWE,
    wxLANGUAGE_ESPERANTO,
    wxLANGUAGE_ESTONIAN,
    wxLANGUAGE_FAEROESE,
    wxLANGUAGE_FARSI,
    wxLANGUAGE_FIJI,
    wxLANGUAGE_FINNISH,
    wxLANGUAGE_FRENCH,
    wxLANGUAGE_FRENCH_BELGIAN,
    wxLANGUAGE_FRENCH_CANADIAN,
    wxLANGUAGE_FRENCH_LUXEMBOURG,
    wxLANGUAGE_FRENCH_MONACO,
    wxLANGUAGE_FRENCH_SWISS,
    wxLANGUAGE_FRISIAN,
    wxLANGUAGE_GALICIAN,
    wxLANGUAGE_GEORGIAN,
    wxLANGUAGE_GERMAN,
    wxLANGUAGE_GERMAN_AUSTRIAN,
    wxLANGUAGE_GERMAN_BELGIUM,
    wxLANGUAGE_GERMAN_LIECHTENSTEIN,
    wxLANGUAGE_GERMAN_LUXEMBOURG,
    wxLANGUAGE_GERMAN_SWISS,
    wxLANGUAGE_GREEK,
    wxLANGUAGE_GREENLANDIC,
    wxLANGUAGE_GUARANI,
    wxLANGUAGE_GUJARATI,
    wxLANGUAGE_HAUSA,
    wxLANGUAGE_HEBREW,
    wxLANGUAGE_HINDI,
    wxLANGUAGE_HUNGARIAN,
    wxLANGUAGE_ICELANDIC,
    wxLANGUAGE_INDONESIAN,
    wxLANGUAGE_INTERLINGUA,
    wxLANGUAGE_INTERLINGUE,
    wxLANGUAGE_INUKTITUT,
    wxLANGUAGE_INUPIAK,
    wxLANGUAGE_IRISH,
    wxLANGUAGE_ITALIAN,
    wxLANGUAGE_ITALIAN_SWISS,
    wxLANGUAGE_JAPANESE,
    wxLANGUAGE_JAVANESE,
    wxLANGUAGE_KANNADA,
    wxLANGUAGE_KASHMIRI,
    wxLANGUAGE_KASHMIRI_INDIA,
    wxLANGUAGE_KAZAKH,
    wxLANGUAGE_KERNEWEK,
    wxLANGUAGE_KINYARWANDA,
    wxLANGUAGE_KIRGHIZ,
    wxLANGUAGE_KIRUNDI,
    wxLANGUAGE_KONKANI,
    wxLANGUAGE_KOREAN,
    wxLANGUAGE_KURDISH,
    wxLANGUAGE_LAOTHIAN,
    wxLANGUAGE_LATIN,
    wxLANGUAGE_LATVIAN,
    wxLANGUAGE_LINGALA,
    wxLANGUAGE_LITHUANIAN,
    wxLANGUAGE_MACEDONIAN,
    wxLANGUAGE_MALAGASY,
    wxLANGUAGE_MALAY,
    wxLANGUAGE_MALAYALAM,
    wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM,
    wxLANGUAGE_MALAY_MALAYSIA,
    wxLANGUAGE_MALTESE,
    wxLANGUAGE_MANIPURI,
    wxLANGUAGE_MAORI,
    wxLANGUAGE_MARATHI,
    wxLANGUAGE_MOLDAVIAN,
    wxLANGUAGE_MONGOLIAN,
    wxLANGUAGE_NAURU,
    wxLANGUAGE_NEPALI,
    wxLANGUAGE_NEPALI_INDIA,
    wxLANGUAGE_NORWEGIAN_BOKMAL,
    wxLANGUAGE_NORWEGIAN_NYNORSK,
    wxLANGUAGE_OCCITAN,
    wxLANGUAGE_ORIYA,
    wxLANGUAGE_OROMO,
    wxLANGUAGE_PASHTO,
    wxLANGUAGE_POLISH,
    wxLANGUAGE_PORTUGUESE,
    wxLANGUAGE_PORTUGUESE_BRAZILIAN,
    wxLANGUAGE_PUNJABI,
    wxLANGUAGE_QUECHUA,
    wxLANGUAGE_RHAETO_ROMANCE,
    wxLANGUAGE_ROMANIAN,
    wxLANGUAGE_RUSSIAN,
    wxLANGUAGE_RUSSIAN_UKRAINE,
    wxLANGUAGE_SAMI,
    wxLANGUAGE_SAMOAN,
    wxLANGUAGE_SANGHO,
    wxLANGUAGE_SANSKRIT,
    wxLANGUAGE_SCOTS_GAELIC,
    wxLANGUAGE_SERBIAN,
    wxLANGUAGE_SERBIAN_CYRILLIC,
    wxLANGUAGE_SERBIAN_LATIN,
    wxLANGUAGE_SERBO_CROATIAN,
    wxLANGUAGE_SESOTHO,
    wxLANGUAGE_SETSWANA,
    wxLANGUAGE_SHONA,
    wxLANGUAGE_SINDHI,
    wxLANGUAGE_SINHALESE,
    wxLANGUAGE_SISWATI,
    wxLANGUAGE_SLOVAK,
    wxLANGUAGE_SLOVENIAN,
    wxLANGUAGE_SOMALI,
    wxLANGUAGE_SPANISH,
    wxLANGUAGE_SPANISH_ARGENTINA,
    wxLANGUAGE_SPANISH_BOLIVIA,
    wxLANGUAGE_SPANISH_CHILE,
    wxLANGUAGE_SPANISH_COLOMBIA,
    wxLANGUAGE_SPANISH_COSTA_RICA,
    wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC,
    wxLANGUAGE_SPANISH_ECUADOR,
    wxLANGUAGE_SPANISH_EL_SALVADOR,
    wxLANGUAGE_SPANISH_GUATEMALA,
    wxLANGUAGE_SPANISH_HONDURAS,
    wxLANGUAGE_SPANISH_MEXICAN,
    wxLANGUAGE_SPANISH_MODERN,
    wxLANGUAGE_SPANISH_NICARAGUA,
    wxLANGUAGE_SPANISH_PANAMA,
    wxLANGUAGE_SPANISH_PARAGUAY,
    wxLANGUAGE_SPANISH_PERU,
    wxLANGUAGE_SPANISH_PUERTO_RICO,
    wxLANGUAGE_SPANISH_URUGUAY,
    wxLANGUAGE_SPANISH_US,
    wxLANGUAGE_SPANISH_VENEZUELA,
    wxLANGUAGE_SUNDANESE,
    wxLANGUAGE_SWAHILI,
    wxLANGUAGE_SWEDISH,
    wxLANGUAGE_SWEDISH_FINLAND,
    wxLANGUAGE_TAGALOG,
    wxLANGUAGE_TAJIK,
    wxLANGUAGE_TAMIL,
    wxLANGUAGE_TATAR,
    wxLANGUAGE_TELUGU,
    wxLANGUAGE_THAI,
    wxLANGUAGE_TIBETAN,
    wxLANGUAGE_TIGRINYA,
    wxLANGUAGE_TONGA,
    wxLANGUAGE_TSONGA,
    wxLANGUAGE_TURKISH,
    wxLANGUAGE_TURKMEN,
    wxLANGUAGE_TWI,
    wxLANGUAGE_UIGHUR,
    wxLANGUAGE_UKRAINIAN,
    wxLANGUAGE_URDU,
    wxLANGUAGE_URDU_INDIA,
    wxLANGUAGE_URDU_PAKISTAN,
    wxLANGUAGE_UZBEK,
    wxLANGUAGE_UZBEK_CYRILLIC,
    wxLANGUAGE_UZBEK_LATIN,
    wxLANGUAGE_VALENCIAN,
    wxLANGUAGE_VIETNAMESE,
    wxLANGUAGE_VOLAPUK,
    wxLANGUAGE_WELSH,
    wxLANGUAGE_WOLOF,
    wxLANGUAGE_XHOSA,
    wxLANGUAGE_YIDDISH,
    wxLANGUAGE_YORUBA,
    wxLANGUAGE_ZHUANG,
    wxLANGUAGE_ZULU,
    /// For custom, user-defined languages.
    wxLANGUAGE_USER_DEFINED
 };
 // --- --- --- generated code ends here --- --- ---
 #endif // wxUSE_INTL
 #endif // _WX_LANGUAGE_H_
--- a/include/wx/translation.h
+++ b/include/wx/translation.h
@@ -0,0 +1,241 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/translation.h
 // Purpose:     Internationalization and localisation for wxWidgets
 // Author:      Vadim Zeitlin, Vaclav Slavik,
 //              Michael N. Filippov <michael@idisys.iae.nsk.su>
 // Created:     2010-04-23
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 //              (c) 2010 Vaclav Slavik <vslavik@fastmail.fm>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_TRANSLATION_H_
 #define _WX_TRANSLATION_H_
 #include "wx/defs.h"
 #include "wx/string.h"
 #if wxUSE_INTL
 #include "wx/language.h"
 #if !wxUSE_UNICODE
    #include "wx/hashmap.h"
 #endif
 // ============================================================================
 // global decls
 // ============================================================================
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // gettext() style macros (notice that xgettext should be invoked with
 // --keyword="_" --keyword="wxPLURAL:1,2" options
 // to extract the strings from the sources)
 #ifndef WXINTL_NO_GETTEXT_MACRO
    #define _(s)                     wxGetTranslation((s))
    #define wxPLURAL(sing, plur, n)  wxGetTranslation((sing), (plur), n)
 #endif
 // another one which just marks the strings for extraction, but doesn't
 // perform the translation (use -kwxTRANSLATE with xgettext!)
 #define wxTRANSLATE(str) str
 // ----------------------------------------------------------------------------
 // forward decls
 // ----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_BASE wxTranslationsLoader;
 class WXDLLIMPEXP_FWD_BASE wxLocale;
 class wxMsgCatalog;
 // ----------------------------------------------------------------------------
 // wxTranslations: message catalogs
 // ----------------------------------------------------------------------------
 // this class allows to get translations for strings
 class WXDLLIMPEXP_BASE wxTranslations
 {
 public:
    wxTranslations();
    ~wxTranslations();
    // returns current translations object, may return NULL
    static wxTranslations *Get();
    // sets current translations object (takes ownership; may be NULL)
    static void Set(wxTranslations *t);
    // changes loader to non-default one; takes ownership of 'loader'
    void SetLoader(wxTranslationsLoader *loader);
    void SetLanguage(wxLanguage lang);
    void SetLanguage(const wxString& lang);
    // add standard wxWidgets catalog ("wxstd")
    bool AddStdCatalog();
    // add catalog with given domain name and language, looking it up via
    // wxTranslationsLoader
    bool AddCatalog(const wxString& domain);
    bool AddCatalog(const wxString& domain, wxLanguage msgIdLanguage);
 #if !wxUSE_UNICODE
    bool AddCatalog(const wxString& domain,
                    wxLanguage msgIdLanguage,
                    const wxString& msgIdCharset);
 #endif
    // check if the given catalog is loaded
    bool IsLoaded(const wxString& domain) const;
    // load catalog data directly from file
    bool LoadCatalogFile(const wxString& filename,
                         const wxString& domain = wxEmptyString);
    // access to translations
    const wxString& GetString(const wxString& origString,
                              const wxString& domain = wxEmptyString) const;
    const wxString& GetString(const wxString& origString,
                              const wxString& origString2,
                              size_t n,
                              const wxString& domain = wxEmptyString) const;
    wxString GetHeaderValue(const wxString& header,
                            const wxString& domain = wxEmptyString) const;
    // this is hack to work around a problem with wxGetTranslation() which
    // returns const wxString& and not wxString, so when it returns untranslated
    // string, it needs to have a copy of it somewhere
    static const wxString& GetUntranslatedString(const wxString& str);
 private:
    // find best translation for given domain
    wxString ChooseLanguageForDomain(const wxString& domain,
                                     const wxString& msgIdLang);
    // find catalog by name in a linked list, return NULL if !found
    wxMsgCatalog *FindCatalog(const wxString& domain) const;
    // same as Set(), without taking ownership; only for wxLocale
    static void SetNonOwned(wxTranslations *t);
    friend class wxLocale;
 private:
    wxString m_lang;
    wxTranslationsLoader *m_loader;
    wxMsgCatalog *m_pMsgCat; // pointer to linked list of catalogs
 #if !wxUSE_UNICODE
    wxStringToStringHashMap m_msgIdCharset;
 #endif
 };
 // abstraction of translations discovery and loading
 class WXDLLIMPEXP_BASE wxTranslationsLoader
 {
 public:
    wxTranslationsLoader() {}
    virtual ~wxTranslationsLoader() {}
    virtual bool LoadCatalog(wxTranslations *translations,
                             const wxString& domain, const wxString& lang) = 0;
 };
 // standard wxTranslationsLoader implementation, using filesystem
 class WXDLLIMPEXP_BASE wxFileTranslationsLoader
    : public wxTranslationsLoader
 {
 public:
    static void AddCatalogLookupPathPrefix(const wxString& prefix);
    virtual bool LoadCatalog(wxTranslations *translations,
                             const wxString& domain, const wxString& lang);
 };
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
 // get the translation of the string in the current locale
 inline const wxString& wxGetTranslation(const wxString& str,
                                        const wxString& domain = wxEmptyString)
 {
    wxTranslations *trans = wxTranslations::Get();
    if ( trans )
        return trans->GetString(str, domain);
    else
        // NB: this function returns reference to a string, so we have to keep
        //     a copy of it somewhere
        return wxTranslations::GetUntranslatedString(str);
 }
 inline const wxString& wxGetTranslation(const wxString& str1,
                                        const wxString& str2,
                                        size_t n,
                                        const wxString& domain = wxEmptyString)
 {
    wxTranslations *trans = wxTranslations::Get();
    if ( trans )
        return trans->GetString(str1, str2, n, domain);
    else
        // NB: this function returns reference to a string, so we have to keep
        //     a copy of it somewhere
        return n == 1
               ? wxTranslations::GetUntranslatedString(str1)
               : wxTranslations::GetUntranslatedString(str2);
 }
 #else // !wxUSE_INTL
 // the macros should still be defined - otherwise compilation would fail
 #if !defined(WXINTL_NO_GETTEXT_MACRO)
    #if !defined(_)
        #define _(s)                 (s)
    #endif
    #define wxPLURAL(sing, plur, n)  ((n) == 1 ? (sing) : (plur))
 #endif
 #define wxTRANSLATE(str) str
 // NB: we use a template here in order to avoid using
 //     wxLocale::GetUntranslatedString() above, which would be required if
 //     we returned const wxString&; this way, the compiler should be able to
 //     optimize wxGetTranslation() away
 template<typename TString>
 inline TString wxGetTranslation(TString str)
    { return str; }
 template<typename TString, typename TDomain>
 inline TString wxGetTranslation(TString str, TDomain WXUNUSED(domain))
    { return str; }
 template<typename TString, typename TDomain>
 inline TString wxGetTranslation(TString str1, TString str2, size_t n)
    { return n == 1 ? str1 : str2; }
 template<typename TString, typename TDomain>
 inline TString wxGetTranslation(TString str1, TString str2, size_t n,
                                TDomain WXUNUSED(domain))
    { return n == 1 ? str1 : str2; }
 #endif // wxUSE_INTL/!wxUSE_INTL
 // define this one just in case it occurs somewhere (instead of preferred
 // wxTRANSLATE) too
 #if !defined(WXINTL_NO_GETTEXT_MACRO)
    #if !defined(gettext_noop)
        #define gettext_noop(str) (str)
    #endif
    #if !defined(N_)
        #define N_(s)             (s)
    #endif
 #endif
 #endif // _WX_TRANSLATION_H_
--- a/interface/wx/intl.h
+++ b/interface/wx/intl.h
@@ -6,263 +6,6 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 // --- --- --- generated code begins here --- --- ---
 /**
    The languages supported by wxLocale.
    This enum is generated by misc/languages/genlang.py
    When making changes, please put them into misc/languages/langtabl.txt
 */
 enum wxLanguage
 {
    /// User's default/preffered language as got from OS.
    wxLANGUAGE_DEFAULT,
    /// Unknown language, returned if wxLocale::GetSystemLanguage fails.
    wxLANGUAGE_UNKNOWN,
    wxLANGUAGE_ABKHAZIAN,
    wxLANGUAGE_AFAR,
    wxLANGUAGE_AFRIKAANS,
    wxLANGUAGE_ALBANIAN,
    wxLANGUAGE_AMHARIC,
    wxLANGUAGE_ARABIC,
    wxLANGUAGE_ARABIC_ALGERIA,
    wxLANGUAGE_ARABIC_BAHRAIN,
    wxLANGUAGE_ARABIC_EGYPT,
    wxLANGUAGE_ARABIC_IRAQ,
    wxLANGUAGE_ARABIC_JORDAN,
    wxLANGUAGE_ARABIC_KUWAIT,
    wxLANGUAGE_ARABIC_LEBANON,
    wxLANGUAGE_ARABIC_LIBYA,
    wxLANGUAGE_ARABIC_MOROCCO,
    wxLANGUAGE_ARABIC_OMAN,
    wxLANGUAGE_ARABIC_QATAR,
    wxLANGUAGE_ARABIC_SAUDI_ARABIA,
    wxLANGUAGE_ARABIC_SUDAN,
    wxLANGUAGE_ARABIC_SYRIA,
    wxLANGUAGE_ARABIC_TUNISIA,
    wxLANGUAGE_ARABIC_UAE,
    wxLANGUAGE_ARABIC_YEMEN,
    wxLANGUAGE_ARMENIAN,
    wxLANGUAGE_ASSAMESE,
    wxLANGUAGE_ASTURIAN,
    wxLANGUAGE_AYMARA,
    wxLANGUAGE_AZERI,
    wxLANGUAGE_AZERI_CYRILLIC,
    wxLANGUAGE_AZERI_LATIN,
    wxLANGUAGE_BASHKIR,
    wxLANGUAGE_BASQUE,
    wxLANGUAGE_BELARUSIAN,
    wxLANGUAGE_BENGALI,
    wxLANGUAGE_BHUTANI,
    wxLANGUAGE_BIHARI,
    wxLANGUAGE_BISLAMA,
    wxLANGUAGE_BRETON,
    wxLANGUAGE_BULGARIAN,
    wxLANGUAGE_BURMESE,
    wxLANGUAGE_CAMBODIAN,
    wxLANGUAGE_CATALAN,
    wxLANGUAGE_CHINESE,
    wxLANGUAGE_CHINESE_SIMPLIFIED,
    wxLANGUAGE_CHINESE_TRADITIONAL,
    wxLANGUAGE_CHINESE_HONGKONG,
    wxLANGUAGE_CHINESE_MACAU,
    wxLANGUAGE_CHINESE_SINGAPORE,
    wxLANGUAGE_CHINESE_TAIWAN,
    wxLANGUAGE_CORSICAN,
    wxLANGUAGE_CROATIAN,
    wxLANGUAGE_CZECH,
    wxLANGUAGE_DANISH,
    wxLANGUAGE_DUTCH,
    wxLANGUAGE_DUTCH_BELGIAN,
    wxLANGUAGE_ENGLISH,
    wxLANGUAGE_ENGLISH_UK,
    wxLANGUAGE_ENGLISH_US,
    wxLANGUAGE_ENGLISH_AUSTRALIA,
    wxLANGUAGE_ENGLISH_BELIZE,
    wxLANGUAGE_ENGLISH_BOTSWANA,
    wxLANGUAGE_ENGLISH_CANADA,
    wxLANGUAGE_ENGLISH_CARIBBEAN,
    wxLANGUAGE_ENGLISH_DENMARK,
    wxLANGUAGE_ENGLISH_EIRE,
    wxLANGUAGE_ENGLISH_JAMAICA,
    wxLANGUAGE_ENGLISH_NEW_ZEALAND,
    wxLANGUAGE_ENGLISH_PHILIPPINES,
    wxLANGUAGE_ENGLISH_SOUTH_AFRICA,
    wxLANGUAGE_ENGLISH_TRINIDAD,
    wxLANGUAGE_ENGLISH_ZIMBABWE,
    wxLANGUAGE_ESPERANTO,
    wxLANGUAGE_ESTONIAN,
    wxLANGUAGE_FAEROESE,
    wxLANGUAGE_FARSI,
    wxLANGUAGE_FIJI,
    wxLANGUAGE_FINNISH,
    wxLANGUAGE_FRENCH,
    wxLANGUAGE_FRENCH_BELGIAN,
    wxLANGUAGE_FRENCH_CANADIAN,
    wxLANGUAGE_FRENCH_LUXEMBOURG,
    wxLANGUAGE_FRENCH_MONACO,
    wxLANGUAGE_FRENCH_SWISS,
    wxLANGUAGE_FRISIAN,
    wxLANGUAGE_GALICIAN,
    wxLANGUAGE_GEORGIAN,
    wxLANGUAGE_GERMAN,
    wxLANGUAGE_GERMAN_AUSTRIAN,
    wxLANGUAGE_GERMAN_BELGIUM,
    wxLANGUAGE_GERMAN_LIECHTENSTEIN,
    wxLANGUAGE_GERMAN_LUXEMBOURG,
    wxLANGUAGE_GERMAN_SWISS,
    wxLANGUAGE_GREEK,
    wxLANGUAGE_GREENLANDIC,
    wxLANGUAGE_GUARANI,
    wxLANGUAGE_GUJARATI,
    wxLANGUAGE_HAUSA,
    wxLANGUAGE_HEBREW,
    wxLANGUAGE_HINDI,
    wxLANGUAGE_HUNGARIAN,
    wxLANGUAGE_ICELANDIC,
    wxLANGUAGE_INDONESIAN,
    wxLANGUAGE_INTERLINGUA,
    wxLANGUAGE_INTERLINGUE,
    wxLANGUAGE_INUKTITUT,
    wxLANGUAGE_INUPIAK,
    wxLANGUAGE_IRISH,
    wxLANGUAGE_ITALIAN,
    wxLANGUAGE_ITALIAN_SWISS,
    wxLANGUAGE_JAPANESE,
    wxLANGUAGE_JAVANESE,
    wxLANGUAGE_KANNADA,
    wxLANGUAGE_KASHMIRI,
    wxLANGUAGE_KASHMIRI_INDIA,
    wxLANGUAGE_KAZAKH,
    wxLANGUAGE_KERNEWEK,
    wxLANGUAGE_KINYARWANDA,
    wxLANGUAGE_KIRGHIZ,
    wxLANGUAGE_KIRUNDI,
    wxLANGUAGE_KONKANI,
    wxLANGUAGE_KOREAN,
    wxLANGUAGE_KURDISH,
    wxLANGUAGE_LAOTHIAN,
    wxLANGUAGE_LATIN,
    wxLANGUAGE_LATVIAN,
    wxLANGUAGE_LINGALA,
    wxLANGUAGE_LITHUANIAN,
    wxLANGUAGE_MACEDONIAN,
    wxLANGUAGE_MALAGASY,
    wxLANGUAGE_MALAY,
    wxLANGUAGE_MALAYALAM,
    wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM,
    wxLANGUAGE_MALAY_MALAYSIA,
    wxLANGUAGE_MALTESE,
    wxLANGUAGE_MANIPURI,
    wxLANGUAGE_MAORI,
    wxLANGUAGE_MARATHI,
    wxLANGUAGE_MOLDAVIAN,
    wxLANGUAGE_MONGOLIAN,
    wxLANGUAGE_NAURU,
    wxLANGUAGE_NEPALI,
    wxLANGUAGE_NEPALI_INDIA,
    wxLANGUAGE_NORWEGIAN_BOKMAL,
    wxLANGUAGE_NORWEGIAN_NYNORSK,
    wxLANGUAGE_OCCITAN,
    wxLANGUAGE_ORIYA,
    wxLANGUAGE_OROMO,
    wxLANGUAGE_PASHTO,
    wxLANGUAGE_POLISH,
    wxLANGUAGE_PORTUGUESE,
    wxLANGUAGE_PORTUGUESE_BRAZILIAN,
    wxLANGUAGE_PUNJABI,
    wxLANGUAGE_QUECHUA,
    wxLANGUAGE_RHAETO_ROMANCE,
    wxLANGUAGE_ROMANIAN,
    wxLANGUAGE_RUSSIAN,
    wxLANGUAGE_RUSSIAN_UKRAINE,
    wxLANGUAGE_SAMI,
    wxLANGUAGE_SAMOAN,
    wxLANGUAGE_SANGHO,
    wxLANGUAGE_SANSKRIT,
    wxLANGUAGE_SCOTS_GAELIC,
    wxLANGUAGE_SERBIAN,
    wxLANGUAGE_SERBIAN_CYRILLIC,
    wxLANGUAGE_SERBIAN_LATIN,
    wxLANGUAGE_SERBO_CROATIAN,
    wxLANGUAGE_SESOTHO,
    wxLANGUAGE_SETSWANA,
    wxLANGUAGE_SHONA,
    wxLANGUAGE_SINDHI,
    wxLANGUAGE_SINHALESE,
    wxLANGUAGE_SISWATI,
    wxLANGUAGE_SLOVAK,
    wxLANGUAGE_SLOVENIAN,
    wxLANGUAGE_SOMALI,
    wxLANGUAGE_SPANISH,
    wxLANGUAGE_SPANISH_ARGENTINA,
    wxLANGUAGE_SPANISH_BOLIVIA,
    wxLANGUAGE_SPANISH_CHILE,
    wxLANGUAGE_SPANISH_COLOMBIA,
    wxLANGUAGE_SPANISH_COSTA_RICA,
    wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC,
    wxLANGUAGE_SPANISH_ECUADOR,
    wxLANGUAGE_SPANISH_EL_SALVADOR,
    wxLANGUAGE_SPANISH_GUATEMALA,
    wxLANGUAGE_SPANISH_HONDURAS,
    wxLANGUAGE_SPANISH_MEXICAN,
    wxLANGUAGE_SPANISH_MODERN,
    wxLANGUAGE_SPANISH_NICARAGUA,
    wxLANGUAGE_SPANISH_PANAMA,
    wxLANGUAGE_SPANISH_PARAGUAY,
    wxLANGUAGE_SPANISH_PERU,
    wxLANGUAGE_SPANISH_PUERTO_RICO,
    wxLANGUAGE_SPANISH_URUGUAY,
    wxLANGUAGE_SPANISH_US,
    wxLANGUAGE_SPANISH_VENEZUELA,
    wxLANGUAGE_SUNDANESE,
    wxLANGUAGE_SWAHILI,
    wxLANGUAGE_SWEDISH,
    wxLANGUAGE_SWEDISH_FINLAND,
    wxLANGUAGE_TAGALOG,
    wxLANGUAGE_TAJIK,
    wxLANGUAGE_TAMIL,
    wxLANGUAGE_TATAR,
    wxLANGUAGE_TELUGU,
    wxLANGUAGE_THAI,
    wxLANGUAGE_TIBETAN,
    wxLANGUAGE_TIGRINYA,
    wxLANGUAGE_TONGA,
    wxLANGUAGE_TSONGA,
    wxLANGUAGE_TURKISH,
    wxLANGUAGE_TURKMEN,
    wxLANGUAGE_TWI,
    wxLANGUAGE_UIGHUR,
    wxLANGUAGE_UKRAINIAN,
    wxLANGUAGE_URDU,
    wxLANGUAGE_URDU_INDIA,
    wxLANGUAGE_URDU_PAKISTAN,
    wxLANGUAGE_UZBEK,
    wxLANGUAGE_UZBEK_CYRILLIC,
    wxLANGUAGE_UZBEK_LATIN,
    wxLANGUAGE_VALENCIAN,
    wxLANGUAGE_VIETNAMESE,
    wxLANGUAGE_VOLAPUK,
    wxLANGUAGE_WELSH,
    wxLANGUAGE_WOLOF,
    wxLANGUAGE_XHOSA,
    wxLANGUAGE_YIDDISH,
    wxLANGUAGE_YORUBA,
    wxLANGUAGE_ZHUANG,
    wxLANGUAGE_ZULU,
    /// For custom, user-defined languages.
    wxLANGUAGE_USER_DEFINED
 };
 // --- --- --- generated code ends here --- --- ---
 /**
    This is the layout direction stored in wxLanguageInfo and returned by
    wxApp::GetLayoutDirection(), wxWindow::GetLayoutDirection(),
@@ -744,430 +487,3 @@ public:
    */
    bool IsOk() const;
 };
 /**
    This class allows to get translations for strings.
    In wxWidgets this class manages message catalogs which contain the
    translations of the strings used to the current language. Unlike wxLocale,
    it isn't bound to locale. It can be used either independently of, or in
    conjunction with wxLocale. In the latter case, you should initialize
    wxLocale (which creates wxTranslations instance) first; in the former, you
    need to create a wxTranslations object and Set() it manually.
    Only one wxTranslations instance is active at a time; it is set with the
    Set() method and obtained using Get().
    Unlike wxLocale, wxTranslations' primary mean of identifying language
    is by its "canonical name", i.e. ISO 639 code, possibly combined with
    ISO 3166 country code and additional modifiers (examples include
    "fr", "en_GB" or "ca@valencia"; see wxLocale::GetCanonicalName() for
    more information). This allows apps using wxTranslations API to use even
    languages not recognized by the operating system or not listed in
    wxLanguage enum.
    @since 2.9.1
    @see wxLocale
 */
 class wxTranslations
 {
 public:
    /// Constructor
    wxTranslations();
    /**
        Returns current translations object, may return NULL.
        You must either call this early in app initialization code, or let
        wxLocale do it for you.
     */
    static wxTranslations *Get();
    /**
        Sets current translations object.
        Deletes previous translation object and takes ownership of @a t.
     */
    static void Set(wxTranslations *t);
    /**
        Changes loader use to read catalogs to a non-default one.
        Deletes previous loader and takes ownership of @a loader.
        @see wxTranslationsLoader, wxFileTranslationsLoader
     */
    void SetLoader(wxTranslationsLoader *loader);
    /**
        Sets translations language to use.
        wxLANGUAGE_DEFAULT has special meaning: best suitable translation,
        given user's preference and available translations, will be used.
     */
    void SetLanguage(wxLanguage lang);
    /**
        Sets translations language to use.
        Empty @a lang string has the same meaning as wxLANGUAGE_DEFAULT in
        SetLanguage(wxLanguage): best suitable translation, given user's
        preference and available translations, will be used.
     */
    void SetLanguage(const wxString& lang);
    /**
        Add standard wxWidgets catalogs ("wxstd" and possible port-specific
        catalogs).
        @return @true if a suitable catalog was found, @false otherwise
        @see AddCatalog()
     */
    bool AddStdCatalog();
    /**
        Add a catalog for use with the current locale.
        By default, it is searched for in standard places (see
        wxFileTranslationsLoader), but you may also prepend additional
        directories to the search path with
        wxFileTranslationsLoader::AddCatalogLookupPathPrefix().
        All loaded catalogs will be used for message lookup by GetString() for
        the current locale.
        In this overload, @c msgid strings are assumed
        to be in English and written only using 7-bit ASCII characters.
        If you have to deal with non-English strings or 8-bit characters in the
        source code, see the instructions in @ref overview_nonenglish.
        @return
            @true if catalog was successfully loaded, @false otherwise (which might
            mean that the catalog is not found or that it isn't in the correct format).
     */
    bool AddCatalog(const wxString& domain);
    /**
        Same as AddCatalog(const wxString&), but takes an additional argument,
        @a msgIdLanguage.
        @param domain
            The catalog domain to add.
        @param msgIdLanguage
            Specifies the language of "msgid" strings in source code
            (i.e. arguments to GetString(), wxGetTranslation() and the _() macro).
            It is used if AddCatalog() cannot find any catalog for current language:
            if the language is same as source code language, then strings from source
            code are used instead.
        @return
            @true if catalog was successfully loaded, @false otherwise (which might
            mean that the catalog is not found or that it isn't in the correct format).
     */
    bool AddCatalog(const wxString& domain, wxLanguage msgIdLanguage);
    /**
        Same as AddCatalog(const wxString&, wxLanguage), but takes two
        additional arguments, @a msgIdLanguage and @a msgIdCharset.
        This overload is only available in non-Unicode build.
        @param domain
            The catalog domain to add.
        @param msgIdLanguage
            Specifies the language of "msgid" strings in source code
            (i.e. arguments to GetString(), wxGetTranslation() and the _() macro).
            It is used if AddCatalog() cannot find any catalog for current language:
            if the language is same as source code language, then strings from source
            code are used instead.
        @param msgIdCharset
            Lets you specify the charset used for msgids in sources
            in case they use 8-bit characters (e.g. German or French strings).
        @return
            @true if catalog was successfully loaded, @false otherwise (which might
            mean that the catalog is not found or that it isn't in the correct format).
     */
    bool AddCatalog(const wxString& domain,
                    wxLanguage msgIdLanguage,
                    const wxString& msgIdCharset);
    /**
        Check if the given catalog is loaded, and returns @true if it is.
        According to GNU gettext tradition, each catalog normally corresponds to
        'domain' which is more or less the application name.
        @see AddCatalog()
     */
    bool IsLoaded(const wxString& domain) const;
    /**
        Directly loads catalog from a file.
        It is caller's responsibility to ensure that the catalog contains
        correct language. This function is primarily intended for
        wxTranslationsLoader implementations.
        @param filename  Name of the MO file to load.
        @param domain    Domain to load the translations into (typically
                         matches file's basename).
     */
    bool LoadCatalogFile(const wxString& filename,
                         const wxString& domain = wxEmptyString);
    /**
        Retrieves the translation for a string in all loaded domains unless the @a domain
        parameter is specified (and then only this catalog/domain is searched).
        Returns original string if translation is not available (in this case an
        error message is generated the first time a string is not found; use
        wxLogNull to suppress it).
        @remarks Domains are searched in the last to first order, i.e. catalogs
                 added later override those added before.
    */
    const wxString& GetString(const wxString& origString,
                              const wxString& domain = wxEmptyString) const;
    /**
        Retrieves the translation for a string in all loaded domains unless the @a domain
        parameter is specified (and then only this catalog/domain is searched).
        Returns original string if translation is not available (in this case an
        error message is generated the first time a string is not found; use
        wxLogNull to suppress it).
        This form is used when retrieving translation of string that has different
        singular and plural form in English or different plural forms in some
        other language.
        It takes two extra arguments: @a origString parameter must contain the
        singular form of the string to be converted.
        It is also used as the key for the search in the catalog.
        The @a origString2 parameter is the plural form (in English).
        The parameter @a n is used to determine the plural form.
        If no message catalog is found @a origString is returned if 'n == 1',
        otherwise @a origString2.
        See GNU gettext manual for additional information on plural forms handling.
        This method is called by the wxGetTranslation() function and _() macro.
        @remarks Domains are searched in the last to first order, i.e. catalogs
                 added later override those added before.
    */
    const wxString& GetString(const wxString& origString,
                              const wxString& origString2,
                              size_t n,
                              const wxString& domain = wxEmptyString) const;
    /**
        Returns the header value for header @a header.
        The search for @a header is case sensitive. If an @a domain is passed,
        this domain is searched. Else all domains will be searched until a
        header has been found.
        The return value is the value of the header if found. Else this will be empty.
    */
    wxString GetHeaderValue(const wxString& header,
                            const wxString& domain = wxEmptyString) const;
 };
 /**
    Abstraction of translations discovery and loading.
    This interface makes it possible to override wxWidgets' default catalogs
    loading mechanism and load MO files from locations other than the
    filesystem (e.g. embed them in executable).
    Implementations must implement the LoadCatalog() method.
    @see wxFileTranslationsLoader
 */
 class wxTranslationsLoader
 {
 public:
    /// Constructor
    wxTranslationsLoader() {}
    /**
        Called to load requested catalog.
        If the catalog is found, LoadCatalog() should call LoadCatalogFile()
        on @a translations to add the translation.
        @param translations  wxTranslations requesting loading.
        @param domain        Domain to load.
        @param lang          Language to look for. This is "canonical name"
                             (see wxLocale::GetCanonicalName()), i.e. ISO 639
                             code, possibly combined with country code or
                             additional modifiers (e.g. "fr", "en_GB" or
                             "ca@valencia").
        @return @true on successful load, @false otherwise
     */
    virtual bool LoadCatalog(wxTranslations *translations,
                             const wxString& domain, const wxString& lang) = 0;
 };
 /**
    Standard wxTranslationsLoader implementation.
    This finds catalogs in the filesystem, using the standard Unix layout.
    This is the default unless you change the loader with
    wxTranslations::SetLoader().
    Catalogs are searched for in standard places (current directory first, then
    the system one), but you may also prepend additional directories to the
    search path with AddCatalogLookupPathPrefix().
 */
 class wxFileTranslationsLoader : public wxTranslationsLoader
 {
 public:
    /**
        Add a prefix to the catalog lookup path: the message catalog files will
        be looked up under prefix/lang/LC_MESSAGES, prefix/lang and prefix
        (in this order).
        This only applies to subsequent invocations of
        wxTranslations::AddCatalog().
    */
    static void AddCatalogLookupPathPrefix(const wxString& prefix);
 };
 // ============================================================================
 // Global functions/macros
 // ============================================================================
 /** @addtogroup group_funcmacro_string */
 //@{
 /**
    This macro is identical to _() but for the plural variant of
    wxGetTranslation().
    @return A const wxString.
    @header{wx/intl.h}
 */
 #define wxPLURAL(string, plural, n)
 /**
    This macro doesn't do anything in the program code -- it simply expands to
    the value of its argument.
    However it does have a purpose which is to mark the literal strings for the
    extraction into the message catalog created by @c xgettext program. Usually
    this is achieved using _() but that macro not only marks the string for
    extraction but also expands into a wxGetTranslation() call which means that
    it cannot be used in some situations, notably for static array
    initialization.
    Here is an example which should make it more clear: suppose that you have a
    static array of strings containing the weekday names and which have to be
    translated (note that it is a bad example, really, as wxDateTime already
    can be used to get the localized week day names already). If you write:
    @code
    static const char * const weekdays[] = { _("Mon"), ..., _("Sun") };
    ...
    // use weekdays[n] as usual
    @endcode
    The code wouldn't compile because the function calls are forbidden in the
    array initializer. So instead you should do this:
    @code
    static const char * const weekdays[] = { wxTRANSLATE("Mon"), ...,
    wxTRANSLATE("Sun") };
    ...
    // use wxGetTranslation(weekdays[n])
    @endcode
    Note that although the code @b would compile if you simply omit
    wxTRANSLATE() in the above, it wouldn't work as expected because there
    would be no translations for the weekday names in the program message
    catalog and wxGetTranslation() wouldn't find them.
    @return A const wxChar*.
    @header{wx/intl.h}
 */
 #define wxTRANSLATE(string)
 /**
    This function returns the translation of @a string in the current
    @c locale(). If the string is not found in any of the loaded message
    catalogs (see @ref overview_i18n), the original string is returned. In
    debug build, an error message is logged -- this should help to find the
    strings which were not yet translated.  If @a domain is specified then only
    that domain/catalog is searched for a matching string.  As this function is
    used very often, an alternative (and also common in Unix world) syntax is
    provided: the _() macro is defined to do the same thing as
    wxGetTranslation().
    This function calls wxTranslations::GetString().
    @note This function is not suitable for literal strings in Unicode builds
          since the literal strings must be enclosed into _T() or wxT() macro
          which makes them unrecognised by @c xgettext, and so they are not
          extracted to the message catalog. Instead, use the _() and wxPLURAL()
          macro for all literal strings.
    @see wxGetTranslation(const wxString&, const wxString&, size_t, const wxString&)
    @header{wx/intl.h}
 */
 const wxString& wxGetTranslation(const wxString& string,
                                 const wxString& domain = wxEmptyString);
 /**
    This is an overloaded version of
    wxGetTranslation(const wxString&, const wxString&), please see its
    documentation for general information.
    This version is used when retrieving translation of string that has
    different singular and plural forms in English or different plural forms in
    some other language. Like wxGetTranslation(const wxString&,const wxString&),
    the @a string parameter must contain the singular form of the string to be
    converted and is used as the key for the search in the catalog. The
    @a plural parameter is the plural form (in English). The parameter @a n is
    used to determine the plural form. If no message catalog is found,
    @a string is returned if "n == 1", otherwise @a plural is returned.
    See GNU gettext Manual for additional information on plural forms handling:
    <http://www.gnu.org/software/gettext/manual/gettext.html#Plural-forms>
    For a shorter alternative see the wxPLURAL() macro.
    This function calls wxLocale::GetString().
    @header{wx/intl.h}
 */
 const wxString& wxGetTranslation(const wxString& string,
                                 const wxString& plural, size_t n,
                                 const wxString& domain = wxEmptyString);
 /**
    This macro expands into a call to wxGetTranslation(), so it marks the
    message for the extraction by @c xgettext just as wxTRANSLATE() does, but
    also returns the translation of the string for the current locale during
    execution.
    Don't confuse this with _T()!
    @header{wx/intl.h}
 */
 const wxString& _(const wxString& string);
 //@}
--- a/interface/wx/language.h
+++ b/interface/wx/language.h
@@ -0,0 +1,263 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        language.h
 // Purpose:     wxLanguage enum
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 // --- --- --- generated code begins here --- --- ---
 /**
    The languages supported by wxLocale.
    This enum is generated by misc/languages/genlang.py
    When making changes, please put them into misc/languages/langtabl.txt
 */
 enum wxLanguage
 {
    /// User's default/preffered language as got from OS.
    wxLANGUAGE_DEFAULT,
    /// Unknown language, returned if wxLocale::GetSystemLanguage fails.
    wxLANGUAGE_UNKNOWN,
    wxLANGUAGE_ABKHAZIAN,
    wxLANGUAGE_AFAR,
    wxLANGUAGE_AFRIKAANS,
    wxLANGUAGE_ALBANIAN,
    wxLANGUAGE_AMHARIC,
    wxLANGUAGE_ARABIC,
    wxLANGUAGE_ARABIC_ALGERIA,
    wxLANGUAGE_ARABIC_BAHRAIN,
    wxLANGUAGE_ARABIC_EGYPT,
    wxLANGUAGE_ARABIC_IRAQ,
    wxLANGUAGE_ARABIC_JORDAN,
    wxLANGUAGE_ARABIC_KUWAIT,
    wxLANGUAGE_ARABIC_LEBANON,
    wxLANGUAGE_ARABIC_LIBYA,
    wxLANGUAGE_ARABIC_MOROCCO,
    wxLANGUAGE_ARABIC_OMAN,
    wxLANGUAGE_ARABIC_QATAR,
    wxLANGUAGE_ARABIC_SAUDI_ARABIA,
    wxLANGUAGE_ARABIC_SUDAN,
    wxLANGUAGE_ARABIC_SYRIA,
    wxLANGUAGE_ARABIC_TUNISIA,
    wxLANGUAGE_ARABIC_UAE,
    wxLANGUAGE_ARABIC_YEMEN,
    wxLANGUAGE_ARMENIAN,
    wxLANGUAGE_ASSAMESE,
    wxLANGUAGE_ASTURIAN,
    wxLANGUAGE_AYMARA,
    wxLANGUAGE_AZERI,
    wxLANGUAGE_AZERI_CYRILLIC,
    wxLANGUAGE_AZERI_LATIN,
    wxLANGUAGE_BASHKIR,
    wxLANGUAGE_BASQUE,
    wxLANGUAGE_BELARUSIAN,
    wxLANGUAGE_BENGALI,
    wxLANGUAGE_BHUTANI,
    wxLANGUAGE_BIHARI,
    wxLANGUAGE_BISLAMA,
    wxLANGUAGE_BRETON,
    wxLANGUAGE_BULGARIAN,
    wxLANGUAGE_BURMESE,
    wxLANGUAGE_CAMBODIAN,
    wxLANGUAGE_CATALAN,
    wxLANGUAGE_CHINESE,
    wxLANGUAGE_CHINESE_SIMPLIFIED,
    wxLANGUAGE_CHINESE_TRADITIONAL,
    wxLANGUAGE_CHINESE_HONGKONG,
    wxLANGUAGE_CHINESE_MACAU,
    wxLANGUAGE_CHINESE_SINGAPORE,
    wxLANGUAGE_CHINESE_TAIWAN,
    wxLANGUAGE_CORSICAN,
    wxLANGUAGE_CROATIAN,
    wxLANGUAGE_CZECH,
    wxLANGUAGE_DANISH,
    wxLANGUAGE_DUTCH,
    wxLANGUAGE_DUTCH_BELGIAN,
    wxLANGUAGE_ENGLISH,
    wxLANGUAGE_ENGLISH_UK,
    wxLANGUAGE_ENGLISH_US,
    wxLANGUAGE_ENGLISH_AUSTRALIA,
    wxLANGUAGE_ENGLISH_BELIZE,
    wxLANGUAGE_ENGLISH_BOTSWANA,
    wxLANGUAGE_ENGLISH_CANADA,
    wxLANGUAGE_ENGLISH_CARIBBEAN,
    wxLANGUAGE_ENGLISH_DENMARK,
    wxLANGUAGE_ENGLISH_EIRE,
    wxLANGUAGE_ENGLISH_JAMAICA,
    wxLANGUAGE_ENGLISH_NEW_ZEALAND,
    wxLANGUAGE_ENGLISH_PHILIPPINES,
    wxLANGUAGE_ENGLISH_SOUTH_AFRICA,
    wxLANGUAGE_ENGLISH_TRINIDAD,
    wxLANGUAGE_ENGLISH_ZIMBABWE,
    wxLANGUAGE_ESPERANTO,
    wxLANGUAGE_ESTONIAN,
    wxLANGUAGE_FAEROESE,
    wxLANGUAGE_FARSI,
    wxLANGUAGE_FIJI,
    wxLANGUAGE_FINNISH,
    wxLANGUAGE_FRENCH,
    wxLANGUAGE_FRENCH_BELGIAN,
    wxLANGUAGE_FRENCH_CANADIAN,
    wxLANGUAGE_FRENCH_LUXEMBOURG,
    wxLANGUAGE_FRENCH_MONACO,
    wxLANGUAGE_FRENCH_SWISS,
    wxLANGUAGE_FRISIAN,
    wxLANGUAGE_GALICIAN,
    wxLANGUAGE_GEORGIAN,
    wxLANGUAGE_GERMAN,
    wxLANGUAGE_GERMAN_AUSTRIAN,
    wxLANGUAGE_GERMAN_BELGIUM,
    wxLANGUAGE_GERMAN_LIECHTENSTEIN,
    wxLANGUAGE_GERMAN_LUXEMBOURG,
    wxLANGUAGE_GERMAN_SWISS,
    wxLANGUAGE_GREEK,
    wxLANGUAGE_GREENLANDIC,
    wxLANGUAGE_GUARANI,
    wxLANGUAGE_GUJARATI,
    wxLANGUAGE_HAUSA,
    wxLANGUAGE_HEBREW,
    wxLANGUAGE_HINDI,
    wxLANGUAGE_HUNGARIAN,
    wxLANGUAGE_ICELANDIC,
    wxLANGUAGE_INDONESIAN,
    wxLANGUAGE_INTERLINGUA,
    wxLANGUAGE_INTERLINGUE,
    wxLANGUAGE_INUKTITUT,
    wxLANGUAGE_INUPIAK,
    wxLANGUAGE_IRISH,
    wxLANGUAGE_ITALIAN,
    wxLANGUAGE_ITALIAN_SWISS,
    wxLANGUAGE_JAPANESE,
    wxLANGUAGE_JAVANESE,
    wxLANGUAGE_KANNADA,
    wxLANGUAGE_KASHMIRI,
    wxLANGUAGE_KASHMIRI_INDIA,
    wxLANGUAGE_KAZAKH,
    wxLANGUAGE_KERNEWEK,
    wxLANGUAGE_KINYARWANDA,
    wxLANGUAGE_KIRGHIZ,
    wxLANGUAGE_KIRUNDI,
    wxLANGUAGE_KONKANI,
    wxLANGUAGE_KOREAN,
    wxLANGUAGE_KURDISH,
    wxLANGUAGE_LAOTHIAN,
    wxLANGUAGE_LATIN,
    wxLANGUAGE_LATVIAN,
    wxLANGUAGE_LINGALA,
    wxLANGUAGE_LITHUANIAN,
    wxLANGUAGE_MACEDONIAN,
    wxLANGUAGE_MALAGASY,
    wxLANGUAGE_MALAY,
    wxLANGUAGE_MALAYALAM,
    wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM,
    wxLANGUAGE_MALAY_MALAYSIA,
    wxLANGUAGE_MALTESE,
    wxLANGUAGE_MANIPURI,
    wxLANGUAGE_MAORI,
    wxLANGUAGE_MARATHI,
    wxLANGUAGE_MOLDAVIAN,
    wxLANGUAGE_MONGOLIAN,
    wxLANGUAGE_NAURU,
    wxLANGUAGE_NEPALI,
    wxLANGUAGE_NEPALI_INDIA,
    wxLANGUAGE_NORWEGIAN_BOKMAL,
    wxLANGUAGE_NORWEGIAN_NYNORSK,
    wxLANGUAGE_OCCITAN,
    wxLANGUAGE_ORIYA,
    wxLANGUAGE_OROMO,
    wxLANGUAGE_PASHTO,
    wxLANGUAGE_POLISH,
    wxLANGUAGE_PORTUGUESE,
    wxLANGUAGE_PORTUGUESE_BRAZILIAN,
    wxLANGUAGE_PUNJABI,
    wxLANGUAGE_QUECHUA,
    wxLANGUAGE_RHAETO_ROMANCE,
    wxLANGUAGE_ROMANIAN,
    wxLANGUAGE_RUSSIAN,
    wxLANGUAGE_RUSSIAN_UKRAINE,
    wxLANGUAGE_SAMI,
    wxLANGUAGE_SAMOAN,
    wxLANGUAGE_SANGHO,
    wxLANGUAGE_SANSKRIT,
    wxLANGUAGE_SCOTS_GAELIC,
    wxLANGUAGE_SERBIAN,
    wxLANGUAGE_SERBIAN_CYRILLIC,
    wxLANGUAGE_SERBIAN_LATIN,
    wxLANGUAGE_SERBO_CROATIAN,
    wxLANGUAGE_SESOTHO,
    wxLANGUAGE_SETSWANA,
    wxLANGUAGE_SHONA,
    wxLANGUAGE_SINDHI,
    wxLANGUAGE_SINHALESE,
    wxLANGUAGE_SISWATI,
    wxLANGUAGE_SLOVAK,
    wxLANGUAGE_SLOVENIAN,
    wxLANGUAGE_SOMALI,
    wxLANGUAGE_SPANISH,
    wxLANGUAGE_SPANISH_ARGENTINA,
    wxLANGUAGE_SPANISH_BOLIVIA,
    wxLANGUAGE_SPANISH_CHILE,
    wxLANGUAGE_SPANISH_COLOMBIA,
    wxLANGUAGE_SPANISH_COSTA_RICA,
    wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC,
    wxLANGUAGE_SPANISH_ECUADOR,
    wxLANGUAGE_SPANISH_EL_SALVADOR,
    wxLANGUAGE_SPANISH_GUATEMALA,
    wxLANGUAGE_SPANISH_HONDURAS,
    wxLANGUAGE_SPANISH_MEXICAN,
    wxLANGUAGE_SPANISH_MODERN,
    wxLANGUAGE_SPANISH_NICARAGUA,
    wxLANGUAGE_SPANISH_PANAMA,
    wxLANGUAGE_SPANISH_PARAGUAY,
    wxLANGUAGE_SPANISH_PERU,
    wxLANGUAGE_SPANISH_PUERTO_RICO,
    wxLANGUAGE_SPANISH_URUGUAY,
    wxLANGUAGE_SPANISH_US,
    wxLANGUAGE_SPANISH_VENEZUELA,
    wxLANGUAGE_SUNDANESE,
    wxLANGUAGE_SWAHILI,
    wxLANGUAGE_SWEDISH,
    wxLANGUAGE_SWEDISH_FINLAND,
    wxLANGUAGE_TAGALOG,
    wxLANGUAGE_TAJIK,
    wxLANGUAGE_TAMIL,
    wxLANGUAGE_TATAR,
    wxLANGUAGE_TELUGU,
    wxLANGUAGE_THAI,
    wxLANGUAGE_TIBETAN,
    wxLANGUAGE_TIGRINYA,
    wxLANGUAGE_TONGA,
    wxLANGUAGE_TSONGA,
    wxLANGUAGE_TURKISH,
    wxLANGUAGE_TURKMEN,
    wxLANGUAGE_TWI,
    wxLANGUAGE_UIGHUR,
    wxLANGUAGE_UKRAINIAN,
    wxLANGUAGE_URDU,
    wxLANGUAGE_URDU_INDIA,
    wxLANGUAGE_URDU_PAKISTAN,
    wxLANGUAGE_UZBEK,
    wxLANGUAGE_UZBEK_CYRILLIC,
    wxLANGUAGE_UZBEK_LATIN,
    wxLANGUAGE_VALENCIAN,
    wxLANGUAGE_VIETNAMESE,
    wxLANGUAGE_VOLAPUK,
    wxLANGUAGE_WELSH,
    wxLANGUAGE_WOLOF,
    wxLANGUAGE_XHOSA,
    wxLANGUAGE_YIDDISH,
    wxLANGUAGE_YORUBA,
    wxLANGUAGE_ZHUANG,
    wxLANGUAGE_ZULU,
    /// For custom, user-defined languages.
    wxLANGUAGE_USER_DEFINED
 };
 // --- --- --- generated code ends here --- --- ---
--- a/interface/wx/translation.h
+++ b/interface/wx/translation.h
@@ -0,0 +1,434 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        translation.h
 // Purpose:     wxTranslation class
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 /**
    This class allows to get translations for strings.
    In wxWidgets this class manages message catalogs which contain the
    translations of the strings used to the current language. Unlike wxLocale,
    it isn't bound to locale. It can be used either independently of, or in
    conjunction with wxLocale. In the latter case, you should initialize
    wxLocale (which creates wxTranslations instance) first; in the former, you
    need to create a wxTranslations object and Set() it manually.
    Only one wxTranslations instance is active at a time; it is set with the
    Set() method and obtained using Get().
    Unlike wxLocale, wxTranslations' primary mean of identifying language
    is by its "canonical name", i.e. ISO 639 code, possibly combined with
    ISO 3166 country code and additional modifiers (examples include
    "fr", "en_GB" or "ca@valencia"; see wxLocale::GetCanonicalName() for
    more information). This allows apps using wxTranslations API to use even
    languages not recognized by the operating system or not listed in
    wxLanguage enum.
    @since 2.9.1
    @see wxLocale
 */
 class wxTranslations
 {
 public:
    /// Constructor
    wxTranslations();
    /**
        Returns current translations object, may return NULL.
        You must either call this early in app initialization code, or let
        wxLocale do it for you.
     */
    static wxTranslations *Get();
    /**
        Sets current translations object.
        Deletes previous translation object and takes ownership of @a t.
     */
    static void Set(wxTranslations *t);
    /**
        Changes loader use to read catalogs to a non-default one.
        Deletes previous loader and takes ownership of @a loader.
        @see wxTranslationsLoader, wxFileTranslationsLoader
     */
    void SetLoader(wxTranslationsLoader *loader);
    /**
        Sets translations language to use.
        wxLANGUAGE_DEFAULT has special meaning: best suitable translation,
        given user's preference and available translations, will be used.
     */
    void SetLanguage(wxLanguage lang);
    /**
        Sets translations language to use.
        Empty @a lang string has the same meaning as wxLANGUAGE_DEFAULT in
        SetLanguage(wxLanguage): best suitable translation, given user's
        preference and available translations, will be used.
     */
    void SetLanguage(const wxString& lang);
    /**
        Add standard wxWidgets catalogs ("wxstd" and possible port-specific
        catalogs).
        @return @true if a suitable catalog was found, @false otherwise
        @see AddCatalog()
     */
    bool AddStdCatalog();
    /**
        Add a catalog for use with the current locale.
        By default, it is searched for in standard places (see
        wxFileTranslationsLoader), but you may also prepend additional
        directories to the search path with
        wxFileTranslationsLoader::AddCatalogLookupPathPrefix().
        All loaded catalogs will be used for message lookup by GetString() for
        the current locale.
        In this overload, @c msgid strings are assumed
        to be in English and written only using 7-bit ASCII characters.
        If you have to deal with non-English strings or 8-bit characters in the
        source code, see the instructions in @ref overview_nonenglish.
        @return
            @true if catalog was successfully loaded, @false otherwise (which might
            mean that the catalog is not found or that it isn't in the correct format).
     */
    bool AddCatalog(const wxString& domain);
    /**
        Same as AddCatalog(const wxString&), but takes an additional argument,
        @a msgIdLanguage.
        @param domain
            The catalog domain to add.
        @param msgIdLanguage
            Specifies the language of "msgid" strings in source code
            (i.e. arguments to GetString(), wxGetTranslation() and the _() macro).
            It is used if AddCatalog() cannot find any catalog for current language:
            if the language is same as source code language, then strings from source
            code are used instead.
        @return
            @true if catalog was successfully loaded, @false otherwise (which might
            mean that the catalog is not found or that it isn't in the correct format).
     */
    bool AddCatalog(const wxString& domain, wxLanguage msgIdLanguage);
    /**
        Same as AddCatalog(const wxString&, wxLanguage), but takes two
        additional arguments, @a msgIdLanguage and @a msgIdCharset.
        This overload is only available in non-Unicode build.
        @param domain
            The catalog domain to add.
        @param msgIdLanguage
            Specifies the language of "msgid" strings in source code
            (i.e. arguments to GetString(), wxGetTranslation() and the _() macro).
            It is used if AddCatalog() cannot find any catalog for current language:
            if the language is same as source code language, then strings from source
            code are used instead.
        @param msgIdCharset
            Lets you specify the charset used for msgids in sources
            in case they use 8-bit characters (e.g. German or French strings).
        @return
            @true if catalog was successfully loaded, @false otherwise (which might
            mean that the catalog is not found or that it isn't in the correct format).
     */
    bool AddCatalog(const wxString& domain,
                    wxLanguage msgIdLanguage,
                    const wxString& msgIdCharset);
    /**
        Check if the given catalog is loaded, and returns @true if it is.
        According to GNU gettext tradition, each catalog normally corresponds to
        'domain' which is more or less the application name.
        @see AddCatalog()
     */
    bool IsLoaded(const wxString& domain) const;
    /**
        Directly loads catalog from a file.
        It is caller's responsibility to ensure that the catalog contains
        correct language. This function is primarily intended for
        wxTranslationsLoader implementations.
        @param filename  Name of the MO file to load.
        @param domain    Domain to load the translations into (typically
                         matches file's basename).
     */
    bool LoadCatalogFile(const wxString& filename,
                         const wxString& domain = wxEmptyString);
    /**
        Retrieves the translation for a string in all loaded domains unless the @a domain
        parameter is specified (and then only this catalog/domain is searched).
        Returns original string if translation is not available (in this case an
        error message is generated the first time a string is not found; use
        wxLogNull to suppress it).
        @remarks Domains are searched in the last to first order, i.e. catalogs
                 added later override those added before.
    */
    const wxString& GetString(const wxString& origString,
                              const wxString& domain = wxEmptyString) const;
    /**
        Retrieves the translation for a string in all loaded domains unless the @a domain
        parameter is specified (and then only this catalog/domain is searched).
        Returns original string if translation is not available (in this case an
        error message is generated the first time a string is not found; use
        wxLogNull to suppress it).
        This form is used when retrieving translation of string that has different
        singular and plural form in English or different plural forms in some
        other language.
        It takes two extra arguments: @a origString parameter must contain the
        singular form of the string to be converted.
        It is also used as the key for the search in the catalog.
        The @a origString2 parameter is the plural form (in English).
        The parameter @a n is used to determine the plural form.
        If no message catalog is found @a origString is returned if 'n == 1',
        otherwise @a origString2.
        See GNU gettext manual for additional information on plural forms handling.
        This method is called by the wxGetTranslation() function and _() macro.
        @remarks Domains are searched in the last to first order, i.e. catalogs
                 added later override those added before.
    */
    const wxString& GetString(const wxString& origString,
                              const wxString& origString2,
                              size_t n,
                              const wxString& domain = wxEmptyString) const;
    /**
        Returns the header value for header @a header.
        The search for @a header is case sensitive. If an @a domain is passed,
        this domain is searched. Else all domains will be searched until a
        header has been found.
        The return value is the value of the header if found. Else this will be empty.
    */
    wxString GetHeaderValue(const wxString& header,
                            const wxString& domain = wxEmptyString) const;
 };
 /**
    Abstraction of translations discovery and loading.
    This interface makes it possible to override wxWidgets' default catalogs
    loading mechanism and load MO files from locations other than the
    filesystem (e.g. embed them in executable).
    Implementations must implement the LoadCatalog() method.
    @see wxFileTranslationsLoader
 */
 class wxTranslationsLoader
 {
 public:
    /// Constructor
    wxTranslationsLoader() {}
    /**
        Called to load requested catalog.
        If the catalog is found, LoadCatalog() should call LoadCatalogFile()
        on @a translations to add the translation.
        @param translations  wxTranslations requesting loading.
        @param domain        Domain to load.
        @param lang          Language to look for. This is "canonical name"
                             (see wxLocale::GetCanonicalName()), i.e. ISO 639
                             code, possibly combined with country code or
                             additional modifiers (e.g. "fr", "en_GB" or
                             "ca@valencia").
        @return @true on successful load, @false otherwise
     */
    virtual bool LoadCatalog(wxTranslations *translations,
                             const wxString& domain, const wxString& lang) = 0;
 };
 /**
    Standard wxTranslationsLoader implementation.
    This finds catalogs in the filesystem, using the standard Unix layout.
    This is the default unless you change the loader with
    wxTranslations::SetLoader().
    Catalogs are searched for in standard places (current directory first, then
    the system one), but you may also prepend additional directories to the
    search path with AddCatalogLookupPathPrefix().
 */
 class wxFileTranslationsLoader : public wxTranslationsLoader
 {
 public:
    /**
        Add a prefix to the catalog lookup path: the message catalog files will
        be looked up under prefix/lang/LC_MESSAGES, prefix/lang and prefix
        (in this order).
        This only applies to subsequent invocations of
        wxTranslations::AddCatalog().
    */
    static void AddCatalogLookupPathPrefix(const wxString& prefix);
 };
 // ============================================================================
 // Global functions/macros
 // ============================================================================
 /** @addtogroup group_funcmacro_string */
 //@{
 /**
    This macro is identical to _() but for the plural variant of
    wxGetTranslation().
    @return A const wxString.
    @header{wx/intl.h}
 */
 #define wxPLURAL(string, plural, n)
 /**
    This macro doesn't do anything in the program code -- it simply expands to
    the value of its argument.
    However it does have a purpose which is to mark the literal strings for the
    extraction into the message catalog created by @c xgettext program. Usually
    this is achieved using _() but that macro not only marks the string for
    extraction but also expands into a wxGetTranslation() call which means that
    it cannot be used in some situations, notably for static array
    initialization.
    Here is an example which should make it more clear: suppose that you have a
    static array of strings containing the weekday names and which have to be
    translated (note that it is a bad example, really, as wxDateTime already
    can be used to get the localized week day names already). If you write:
    @code
    static const char * const weekdays[] = { _("Mon"), ..., _("Sun") };
    ...
    // use weekdays[n] as usual
    @endcode
    The code wouldn't compile because the function calls are forbidden in the
    array initializer. So instead you should do this:
    @code
    static const char * const weekdays[] = { wxTRANSLATE("Mon"), ...,
    wxTRANSLATE("Sun") };
    ...
    // use wxGetTranslation(weekdays[n])
    @endcode
    Note that although the code @b would compile if you simply omit
    wxTRANSLATE() in the above, it wouldn't work as expected because there
    would be no translations for the weekday names in the program message
    catalog and wxGetTranslation() wouldn't find them.
    @return A const wxChar*.
    @header{wx/intl.h}
 */
 #define wxTRANSLATE(string)
 /**
    This function returns the translation of @a string in the current
    @c locale(). If the string is not found in any of the loaded message
    catalogs (see @ref overview_i18n), the original string is returned. In
    debug build, an error message is logged -- this should help to find the
    strings which were not yet translated.  If @a domain is specified then only
    that domain/catalog is searched for a matching string.  As this function is
    used very often, an alternative (and also common in Unix world) syntax is
    provided: the _() macro is defined to do the same thing as
    wxGetTranslation().
    This function calls wxTranslations::GetString().
    @note This function is not suitable for literal strings in Unicode builds
          since the literal strings must be enclosed into _T() or wxT() macro
          which makes them unrecognised by @c xgettext, and so they are not
          extracted to the message catalog. Instead, use the _() and wxPLURAL()
          macro for all literal strings.
    @see wxGetTranslation(const wxString&, const wxString&, size_t, const wxString&)
    @header{wx/intl.h}
 */
 const wxString& wxGetTranslation(const wxString& string,
                                 const wxString& domain = wxEmptyString);
 /**
    This is an overloaded version of
    wxGetTranslation(const wxString&, const wxString&), please see its
    documentation for general information.
    This version is used when retrieving translation of string that has
    different singular and plural forms in English or different plural forms in
    some other language. Like wxGetTranslation(const wxString&,const wxString&),
    the @a string parameter must contain the singular form of the string to be
    converted and is used as the key for the search in the catalog. The
    @a plural parameter is the plural form (in English). The parameter @a n is
    used to determine the plural form. If no message catalog is found,
    @a string is returned if "n == 1", otherwise @a plural is returned.
    See GNU gettext Manual for additional information on plural forms handling:
    <http://www.gnu.org/software/gettext/manual/gettext.html#Plural-forms>
    For a shorter alternative see the wxPLURAL() macro.
    This function calls wxLocale::GetString().
    @header{wx/intl.h}
 */
 const wxString& wxGetTranslation(const wxString& string,
                                 const wxString& plural, size_t n,
                                 const wxString& domain = wxEmptyString);
 /**
    This macro expands into a call to wxGetTranslation(), so it marks the
    message for the extraction by @c xgettext just as wxTRANSLATE() does, but
    also returns the translation of the string for the current locale during
    execution.
    Don't confuse this with _T()!
    @header{wx/intl.h}
 */
 const wxString& _(const wxString& string);
 //@}
--- a/misc/languages/README
+++ b/misc/languages/README
@@ -1,4 +1,5 @@
 Run the genlang.py script from the top level wxWidgets directory to update
-include/wx/intl.h (wxLanguage enum), interface/wx/intl.h (its documentation)
+include/wx/language.h (wxLanguage enum), interface/wx/language.h (its
-and src/common/intl.cpp (conversion tables) with the data from langtabl.txt.
+documentation) and src/common/language.cpp (conversion tables) with the data
 from langtabl.txt.
--- a/misc/languages/genlang.py
+++ b/misc/languages/genlang.py
@@ -165,6 +165,6 @@ def ReplaceGeneratedPartOfFile(fname, func):
    os.rename(fnameNew, fname)
 table = ReadTable()
-ReplaceGeneratedPartOfFile('include/wx/intl.h', WriteEnum)
+ReplaceGeneratedPartOfFile('include/wx/language.h', WriteEnum)
-ReplaceGeneratedPartOfFile('interface/wx/intl.h', WriteEnum)
+ReplaceGeneratedPartOfFile('interface/wx/language.h', WriteEnum)
-ReplaceGeneratedPartOfFile('src/common/intl.cpp', WriteTable)
+ReplaceGeneratedPartOfFile('src/common/languageinfo.cpp', WriteTable)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
--- a/src/common/languageinfo.cpp
+++ b/src/common/languageinfo.cpp
@@ -0,0 +1,789 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/language.cpp
 // Purpose:     wxLocale::InitLanguagesDB()
 // Author:      Vadim Zeitlin, Vaclav Slavik
 // Created:     2010-04-23
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // ============================================================================
 // declaration
 // ============================================================================
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 #ifdef __BORLANDC__
    #pragma hdrstop
 #endif
 #include "wx/intl.h"
 #if wxUSE_INTL
 #ifdef __WIN32__
    #include "wx/msw/private.h"
 #endif
 // ----------------------------------------------------------------------------
 // default languages table & initialization
 // ----------------------------------------------------------------------------
 // --- --- --- generated code begins here --- --- ---
 // This table is generated by misc/languages/genlang.py
 // When making changes, please put them into misc/languages/langtabl.txt
 #if !defined(__WIN32__) || defined(__WXMICROWIN__)
 #define SETWINLANG(info,lang,sublang)
 #else
 #define SETWINLANG(info,lang,sublang) \
    info.WinLang = lang, info.WinSublang = sublang;
 #ifndef LANG_AFRIKAANS
 #define LANG_AFRIKAANS (0)
 #endif
 #ifndef LANG_ALBANIAN
 #define LANG_ALBANIAN (0)
 #endif
 #ifndef LANG_ARABIC
 #define LANG_ARABIC (0)
 #endif
 #ifndef LANG_ARMENIAN
 #define LANG_ARMENIAN (0)
 #endif
 #ifndef LANG_ASSAMESE
 #define LANG_ASSAMESE (0)
 #endif
 #ifndef LANG_AZERI
 #define LANG_AZERI (0)
 #endif
 #ifndef LANG_BASQUE
 #define LANG_BASQUE (0)
 #endif
 #ifndef LANG_BELARUSIAN
 #define LANG_BELARUSIAN (0)
 #endif
 #ifndef LANG_BENGALI
 #define LANG_BENGALI (0)
 #endif
 #ifndef LANG_BULGARIAN
 #define LANG_BULGARIAN (0)
 #endif
 #ifndef LANG_CATALAN
 #define LANG_CATALAN (0)
 #endif
 #ifndef LANG_CHINESE
 #define LANG_CHINESE (0)
 #endif
 #ifndef LANG_CROATIAN
 #define LANG_CROATIAN (0)
 #endif
 #ifndef LANG_CZECH
 #define LANG_CZECH (0)
 #endif
 #ifndef LANG_DANISH
 #define LANG_DANISH (0)
 #endif
 #ifndef LANG_DUTCH
 #define LANG_DUTCH (0)
 #endif
 #ifndef LANG_ENGLISH
 #define LANG_ENGLISH (0)
 #endif
 #ifndef LANG_ESTONIAN
 #define LANG_ESTONIAN (0)
 #endif
 #ifndef LANG_FAEROESE
 #define LANG_FAEROESE (0)
 #endif
 #ifndef LANG_FARSI
 #define LANG_FARSI (0)
 #endif
 #ifndef LANG_FINNISH
 #define LANG_FINNISH (0)
 #endif
 #ifndef LANG_FRENCH
 #define LANG_FRENCH (0)
 #endif
 #ifndef LANG_GEORGIAN
 #define LANG_GEORGIAN (0)
 #endif
 #ifndef LANG_GERMAN
 #define LANG_GERMAN (0)
 #endif
 #ifndef LANG_GREEK
 #define LANG_GREEK (0)
 #endif
 #ifndef LANG_GUJARATI
 #define LANG_GUJARATI (0)
 #endif
 #ifndef LANG_HEBREW
 #define LANG_HEBREW (0)
 #endif
 #ifndef LANG_HINDI
 #define LANG_HINDI (0)
 #endif
 #ifndef LANG_HUNGARIAN
 #define LANG_HUNGARIAN (0)
 #endif
 #ifndef LANG_ICELANDIC
 #define LANG_ICELANDIC (0)
 #endif
 #ifndef LANG_INDONESIAN
 #define LANG_INDONESIAN (0)
 #endif
 #ifndef LANG_ITALIAN
 #define LANG_ITALIAN (0)
 #endif
 #ifndef LANG_JAPANESE
 #define LANG_JAPANESE (0)
 #endif
 #ifndef LANG_KANNADA
 #define LANG_KANNADA (0)
 #endif
 #ifndef LANG_KASHMIRI
 #define LANG_KASHMIRI (0)
 #endif
 #ifndef LANG_KAZAK
 #define LANG_KAZAK (0)
 #endif
 #ifndef LANG_KONKANI
 #define LANG_KONKANI (0)
 #endif
 #ifndef LANG_KOREAN
 #define LANG_KOREAN (0)
 #endif
 #ifndef LANG_LATVIAN
 #define LANG_LATVIAN (0)
 #endif
 #ifndef LANG_LITHUANIAN
 #define LANG_LITHUANIAN (0)
 #endif
 #ifndef LANG_MACEDONIAN
 #define LANG_MACEDONIAN (0)
 #endif
 #ifndef LANG_MALAY
 #define LANG_MALAY (0)
 #endif
 #ifndef LANG_MALAYALAM
 #define LANG_MALAYALAM (0)
 #endif
 #ifndef LANG_MANIPURI
 #define LANG_MANIPURI (0)
 #endif
 #ifndef LANG_MARATHI
 #define LANG_MARATHI (0)
 #endif
 #ifndef LANG_NEPALI
 #define LANG_NEPALI (0)
 #endif
 #ifndef LANG_NORWEGIAN
 #define LANG_NORWEGIAN (0)
 #endif
 #ifndef LANG_ORIYA
 #define LANG_ORIYA (0)
 #endif
 #ifndef LANG_POLISH
 #define LANG_POLISH (0)
 #endif
 #ifndef LANG_PORTUGUESE
 #define LANG_PORTUGUESE (0)
 #endif
 #ifndef LANG_PUNJABI
 #define LANG_PUNJABI (0)
 #endif
 #ifndef LANG_ROMANIAN
 #define LANG_ROMANIAN (0)
 #endif
 #ifndef LANG_RUSSIAN
 #define LANG_RUSSIAN (0)
 #endif
 #ifndef LANG_SAMI
 #define LANG_SAMI (0)
 #endif
 #ifndef LANG_SANSKRIT
 #define LANG_SANSKRIT (0)
 #endif
 #ifndef LANG_SERBIAN
 #define LANG_SERBIAN (0)
 #endif
 #ifndef LANG_SINDHI
 #define LANG_SINDHI (0)
 #endif
 #ifndef LANG_SLOVAK
 #define LANG_SLOVAK (0)
 #endif
 #ifndef LANG_SLOVENIAN
 #define LANG_SLOVENIAN (0)
 #endif
 #ifndef LANG_SPANISH
 #define LANG_SPANISH (0)
 #endif
 #ifndef LANG_SWAHILI
 #define LANG_SWAHILI (0)
 #endif
 #ifndef LANG_SWEDISH
 #define LANG_SWEDISH (0)
 #endif
 #ifndef LANG_TAMIL
 #define LANG_TAMIL (0)
 #endif
 #ifndef LANG_TATAR
 #define LANG_TATAR (0)
 #endif
 #ifndef LANG_TELUGU
 #define LANG_TELUGU (0)
 #endif
 #ifndef LANG_THAI
 #define LANG_THAI (0)
 #endif
 #ifndef LANG_TURKISH
 #define LANG_TURKISH (0)
 #endif
 #ifndef LANG_UKRAINIAN
 #define LANG_UKRAINIAN (0)
 #endif
 #ifndef LANG_URDU
 #define LANG_URDU (0)
 #endif
 #ifndef LANG_UZBEK
 #define LANG_UZBEK (0)
 #endif
 #ifndef LANG_VIETNAMESE
 #define LANG_VIETNAMESE (0)
 #endif
 #ifndef SUBLANG_ARABIC_ALGERIA
 #define SUBLANG_ARABIC_ALGERIA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_BAHRAIN
 #define SUBLANG_ARABIC_BAHRAIN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_EGYPT
 #define SUBLANG_ARABIC_EGYPT SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_IRAQ
 #define SUBLANG_ARABIC_IRAQ SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_JORDAN
 #define SUBLANG_ARABIC_JORDAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_KUWAIT
 #define SUBLANG_ARABIC_KUWAIT SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_LEBANON
 #define SUBLANG_ARABIC_LEBANON SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_LIBYA
 #define SUBLANG_ARABIC_LIBYA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_MOROCCO
 #define SUBLANG_ARABIC_MOROCCO SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_OMAN
 #define SUBLANG_ARABIC_OMAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_QATAR
 #define SUBLANG_ARABIC_QATAR SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_SAUDI_ARABIA
 #define SUBLANG_ARABIC_SAUDI_ARABIA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_SYRIA
 #define SUBLANG_ARABIC_SYRIA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_TUNISIA
 #define SUBLANG_ARABIC_TUNISIA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_UAE
 #define SUBLANG_ARABIC_UAE SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ARABIC_YEMEN
 #define SUBLANG_ARABIC_YEMEN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_AZERI_CYRILLIC
 #define SUBLANG_AZERI_CYRILLIC SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_AZERI_LATIN
 #define SUBLANG_AZERI_LATIN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_CHINESE_SIMPLIFIED
 #define SUBLANG_CHINESE_SIMPLIFIED SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_CHINESE_TRADITIONAL
 #define SUBLANG_CHINESE_TRADITIONAL SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_CHINESE_HONGKONG
 #define SUBLANG_CHINESE_HONGKONG SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_CHINESE_MACAU
 #define SUBLANG_CHINESE_MACAU SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_CHINESE_SINGAPORE
 #define SUBLANG_CHINESE_SINGAPORE SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_DUTCH
 #define SUBLANG_DUTCH SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_DUTCH_BELGIAN
 #define SUBLANG_DUTCH_BELGIAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ENGLISH_UK
 #define SUBLANG_ENGLISH_UK SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ENGLISH_US
 #define SUBLANG_ENGLISH_US SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ENGLISH_AUS
 #define SUBLANG_ENGLISH_AUS SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ENGLISH_BELIZE
 #define SUBLANG_ENGLISH_BELIZE SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ENGLISH_CAN
 #define SUBLANG_ENGLISH_CAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ENGLISH_CARIBBEAN
 #define SUBLANG_ENGLISH_CARIBBEAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ENGLISH_EIRE
 #define SUBLANG_ENGLISH_EIRE SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ENGLISH_JAMAICA
 #define SUBLANG_ENGLISH_JAMAICA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ENGLISH_NZ
 #define SUBLANG_ENGLISH_NZ SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ENGLISH_PHILIPPINES
 #define SUBLANG_ENGLISH_PHILIPPINES SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
 #define SUBLANG_ENGLISH_SOUTH_AFRICA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ENGLISH_TRINIDAD
 #define SUBLANG_ENGLISH_TRINIDAD SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ENGLISH_ZIMBABWE
 #define SUBLANG_ENGLISH_ZIMBABWE SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_FRENCH
 #define SUBLANG_FRENCH SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_FRENCH_BELGIAN
 #define SUBLANG_FRENCH_BELGIAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_FRENCH_CANADIAN
 #define SUBLANG_FRENCH_CANADIAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_FRENCH_LUXEMBOURG
 #define SUBLANG_FRENCH_LUXEMBOURG SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_FRENCH_MONACO
 #define SUBLANG_FRENCH_MONACO SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_FRENCH_SWISS
 #define SUBLANG_FRENCH_SWISS SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_GERMAN
 #define SUBLANG_GERMAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_GERMAN_AUSTRIAN
 #define SUBLANG_GERMAN_AUSTRIAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_GERMAN_LIECHTENSTEIN
 #define SUBLANG_GERMAN_LIECHTENSTEIN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_GERMAN_LUXEMBOURG
 #define SUBLANG_GERMAN_LUXEMBOURG SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_GERMAN_SWISS
 #define SUBLANG_GERMAN_SWISS SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ITALIAN
 #define SUBLANG_ITALIAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_ITALIAN_SWISS
 #define SUBLANG_ITALIAN_SWISS SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_KASHMIRI_INDIA
 #define SUBLANG_KASHMIRI_INDIA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_KOREAN
 #define SUBLANG_KOREAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_LITHUANIAN
 #define SUBLANG_LITHUANIAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
 #define SUBLANG_MALAY_BRUNEI_DARUSSALAM SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_MALAY_MALAYSIA
 #define SUBLANG_MALAY_MALAYSIA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_NEPALI_INDIA
 #define SUBLANG_NEPALI_INDIA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_NORWEGIAN_BOKMAL
 #define SUBLANG_NORWEGIAN_BOKMAL SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_NORWEGIAN_NYNORSK
 #define SUBLANG_NORWEGIAN_NYNORSK SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_PORTUGUESE
 #define SUBLANG_PORTUGUESE SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_PORTUGUESE_BRAZILIAN
 #define SUBLANG_PORTUGUESE_BRAZILIAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SERBIAN_CYRILLIC
 #define SUBLANG_SERBIAN_CYRILLIC SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SERBIAN_LATIN
 #define SUBLANG_SERBIAN_LATIN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH
 #define SUBLANG_SPANISH SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_ARGENTINA
 #define SUBLANG_SPANISH_ARGENTINA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_BOLIVIA
 #define SUBLANG_SPANISH_BOLIVIA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_CHILE
 #define SUBLANG_SPANISH_CHILE SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_COLOMBIA
 #define SUBLANG_SPANISH_COLOMBIA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_COSTA_RICA
 #define SUBLANG_SPANISH_COSTA_RICA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
 #define SUBLANG_SPANISH_DOMINICAN_REPUBLIC SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_ECUADOR
 #define SUBLANG_SPANISH_ECUADOR SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_EL_SALVADOR
 #define SUBLANG_SPANISH_EL_SALVADOR SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_GUATEMALA
 #define SUBLANG_SPANISH_GUATEMALA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_HONDURAS
 #define SUBLANG_SPANISH_HONDURAS SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_MEXICAN
 #define SUBLANG_SPANISH_MEXICAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_MODERN
 #define SUBLANG_SPANISH_MODERN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_NICARAGUA
 #define SUBLANG_SPANISH_NICARAGUA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_PANAMA
 #define SUBLANG_SPANISH_PANAMA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_PARAGUAY
 #define SUBLANG_SPANISH_PARAGUAY SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_PERU
 #define SUBLANG_SPANISH_PERU SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_PUERTO_RICO
 #define SUBLANG_SPANISH_PUERTO_RICO SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_URUGUAY
 #define SUBLANG_SPANISH_URUGUAY SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SPANISH_VENEZUELA
 #define SUBLANG_SPANISH_VENEZUELA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SWEDISH
 #define SUBLANG_SWEDISH SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_SWEDISH_FINLAND
 #define SUBLANG_SWEDISH_FINLAND SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_URDU_INDIA
 #define SUBLANG_URDU_INDIA SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_URDU_PAKISTAN
 #define SUBLANG_URDU_PAKISTAN SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_UZBEK_CYRILLIC
 #define SUBLANG_UZBEK_CYRILLIC SUBLANG_DEFAULT
 #endif
 #ifndef SUBLANG_UZBEK_LATIN
 #define SUBLANG_UZBEK_LATIN SUBLANG_DEFAULT
 #endif
 #endif // __WIN32__
 #define LNG(wxlang, canonical, winlang, winsublang, layout, desc) \
    info.Language = wxlang;                               \
    info.CanonicalName = wxT(canonical);                  \
    info.LayoutDirection = layout;                        \
    info.Description = wxT(desc);                         \
    SETWINLANG(info, winlang, winsublang)                 \
    AddLanguage(info);
 void wxLocale::InitLanguagesDB()
 {
   wxLanguageInfo info;
   wxStringTokenizer tkn;
   LNG(wxLANGUAGE_ABKHAZIAN,                  "ab"   , 0              , 0                                 , wxLayout_LeftToRight, "Abkhazian")
   LNG(wxLANGUAGE_AFAR,                       "aa"   , 0              , 0                                 , wxLayout_LeftToRight, "Afar")
   LNG(wxLANGUAGE_AFRIKAANS,                  "af_ZA", LANG_AFRIKAANS , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Afrikaans")
   LNG(wxLANGUAGE_ALBANIAN,                   "sq_AL", LANG_ALBANIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Albanian")
   LNG(wxLANGUAGE_AMHARIC,                    "am"   , 0              , 0                                 , wxLayout_LeftToRight, "Amharic")
   LNG(wxLANGUAGE_ARABIC,                     "ar"   , LANG_ARABIC    , SUBLANG_DEFAULT                   , wxLayout_RightToLeft, "Arabic")
   LNG(wxLANGUAGE_ARABIC_ALGERIA,             "ar_DZ", LANG_ARABIC    , SUBLANG_ARABIC_ALGERIA            , wxLayout_RightToLeft, "Arabic (Algeria)")
   LNG(wxLANGUAGE_ARABIC_BAHRAIN,             "ar_BH", LANG_ARABIC    , SUBLANG_ARABIC_BAHRAIN            , wxLayout_RightToLeft, "Arabic (Bahrain)")
   LNG(wxLANGUAGE_ARABIC_EGYPT,               "ar_EG", LANG_ARABIC    , SUBLANG_ARABIC_EGYPT              , wxLayout_RightToLeft, "Arabic (Egypt)")
   LNG(wxLANGUAGE_ARABIC_IRAQ,                "ar_IQ", LANG_ARABIC    , SUBLANG_ARABIC_IRAQ               , wxLayout_RightToLeft, "Arabic (Iraq)")
   LNG(wxLANGUAGE_ARABIC_JORDAN,              "ar_JO", LANG_ARABIC    , SUBLANG_ARABIC_JORDAN             , wxLayout_RightToLeft, "Arabic (Jordan)")
   LNG(wxLANGUAGE_ARABIC_KUWAIT,              "ar_KW", LANG_ARABIC    , SUBLANG_ARABIC_KUWAIT             , wxLayout_RightToLeft, "Arabic (Kuwait)")
   LNG(wxLANGUAGE_ARABIC_LEBANON,             "ar_LB", LANG_ARABIC    , SUBLANG_ARABIC_LEBANON            , wxLayout_RightToLeft, "Arabic (Lebanon)")
   LNG(wxLANGUAGE_ARABIC_LIBYA,               "ar_LY", LANG_ARABIC    , SUBLANG_ARABIC_LIBYA              , wxLayout_RightToLeft, "Arabic (Libya)")
   LNG(wxLANGUAGE_ARABIC_MOROCCO,             "ar_MA", LANG_ARABIC    , SUBLANG_ARABIC_MOROCCO            , wxLayout_RightToLeft, "Arabic (Morocco)")
   LNG(wxLANGUAGE_ARABIC_OMAN,                "ar_OM", LANG_ARABIC    , SUBLANG_ARABIC_OMAN               , wxLayout_RightToLeft, "Arabic (Oman)")
   LNG(wxLANGUAGE_ARABIC_QATAR,               "ar_QA", LANG_ARABIC    , SUBLANG_ARABIC_QATAR              , wxLayout_RightToLeft, "Arabic (Qatar)")
   LNG(wxLANGUAGE_ARABIC_SAUDI_ARABIA,        "ar_SA", LANG_ARABIC    , SUBLANG_ARABIC_SAUDI_ARABIA       , wxLayout_RightToLeft, "Arabic (Saudi Arabia)")
   LNG(wxLANGUAGE_ARABIC_SUDAN,               "ar_SD", 0              , 0                                 , wxLayout_RightToLeft, "Arabic (Sudan)")
   LNG(wxLANGUAGE_ARABIC_SYRIA,               "ar_SY", LANG_ARABIC    , SUBLANG_ARABIC_SYRIA              , wxLayout_RightToLeft, "Arabic (Syria)")
   LNG(wxLANGUAGE_ARABIC_TUNISIA,             "ar_TN", LANG_ARABIC    , SUBLANG_ARABIC_TUNISIA            , wxLayout_RightToLeft, "Arabic (Tunisia)")
   LNG(wxLANGUAGE_ARABIC_UAE,                 "ar_AE", LANG_ARABIC    , SUBLANG_ARABIC_UAE                , wxLayout_RightToLeft, "Arabic (Uae)")
   LNG(wxLANGUAGE_ARABIC_YEMEN,               "ar_YE", LANG_ARABIC    , SUBLANG_ARABIC_YEMEN              , wxLayout_RightToLeft, "Arabic (Yemen)")
   LNG(wxLANGUAGE_ARMENIAN,                   "hy"   , LANG_ARMENIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Armenian")
   LNG(wxLANGUAGE_ASSAMESE,                   "as"   , LANG_ASSAMESE  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Assamese")
   LNG(wxLANGUAGE_ASTURIAN,                   "ast"  , 0              , 0                                 , wxLayout_LeftToRight, "Asturian")
   LNG(wxLANGUAGE_AYMARA,                     "ay"   , 0              , 0                                 , wxLayout_LeftToRight, "Aymara")
   LNG(wxLANGUAGE_AZERI,                      "az"   , LANG_AZERI     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Azeri")
   LNG(wxLANGUAGE_AZERI_CYRILLIC,             "az"   , LANG_AZERI     , SUBLANG_AZERI_CYRILLIC            , wxLayout_LeftToRight, "Azeri (Cyrillic)")
   LNG(wxLANGUAGE_AZERI_LATIN,                "az"   , LANG_AZERI     , SUBLANG_AZERI_LATIN               , wxLayout_LeftToRight, "Azeri (Latin)")
   LNG(wxLANGUAGE_BASHKIR,                    "ba"   , 0              , 0                                 , wxLayout_LeftToRight, "Bashkir")
   LNG(wxLANGUAGE_BASQUE,                     "eu_ES", LANG_BASQUE    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Basque")
   LNG(wxLANGUAGE_BELARUSIAN,                 "be_BY", LANG_BELARUSIAN, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Belarusian")
   LNG(wxLANGUAGE_BENGALI,                    "bn"   , LANG_BENGALI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Bengali")
   LNG(wxLANGUAGE_BHUTANI,                    "dz"   , 0              , 0                                 , wxLayout_LeftToRight, "Bhutani")
   LNG(wxLANGUAGE_BIHARI,                     "bh"   , 0              , 0                                 , wxLayout_LeftToRight, "Bihari")
   LNG(wxLANGUAGE_BISLAMA,                    "bi"   , 0              , 0                                 , wxLayout_LeftToRight, "Bislama")
   LNG(wxLANGUAGE_BRETON,                     "br"   , 0              , 0                                 , wxLayout_LeftToRight, "Breton")
   LNG(wxLANGUAGE_BULGARIAN,                  "bg_BG", LANG_BULGARIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Bulgarian")
   LNG(wxLANGUAGE_BURMESE,                    "my"   , 0              , 0                                 , wxLayout_LeftToRight, "Burmese")
   LNG(wxLANGUAGE_CAMBODIAN,                  "km"   , 0              , 0                                 , wxLayout_LeftToRight, "Cambodian")
   LNG(wxLANGUAGE_CATALAN,                    "ca_ES", LANG_CATALAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Catalan")
   LNG(wxLANGUAGE_CHINESE,                    "zh_TW", LANG_CHINESE   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Chinese")
   LNG(wxLANGUAGE_CHINESE_SIMPLIFIED,         "zh_CN", LANG_CHINESE   , SUBLANG_CHINESE_SIMPLIFIED        , wxLayout_LeftToRight, "Chinese (Simplified)")
   LNG(wxLANGUAGE_CHINESE_TRADITIONAL,        "zh_TW", LANG_CHINESE   , SUBLANG_CHINESE_TRADITIONAL       , wxLayout_LeftToRight, "Chinese (Traditional)")
   LNG(wxLANGUAGE_CHINESE_HONGKONG,           "zh_HK", LANG_CHINESE   , SUBLANG_CHINESE_HONGKONG          , wxLayout_LeftToRight, "Chinese (Hongkong)")
   LNG(wxLANGUAGE_CHINESE_MACAU,              "zh_MO", LANG_CHINESE   , SUBLANG_CHINESE_MACAU             , wxLayout_LeftToRight, "Chinese (Macau)")
   LNG(wxLANGUAGE_CHINESE_SINGAPORE,          "zh_SG", LANG_CHINESE   , SUBLANG_CHINESE_SINGAPORE         , wxLayout_LeftToRight, "Chinese (Singapore)")
   LNG(wxLANGUAGE_CHINESE_TAIWAN,             "zh_TW", LANG_CHINESE   , SUBLANG_CHINESE_TRADITIONAL       , wxLayout_LeftToRight, "Chinese (Taiwan)")
   LNG(wxLANGUAGE_CORSICAN,                   "co"   , 0              , 0                                 , wxLayout_LeftToRight, "Corsican")
   LNG(wxLANGUAGE_CROATIAN,                   "hr_HR", LANG_CROATIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Croatian")
   LNG(wxLANGUAGE_CZECH,                      "cs_CZ", LANG_CZECH     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Czech")
   LNG(wxLANGUAGE_DANISH,                     "da_DK", LANG_DANISH    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Danish")
   LNG(wxLANGUAGE_DUTCH,                      "nl_NL", LANG_DUTCH     , SUBLANG_DUTCH                     , wxLayout_LeftToRight, "Dutch")
   LNG(wxLANGUAGE_DUTCH_BELGIAN,              "nl_BE", LANG_DUTCH     , SUBLANG_DUTCH_BELGIAN             , wxLayout_LeftToRight, "Dutch (Belgian)")
   LNG(wxLANGUAGE_ENGLISH,                    "en_GB", LANG_ENGLISH   , SUBLANG_ENGLISH_UK                , wxLayout_LeftToRight, "English")
   LNG(wxLANGUAGE_ENGLISH_UK,                 "en_GB", LANG_ENGLISH   , SUBLANG_ENGLISH_UK                , wxLayout_LeftToRight, "English (U.K.)")
   LNG(wxLANGUAGE_ENGLISH_US,                 "en_US", LANG_ENGLISH   , SUBLANG_ENGLISH_US                , wxLayout_LeftToRight, "English (U.S.)")
   LNG(wxLANGUAGE_ENGLISH_AUSTRALIA,          "en_AU", LANG_ENGLISH   , SUBLANG_ENGLISH_AUS               , wxLayout_LeftToRight, "English (Australia)")
   LNG(wxLANGUAGE_ENGLISH_BELIZE,             "en_BZ", LANG_ENGLISH   , SUBLANG_ENGLISH_BELIZE            , wxLayout_LeftToRight, "English (Belize)")
   LNG(wxLANGUAGE_ENGLISH_BOTSWANA,           "en_BW", 0              , 0                                 , wxLayout_LeftToRight, "English (Botswana)")
   LNG(wxLANGUAGE_ENGLISH_CANADA,             "en_CA", LANG_ENGLISH   , SUBLANG_ENGLISH_CAN               , wxLayout_LeftToRight, "English (Canada)")
   LNG(wxLANGUAGE_ENGLISH_CARIBBEAN,          "en_CB", LANG_ENGLISH   , SUBLANG_ENGLISH_CARIBBEAN         , wxLayout_LeftToRight, "English (Caribbean)")
   LNG(wxLANGUAGE_ENGLISH_DENMARK,            "en_DK", 0              , 0                                 , wxLayout_LeftToRight, "English (Denmark)")
   LNG(wxLANGUAGE_ENGLISH_EIRE,               "en_IE", LANG_ENGLISH   , SUBLANG_ENGLISH_EIRE              , wxLayout_LeftToRight, "English (Eire)")
   LNG(wxLANGUAGE_ENGLISH_JAMAICA,            "en_JM", LANG_ENGLISH   , SUBLANG_ENGLISH_JAMAICA           , wxLayout_LeftToRight, "English (Jamaica)")
   LNG(wxLANGUAGE_ENGLISH_NEW_ZEALAND,        "en_NZ", LANG_ENGLISH   , SUBLANG_ENGLISH_NZ                , wxLayout_LeftToRight, "English (New Zealand)")
   LNG(wxLANGUAGE_ENGLISH_PHILIPPINES,        "en_PH", LANG_ENGLISH   , SUBLANG_ENGLISH_PHILIPPINES       , wxLayout_LeftToRight, "English (Philippines)")
   LNG(wxLANGUAGE_ENGLISH_SOUTH_AFRICA,       "en_ZA", LANG_ENGLISH   , SUBLANG_ENGLISH_SOUTH_AFRICA      , wxLayout_LeftToRight, "English (South Africa)")
   LNG(wxLANGUAGE_ENGLISH_TRINIDAD,           "en_TT", LANG_ENGLISH   , SUBLANG_ENGLISH_TRINIDAD          , wxLayout_LeftToRight, "English (Trinidad)")
   LNG(wxLANGUAGE_ENGLISH_ZIMBABWE,           "en_ZW", LANG_ENGLISH   , SUBLANG_ENGLISH_ZIMBABWE          , wxLayout_LeftToRight, "English (Zimbabwe)")
   LNG(wxLANGUAGE_ESPERANTO,                  "eo"   , 0              , 0                                 , wxLayout_LeftToRight, "Esperanto")
   LNG(wxLANGUAGE_ESTONIAN,                   "et_EE", LANG_ESTONIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Estonian")
   LNG(wxLANGUAGE_FAEROESE,                   "fo_FO", LANG_FAEROESE  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Faeroese")
   LNG(wxLANGUAGE_FARSI,                      "fa_IR", LANG_FARSI     , SUBLANG_DEFAULT                   , wxLayout_RightToLeft, "Farsi")
   LNG(wxLANGUAGE_FIJI,                       "fj"   , 0              , 0                                 , wxLayout_LeftToRight, "Fiji")
   LNG(wxLANGUAGE_FINNISH,                    "fi_FI", LANG_FINNISH   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Finnish")
   LNG(wxLANGUAGE_FRENCH,                     "fr_FR", LANG_FRENCH    , SUBLANG_FRENCH                    , wxLayout_LeftToRight, "French")
   LNG(wxLANGUAGE_FRENCH_BELGIAN,             "fr_BE", LANG_FRENCH    , SUBLANG_FRENCH_BELGIAN            , wxLayout_LeftToRight, "French (Belgian)")
   LNG(wxLANGUAGE_FRENCH_CANADIAN,            "fr_CA", LANG_FRENCH    , SUBLANG_FRENCH_CANADIAN           , wxLayout_LeftToRight, "French (Canadian)")
   LNG(wxLANGUAGE_FRENCH_LUXEMBOURG,          "fr_LU", LANG_FRENCH    , SUBLANG_FRENCH_LUXEMBOURG         , wxLayout_LeftToRight, "French (Luxembourg)")
   LNG(wxLANGUAGE_FRENCH_MONACO,              "fr_MC", LANG_FRENCH    , SUBLANG_FRENCH_MONACO             , wxLayout_LeftToRight, "French (Monaco)")
   LNG(wxLANGUAGE_FRENCH_SWISS,               "fr_CH", LANG_FRENCH    , SUBLANG_FRENCH_SWISS              , wxLayout_LeftToRight, "French (Swiss)")
   LNG(wxLANGUAGE_FRISIAN,                    "fy"   , 0              , 0                                 , wxLayout_LeftToRight, "Frisian")
   LNG(wxLANGUAGE_GALICIAN,                   "gl_ES", 0              , 0                                 , wxLayout_LeftToRight, "Galician")
   LNG(wxLANGUAGE_GEORGIAN,                   "ka_GE", LANG_GEORGIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Georgian")
   LNG(wxLANGUAGE_GERMAN,                     "de_DE", LANG_GERMAN    , SUBLANG_GERMAN                    , wxLayout_LeftToRight, "German")
   LNG(wxLANGUAGE_GERMAN_AUSTRIAN,            "de_AT", LANG_GERMAN    , SUBLANG_GERMAN_AUSTRIAN           , wxLayout_LeftToRight, "German (Austrian)")
   LNG(wxLANGUAGE_GERMAN_BELGIUM,             "de_BE", 0              , 0                                 , wxLayout_LeftToRight, "German (Belgium)")
   LNG(wxLANGUAGE_GERMAN_LIECHTENSTEIN,       "de_LI", LANG_GERMAN    , SUBLANG_GERMAN_LIECHTENSTEIN      , wxLayout_LeftToRight, "German (Liechtenstein)")
   LNG(wxLANGUAGE_GERMAN_LUXEMBOURG,          "de_LU", LANG_GERMAN    , SUBLANG_GERMAN_LUXEMBOURG         , wxLayout_LeftToRight, "German (Luxembourg)")
   LNG(wxLANGUAGE_GERMAN_SWISS,               "de_CH", LANG_GERMAN    , SUBLANG_GERMAN_SWISS              , wxLayout_LeftToRight, "German (Swiss)")
   LNG(wxLANGUAGE_GREEK,                      "el_GR", LANG_GREEK     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Greek")
   LNG(wxLANGUAGE_GREENLANDIC,                "kl_GL", 0              , 0                                 , wxLayout_LeftToRight, "Greenlandic")
   LNG(wxLANGUAGE_GUARANI,                    "gn"   , 0              , 0                                 , wxLayout_LeftToRight, "Guarani")
   LNG(wxLANGUAGE_GUJARATI,                   "gu"   , LANG_GUJARATI  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Gujarati")
   LNG(wxLANGUAGE_HAUSA,                      "ha"   , 0              , 0                                 , wxLayout_LeftToRight, "Hausa")
   LNG(wxLANGUAGE_HEBREW,                     "he_IL", LANG_HEBREW    , SUBLANG_DEFAULT                   , wxLayout_RightToLeft, "Hebrew")
   LNG(wxLANGUAGE_HINDI,                      "hi_IN", LANG_HINDI     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Hindi")
   LNG(wxLANGUAGE_HUNGARIAN,                  "hu_HU", LANG_HUNGARIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Hungarian")
   LNG(wxLANGUAGE_ICELANDIC,                  "is_IS", LANG_ICELANDIC , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Icelandic")
   LNG(wxLANGUAGE_INDONESIAN,                 "id_ID", LANG_INDONESIAN, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Indonesian")
   LNG(wxLANGUAGE_INTERLINGUA,                "ia"   , 0              , 0                                 , wxLayout_LeftToRight, "Interlingua")
   LNG(wxLANGUAGE_INTERLINGUE,                "ie"   , 0              , 0                                 , wxLayout_LeftToRight, "Interlingue")
   LNG(wxLANGUAGE_INUKTITUT,                  "iu"   , 0              , 0                                 , wxLayout_LeftToRight, "Inuktitut")
   LNG(wxLANGUAGE_INUPIAK,                    "ik"   , 0              , 0                                 , wxLayout_LeftToRight, "Inupiak")
   LNG(wxLANGUAGE_IRISH,                      "ga_IE", 0              , 0                                 , wxLayout_LeftToRight, "Irish")
   LNG(wxLANGUAGE_ITALIAN,                    "it_IT", LANG_ITALIAN   , SUBLANG_ITALIAN                   , wxLayout_LeftToRight, "Italian")
   LNG(wxLANGUAGE_ITALIAN_SWISS,              "it_CH", LANG_ITALIAN   , SUBLANG_ITALIAN_SWISS             , wxLayout_LeftToRight, "Italian (Swiss)")
   LNG(wxLANGUAGE_JAPANESE,                   "ja_JP", LANG_JAPANESE  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Japanese")
   LNG(wxLANGUAGE_JAVANESE,                   "jw"   , 0              , 0                                 , wxLayout_LeftToRight, "Javanese")
   LNG(wxLANGUAGE_KANNADA,                    "kn"   , LANG_KANNADA   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Kannada")
   LNG(wxLANGUAGE_KASHMIRI,                   "ks"   , LANG_KASHMIRI  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Kashmiri")
   LNG(wxLANGUAGE_KASHMIRI_INDIA,             "ks_IN", LANG_KASHMIRI  , SUBLANG_KASHMIRI_INDIA            , wxLayout_LeftToRight, "Kashmiri (India)")
   LNG(wxLANGUAGE_KAZAKH,                     "kk"   , LANG_KAZAK     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Kazakh")
   LNG(wxLANGUAGE_KERNEWEK,                   "kw_GB", 0              , 0                                 , wxLayout_LeftToRight, "Kernewek")
   LNG(wxLANGUAGE_KINYARWANDA,                "rw"   , 0              , 0                                 , wxLayout_LeftToRight, "Kinyarwanda")
   LNG(wxLANGUAGE_KIRGHIZ,                    "ky"   , 0              , 0                                 , wxLayout_LeftToRight, "Kirghiz")
   LNG(wxLANGUAGE_KIRUNDI,                    "rn"   , 0              , 0                                 , wxLayout_LeftToRight, "Kirundi")
   LNG(wxLANGUAGE_KONKANI,                    ""     , LANG_KONKANI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Konkani")
   LNG(wxLANGUAGE_KOREAN,                     "ko_KR", LANG_KOREAN    , SUBLANG_KOREAN                    , wxLayout_LeftToRight, "Korean")
   LNG(wxLANGUAGE_KURDISH,                    "ku_TR", 0              , 0                                 , wxLayout_LeftToRight, "Kurdish")
   LNG(wxLANGUAGE_LAOTHIAN,                   "lo"   , 0              , 0                                 , wxLayout_LeftToRight, "Laothian")
   LNG(wxLANGUAGE_LATIN,                      "la"   , 0              , 0                                 , wxLayout_LeftToRight, "Latin")
   LNG(wxLANGUAGE_LATVIAN,                    "lv_LV", LANG_LATVIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Latvian")
   LNG(wxLANGUAGE_LINGALA,                    "ln"   , 0              , 0                                 , wxLayout_LeftToRight, "Lingala")
   LNG(wxLANGUAGE_LITHUANIAN,                 "lt_LT", LANG_LITHUANIAN, SUBLANG_LITHUANIAN                , wxLayout_LeftToRight, "Lithuanian")
   LNG(wxLANGUAGE_MACEDONIAN,                 "mk_MK", LANG_MACEDONIAN, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Macedonian")
   LNG(wxLANGUAGE_MALAGASY,                   "mg"   , 0              , 0                                 , wxLayout_LeftToRight, "Malagasy")
   LNG(wxLANGUAGE_MALAY,                      "ms_MY", LANG_MALAY     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Malay")
   LNG(wxLANGUAGE_MALAYALAM,                  "ml"   , LANG_MALAYALAM , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Malayalam")
   LNG(wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM,    "ms_BN", LANG_MALAY     , SUBLANG_MALAY_BRUNEI_DARUSSALAM   , wxLayout_LeftToRight, "Malay (Brunei Darussalam)")
   LNG(wxLANGUAGE_MALAY_MALAYSIA,             "ms_MY", LANG_MALAY     , SUBLANG_MALAY_MALAYSIA            , wxLayout_LeftToRight, "Malay (Malaysia)")
   LNG(wxLANGUAGE_MALTESE,                    "mt_MT", 0              , 0                                 , wxLayout_LeftToRight, "Maltese")
   LNG(wxLANGUAGE_MANIPURI,                   ""     , LANG_MANIPURI  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Manipuri")
   LNG(wxLANGUAGE_MAORI,                      "mi"   , 0              , 0                                 , wxLayout_LeftToRight, "Maori")
   LNG(wxLANGUAGE_MARATHI,                    "mr_IN", LANG_MARATHI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Marathi")
   LNG(wxLANGUAGE_MOLDAVIAN,                  "mo"   , 0              , 0                                 , wxLayout_LeftToRight, "Moldavian")
   LNG(wxLANGUAGE_MONGOLIAN,                  "mn"   , 0              , 0                                 , wxLayout_LeftToRight, "Mongolian")
   LNG(wxLANGUAGE_NAURU,                      "na"   , 0              , 0                                 , wxLayout_LeftToRight, "Nauru")
   LNG(wxLANGUAGE_NEPALI,                     "ne_NP", LANG_NEPALI    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Nepali")
   LNG(wxLANGUAGE_NEPALI_INDIA,               "ne_IN", LANG_NEPALI    , SUBLANG_NEPALI_INDIA              , wxLayout_LeftToRight, "Nepali (India)")
   LNG(wxLANGUAGE_NORWEGIAN_BOKMAL,           "nb_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_BOKMAL          , wxLayout_LeftToRight, "Norwegian (Bokmal)")
   LNG(wxLANGUAGE_NORWEGIAN_NYNORSK,          "nn_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_NYNORSK         , wxLayout_LeftToRight, "Norwegian (Nynorsk)")
   LNG(wxLANGUAGE_OCCITAN,                    "oc"   , 0              , 0                                 , wxLayout_LeftToRight, "Occitan")
   LNG(wxLANGUAGE_ORIYA,                      "or"   , LANG_ORIYA     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Oriya")
   LNG(wxLANGUAGE_OROMO,                      "om"   , 0              , 0                                 , wxLayout_LeftToRight, "(Afan) Oromo")
   LNG(wxLANGUAGE_PASHTO,                     "ps"   , 0              , 0                                 , wxLayout_LeftToRight, "Pashto, Pushto")
   LNG(wxLANGUAGE_POLISH,                     "pl_PL", LANG_POLISH    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Polish")
   LNG(wxLANGUAGE_PORTUGUESE,                 "pt_PT", LANG_PORTUGUESE, SUBLANG_PORTUGUESE                , wxLayout_LeftToRight, "Portuguese")
   LNG(wxLANGUAGE_PORTUGUESE_BRAZILIAN,       "pt_BR", LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN      , wxLayout_LeftToRight, "Portuguese (Brazilian)")
   LNG(wxLANGUAGE_PUNJABI,                    "pa"   , LANG_PUNJABI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Punjabi")
   LNG(wxLANGUAGE_QUECHUA,                    "qu"   , 0              , 0                                 , wxLayout_LeftToRight, "Quechua")
   LNG(wxLANGUAGE_RHAETO_ROMANCE,             "rm"   , 0              , 0                                 , wxLayout_LeftToRight, "Rhaeto-Romance")
   LNG(wxLANGUAGE_ROMANIAN,                   "ro_RO", LANG_ROMANIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Romanian")
   LNG(wxLANGUAGE_RUSSIAN,                    "ru_RU", LANG_RUSSIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Russian")
   LNG(wxLANGUAGE_RUSSIAN_UKRAINE,            "ru_UA", 0              , 0                                 , wxLayout_LeftToRight, "Russian (Ukraine)")
   LNG(wxLANGUAGE_SAMI,                       "se_NO", LANG_SAMI      , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Northern Sami")
   LNG(wxLANGUAGE_SAMOAN,                     "sm"   , 0              , 0                                 , wxLayout_LeftToRight, "Samoan")
   LNG(wxLANGUAGE_SANGHO,                     "sg"   , 0              , 0                                 , wxLayout_LeftToRight, "Sangho")
   LNG(wxLANGUAGE_SANSKRIT,                   "sa"   , LANG_SANSKRIT  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Sanskrit")
   LNG(wxLANGUAGE_SCOTS_GAELIC,               "gd"   , 0              , 0                                 , wxLayout_LeftToRight, "Scots Gaelic")
   LNG(wxLANGUAGE_SERBIAN,                    "sr_RS", LANG_SERBIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Serbian")
   LNG(wxLANGUAGE_SERBIAN_CYRILLIC,           "sr_RS", LANG_SERBIAN   , SUBLANG_SERBIAN_CYRILLIC          , wxLayout_LeftToRight, "Serbian (Cyrillic)")
   LNG(wxLANGUAGE_SERBIAN_LATIN,              "sr_RS@latin", LANG_SERBIAN   , SUBLANG_SERBIAN_LATIN             , wxLayout_LeftToRight, "Serbian (Latin)")
   LNG(wxLANGUAGE_SERBIAN_CYRILLIC,           "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_CYRILLIC          , wxLayout_LeftToRight, "Serbian (Cyrillic)")
   LNG(wxLANGUAGE_SERBIAN_LATIN,              "sr_YU@latin", LANG_SERBIAN   , SUBLANG_SERBIAN_LATIN             , wxLayout_LeftToRight, "Serbian (Latin)")
   LNG(wxLANGUAGE_SERBO_CROATIAN,             "sh"   , 0              , 0                                 , wxLayout_LeftToRight, "Serbo-Croatian")
   LNG(wxLANGUAGE_SESOTHO,                    "st"   , 0              , 0                                 , wxLayout_LeftToRight, "Sesotho")
   LNG(wxLANGUAGE_SETSWANA,                   "tn"   , 0              , 0                                 , wxLayout_LeftToRight, "Setswana")
   LNG(wxLANGUAGE_SHONA,                      "sn"   , 0              , 0                                 , wxLayout_LeftToRight, "Shona")
   LNG(wxLANGUAGE_SINDHI,                     "sd"   , LANG_SINDHI    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Sindhi")
   LNG(wxLANGUAGE_SINHALESE,                  "si"   , 0              , 0                                 , wxLayout_LeftToRight, "Sinhalese")
   LNG(wxLANGUAGE_SISWATI,                    "ss"   , 0              , 0                                 , wxLayout_LeftToRight, "Siswati")
   LNG(wxLANGUAGE_SLOVAK,                     "sk_SK", LANG_SLOVAK    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Slovak")
   LNG(wxLANGUAGE_SLOVENIAN,                  "sl_SI", LANG_SLOVENIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Slovenian")
   LNG(wxLANGUAGE_SOMALI,                     "so"   , 0              , 0                                 , wxLayout_LeftToRight, "Somali")
   LNG(wxLANGUAGE_SPANISH,                    "es_ES", LANG_SPANISH   , SUBLANG_SPANISH                   , wxLayout_LeftToRight, "Spanish")
   LNG(wxLANGUAGE_SPANISH_ARGENTINA,          "es_AR", LANG_SPANISH   , SUBLANG_SPANISH_ARGENTINA         , wxLayout_LeftToRight, "Spanish (Argentina)")
   LNG(wxLANGUAGE_SPANISH_BOLIVIA,            "es_BO", LANG_SPANISH   , SUBLANG_SPANISH_BOLIVIA           , wxLayout_LeftToRight, "Spanish (Bolivia)")
   LNG(wxLANGUAGE_SPANISH_CHILE,              "es_CL", LANG_SPANISH   , SUBLANG_SPANISH_CHILE             , wxLayout_LeftToRight, "Spanish (Chile)")
   LNG(wxLANGUAGE_SPANISH_COLOMBIA,           "es_CO", LANG_SPANISH   , SUBLANG_SPANISH_COLOMBIA          , wxLayout_LeftToRight, "Spanish (Colombia)")
   LNG(wxLANGUAGE_SPANISH_COSTA_RICA,         "es_CR", LANG_SPANISH   , SUBLANG_SPANISH_COSTA_RICA        , wxLayout_LeftToRight, "Spanish (Costa Rica)")
   LNG(wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, "es_DO", LANG_SPANISH   , SUBLANG_SPANISH_DOMINICAN_REPUBLIC, wxLayout_LeftToRight, "Spanish (Dominican republic)")
   LNG(wxLANGUAGE_SPANISH_ECUADOR,            "es_EC", LANG_SPANISH   , SUBLANG_SPANISH_ECUADOR           , wxLayout_LeftToRight, "Spanish (Ecuador)")
   LNG(wxLANGUAGE_SPANISH_EL_SALVADOR,        "es_SV", LANG_SPANISH   , SUBLANG_SPANISH_EL_SALVADOR       , wxLayout_LeftToRight, "Spanish (El Salvador)")
   LNG(wxLANGUAGE_SPANISH_GUATEMALA,          "es_GT", LANG_SPANISH   , SUBLANG_SPANISH_GUATEMALA         , wxLayout_LeftToRight, "Spanish (Guatemala)")
   LNG(wxLANGUAGE_SPANISH_HONDURAS,           "es_HN", LANG_SPANISH   , SUBLANG_SPANISH_HONDURAS          , wxLayout_LeftToRight, "Spanish (Honduras)")
   LNG(wxLANGUAGE_SPANISH_MEXICAN,            "es_MX", LANG_SPANISH   , SUBLANG_SPANISH_MEXICAN           , wxLayout_LeftToRight, "Spanish (Mexican)")
   LNG(wxLANGUAGE_SPANISH_MODERN,             "es_ES", LANG_SPANISH   , SUBLANG_SPANISH_MODERN            , wxLayout_LeftToRight, "Spanish (Modern)")
   LNG(wxLANGUAGE_SPANISH_NICARAGUA,          "es_NI", LANG_SPANISH   , SUBLANG_SPANISH_NICARAGUA         , wxLayout_LeftToRight, "Spanish (Nicaragua)")
   LNG(wxLANGUAGE_SPANISH_PANAMA,             "es_PA", LANG_SPANISH   , SUBLANG_SPANISH_PANAMA            , wxLayout_LeftToRight, "Spanish (Panama)")
   LNG(wxLANGUAGE_SPANISH_PARAGUAY,           "es_PY", LANG_SPANISH   , SUBLANG_SPANISH_PARAGUAY          , wxLayout_LeftToRight, "Spanish (Paraguay)")
   LNG(wxLANGUAGE_SPANISH_PERU,               "es_PE", LANG_SPANISH   , SUBLANG_SPANISH_PERU              , wxLayout_LeftToRight, "Spanish (Peru)")
   LNG(wxLANGUAGE_SPANISH_PUERTO_RICO,        "es_PR", LANG_SPANISH   , SUBLANG_SPANISH_PUERTO_RICO       , wxLayout_LeftToRight, "Spanish (Puerto Rico)")
   LNG(wxLANGUAGE_SPANISH_URUGUAY,            "es_UY", LANG_SPANISH   , SUBLANG_SPANISH_URUGUAY           , wxLayout_LeftToRight, "Spanish (Uruguay)")
   LNG(wxLANGUAGE_SPANISH_US,                 "es_US", 0              , 0                                 , wxLayout_LeftToRight, "Spanish (U.S.)")
   LNG(wxLANGUAGE_SPANISH_VENEZUELA,          "es_VE", LANG_SPANISH   , SUBLANG_SPANISH_VENEZUELA         , wxLayout_LeftToRight, "Spanish (Venezuela)")
   LNG(wxLANGUAGE_SUNDANESE,                  "su"   , 0              , 0                                 , wxLayout_LeftToRight, "Sundanese")
   LNG(wxLANGUAGE_SWAHILI,                    "sw_KE", LANG_SWAHILI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Swahili")
   LNG(wxLANGUAGE_SWEDISH,                    "sv_SE", LANG_SWEDISH   , SUBLANG_SWEDISH                   , wxLayout_LeftToRight, "Swedish")
   LNG(wxLANGUAGE_SWEDISH_FINLAND,            "sv_FI", LANG_SWEDISH   , SUBLANG_SWEDISH_FINLAND           , wxLayout_LeftToRight, "Swedish (Finland)")
   LNG(wxLANGUAGE_TAGALOG,                    "tl_PH", 0              , 0                                 , wxLayout_LeftToRight, "Tagalog")
   LNG(wxLANGUAGE_TAJIK,                      "tg"   , 0              , 0                                 , wxLayout_LeftToRight, "Tajik")
   LNG(wxLANGUAGE_TAMIL,                      "ta"   , LANG_TAMIL     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Tamil")
   LNG(wxLANGUAGE_TATAR,                      "tt"   , LANG_TATAR     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Tatar")
   LNG(wxLANGUAGE_TELUGU,                     "te"   , LANG_TELUGU    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Telugu")
   LNG(wxLANGUAGE_THAI,                       "th_TH", LANG_THAI      , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Thai")
   LNG(wxLANGUAGE_TIBETAN,                    "bo"   , 0              , 0                                 , wxLayout_LeftToRight, "Tibetan")
   LNG(wxLANGUAGE_TIGRINYA,                   "ti"   , 0              , 0                                 , wxLayout_LeftToRight, "Tigrinya")
   LNG(wxLANGUAGE_TONGA,                      "to"   , 0              , 0                                 , wxLayout_LeftToRight, "Tonga")
   LNG(wxLANGUAGE_TSONGA,                     "ts"   , 0              , 0                                 , wxLayout_LeftToRight, "Tsonga")
   LNG(wxLANGUAGE_TURKISH,                    "tr_TR", LANG_TURKISH   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Turkish")
   LNG(wxLANGUAGE_TURKMEN,                    "tk"   , 0              , 0                                 , wxLayout_LeftToRight, "Turkmen")
   LNG(wxLANGUAGE_TWI,                        "tw"   , 0              , 0                                 , wxLayout_LeftToRight, "Twi")
   LNG(wxLANGUAGE_UIGHUR,                     "ug"   , 0              , 0                                 , wxLayout_LeftToRight, "Uighur")
   LNG(wxLANGUAGE_UKRAINIAN,                  "uk_UA", LANG_UKRAINIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Ukrainian")
   LNG(wxLANGUAGE_URDU,                       "ur"   , LANG_URDU      , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Urdu")
   LNG(wxLANGUAGE_URDU_INDIA,                 "ur_IN", LANG_URDU      , SUBLANG_URDU_INDIA                , wxLayout_LeftToRight, "Urdu (India)")
   LNG(wxLANGUAGE_URDU_PAKISTAN,              "ur_PK", LANG_URDU      , SUBLANG_URDU_PAKISTAN             , wxLayout_LeftToRight, "Urdu (Pakistan)")
   LNG(wxLANGUAGE_UZBEK,                      "uz"   , LANG_UZBEK     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Uzbek")
   LNG(wxLANGUAGE_UZBEK_CYRILLIC,             "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_CYRILLIC            , wxLayout_LeftToRight, "Uzbek (Cyrillic)")
   LNG(wxLANGUAGE_UZBEK_LATIN,                "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_LATIN               , wxLayout_LeftToRight, "Uzbek (Latin)")
   LNG(wxLANGUAGE_VALENCIAN,                  "ca_ES@valencia", 0              , 0                                 , wxLayout_LeftToRight, "Valencian (Southern Catalan)")
   LNG(wxLANGUAGE_VIETNAMESE,                 "vi_VN", LANG_VIETNAMESE, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Vietnamese")
   LNG(wxLANGUAGE_VOLAPUK,                    "vo"   , 0              , 0                                 , wxLayout_LeftToRight, "Volapuk")
   LNG(wxLANGUAGE_WELSH,                      "cy"   , 0              , 0                                 , wxLayout_LeftToRight, "Welsh")
   LNG(wxLANGUAGE_WOLOF,                      "wo"   , 0              , 0                                 , wxLayout_LeftToRight, "Wolof")
   LNG(wxLANGUAGE_XHOSA,                      "xh"   , 0              , 0                                 , wxLayout_LeftToRight, "Xhosa")
   LNG(wxLANGUAGE_YIDDISH,                    "yi"   , 0              , 0                                 , wxLayout_LeftToRight, "Yiddish")
   LNG(wxLANGUAGE_YORUBA,                     "yo"   , 0              , 0                                 , wxLayout_LeftToRight, "Yoruba")
   LNG(wxLANGUAGE_ZHUANG,                     "za"   , 0              , 0                                 , wxLayout_LeftToRight, "Zhuang")
   LNG(wxLANGUAGE_ZULU,                       "zu"   , 0              , 0                                 , wxLayout_LeftToRight, "Zulu")
 }
 #undef LNG
 // --- --- --- generated code ends here --- --- ---
 #endif // wxUSE_INTL
--- a/src/common/translation.cpp
+++ b/src/common/translation.cpp
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -271,6 +271,7 @@ wx/ioswrap.h
 wx/ipc.h
 wx/ipcbase.h
 wx/kbdstate.h
 wx/language.h
 wx/link.h
 wx/list.h
 wx/listimpl.cpp
@@ -322,6 +323,7 @@ wx/timer.h
 wx/tls.h
 wx/tokenzr.h
 wx/tracker.h
 wx/translation.h
 wx/txtstrm.h
 wx/typeinfo.h
 wx/types.h
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -176,6 +176,7 @@ wx/ioswrap.h
 wx/ipc.h
 wx/ipcbase.h
 wx/kbdstate.h
 wx/language.h
 wx/link.h
 wx/list.h
 wx/listimpl.cpp
@@ -227,6 +228,7 @@ wx/timer.h
 wx/tls.h
 wx/tokenzr.h
 wx/tracker.h
 wx/translation.h
 wx/txtstrm.h
 wx/typeinfo.h
 wx/types.h
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -200,6 +200,7 @@ wx/ioswrap.h
 wx/ipc.h
 wx/ipcbase.h
 wx/kbdstate.h
 wx/language.h
 wx/link.h
 wx/list.h
 wx/listimpl.cpp
@@ -251,6 +252,7 @@ wx/timer.h
 wx/tls.h
 wx/tokenzr.h
 wx/tracker.h
 wx/translation.h
 wx/txtstrm.h
 wx/typeinfo.h
 wx/types.h