diff --git a/dll/win32/kernel32/winnls/locale_rc.rc b/dll/win32/kernel32/winnls/locale_rc.rc
index 96a33848688..86ababd0900 100644
--- a/dll/win32/kernel32/winnls/locale_rc.rc
+++ b/dll/win32/kernel32/winnls/locale_rc.rc
@@ -15,377 +15,248 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
-//#include "winbase.h"
-#include <winnls.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
 
 #define LGRPID_RES_BASE 0x2000
 
 /* add languages in numerical order of main language (last two digits)
  * it is much easier to find the missing holes that way */
 
-#pragma code_page(1256)
 #include "nls/ara.nls"   /* 0x0401  LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA */
-#pragma code_page(1256)
 #include "nls/ari.nls"   /* 0x0801  LANG_ARABIC, SUBLANG_ARABIC_IRAQ */
-#pragma code_page(1256)
 #include "nls/are.nls"   /* 0x0c01  LANG_ARABIC, SUBLANG_ARABIC_EGYPT */
-#pragma code_page(1256)
 #include "nls/arl.nls"   /* 0x1001  LANG_ARABIC, SUBLANG_ARABIC_LIBYA */
-#pragma code_page(1256)
 #include "nls/arg.nls"   /* 0x1401  LANG_ARABIC, SUBLANG_ARABIC_ALGERIA */
-#pragma code_page(1256)
 #include "nls/arm.nls"   /* 0x1801  LANG_ARABIC, SUBLANG_ARABIC_MOROCCO */
-#pragma code_page(1256)
 #include "nls/art.nls"   /* 0x1c01  LANG_ARABIC, SUBLANG_ARABIC_TUNISIA */
-#pragma code_page(1256)
 #include "nls/aro.nls"   /* 0x2001  LANG_ARABIC, SUBLANG_ARABIC_OMAN */
-#pragma code_page(1256)
 #include "nls/ary.nls"   /* 0x2401  LANG_ARABIC, SUBLANG_ARABIC_YEMEN */
-#pragma code_page(1256)
 #include "nls/ars.nls"   /* 0x2801  LANG_ARABIC, SUBLANG_ARABIC_SYRIA */
-#pragma code_page(1256)
 #include "nls/arj.nls"   /* 0x2c01  LANG_ARABIC, SUBLANG_ARABIC_JORDAN */
-#pragma code_page(1256)
 #include "nls/arb.nls"   /* 0x3001  LANG_ARABIC, SUBLANG_ARABIC_LEBANON */
-#pragma code_page(1256)
 #include "nls/ark.nls"   /* 0x3401  LANG_ARABIC, SUBLANG_ARABIC_KUWAIT */
-#pragma code_page(1256)
 #include "nls/aru.nls"   /* 0x3801  LANG_ARABIC, SUBLANG_ARABIC_UAE */
-#pragma code_page(1256)
 #include "nls/arh.nls"   /* 0x3c01  LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN */
-#pragma code_page(1256)
 #include "nls/arq.nls"   /* 0x4001  LANG_ARABIC, SUBLANG_ARABIC_QATAR */
 
-#pragma code_page(1251)
 #include "nls/bgr.nls"   /* 0x0402  LANG_BULGARIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
 #include "nls/cat.nls"   /* 0x0403  LANG_CATALAN, SUBLANG_DEFAULT */
 
-#pragma code_page(950)
 #include "nls/cht.nls"   /* 0x0404  LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL */
-#pragma code_page(936)
 #include "nls/chs.nls"   /* 0x0804  LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED */
-#pragma code_page(950)
 #include "nls/zhh.nls"   /* 0x0c04  LANG_CHINESE, SUBLANG_CHINESE_HONGKONG */
-#pragma code_page(936)
 #include "nls/zhi.nls"   /* 0x1004  LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE */
-#pragma code_page(950)
 #include "nls/zhm.nls"   /* 0x1404  LANG_CHINESE, SUBLANG_CHINESE_MACAU */
 
-#pragma code_page(1250)
 #include "nls/csy.nls"   /* 0x0405  LANG_CZECH, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
 #include "nls/dan.nls"   /* 0x0406  LANG_DANISH, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
 #include "nls/deu.nls"   /* 0x0407  LANG_GERMAN, SUBLANG_GERMAN */
-#pragma code_page(1252)
 #include "nls/des.nls"   /* 0x0807  LANG_GERMAN, SUBLANG_GERMAN_SWISS */
-#pragma code_page(1252)
 #include "nls/dea.nls"   /* 0x0c07  LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN */
-#pragma code_page(1252)
 #include "nls/del.nls"   /* 0x1007  LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG */
-#pragma code_page(1252)
 #include "nls/dec.nls"   /* 0x1407  LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN */
 
-#pragma code_page(1253)
 #include "nls/ell.nls"   /* 0x0408  LANG_GREEK, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
 #include "nls/enu.nls"   /* 0x0409  LANG_ENGLISH, SUBLANG_ENGLISH_US */
-#pragma code_page(1252)
 #include "nls/eng.nls"   /* 0x0809  LANG_ENGLISH, SUBLANG_ENGLISH_UK */
-#pragma code_page(1252)
 #include "nls/ena.nls"   /* 0x0c09  LANG_ENGLISH, SUBLANG_ENGLISH_AUS */
-#pragma code_page(1252)
 #include "nls/enc.nls"   /* 0x1009  LANG_ENGLISH, SUBLANG_ENGLISH_CAN */
-#pragma code_page(1252)
 #include "nls/enz.nls"   /* 0x1409  LANG_ENGLISH, SUBLANG_ENGLISH_NZ */
-#pragma code_page(1252)
 #include "nls/eni.nls"   /* 0x1809  LANG_ENGLISH, SUBLANG_ENGLISH_EIRE */
-#pragma code_page(1252)
 #include "nls/ens.nls"   /* 0x1c09  LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA */
-#pragma code_page(1252)
 #include "nls/enj.nls"   /* 0x2009  LANG_ENGLISH, SUBLANG_ENGLISH_JAMAICA */
-#pragma code_page(1252)
 #include "nls/enb.nls"   /* 0x2409  LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN */
-#pragma code_page(1252)
 #include "nls/enl.nls"   /* 0x2809  LANG_ENGLISH, SUBLANG_ENGLISH_BELIZE */
-#pragma code_page(1252)
 #include "nls/ent.nls"   /* 0x2c09  LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD */
-#pragma code_page(1252)
 #include "nls/enw.nls"   /* 0x3009  LANG_ENGLISH, SUBLANG_ENGLISH_ZIMBABWE */
-#pragma code_page(1252)
 #include "nls/enp.nls"   /* 0x3409  LANG_ENGLISH, SUBLANG_ENGLISH_PHILIPPINES */
 
-#pragma code_page(1252)
-#include "nls/eoa.nls"   /* 0x048F  LANG_ESPERANTO, SUBLANG_ESPERANTO */
-
-#pragma code_page(1252)
 #include "nls/esp.nls"   /* 0x040a  LANG_SPANISH, SUBLANG_SPANISH */
-#pragma code_page(1252)
 #include "nls/esm.nls"   /* 0x080a  LANG_SPANISH, SUBLANG_SPANISH_MEXICAN */
-#pragma code_page(1252)
 #include "nls/esn.nls"   /* 0x0c0a  LANG_SPANISH, SUBLANG_SPANISH_MODERN */
-#pragma code_page(1252)
 #include "nls/esg.nls"   /* 0x100a  LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA */
-#pragma code_page(1252)
 #include "nls/esc.nls"   /* 0x140a  LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA */
-#pragma code_page(1252)
 #include "nls/esa.nls"   /* 0x180a  LANG_SPANISH, SUBLANG_SPANISH_PANAMA */
-#pragma code_page(1252)
 #include "nls/esd.nls"   /* 0x1c0a  LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC */
-#pragma code_page(1252)
 #include "nls/esv.nls"   /* 0x200a  LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA */
-#pragma code_page(1252)
 #include "nls/eso.nls"   /* 0x240a  LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA */
-#pragma code_page(1252)
 #include "nls/esr.nls"   /* 0x280a  LANG_SPANISH, SUBLANG_SPANISH_PERU */
-#pragma code_page(1252)
 #include "nls/ess.nls"   /* 0x2c0a  LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA */
-#pragma code_page(1252)
 #include "nls/esf.nls"   /* 0x300a  LANG_SPANISH, SUBLANG_SPANISH_ECUADOR */
