* forward-port of [11453] plus a small string-enhancement to src/libvlc.h

diff --git a/configure.ac b/configure.ac
index 5ad97dd047ecbb74f5ae1ebfd72caa6b318ecd75..c4810db85229fce091c8896fbe5ae7e6ccef6479 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,7 @@ AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
 dnl
 dnl Gettext stuff
 dnl
-ALL_LINGUAS="bn ca da de el en_GB es fr hi hu it ja my ne nl no pl ps pt_BR ru sv tet tl zh_TW"
+ALL_LINGUAS="ca da de en_GB es fr it ja nl pt_BR zh_TW"
 AM_GNU_GETTEXT_VERSION(0.11.5)
 AM_GNU_GETTEXT
 if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then

diff --git a/src/libvlc.h b/src/libvlc.h
index dd3b2e88ee9edd88a4d8ea41f68966aeb53e22d0..e8d9f25588569286d58b13629d7cf69a62dca92b 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -27,13 +27,10 @@
 #include "vlc_keys.h"
 
 static char *ppsz_language[] =
-{ "auto", "en", "en_GB", "bn", "ca", "da", "de", "el", "es",
-  "fr", "hi", "hu", "it", "ja", "my", "ne", "nl", "no",
-  "pl", "ps", "pt_BR", "ru", "sv", "tet", "tl", "zh_TW" };
+{ "auto", "en", "en_GB", "ca", "da", "de", "es",
+  "fr", "it", "ja", "nl", "pt_BR", "zh_TW" };
 static char *ppsz_language_text[] =
-{ N_("Auto"), N_("American"), N_("British"), N_("Bengali"), N_("Catalan"), N_("Danish"), N_("German"), N_("Greek"), N_("Spanish"),
-  N_("French"), N_("Hindi"), N_("Hungarian"), N_("Italian"), N_("Japanese"), N_("Burmese"), N_("Nepali"), N_("Dutch"), N_("Norwegian"),
-  N_("Polish"), N_("Pashto"), N_("Brazilian"), N_("Russian"), N_("Swedish"), N_("Tetum"), N_("Tagalog"), N_("Chinese Traditional") };
+{ N_("Auto"), N_("American English"), N_("British English"), N_("Catalan"), N_("Danish"), N_("German"), N_("Spanish"), N_("French"), N_("Italian"), N_("Japanese"), N_("Dutch"), N_("Brazilian Portuguese"), N_("Chinese Traditional") };
 
 static char *ppsz_snap_formats[] =
 { "png", "jpg" };

diff --git a/src/misc/darwin_specific.m b/src/misc/darwin_specific.m
index 9906681ad79862a94fa52c24785554f0921f1091..154f74ecdead1a72bc9c2846591c7ac608d81c22 100644 (file)
--- a/src/misc/darwin_specific.m
+++ b/src/misc/darwin_specific.m
@@ -40,30 +40,17 @@ static int FindLanguage( const char * psz_lang )
     const char ** ppsz_parser;
     const char * ppsz_all[] =
     {
-        "Bengali", "bn",
         "Catalan", "ca",
         "Danish", "da",
         "German", "de",
-        "Modern Greek", "el",
         "British", "en_GB",
         "English", "en",
         "Spanish", "es",
         "French", "fr",
-        "Hindi", "hi",
-        "Hungarian", "hu",
         "Italian", "it",
         "Japanese", "ja",
-        "Burmese", "my",
-        "Nepali", "ne",
         "Dutch", "nl",
-        "Norwegian", "no",
-        "Polish", "pl",
-        "Pashto", "ps",
         "Brazillian Portuguese", "pt_BR",
-        "Russian", "ru",
-        "Swedish", "sv",
-        "Tetum", "tet",
-        "Tagalog", "tl",
         "Chinese Traditional", "zh_TW",
         NULL
     };