diff --git a/misc/languages/langtabl.txt b/misc/languages/langtabl.txt index 94a34cbbc3..3150572a4a 100644 --- a/misc/languages/langtabl.txt +++ b/misc/languages/langtabl.txt @@ -219,7 +219,7 @@ wxLANGUAGE_URDU_PAKISTAN ur_PK LANG_URDU SUBLANG_URDU_PAKI wxLANGUAGE_UZBEK uz LANG_UZBEK SUBLANG_DEFAULT LTR "Uzbek" wxLANGUAGE_UZBEK_CYRILLIC uz LANG_UZBEK SUBLANG_UZBEK_CYRILLIC LTR "Uzbek (Cyrillic)" wxLANGUAGE_UZBEK_LATIN uz LANG_UZBEK SUBLANG_UZBEK_LATIN LTR "Uzbek (Latin)" -wxLANGUAGE_VALENCIAN ca_ES@valencia LANG_VALENCIAN SUBLANG_DEFAULT LTR "Valencian" +wxLANGUAGE_VALENCIAN ca_ES@valencia - - LTR "Valencian" wxLANGUAGE_VIETNAMESE vi_VN LANG_VIETNAMESE SUBLANG_DEFAULT LTR "Vietnamese" wxLANGUAGE_VOLAPUK vo - - LTR "Volapuk" wxLANGUAGE_WELSH cy - - LTR "Welsh" diff --git a/src/common/intl.cpp b/src/common/intl.cpp index bd4a1953e3..e61703c9c0 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -3004,9 +3004,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule) #ifndef LANG_UZBEK #define LANG_UZBEK (0) #endif -#ifndef LANG_VALENCIAN -#define LANG_VALENCIAN (0) -#endif #ifndef LANG_VIETNAMESE #define LANG_VIETNAMESE (0) #endif @@ -3515,7 +3512,7 @@ void wxLocale::InitLanguagesDB() 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", LANG_VALENCIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Valencian") + LNG(wxLANGUAGE_VALENCIAN, "ca_ES@valencia", 0 , 0 , wxLayout_LeftToRight, "Valencian") 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")