post wxUniv merge fixes

[wxWidgets.git] / misc / languages / langtabl.txt

diff --git a/misc/languages/langtabl.txt b/misc/languages/langtabl.txt
index 53d257888d7171ffa34564855b1a181aca34af0f..d7c084ddf0e05feea2bd8528986d5d7969fc484a 100644 (file)
--- a/misc/languages/langtabl.txt
+++ b/misc/languages/langtabl.txt
@@ -71,7 +71,7 @@ wxLANGUAGE_ENGLISH_ZIMBABWE            en_ZW  LANG_ENGLISH     SUBLANG_ENGLISH_Z
 wxLANGUAGE_ESPERANTO                   eo     -                -                                   "Esperanto"
 wxLANGUAGE_ESTONIAN                    et_EE  LANG_ESTONIAN    SUBLANG_DEFAULT                     "Estonian"
 wxLANGUAGE_FAEROESE                    fo_FO  LANG_FAEROESE    SUBLANG_DEFAULT                     "Faeroese"
-wxLANGUAGE_FARSI                       -      LANG_FARSI       SUBLANG_DEFAULT                     "Farsi"
+wxLANGUAGE_FARSI                       fa_IR  LANG_FARSI       SUBLANG_DEFAULT                     "Farsi"
 wxLANGUAGE_FIJI                        fj     -                -                                   "Fiji"
 wxLANGUAGE_FINNISH                     fi_FI  LANG_FINNISH     SUBLANG_DEFAULT                     "Finnish"
 wxLANGUAGE_FRENCH                      fr_FR  LANG_FRENCH      SUBLANG_FRENCH                      "French"
@@ -112,6 +112,7 @@ wxLANGUAGE_KANNADA                     kn     LANG_KANNADA     SUBLANG_DEFAULT
 wxLANGUAGE_KASHMIRI                    ks     LANG_KASHMIRI    SUBLANG_DEFAULT                     "Kashmiri"
 wxLANGUAGE_KASHMIRI_INDIA              ks_IN  LANG_KASHMIRI    SUBLANG_KASHMIRI_INDIA              "Kashmiri (India)"
 wxLANGUAGE_KAZAKH                      kk     LANG_KAZAK       SUBLANG_DEFAULT                     "Kazakh"
+wxLANGUAGE_KERNEWEK                    kw_GB  -                -                                   "Kernewek"
 wxLANGUAGE_KINYARWANDA                 rw     -                -                                   "Kinyarwanda"
 wxLANGUAGE_KIRGHIZ                     ky     -                -                                   "Kirghiz"
 wxLANGUAGE_KIRUNDI                     rn     -                -                                   "Kirundi"
@@ -138,14 +139,12 @@ wxLANGUAGE_MONGOLIAN                   mn     -                -
 wxLANGUAGE_NAURU                       na     -                -                                   "Nauru"
 wxLANGUAGE_NEPALI                      ne     LANG_NEPALI      SUBLANG_DEFAULT                     "Nepali"
 wxLANGUAGE_NEPALI_INDIA                ne_IN  LANG_NEPALI      SUBLANG_NEPALI_INDIA                "Nepali (India)"
-wxLANGUAGE_NORWEGIAN                   no_NO  LANG_NORWEGIAN   SUBLANG_DEFAULT                     "Norwegian"
 wxLANGUAGE_NORWEGIAN_BOKMAL            no_NO  LANG_NORWEGIAN   SUBLANG_NORWEGIAN_BOKMAL            "Norwegian (Bokmal)"
-wxLANGUAGE_NORWEGIAN_NYNORSK           no_NO  LANG_NORWEGIAN   SUBLANG_NORWEGIAN_NYNORSK           "Norwegian (Nynorsk)"
+wxLANGUAGE_NORWEGIAN_NYNORSK           nn_NO  LANG_NORWEGIAN   SUBLANG_NORWEGIAN_NYNORSK           "Norwegian (Nynorsk)"
 wxLANGUAGE_OCCITAN                     oc     -                -                                   "Occitan"
 wxLANGUAGE_ORIYA                       or     LANG_ORIYA       SUBLANG_DEFAULT                     "Oriya"
 wxLANGUAGE_OROMO                       om     -                -                                   "(Afan) Oromo"
 wxLANGUAGE_PASHTO                      ps     -                -                                   "Pashto, Pushto"
-wxLANGUAGE_PERSIAN                     fa_IR  -                -                                   "Persian"
 wxLANGUAGE_POLISH                      pl_PL  LANG_POLISH      SUBLANG_DEFAULT                     "Polish"
 wxLANGUAGE_PORTUGUESE                  pt_PT  LANG_PORTUGUESE  SUBLANG_PORTUGUESE                  "Portuguese"
 wxLANGUAGE_PORTUGUESE_BRAZILIAN        pt_BR  LANG_PORTUGUESE  SUBLANG_PORTUGUESE_BRAZILIAN        "Portuguese (Brazilian)"