removed wxLANGUAGE_SERBIAN, we must explicitly use either or wxLANGUAGE_SERBIAN_CYRIL...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/misc/languages/langtabl.txt b/misc/languages/langtabl.txt
index f6276a205e4b8374af8a739340449bcd43eb40ab..b3225c626ba86c61b90f73558865323d824c3e86 100644 (file)
--- a/misc/languages/langtabl.txt
+++ b/misc/languages/langtabl.txt
@@ -158,7 +158,6 @@ wxLANGUAGE_SAMOAN                      sm     -                -
 wxLANGUAGE_SANGHO                      sg     -                -                                   "Sangho"
 wxLANGUAGE_SANSKRIT                    sa     LANG_SANSKRIT    SUBLANG_DEFAULT                     "Sanskrit"
 wxLANGUAGE_SCOTS_GAELIC                gd     -                -                                   "Scots Gaelic"
-wxLANGUAGE_SERBIAN                     sr_YU  LANG_SERBIAN     SUBLANG_DEFAULT                     "Serbian"
 wxLANGUAGE_SERBIAN_CYRILLIC            sr_YU  LANG_SERBIAN     SUBLANG_SERBIAN_CYRILLIC            "Serbian (Cyrillic)"
 wxLANGUAGE_SERBIAN_LATIN               sr_YU  LANG_SERBIAN     SUBLANG_SERBIAN_LATIN               "Serbian (Latin)"
 wxLANGUAGE_SERBO_CROATIAN              sh     -                -                                   "Serbo-Croatian"

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index c51372ac9ed2f64130efefa2b8d0bd8a0038afc8..a5e863883ef101a092fddaf9fdbca443b00e3707 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -3557,7 +3557,6 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_SANGHO,                     "sg"   , 0              , 0                                 , "Sangho")
    LNG(wxLANGUAGE_SANSKRIT,                   "sa"   , LANG_SANSKRIT  , SUBLANG_DEFAULT                   , "Sanskrit")
    LNG(wxLANGUAGE_SCOTS_GAELIC,               "gd"   , 0              , 0                                 , "Scots Gaelic")
-   LNG(wxLANGUAGE_SERBIAN,                    "sr_YU", LANG_SERBIAN   , SUBLANG_DEFAULT                   , "Serbian")
    LNG(wxLANGUAGE_SERBIAN_CYRILLIC,           "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_CYRILLIC          , "Serbian (Cyrillic)")
    LNG(wxLANGUAGE_SERBIAN_LATIN,              "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_LATIN             , "Serbian (Latin)")
    LNG(wxLANGUAGE_SERBO_CROATIAN,             "sh"   , 0              , 0                                 , "Serbo-Croatian")