Commit d4d94351 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

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

parent 5d88ca9c
...@@ -206,7 +206,7 @@ AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce") ...@@ -206,7 +206,7 @@ AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
dnl dnl
dnl Gettext stuff dnl Gettext stuff
dnl 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"
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
...@@ -27,13 +27,10 @@ ...@@ -27,13 +27,10 @@
#include "vlc_keys.h" #include "vlc_keys.h"
static char *ppsz_language[] = static char *ppsz_language[] =
{ "auto", "en", "en_GB", "bn", "ca", "da", "de", "el", "es", { "auto", "en", "en_GB", "ca", "da", "de", "es",
"fr", "hi", "hu", "it", "ja", "my", "ne", "nl", "no", "fr", "it", "ja", "nl", "pt_BR", "zh_TW" };
"pl", "ps", "pt_BR", "ru", "sv", "tet", "tl", "zh_TW" };
static char *ppsz_language_text[] = static char *ppsz_language_text[] =
{ N_("Auto"), N_("American"), N_("British"), N_("Bengali"), N_("Catalan"), N_("Danish"), N_("German"), N_("Greek"), N_("Spanish"), { 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") };
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") };
static char *ppsz_snap_formats[] = static char *ppsz_snap_formats[] =
{ "png", "jpg" }; { "png", "jpg" };
...@@ -40,30 +40,17 @@ static int FindLanguage( const char * psz_lang ) ...@@ -40,30 +40,17 @@ static int FindLanguage( const char * psz_lang )
const char ** ppsz_parser; const char ** ppsz_parser;
const char * ppsz_all[] = const char * ppsz_all[] =
{ {
"Bengali", "bn",
"Catalan", "ca", "Catalan", "ca",
"Danish", "da", "Danish", "da",
"German", "de", "German", "de",
"Modern Greek", "el",
"British", "en_GB", "British", "en_GB",
"English", "en", "English", "en",
"Spanish", "es", "Spanish", "es",
"French", "fr", "French", "fr",
"Hindi", "hi",
"Hungarian", "hu",
"Italian", "it", "Italian", "it",
"Japanese", "ja", "Japanese", "ja",
"Burmese", "my",
"Nepali", "ne",
"Dutch", "nl", "Dutch", "nl",
"Norwegian", "no",
"Polish", "pl",
"Pashto", "ps",
"Brazillian Portuguese", "pt_BR", "Brazillian Portuguese", "pt_BR",
"Russian", "ru",
"Swedish", "sv",
"Tetum", "tet",
"Tagalog", "tl",
"Chinese Traditional", "zh_TW", "Chinese Traditional", "zh_TW",
}; };
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment