From 6cf05f914d9f4ef64e69d9fc62a10cde6146ecad Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Mon, 8 Jul 2013 16:26:21 +0200 Subject: [PATCH] include: Remove some non-standard sublang synonyms. --- include/winnt.rh | 6 +----- tools/wmc/po.c | 2 +- tools/wrc/po.c | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/winnt.rh b/include/winnt.rh index 3d2cde7a643..1013a24e88b 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -297,7 +297,7 @@ #define SUBLANG_KYRGYZ_KYRGYZSTAN 0x01 #define SUBLANG_LAO_LAO 0x01 #define SUBLANG_LATVIAN_LATVIA 0x01 -#define SUBLANG_LITHUANIAN_LITHUANIA 0x01 +#define SUBLANG_LITHUANIAN 0x01 #define SUBLANG_LOWER_SORBIAN_GERMANY 0x02 #define SUBLANG_LUXEMBOURGISH_LUXEMBOURG 0x01 #define SUBLANG_MACEDONIAN_MACEDONIA 0x01 @@ -413,7 +413,6 @@ #define SUBLANG_ENGLISH_IRELAND SUBLANG_ENGLISH_EIRE #define SUBLANG_HAUSA_NIGERIA SUBLANG_HAUSA_NIGERIA_LATIN #define SUBLANG_LAO_LAO_PDR SUBLANG_LAO_LAO -#define SUBLANG_LITHUANIAN SUBLANG_LITHUANIAN_LITHUANIA #define SUBLANG_PORTUGUESE_PORTUGAL SUBLANG_PORTUGUESE #define SUBLANG_SWAHILI SUBLANG_SWAHILI_KENYA #define SUBLANG_SWEDISH_SWEDEN SUBLANG_SWEDISH @@ -421,11 +420,8 @@ /* FIXME: these are not defined anywhere */ #define SUBLANG_DUTCH_SURINAM 0x03 -#define SUBLANG_ROMANIAN SUBLANG_ROMANIAN_ROMANIA #define SUBLANG_ROMANIAN_MOLDAVIA 0x02 -#define SUBLANG_RUSSIAN SUBLANG_RUSSIAN_RUSSIA #define SUBLANG_RUSSIAN_MOLDAVIA 0x02 -#define SUBLANG_CROATIAN SUBLANG_CROATIAN_CROATIA #define SUBLANG_LITHUANIAN_CLASSIC 0x02 #define SUBLANG_MANX_GAELIC 0x01 diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 2d68969107a..de15e24405b 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -191,7 +191,7 @@ static const struct { LANG_LATVIAN, SUBLANG_NEUTRAL, "lv" }, { LANG_LATVIAN, SUBLANG_LATVIAN_LATVIA, "lv_LV" }, { LANG_LITHUANIAN, SUBLANG_NEUTRAL, "lt" }, - { LANG_LITHUANIAN, SUBLANG_LITHUANIAN_LITHUANIA, "lt_LT" }, + { LANG_LITHUANIAN, SUBLANG_LITHUANIAN, "lt_LT" }, { LANG_PERSIAN, SUBLANG_NEUTRAL, "fa" }, { LANG_PERSIAN, SUBLANG_PERSIAN_IRAN, "fa_IR" }, { LANG_ARMENIAN, SUBLANG_NEUTRAL, "hy" }, diff --git a/tools/wrc/po.c b/tools/wrc/po.c index b31594ff9ee..4b13c268094 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -338,7 +338,7 @@ static const struct { LANG_LATVIAN, SUBLANG_NEUTRAL, "lv" }, { LANG_LATVIAN, SUBLANG_LATVIAN_LATVIA, "lv_LV" }, { LANG_LITHUANIAN, SUBLANG_NEUTRAL, "lt" }, - { LANG_LITHUANIAN, SUBLANG_LITHUANIAN_LITHUANIA, "lt_LT" }, + { LANG_LITHUANIAN, SUBLANG_LITHUANIAN, "lt_LT" }, { LANG_PERSIAN, SUBLANG_NEUTRAL, "fa" }, { LANG_PERSIAN, SUBLANG_PERSIAN_IRAN, "fa_IR" }, { LANG_ARMENIAN, SUBLANG_NEUTRAL, "hy" },