-#pragma code_page(1252)
 #include "nls/esl.nls"   /* 0x340a  LANG_SPANISH, SUBLANG_SPANISH_CHILE */
-#pragma code_page(1252)
 #include "nls/esy.nls"   /* 0x380a  LANG_SPANISH, SUBLANG_SPANISH_URUGUAY */
-#pragma code_page(1252)
 #include "nls/esz.nls"   /* 0x3c0a  LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY */
-#pragma code_page(1252)
 #include "nls/esb.nls"   /* 0x400a  LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA */
-#pragma code_page(1252)
 #include "nls/ese.nls"   /* 0x440a  LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR */
-#pragma code_page(1252)
 #include "nls/esh.nls"   /* 0x480a  LANG_SPANISH, SUBLANG_SPANISH_HONDURAS */
-#pragma code_page(1252)
 #include "nls/esi.nls"   /* 0x4c0a  LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA */
-#pragma code_page(1252)
 #include "nls/esu.nls"   /* 0x500a  LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO */
 
-#pragma code_page(1252)
 #include "nls/fin.nls"   /* 0x040b  LANG_FINNISH, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
 #include "nls/fra.nls"   /* 0x040c  LANG_FRENCH, SUBLANG_FRENCH */
-#pragma code_page(1252)
 #include "nls/frb.nls"   /* 0x080c  LANG_FRENCH, SUBLANG_FRENCH_BELGIAN */
-#pragma code_page(1252)
 #include "nls/frc.nls"   /* 0x0c0c  LANG_FRENCH, SUBLANG_FRENCH_CANADIAN */
-#pragma code_page(1252)
 #include "nls/frs.nls"   /* 0x100c  LANG_FRENCH, SUBLANG_FRENCH_SWISS */
-#pragma code_page(1252)
 #include "nls/frl.nls"   /* 0x140c  LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG */
-#pragma code_page(1252)
 #include "nls/frm.nls"   /* 0x180c  LANG_FRENCH, SUBLANG_FRENCH_MONACO */
 
-#pragma code_page(1255)
 #include "nls/heb.nls"   /* 0x040d  LANG_HEBREW, SUBLANG_DEFAULT */
 
-#pragma code_page(1250)
 #include "nls/hun.nls"   /* 0x040e  LANG_HUNGARIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
 #include "nls/isl.nls"   /* 0x040f  LANG_ICELANDIC, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
 #include "nls/ita.nls"   /* 0x0410  LANG_ITALIAN, SUBLANG_ITALIAN */
-#pragma code_page(1252)
 #include "nls/its.nls"   /* 0x0810  LANG_ITALIAN, SUBLANG_ITALIAN_SWISS */
 
-#pragma code_page(932)
 #include "nls/jpn.nls"   /* 0x0411  LANG_JAPANESE, SUBLANG_DEFAULT */
 
-#pragma code_page(949)
 #include "nls/kor.nls"   /* 0x0412  LANG_KOREAN, SUBLANG_KOREAN */
 
-#pragma code_page(1252)
 #include "nls/nld.nls"   /* 0x0413  LANG_DUTCH, SUBLANG_DUTCH */
-#pragma code_page(1252)
 #include "nls/nlb.nls"   /* 0x0813  LANG_DUTCH, SUBLANG_DUTCH_BELGIAN */
 
-#pragma code_page(1252)
 #include "nls/nor.nls"   /* 0x0414  LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL */
-#pragma code_page(1252)
 #include "nls/non.nls"   /* 0x0814  LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK */
 
-#pragma code_page(1250)
 #include "nls/plk.nls"   /* 0x0415  LANG_POLISH, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
 #include "nls/ptb.nls"   /* 0x0416  LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN */
-#pragma code_page(1252)
 #include "nls/ptg.nls"   /* 0x0816  LANG_PORTUGUESE, SUBLANG_PORTUGUESE */
 
-//#pragma code_page(1252)
-//#include "nls/rmc.nls"   /* 0x0417  LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND */
+#include "nls/rmc.nls"   /* 0x0417  LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND */
 
-#pragma code_page(65001)
 #include "nls/rom.nls"   /* 0x0418  LANG_ROMANIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
 #include "nls/rus.nls"   /* 0x0419  LANG_RUSSIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(1250)
 #include "nls/hrv.nls"   /* 0x041a  LANG_SERBIAN, SUBLANG_DEFAULT */
-#pragma code_page(1250)
 #include "nls/srl.nls"   /* 0x081a  LANG_SERBIAN, SUBLANG_SERBIAN_LATIN */
-#pragma code_page(1251)
 #include "nls/srb.nls"   /* 0x0c1a  LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC */
+#include "nls/srm.nls"   /* 0x241a  LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN */
 
-#pragma code_page(1250)
 #include "nls/sky.nls"   /* 0x041b  LANG_SLOVAK, SUBLANG_DEFAULT */
 
-#pragma code_page(1250)
 #include "nls/sqi.nls"   /* 0x041c  LANG_ALBANIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
 #include "nls/sve.nls"   /* 0x041d  LANG_SWEDISH, SUBLANG_SWEDISH */
-#pragma code_page(1252)
 #include "nls/svf.nls"   /* 0x081d  LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND */
 
-#pragma code_page(874)
 #include "nls/tha.nls"   /* 0x041e  LANG_THAI, SUBLANG_DEFAULT */
 
-#pragma code_page(1254)
 #include "nls/trk.nls"   /* 0x041f  LANG_TURKISH, SUBLANG_DEFAULT */
 
-#pragma code_page(1256)
 #include "nls/urd.nls"   /* 0x0420  LANG_URDU, SUBLANG_URDU_PAKISTAN */
 
-#pragma code_page(1252)
 #include "nls/ind.nls"   /* 0x0421  LANG_INDONESIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(1251)
 #include "nls/ukr.nls"   /* 0x0422  LANG_UKRAINIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(1251)
 #include "nls/bel.nls"   /* 0x0423  LANG_BELARUSIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(1250)
 #include "nls/slv.nls"   /* 0x0424  LANG_SLOVENIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(1257)
 #include "nls/eti.nls"   /* 0x0425  LANG_ESTONIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(1257)
 #include "nls/lvi.nls"   /* 0x0426  LANG_LATVIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
 #include "nls/lth.nls"   /* 0x0427  LANG_LITHUANIAN, SUBLANG_LITHUANIAN */
 
-#pragma code_page(1256)
 #include "nls/far.nls"   /* 0x0429  LANG_FARSI, SUBLANG_DEFAULT */
 
-#pragma code_page(1258)
 #include "nls/vit.nls"   /* 0x042a  LANG_VIETNAMESE, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
 #include "nls/hye.nls"   /* 0x042b  LANG_ARMENIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(1254)
 #include "nls/azl.nls"   /* 0x042c  LANG_AZERI, SUBLANG_AZERI_LATIN */
-#pragma code_page(1251)
 #include "nls/aze.nls"   /* 0x082c  LANG_AZERI, SUBLANG_AZERI_CYRILLIC */
 
-#pragma code_page(1252)
 #include "nls/euq.nls"   /* 0x042d  LANG_BASQUE, SUBLANG_DEFAULT */
 
-#pragma code_page(1251)
 #include "nls/mki.nls"   /* 0x042f  LANG_MACEDONIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
 #include "nls/afk.nls"   /* 0x0436  LANG_AFRIKAANS, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
 #include "nls/kat.nls"   /* 0x0437  LANG_GEORGIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
 #include "nls/fos.nls"   /* 0x0438  LANG_FAEROESE, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
 #include "nls/hin.nls"   /* 0x0439  LANG_HINDI, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
+#include "nls/gae.nls"   /* 0x083c  LANG_IRISH, SUBLANG_IRISH_IRELAND */
+
 #include "nls/msl.nls"   /* 0x043e  LANG_MALAY, SUBLANG_MALAY_MALAYSIA */
-#pragma code_page(1252)
 #include "nls/msb.nls"   /* 0x083e  LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM */
 
-#pragma code_page(1251)
 #include "nls/kkz.nls"   /* 0x043f  LANG_KAZAK, SUBLANG_DEFAULT */
 
-#pragma code_page(1251)
 #include "nls/kyr.nls"   /* 0x0440  LANG_KYRGYZ, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
 #include "nls/swk.nls"   /* 0x0441  LANG_SWAHILI, SUBLANG_DEFAULT */
 
-#pragma code_page(1254)
 #include "nls/uzl.nls"   /* 0x0443  LANG_UZBEK, SUBLANG_UZBEK_LATIN */
-#pragma code_page(1251)
 #include "nls/uzb.nls"   /* 0x0843  LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC */
 
-#pragma code_page(1251)
 #include "nls/ttt.nls"   /* 0x0444  LANG_TATAR, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
+#include "nls/ben.nls"   /* 0x0445  LANG_BANGLA, SUBLANG_BANGLA_INDIA */
+
 #include "nls/pan.nls"   /* 0x0446  LANG_PUNJABI, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
 #include "nls/guj.nls"   /* 0x0447  LANG_GUJARATI, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
 #include "nls/tam.nls"   /* 0x0449  LANG_TAMIL, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
 #include "nls/tel.nls"   /* 0x044a  LANG_TELUGU, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
 #include "nls/kan.nls"   /* 0x044b  LANG_KANNADA, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
 #include "nls/mar.nls"   /* 0x044e  LANG_MARATHI, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
 #include "nls/san.nls"   /* 0x044f  LANG_SANSKRIT, SUBLANG_DEFAULT */
 
-#pragma code_page(1251)
 #include "nls/mon.nls"   /* 0x0450  LANG_MONGOLIAN, SUBLANG_DEFAULT */
 
-//#pragma code_page(28604)
-//#include "nls/cym.nls"   /* 0x0452  LANG_WELSH, SUBLANG_DEFAULT */
+#include "nls/cym.nls"   /* 0x0452  LANG_WELSH, SUBLANG_DEFAULT */
 
-#pragma code_page(1252)
 #include "nls/glc.nls"   /* 0x0456  LANG_GALICIAN, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
 #include "nls/knk.nls"   /* 0x0457  LANG_KONKANI, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
 #include "nls/syr.nls"   /* 0x045a  LANG_SYRIAC, SUBLANG_DEFAULT */
 
-#pragma code_page(65001)
+#include "nls/sin.nls"   /* 0x045b  LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA */
+
+#include "nls/nep.nls"   /* 0x0461  LANG_NEPALI, SUBLANG_NEPALI_NEPAL */
+
 #include "nls/div.nls"   /* 0x0465  LANG_DIVEHI, SUBLANG_DEFAULT */
 
-//#pragma code_page(1252)
-//#include "nls/brf.nls"   /* 0x0493  LANG_BRETON, SUBLANG_DEFAULT */
+#include "nls/brf.nls"   /* 0x047e  LANG_BRETON, SUBLANG_DEFAULT */
 
+#include "nls/gdh.nls"   /* 0x0491  LANG_SCOTTISH_GAELIC, SUBLANG_SCOTTISH_GAELIC */
 
 /* Wine extensions */
 
-//#include "nls/nls.nls"   /* 0x0c13  LANG_DUTCH, SUBLANG_DUTCH_SURINAM */
+#include "nls/nls.nls"   /* 0x0c13  LANG_DUTCH, SUBLANG_DUTCH_SURINAM */
 
-//#include "nls/eox.nls"   /* 0x048f  LANG_ESPERANTO, SUBLANG_DEFAULT */
+#include "nls/eox.nls"   /* 0x048f  LANG_ESPERANTO, SUBLANG_DEFAULT */
 
-//#include "nls/wal.nls"   /* 0x0490  LANG_WALON, SUBLANG_DEFAULT */
+#include "nls/wal.nls"   /* 0x0490  LANG_WALON, SUBLANG_DEFAULT */
 
-//#include "nls/cor.nls"   /* 0x0492  LANG_CORNISH, SUBLANG_DEFAULT */
+#include "nls/cor.nls"   /* 0x0492  LANG_CORNISH, SUBLANG_DEFAULT */
 
-//#include "nls/gae.nls"   /* 0x0494  LANG_GAELIC, SUBLANG_GAELIC */
-//#include "nls/gdh.nls"   /* 0x0894  LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH */
-//#include "nls/gdv.nls"   /* 0x0c94  LANG_GAELIC, SUBLANG_GAELIC_MANX */
+#include "nls/gdv.nls"   /* 0x0494  LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC */
+
+#include "nls/ast.nls"   /* 0x04a5  LANG_ASTURIAN, SUBLANG_DEFAULT */
+
+#include "nls/ivl.nls"   /* 0x047f  LANG_INVARIANT, SUBLANG_NEUTRAL */
diff --git a/dll/win32/kernel32/winnls/nls/afk.nls b/dll/win32/kernel32/winnls/nls/afk.nls
index 0869cf20887..aa33aa06d53 100644
Binary files a/dll/win32/kernel32/winnls/nls/afk.nls and b/dll/win32/kernel32/winnls/nls/afk.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ara.nls b/dll/win32/kernel32/winnls/nls/ara.nls
index d1cee066408..ff63164d472 100644
Binary files a/dll/win32/kernel32/winnls/nls/ara.nls and b/dll/win32/kernel32/winnls/nls/ara.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/arb.nls b/dll/win32/kernel32/winnls/nls/arb.nls
index b898bd228d3..fb854ac44cd 100644
Binary files a/dll/win32/kernel32/winnls/nls/arb.nls and b/dll/win32/kernel32/winnls/nls/arb.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/are.nls b/dll/win32/kernel32/winnls/nls/are.nls
index 560b2fc87b0..b044d3299b4 100644
Binary files a/dll/win32/kernel32/winnls/nls/are.nls and b/dll/win32/kernel32/winnls/nls/are.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/arg.nls b/dll/win32/kernel32/winnls/nls/arg.nls
index c28425cfebe..6c10551f012 100644
Binary files a/dll/win32/kernel32/winnls/nls/arg.nls and b/dll/win32/kernel32/winnls/nls/arg.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/arh.nls b/dll/win32/kernel32/winnls/nls/arh.nls
index 6ccb9937087..ce2fe000d43 100644
Binary files a/dll/win32/kernel32/winnls/nls/arh.nls and b/dll/win32/kernel32/winnls/nls/arh.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ari.nls b/dll/win32/kernel32/winnls/nls/ari.nls
index 95340062e1a..466fa2540b4 100644
Binary files a/dll/win32/kernel32/winnls/nls/ari.nls and b/dll/win32/kernel32/winnls/nls/ari.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/arj.nls b/dll/win32/kernel32/winnls/nls/arj.nls
index be7d4fae41c..fc4f15c509f 100644
Binary files a/dll/win32/kernel32/winnls/nls/arj.nls and b/dll/win32/kernel32/winnls/nls/arj.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ark.nls b/dll/win32/kernel32/winnls/nls/ark.nls
index c2c864da2b8..9086b622262 100644
Binary files a/dll/win32/kernel32/winnls/nls/ark.nls and b/dll/win32/kernel32/winnls/nls/ark.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/arl.nls b/dll/win32/kernel32/winnls/nls/arl.nls
index 111611b9e17..22bde6893fa 100644
Binary files a/dll/win32/kernel32/winnls/nls/arl.nls and b/dll/win32/kernel32/winnls/nls/arl.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/arm.nls b/dll/win32/kernel32/winnls/nls/arm.nls
index 15aa3fb617f..8ac926550a2 100644
Binary files a/dll/win32/kernel32/winnls/nls/arm.nls and b/dll/win32/kernel32/winnls/nls/arm.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/aro.nls b/dll/win32/kernel32/winnls/nls/aro.nls
index 4a950cd7683..953b761de72 100644
Binary files a/dll/win32/kernel32/winnls/nls/aro.nls and b/dll/win32/kernel32/winnls/nls/aro.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/arq.nls b/dll/win32/kernel32/winnls/nls/arq.nls
index da63340cb60..25ac8b91323 100644
Binary files a/dll/win32/kernel32/winnls/nls/arq.nls and b/dll/win32/kernel32/winnls/nls/arq.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ars.nls b/dll/win32/kernel32/winnls/nls/ars.nls
index 0124cf301a4..803ca071182 100644
Binary files a/dll/win32/kernel32/winnls/nls/ars.nls and b/dll/win32/kernel32/winnls/nls/ars.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/art.nls b/dll/win32/kernel32/winnls/nls/art.nls
index 52c0d50537f..55e34ac77f1 100644
Binary files a/dll/win32/kernel32/winnls/nls/art.nls and b/dll/win32/kernel32/winnls/nls/art.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/aru.nls b/dll/win32/kernel32/winnls/nls/aru.nls
index f8422ef6929..d519b38bdd5 100644
Binary files a/dll/win32/kernel32/winnls/nls/aru.nls and b/dll/win32/kernel32/winnls/nls/aru.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ary.nls b/dll/win32/kernel32/winnls/nls/ary.nls
index a91d166265e..0cb1bb88b64 100644
Binary files a/dll/win32/kernel32/winnls/nls/ary.nls and b/dll/win32/kernel32/winnls/nls/ary.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ast.nls b/dll/win32/kernel32/winnls/nls/ast.nls
new file mode 100644
index 00000000000..4a6a77aa721
Binary files /dev/null and b/dll/win32/kernel32/winnls/nls/ast.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/aze.nls b/dll/win32/kernel32/winnls/nls/aze.nls
index 4d1700fcad2..e2860d088f0 100644
Binary files a/dll/win32/kernel32/winnls/nls/aze.nls and b/dll/win32/kernel32/winnls/nls/aze.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/azl.nls b/dll/win32/kernel32/winnls/nls/azl.nls
index 82315904cd5..86d49a6b5fc 100644
Binary files a/dll/win32/kernel32/winnls/nls/azl.nls and b/dll/win32/kernel32/winnls/nls/azl.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/bel.nls b/dll/win32/kernel32/winnls/nls/bel.nls
index 86e5c2c3315..e6cc7a58df8 100644
Binary files a/dll/win32/kernel32/winnls/nls/bel.nls and b/dll/win32/kernel32/winnls/nls/bel.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ben.nls b/dll/win32/kernel32/winnls/nls/ben.nls
new file mode 100644
index 00000000000..bead15abaf4
Binary files /dev/null and b/dll/win32/kernel32/winnls/nls/ben.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/bgr.nls b/dll/win32/kernel32/winnls/nls/bgr.nls
index 9e50e95630a..5f1f0e66974 100644
Binary files a/dll/win32/kernel32/winnls/nls/bgr.nls and b/dll/win32/kernel32/winnls/nls/bgr.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/brf.nls b/dll/win32/kernel32/winnls/nls/brf.nls
index e42199a4ca3..06862e665c6 100644
Binary files a/dll/win32/kernel32/winnls/nls/brf.nls and b/dll/win32/kernel32/winnls/nls/brf.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/cat.nls b/dll/win32/kernel32/winnls/nls/cat.nls
index 65c0985f975..5f1fa43e025 100644
Binary files a/dll/win32/kernel32/winnls/nls/cat.nls and b/dll/win32/kernel32/winnls/nls/cat.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/chs.nls b/dll/win32/kernel32/winnls/nls/chs.nls
index 180e55f35a1..c7f6114768b 100644
Binary files a/dll/win32/kernel32/winnls/nls/chs.nls and b/dll/win32/kernel32/winnls/nls/chs.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/cht.nls b/dll/win32/kernel32/winnls/nls/cht.nls
index 322559b335f..1cfeb840f01 100644
Binary files a/dll/win32/kernel32/winnls/nls/cht.nls and b/dll/win32/kernel32/winnls/nls/cht.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/cor.nls b/dll/win32/kernel32/winnls/nls/cor.nls
new file mode 100644
index 00000000000..36c7e7f234f
Binary files /dev/null and b/dll/win32/kernel32/winnls/nls/cor.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/csy.nls b/dll/win32/kernel32/winnls/nls/csy.nls
index 003dbd4bf1f..d03494e4cde 100644
Binary files a/dll/win32/kernel32/winnls/nls/csy.nls and b/dll/win32/kernel32/winnls/nls/csy.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/cym.nls b/dll/win32/kernel32/winnls/nls/cym.nls
index 653b1b219e5..41a25c415b8 100644
Binary files a/dll/win32/kernel32/winnls/nls/cym.nls and b/dll/win32/kernel32/winnls/nls/cym.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/dan.nls b/dll/win32/kernel32/winnls/nls/dan.nls
index b5d78e10df3..3e567cd3337 100644
Binary files a/dll/win32/kernel32/winnls/nls/dan.nls and b/dll/win32/kernel32/winnls/nls/dan.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/dea.nls b/dll/win32/kernel32/winnls/nls/dea.nls
index 54c87d0f3b1..f97ae8ebe3e 100644
Binary files a/dll/win32/kernel32/winnls/nls/dea.nls and b/dll/win32/kernel32/winnls/nls/dea.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/dec.nls b/dll/win32/kernel32/winnls/nls/dec.nls
index b38f12c57a0..b6b492b84d4 100644
Binary files a/dll/win32/kernel32/winnls/nls/dec.nls and b/dll/win32/kernel32/winnls/nls/dec.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/del.nls b/dll/win32/kernel32/winnls/nls/del.nls
index 36311f0d37b..6a7258d9fe4 100644
Binary files a/dll/win32/kernel32/winnls/nls/del.nls and b/dll/win32/kernel32/winnls/nls/del.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/des.nls b/dll/win32/kernel32/winnls/nls/des.nls
index 9f030f3c5f8..bb6fed059cb 100644
Binary files a/dll/win32/kernel32/winnls/nls/des.nls and b/dll/win32/kernel32/winnls/nls/des.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/deu.nls b/dll/win32/kernel32/winnls/nls/deu.nls
index 8c26ec01b39..b02639801bf 100644
Binary files a/dll/win32/kernel32/winnls/nls/deu.nls and b/dll/win32/kernel32/winnls/nls/deu.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/div.nls b/dll/win32/kernel32/winnls/nls/div.nls
index 0327cb7b90b..1c7989e0068 100644
Binary files a/dll/win32/kernel32/winnls/nls/div.nls and b/dll/win32/kernel32/winnls/nls/div.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ell.nls b/dll/win32/kernel32/winnls/nls/ell.nls
index 130f0b485d9..d86fe9e473d 100644
Binary files a/dll/win32/kernel32/winnls/nls/ell.nls and b/dll/win32/kernel32/winnls/nls/ell.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ena.nls b/dll/win32/kernel32/winnls/nls/ena.nls
index 73354fe4a33..f34a20b96d2 100644
Binary files a/dll/win32/kernel32/winnls/nls/ena.nls and b/dll/win32/kernel32/winnls/nls/ena.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/enb.nls b/dll/win32/kernel32/winnls/nls/enb.nls
index b01bb08448a..8b09c536c23 100644
Binary files a/dll/win32/kernel32/winnls/nls/enb.nls and b/dll/win32/kernel32/winnls/nls/enb.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/enc.nls b/dll/win32/kernel32/winnls/nls/enc.nls
index 96324b74726..0f3a394263d 100644
Binary files a/dll/win32/kernel32/winnls/nls/enc.nls and b/dll/win32/kernel32/winnls/nls/enc.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/eng.nls b/dll/win32/kernel32/winnls/nls/eng.nls
index c6c67690b27..779bd0ae6d9 100644
Binary files a/dll/win32/kernel32/winnls/nls/eng.nls and b/dll/win32/kernel32/winnls/nls/eng.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/eni.nls b/dll/win32/kernel32/winnls/nls/eni.nls
index f739f7a9fad..9796b0f6cda 100644
Binary files a/dll/win32/kernel32/winnls/nls/eni.nls and b/dll/win32/kernel32/winnls/nls/eni.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/enj.nls b/dll/win32/kernel32/winnls/nls/enj.nls
index 055f0760683..36134691efe 100644
Binary files a/dll/win32/kernel32/winnls/nls/enj.nls and b/dll/win32/kernel32/winnls/nls/enj.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/enl.nls b/dll/win32/kernel32/winnls/nls/enl.nls
index a99b638a129..ee78870cc89 100644
Binary files a/dll/win32/kernel32/winnls/nls/enl.nls and b/dll/win32/kernel32/winnls/nls/enl.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/enp.nls b/dll/win32/kernel32/winnls/nls/enp.nls
index df36a5649c8..5af8b97efcc 100644
Binary files a/dll/win32/kernel32/winnls/nls/enp.nls and b/dll/win32/kernel32/winnls/nls/enp.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ens.nls b/dll/win32/kernel32/winnls/nls/ens.nls
index b8ff4825010..ee2403196f2 100644
Binary files a/dll/win32/kernel32/winnls/nls/ens.nls and b/dll/win32/kernel32/winnls/nls/ens.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ent.nls b/dll/win32/kernel32/winnls/nls/ent.nls
index aba35dfcdff..48bfb26b15c 100644
Binary files a/dll/win32/kernel32/winnls/nls/ent.nls and b/dll/win32/kernel32/winnls/nls/ent.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/enu.nls b/dll/win32/kernel32/winnls/nls/enu.nls
index 0ad0267892c..527d6430f0b 100644
Binary files a/dll/win32/kernel32/winnls/nls/enu.nls and b/dll/win32/kernel32/winnls/nls/enu.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/enw.nls b/dll/win32/kernel32/winnls/nls/enw.nls
index 51b1a3efadb..1ba782fc32e 100644
Binary files a/dll/win32/kernel32/winnls/nls/enw.nls and b/dll/win32/kernel32/winnls/nls/enw.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/enz.nls b/dll/win32/kernel32/winnls/nls/enz.nls
index 526f92a6b12..e4571a765b5 100644
Binary files a/dll/win32/kernel32/winnls/nls/enz.nls and b/dll/win32/kernel32/winnls/nls/enz.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/eox.nls b/dll/win32/kernel32/winnls/nls/eox.nls
new file mode 100644
index 00000000000..bbd617eac48
Binary files /dev/null and b/dll/win32/kernel32/winnls/nls/eox.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esa.nls b/dll/win32/kernel32/winnls/nls/esa.nls
index 695d6f40bd8..a311d796eb7 100644
Binary files a/dll/win32/kernel32/winnls/nls/esa.nls and b/dll/win32/kernel32/winnls/nls/esa.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esb.nls b/dll/win32/kernel32/winnls/nls/esb.nls
index e9ec38fcfe0..ce95402300d 100644
Binary files a/dll/win32/kernel32/winnls/nls/esb.nls and b/dll/win32/kernel32/winnls/nls/esb.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esc.nls b/dll/win32/kernel32/winnls/nls/esc.nls
index f48dbaf439a..60ed24e7067 100644
Binary files a/dll/win32/kernel32/winnls/nls/esc.nls and b/dll/win32/kernel32/winnls/nls/esc.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esd.nls b/dll/win32/kernel32/winnls/nls/esd.nls
index 0b53f365dcd..93b6bb0005b 100644
Binary files a/dll/win32/kernel32/winnls/nls/esd.nls and b/dll/win32/kernel32/winnls/nls/esd.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ese.nls b/dll/win32/kernel32/winnls/nls/ese.nls
index 6fced597137..a68c027440b 100644
Binary files a/dll/win32/kernel32/winnls/nls/ese.nls and b/dll/win32/kernel32/winnls/nls/ese.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esf.nls b/dll/win32/kernel32/winnls/nls/esf.nls
index e709b66093c..65f47d73a20 100644
Binary files a/dll/win32/kernel32/winnls/nls/esf.nls and b/dll/win32/kernel32/winnls/nls/esf.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esg.nls b/dll/win32/kernel32/winnls/nls/esg.nls
index fab430207fd..a9c9a8a8603 100644
Binary files a/dll/win32/kernel32/winnls/nls/esg.nls and b/dll/win32/kernel32/winnls/nls/esg.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esh.nls b/dll/win32/kernel32/winnls/nls/esh.nls
index 46bc326476f..5593836b44b 100644
Binary files a/dll/win32/kernel32/winnls/nls/esh.nls and b/dll/win32/kernel32/winnls/nls/esh.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esi.nls b/dll/win32/kernel32/winnls/nls/esi.nls
index 69615b06535..ac4bdb79d0f 100644
Binary files a/dll/win32/kernel32/winnls/nls/esi.nls and b/dll/win32/kernel32/winnls/nls/esi.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esl.nls b/dll/win32/kernel32/winnls/nls/esl.nls
index 0e1e402e651..57f35643b62 100644
Binary files a/dll/win32/kernel32/winnls/nls/esl.nls and b/dll/win32/kernel32/winnls/nls/esl.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esm.nls b/dll/win32/kernel32/winnls/nls/esm.nls
index e2e452f80b7..8c404f1733b 100644
Binary files a/dll/win32/kernel32/winnls/nls/esm.nls and b/dll/win32/kernel32/winnls/nls/esm.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esn.nls b/dll/win32/kernel32/winnls/nls/esn.nls
index ab5705f1abf..0cb88fa3666 100644
Binary files a/dll/win32/kernel32/winnls/nls/esn.nls and b/dll/win32/kernel32/winnls/nls/esn.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/eso.nls b/dll/win32/kernel32/winnls/nls/eso.nls
index f914aca848a..9f7131066a5 100644
Binary files a/dll/win32/kernel32/winnls/nls/eso.nls and b/dll/win32/kernel32/winnls/nls/eso.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esp.nls b/dll/win32/kernel32/winnls/nls/esp.nls
index d0521449220..a557a52b7d4 100644
Binary files a/dll/win32/kernel32/winnls/nls/esp.nls and b/dll/win32/kernel32/winnls/nls/esp.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esr.nls b/dll/win32/kernel32/winnls/nls/esr.nls
index 75eb84ef8b6..752120dadf1 100644
Binary files a/dll/win32/kernel32/winnls/nls/esr.nls and b/dll/win32/kernel32/winnls/nls/esr.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ess.nls b/dll/win32/kernel32/winnls/nls/ess.nls
index bf8d1474c64..30c96a0bf78 100644
Binary files a/dll/win32/kernel32/winnls/nls/ess.nls and b/dll/win32/kernel32/winnls/nls/ess.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esu.nls b/dll/win32/kernel32/winnls/nls/esu.nls
index c1378baef32..eb2ec3b04a5 100644
Binary files a/dll/win32/kernel32/winnls/nls/esu.nls and b/dll/win32/kernel32/winnls/nls/esu.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esv.nls b/dll/win32/kernel32/winnls/nls/esv.nls
index 6153680e1a5..155ebef33c3 100644
Binary files a/dll/win32/kernel32/winnls/nls/esv.nls and b/dll/win32/kernel32/winnls/nls/esv.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esy.nls b/dll/win32/kernel32/winnls/nls/esy.nls
index 3cf7cb4ca2b..9444f436a11 100644
Binary files a/dll/win32/kernel32/winnls/nls/esy.nls and b/dll/win32/kernel32/winnls/nls/esy.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/esz.nls b/dll/win32/kernel32/winnls/nls/esz.nls
index d7de2d20e19..82eb4241b2f 100644
Binary files a/dll/win32/kernel32/winnls/nls/esz.nls and b/dll/win32/kernel32/winnls/nls/esz.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/eti.nls b/dll/win32/kernel32/winnls/nls/eti.nls
index 64b94ff223f..8d7f0fe39c3 100644
Binary files a/dll/win32/kernel32/winnls/nls/eti.nls and b/dll/win32/kernel32/winnls/nls/eti.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/euq.nls b/dll/win32/kernel32/winnls/nls/euq.nls
index a579137e9e1..38d34312eab 100644
Binary files a/dll/win32/kernel32/winnls/nls/euq.nls and b/dll/win32/kernel32/winnls/nls/euq.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/far.nls b/dll/win32/kernel32/winnls/nls/far.nls
index 3d7c5c891c1..ddc4495f77d 100644
Binary files a/dll/win32/kernel32/winnls/nls/far.nls and b/dll/win32/kernel32/winnls/nls/far.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/fin.nls b/dll/win32/kernel32/winnls/nls/fin.nls
index b53eaf166c8..29b7d2e8979 100644
Binary files a/dll/win32/kernel32/winnls/nls/fin.nls and b/dll/win32/kernel32/winnls/nls/fin.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/fos.nls b/dll/win32/kernel32/winnls/nls/fos.nls
index e9b6b58b8bf..5d53bcc81f4 100644
Binary files a/dll/win32/kernel32/winnls/nls/fos.nls and b/dll/win32/kernel32/winnls/nls/fos.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/fra.nls b/dll/win32/kernel32/winnls/nls/fra.nls
index 972aa6f27c5..9a588a932e6 100644
Binary files a/dll/win32/kernel32/winnls/nls/fra.nls and b/dll/win32/kernel32/winnls/nls/fra.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/frb.nls b/dll/win32/kernel32/winnls/nls/frb.nls
index 467036d1147..7ee0b297515 100644
Binary files a/dll/win32/kernel32/winnls/nls/frb.nls and b/dll/win32/kernel32/winnls/nls/frb.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/frc.nls b/dll/win32/kernel32/winnls/nls/frc.nls
index da5319dc7ee..79eac11d96b 100644
Binary files a/dll/win32/kernel32/winnls/nls/frc.nls and b/dll/win32/kernel32/winnls/nls/frc.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/frl.nls b/dll/win32/kernel32/winnls/nls/frl.nls
index 309408e3d26..29d2ad0c9cf 100644
Binary files a/dll/win32/kernel32/winnls/nls/frl.nls and b/dll/win32/kernel32/winnls/nls/frl.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/frm.nls b/dll/win32/kernel32/winnls/nls/frm.nls
index 1359ade5ba1..fa38552812c 100644
Binary files a/dll/win32/kernel32/winnls/nls/frm.nls and b/dll/win32/kernel32/winnls/nls/frm.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/frs.nls b/dll/win32/kernel32/winnls/nls/frs.nls
index e40b8c0d66f..cefb9d36db0 100644
Binary files a/dll/win32/kernel32/winnls/nls/frs.nls and b/dll/win32/kernel32/winnls/nls/frs.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/gae.nls b/dll/win32/kernel32/winnls/nls/gae.nls
new file mode 100644
index 00000000000..e817403c431
Binary files /dev/null and b/dll/win32/kernel32/winnls/nls/gae.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/gdh.nls b/dll/win32/kernel32/winnls/nls/gdh.nls
new file mode 100644
index 00000000000..0cd5699120c
Binary files /dev/null and b/dll/win32/kernel32/winnls/nls/gdh.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/gdv.nls b/dll/win32/kernel32/winnls/nls/gdv.nls
new file mode 100644
index 00000000000..0723813c148
Binary files /dev/null and b/dll/win32/kernel32/winnls/nls/gdv.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/glc.nls b/dll/win32/kernel32/winnls/nls/glc.nls
index 5a3c7f1d5a9..f60a0aac69b 100644
Binary files a/dll/win32/kernel32/winnls/nls/glc.nls and b/dll/win32/kernel32/winnls/nls/glc.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/guj.nls b/dll/win32/kernel32/winnls/nls/guj.nls
index bb23da34215..e24ba5e43f4 100644
Binary files a/dll/win32/kernel32/winnls/nls/guj.nls and b/dll/win32/kernel32/winnls/nls/guj.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/heb.nls b/dll/win32/kernel32/winnls/nls/heb.nls
index b3a54af939a..2d69ffd4676 100644
Binary files a/dll/win32/kernel32/winnls/nls/heb.nls and b/dll/win32/kernel32/winnls/nls/heb.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/hin.nls b/dll/win32/kernel32/winnls/nls/hin.nls
index b5a315590e8..b32a0572654 100644
Binary files a/dll/win32/kernel32/winnls/nls/hin.nls and b/dll/win32/kernel32/winnls/nls/hin.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/hrv.nls b/dll/win32/kernel32/winnls/nls/hrv.nls
index c4f9869ca61..958e15e59e4 100644
Binary files a/dll/win32/kernel32/winnls/nls/hrv.nls and b/dll/win32/kernel32/winnls/nls/hrv.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/hun.nls b/dll/win32/kernel32/winnls/nls/hun.nls
index 268d1a732b6..c3dbb9773f9 100644
Binary files a/dll/win32/kernel32/winnls/nls/hun.nls and b/dll/win32/kernel32/winnls/nls/hun.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/hye.nls b/dll/win32/kernel32/winnls/nls/hye.nls
index fbba2c79914..2000280fe1e 100644
Binary files a/dll/win32/kernel32/winnls/nls/hye.nls and b/dll/win32/kernel32/winnls/nls/hye.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ind.nls b/dll/win32/kernel32/winnls/nls/ind.nls
index e8764e3ffb4..c33acb8a3e4 100644
Binary files a/dll/win32/kernel32/winnls/nls/ind.nls and b/dll/win32/kernel32/winnls/nls/ind.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/isl.nls b/dll/win32/kernel32/winnls/nls/isl.nls
index 377f85186c6..5a6c3d67e34 100644
Binary files a/dll/win32/kernel32/winnls/nls/isl.nls and b/dll/win32/kernel32/winnls/nls/isl.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ita.nls b/dll/win32/kernel32/winnls/nls/ita.nls
index 8f98edee38f..256d5468199 100644
Binary files a/dll/win32/kernel32/winnls/nls/ita.nls and b/dll/win32/kernel32/winnls/nls/ita.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/its.nls b/dll/win32/kernel32/winnls/nls/its.nls
index bfd524e20d7..c9a6c1744ca 100644
Binary files a/dll/win32/kernel32/winnls/nls/its.nls and b/dll/win32/kernel32/winnls/nls/its.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ivl.nls b/dll/win32/kernel32/winnls/nls/ivl.nls
new file mode 100644
index 00000000000..6bfaf0f950d
Binary files /dev/null and b/dll/win32/kernel32/winnls/nls/ivl.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/jpn.nls b/dll/win32/kernel32/winnls/nls/jpn.nls
index e432761b1f0..39507dee84f 100644
Binary files a/dll/win32/kernel32/winnls/nls/jpn.nls and b/dll/win32/kernel32/winnls/nls/jpn.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/kan.nls b/dll/win32/kernel32/winnls/nls/kan.nls
index 045b3ce81d7..e6934d1a428 100644
Binary files a/dll/win32/kernel32/winnls/nls/kan.nls and b/dll/win32/kernel32/winnls/nls/kan.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/kat.nls b/dll/win32/kernel32/winnls/nls/kat.nls
index 7cbd1f26b2e..26e165001e6 100644
Binary files a/dll/win32/kernel32/winnls/nls/kat.nls and b/dll/win32/kernel32/winnls/nls/kat.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/kkz.nls b/dll/win32/kernel32/winnls/nls/kkz.nls
index 617c7c22af3..5a8451563bd 100644
Binary files a/dll/win32/kernel32/winnls/nls/kkz.nls and b/dll/win32/kernel32/winnls/nls/kkz.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/knk.nls b/dll/win32/kernel32/winnls/nls/knk.nls
index 701f4eac1e6..c2526d2c813 100644
Binary files a/dll/win32/kernel32/winnls/nls/knk.nls and b/dll/win32/kernel32/winnls/nls/knk.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/kor.nls b/dll/win32/kernel32/winnls/nls/kor.nls
index 2f48f7828cf..9d44870b390 100644
Binary files a/dll/win32/kernel32/winnls/nls/kor.nls and b/dll/win32/kernel32/winnls/nls/kor.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/kyr.nls b/dll/win32/kernel32/winnls/nls/kyr.nls
index 4a82cc87859..7ab2a4d0b64 100644
Binary files a/dll/win32/kernel32/winnls/nls/kyr.nls and b/dll/win32/kernel32/winnls/nls/kyr.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/lth.nls b/dll/win32/kernel32/winnls/nls/lth.nls
index 610cc6b12d1..fa1417357a0 100644
Binary files a/dll/win32/kernel32/winnls/nls/lth.nls and b/dll/win32/kernel32/winnls/nls/lth.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/lvi.nls b/dll/win32/kernel32/winnls/nls/lvi.nls
index e64eac4683e..3faa56bf548 100644
Binary files a/dll/win32/kernel32/winnls/nls/lvi.nls and b/dll/win32/kernel32/winnls/nls/lvi.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/mar.nls b/dll/win32/kernel32/winnls/nls/mar.nls
index 00ba7620171..3069a59070b 100644
Binary files a/dll/win32/kernel32/winnls/nls/mar.nls and b/dll/win32/kernel32/winnls/nls/mar.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/mki.nls b/dll/win32/kernel32/winnls/nls/mki.nls
index 2b1d0637571..30efc19b37c 100644
Binary files a/dll/win32/kernel32/winnls/nls/mki.nls and b/dll/win32/kernel32/winnls/nls/mki.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/mon.nls b/dll/win32/kernel32/winnls/nls/mon.nls
index 8ba66ebb212..c60ec86c91c 100644
Binary files a/dll/win32/kernel32/winnls/nls/mon.nls and b/dll/win32/kernel32/winnls/nls/mon.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/msb.nls b/dll/win32/kernel32/winnls/nls/msb.nls
index 6125e555590..0e232cfcb04 100644
Binary files a/dll/win32/kernel32/winnls/nls/msb.nls and b/dll/win32/kernel32/winnls/nls/msb.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/msl.nls b/dll/win32/kernel32/winnls/nls/msl.nls
index 4d4f6e2412d..1df52003c28 100644
Binary files a/dll/win32/kernel32/winnls/nls/msl.nls and b/dll/win32/kernel32/winnls/nls/msl.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/nep.nls b/dll/win32/kernel32/winnls/nls/nep.nls
new file mode 100644
index 00000000000..63946744cb3
Binary files /dev/null and b/dll/win32/kernel32/winnls/nls/nep.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/nlb.nls b/dll/win32/kernel32/winnls/nls/nlb.nls
index c746891d5ee..17fd3790de2 100644
Binary files a/dll/win32/kernel32/winnls/nls/nlb.nls and b/dll/win32/kernel32/winnls/nls/nlb.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/nld.nls b/dll/win32/kernel32/winnls/nls/nld.nls
index 489536c11df..47de663dec6 100644
Binary files a/dll/win32/kernel32/winnls/nls/nld.nls and b/dll/win32/kernel32/winnls/nls/nld.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/nls.nls b/dll/win32/kernel32/winnls/nls/nls.nls
new file mode 100644
index 00000000000..b29f0bc3a1a
Binary files /dev/null and b/dll/win32/kernel32/winnls/nls/nls.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/non.nls b/dll/win32/kernel32/winnls/nls/non.nls
index ea2bcc18bd8..ac6827536f6 100644
Binary files a/dll/win32/kernel32/winnls/nls/non.nls and b/dll/win32/kernel32/winnls/nls/non.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/nor.nls b/dll/win32/kernel32/winnls/nls/nor.nls
index 2edfd336656..bd783905419 100644
Binary files a/dll/win32/kernel32/winnls/nls/nor.nls and b/dll/win32/kernel32/winnls/nls/nor.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/pan.nls b/dll/win32/kernel32/winnls/nls/pan.nls
index 6885964ca69..bd8aeb883fb 100644
Binary files a/dll/win32/kernel32/winnls/nls/pan.nls and b/dll/win32/kernel32/winnls/nls/pan.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/plk.nls b/dll/win32/kernel32/winnls/nls/plk.nls
index c780ba2aeb4..b79020ecb03 100644
Binary files a/dll/win32/kernel32/winnls/nls/plk.nls and b/dll/win32/kernel32/winnls/nls/plk.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ptb.nls b/dll/win32/kernel32/winnls/nls/ptb.nls
index e6a923ca70a..66cc65be837 100644
Binary files a/dll/win32/kernel32/winnls/nls/ptb.nls and b/dll/win32/kernel32/winnls/nls/ptb.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ptg.nls b/dll/win32/kernel32/winnls/nls/ptg.nls
index fc28e2207c8..c75d5a1cafe 100644
Binary files a/dll/win32/kernel32/winnls/nls/ptg.nls and b/dll/win32/kernel32/winnls/nls/ptg.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/rmc.nls b/dll/win32/kernel32/winnls/nls/rmc.nls
index 47ca6afb859..f54db3585ac 100644
Binary files a/dll/win32/kernel32/winnls/nls/rmc.nls and b/dll/win32/kernel32/winnls/nls/rmc.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/rom.nls b/dll/win32/kernel32/winnls/nls/rom.nls
index 77dcfacd7aa..fd519238dda 100644
Binary files a/dll/win32/kernel32/winnls/nls/rom.nls and b/dll/win32/kernel32/winnls/nls/rom.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/rus.nls b/dll/win32/kernel32/winnls/nls/rus.nls
index 49930c7051e..5c78460f668 100644
Binary files a/dll/win32/kernel32/winnls/nls/rus.nls and b/dll/win32/kernel32/winnls/nls/rus.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/san.nls b/dll/win32/kernel32/winnls/nls/san.nls
index ecbc7a47ff2..4f44f3e3d9b 100644
Binary files a/dll/win32/kernel32/winnls/nls/san.nls and b/dll/win32/kernel32/winnls/nls/san.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/sin.nls b/dll/win32/kernel32/winnls/nls/sin.nls
new file mode 100644
index 00000000000..31d258b673d
Binary files /dev/null and b/dll/win32/kernel32/winnls/nls/sin.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/sky.nls b/dll/win32/kernel32/winnls/nls/sky.nls
index a2237ceb5ad..29647b2b1b4 100644
Binary files a/dll/win32/kernel32/winnls/nls/sky.nls and b/dll/win32/kernel32/winnls/nls/sky.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/slv.nls b/dll/win32/kernel32/winnls/nls/slv.nls
index c91e827dc45..8f7fc66ac7f 100644
Binary files a/dll/win32/kernel32/winnls/nls/slv.nls and b/dll/win32/kernel32/winnls/nls/slv.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/sqi.nls b/dll/win32/kernel32/winnls/nls/sqi.nls
index 910f4fba79f..6f4048230ea 100644
Binary files a/dll/win32/kernel32/winnls/nls/sqi.nls and b/dll/win32/kernel32/winnls/nls/sqi.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/srb.nls b/dll/win32/kernel32/winnls/nls/srb.nls
index f2686cff83f..eb500cf0fd8 100644
Binary files a/dll/win32/kernel32/winnls/nls/srb.nls and b/dll/win32/kernel32/winnls/nls/srb.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/srl.nls b/dll/win32/kernel32/winnls/nls/srl.nls
index 69b1b1239e7..516bb512aae 100644
Binary files a/dll/win32/kernel32/winnls/nls/srl.nls and b/dll/win32/kernel32/winnls/nls/srl.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/srm.nls b/dll/win32/kernel32/winnls/nls/srm.nls
new file mode 100644
index 00000000000..f4b1169943a
Binary files /dev/null and b/dll/win32/kernel32/winnls/nls/srm.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/sve.nls b/dll/win32/kernel32/winnls/nls/sve.nls
index 25df30c5342..6c8db124a6e 100644
Binary files a/dll/win32/kernel32/winnls/nls/sve.nls and b/dll/win32/kernel32/winnls/nls/sve.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/svf.nls b/dll/win32/kernel32/winnls/nls/svf.nls
index 4479b2691e1..59982e8a39b 100644
Binary files a/dll/win32/kernel32/winnls/nls/svf.nls and b/dll/win32/kernel32/winnls/nls/svf.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/swk.nls b/dll/win32/kernel32/winnls/nls/swk.nls
index a59d510bcd8..63085629911 100644
Binary files a/dll/win32/kernel32/winnls/nls/swk.nls and b/dll/win32/kernel32/winnls/nls/swk.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/syr.nls b/dll/win32/kernel32/winnls/nls/syr.nls
index 0d6caca68a9..6f8aa766027 100644
Binary files a/dll/win32/kernel32/winnls/nls/syr.nls and b/dll/win32/kernel32/winnls/nls/syr.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/tam.nls b/dll/win32/kernel32/winnls/nls/tam.nls
index 425ad6ed1af..8db932bf651 100644
Binary files a/dll/win32/kernel32/winnls/nls/tam.nls and b/dll/win32/kernel32/winnls/nls/tam.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/tel.nls b/dll/win32/kernel32/winnls/nls/tel.nls
index 87ebffc87f8..37586776ea7 100644
Binary files a/dll/win32/kernel32/winnls/nls/tel.nls and b/dll/win32/kernel32/winnls/nls/tel.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/tha.nls b/dll/win32/kernel32/winnls/nls/tha.nls
index 73feeb82686..2097b3728da 100644
Binary files a/dll/win32/kernel32/winnls/nls/tha.nls and b/dll/win32/kernel32/winnls/nls/tha.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/trk.nls b/dll/win32/kernel32/winnls/nls/trk.nls
index e1a875c0023..3954b4b63e4 100644
Binary files a/dll/win32/kernel32/winnls/nls/trk.nls and b/dll/win32/kernel32/winnls/nls/trk.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ttt.nls b/dll/win32/kernel32/winnls/nls/ttt.nls
index 92e26f8f181..64cdb3d1022 100644
Binary files a/dll/win32/kernel32/winnls/nls/ttt.nls and b/dll/win32/kernel32/winnls/nls/ttt.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/ukr.nls b/dll/win32/kernel32/winnls/nls/ukr.nls
index 55ce250b962..e13ac684fc3 100644
Binary files a/dll/win32/kernel32/winnls/nls/ukr.nls and b/dll/win32/kernel32/winnls/nls/ukr.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/urd.nls b/dll/win32/kernel32/winnls/nls/urd.nls
index d2bac822af1..1bebe46e747 100644
Binary files a/dll/win32/kernel32/winnls/nls/urd.nls and b/dll/win32/kernel32/winnls/nls/urd.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/uzb.nls b/dll/win32/kernel32/winnls/nls/uzb.nls
index 6a5add514fe..1257f39f2fd 100644
Binary files a/dll/win32/kernel32/winnls/nls/uzb.nls and b/dll/win32/kernel32/winnls/nls/uzb.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/uzl.nls b/dll/win32/kernel32/winnls/nls/uzl.nls
index 61d40267818..b03cfb6fb10 100644
Binary files a/dll/win32/kernel32/winnls/nls/uzl.nls and b/dll/win32/kernel32/winnls/nls/uzl.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/vit.nls b/dll/win32/kernel32/winnls/nls/vit.nls
index 7a10b84a70d..17389243dc6 100644
Binary files a/dll/win32/kernel32/winnls/nls/vit.nls and b/dll/win32/kernel32/winnls/nls/vit.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/wal.nls b/dll/win32/kernel32/winnls/nls/wal.nls
new file mode 100644
index 00000000000..3e5f9585d71
Binary files /dev/null and b/dll/win32/kernel32/winnls/nls/wal.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/zhh.nls b/dll/win32/kernel32/winnls/nls/zhh.nls
index fa400df2091..f6aca66bd1d 100644
Binary files a/dll/win32/kernel32/winnls/nls/zhh.nls and b/dll/win32/kernel32/winnls/nls/zhh.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/zhi.nls b/dll/win32/kernel32/winnls/nls/zhi.nls
index b1879886060..8b304d7514e 100644
Binary files a/dll/win32/kernel32/winnls/nls/zhi.nls and b/dll/win32/kernel32/winnls/nls/zhi.nls differ
diff --git a/dll/win32/kernel32/winnls/nls/zhm.nls b/dll/win32/kernel32/winnls/nls/zhm.nls
index 1f198c85045..1a915bda16f 100644
Binary files a/dll/win32/kernel32/winnls/nls/zhm.nls and b/dll/win32/kernel32/winnls/nls/zhm.nls differ
diff --git a/sdk/include/psdk/winnls.h b/sdk/include/psdk/winnls.h
index 61baa71dce6..195652d0621 100644
--- a/sdk/include/psdk/winnls.h
+++ b/sdk/include/psdk/winnls.h
@@ -116,42 +116,45 @@ extern "C" {
 #define LOCALE_SABBREVMONTHNAME13	0x100F
 #define LOCALE_SPOSITIVESIGN	80
 #define LOCALE_SNEGATIVESIGN	81
-#define LOCALE_SSCRIPTS         108 // FIXME
-#define LOCALE_IPOSSIGNPOSN	82
-#define LOCALE_INEGSIGNPOSN	83
-#define LOCALE_IPOSSYMPRECEDES	84
-#define LOCALE_IPOSSEPBYSPACE	85
-#define LOCALE_INEGSYMPRECEDES	86
-#define LOCALE_INEGSEPBYSPACE	87
-#define LOCALE_FONTSIGNATURE    88
-#define LOCALE_SISO639LANGNAME  89
-#define LOCALE_SISO3166CTRYNAME 90
-#define LOCALE_SNAME            92 // FIXME
+#define LOCALE_IPOSSIGNPOSN         82
+#define LOCALE_INEGSIGNPOSN         83
+#define LOCALE_IPOSSYMPRECEDES      84
+#define LOCALE_IPOSSEPBYSPACE       85
+#define LOCALE_INEGSYMPRECEDES      86
+#define LOCALE_INEGSEPBYSPACE       87
+#define LOCALE_FONTSIGNATURE        88
+#define LOCALE_SISO639LANGNAME      89
+#define LOCALE_SISO3166CTRYNAME     90
 
-#if (WINVER >= 0x0600)
-#define LOCALE_SNAME            92
-#define LOCALE_SDURATION        93
-#define LOCALE_SKEYBOARDSTOINSTALL 94
-#define LOCALE_SSHORTESTDAYNAME1 96
-#define LOCALE_SSHORTESTDAYNAME2 97
-#define LOCALE_SSHORTESTDAYNAME3 98
-#define LOCALE_SSHORTESTDAYNAME4 99
-#define LOCALE_SSHORTESTDAYNAME5 100
-#define LOCALE_SSHORTESTDAYNAME6 101
-#define LOCALE_SSHORTESTDAYNAME7 102
-#define LOCALE_SISO639LANGNAME2  103
-#define LOCALE_SISO3166CTRYNAME2 104
-#define LOCALE_SNAN              105
-#define LOCALE_SPOSINFINITY      106
-#define LOCALE_SNEGINFINITY      107
-#define LOCALE_SSCRIPTS 108
-#define LOCALE_SPARENT  109
+/* FIXME: This value should be in the guarded block below */
+#define LOCALE_SNAME                92
+
+#if (WINVER >= 0x0600) || (defined(__REACTOS__) && defined(_KERNEL32_))
+#define LOCALE_IGEOID               91
+#define LOCALE_SNAME                92
+#define LOCALE_SDURATION            93
+#define LOCALE_SKEYBOARDSTOINSTALL  94
+#define LOCALE_SSHORTESTDAYNAME1    96
+#define LOCALE_SSHORTESTDAYNAME2    97
+#define LOCALE_SSHORTESTDAYNAME3    98
+#define LOCALE_SSHORTESTDAYNAME4    99
+#define LOCALE_SSHORTESTDAYNAME5    100
+#define LOCALE_SSHORTESTDAYNAME6    101
+#define LOCALE_SSHORTESTDAYNAME7    102
+#define LOCALE_SISO639LANGNAME2     103
+#define LOCALE_SISO3166CTRYNAME2    104
+#define LOCALE_SNAN                 105
+#define LOCALE_SPOSINFINITY         106
+#define LOCALE_SNEGINFINITY         107
+#define LOCALE_SSCRIPTS             108
+#define LOCALE_SPARENT              109
 #define LOCALE_SCONSOLEFALLBACKNAME 110
 #endif /* (WINVER >= 0x0600) */
 
 //#if (WINVER >= _WIN32_WINNT_WIN7)
 #define LOCALE_IREADINGLAYOUT       0x0070
 #define LOCALE_INEUTRAL             0x0071
+#define LOCALE_SNATIVEDISPLAYNAME   0x0073
 #define LOCALE_INEGATIVEPERCENT     0x0074
 #define LOCALE_IPOSITIVEPERCENT     0x0075
 #define LOCALE_SPERCENT             0x0076
diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h
index 50f8b9314f1..204d3164eaf 100644
--- a/sdk/include/xdk/ntbasedef.h
+++ b/sdk/include/xdk/ntbasedef.h
@@ -1081,6 +1081,24 @@ $endif(_WINNT_)
 #define LANG_YORUBA                               0x6a
 #define LANG_ZULU                                 0x35
 
+#ifdef __REACTOS__
+/* WINE extensions */
+/* These are documented by the MSDN but are missing from the Windows header */
+#define LANG_MALAGASY       0x8d
+
+/* FIXME: these are not defined anywhere */
+#define LANG_SUTU           0x30
+#define LANG_TSONGA         0x31
+#define LANG_VENDA          0x33
+
+/* non standard; keep the number high enough (but < 0xff) */
+#define LANG_ASTURIAN                    0xa5
+#define LANG_ESPERANTO                   0x8f
+#define LANG_WALON                       0x90
+#define LANG_CORNISH                     0x92
+#define LANG_MANX_GAELIC                 0x94
+#endif
+
 #define SUBLANG_NEUTRAL                             0x00
 #define SUBLANG_DEFAULT                             0x01
 #define SUBLANG_SYS_DEFAULT                         0x02
@@ -1326,6 +1344,15 @@ $endif(_WINNT_)
 #define SUBLANG_YORUBA_NIGERIA                      0x01
 #define SUBLANG_ZULU_SOUTH_AFRICA                   0x01
 
+#ifdef __REACTOS__
+/* WINE extensions */
+#define SUBLANG_DUTCH_SURINAM              0x03
+#define SUBLANG_ROMANIAN_MOLDAVIA          0x02
+#define SUBLANG_RUSSIAN_MOLDAVIA           0x02
+#define SUBLANG_LITHUANIAN_CLASSIC         0x02
+#define SUBLANG_MANX_GAELIC                0x01
+#endif
+
 #define SORT_DEFAULT                     0x0
 #define SORT_INVARIANT_MATH              0x1
 #define SORT_JAPANESE_XJIS               0x0