Skip to content

V
vlc-1.1
Commit d65301ab authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

* Italien translation, courtesy of Bruno <allevb@tin.it>, 

* Compilation fixes for gettext 0.11.5 on MacOS X.
parent e00996a4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 189 deletions
Makefile.am
View file @ d65301ab
......@@ -473,6 +473,11 @@ vlc.app: vlc $(PLUGIN_FILES)
fi ; done
$(INSTALL) -d vlc.app/Contents/MacOS/share
$(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
$(INSTALL) -d vlc.app/Contents/MacOS/locale
for i in $(CATALOGS); do
mkdir -p vlc.app/Contents/MacOS/locale/${i%.gmo}/LC_MESSAGES
cp po/$i vlc.app/Contents/MacOS/locale/${i%.gmo}/LC_MESSAGES/vlc.mo
done
endif
if HAVE_WIN32
......@@ -503,7 +508,7 @@ package-win32:
cp vlc.exe tmp/
$(STRIP) tmp/vlc.exe
cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
for file in AUTHORS COPYING ChangeLog README FAQ TODO ; \
for file in AUTHORS COPYING ChangeLog README FAQ ; \
do cp $$file tmp/$${file}.txt ; \
unix2dos tmp/$${file}.txt ; done
mkdir tmp/plugins
......@@ -535,7 +540,7 @@ package-beos:
cp vlc tmp/vlc/
$(STRIP) tmp/vlc/vlc
xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc
cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/vlc/
cp AUTHORS COPYING ChangeLog README FAQ tmp/vlc/
for file in default8x16.psf default8x9.psf ; \
do cp share/$$file tmp/vlc/share/ ; done
mkdir tmp/vlc/plugins
......@@ -561,11 +566,10 @@ package-macosx:
# Copy relevant files
cp -R vlc.app tmp/
$(STRIP) tmp/vlc.app/Contents/MacOS/vlc
cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf FAQ TODO tmp/
cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf FAQ tmp/
# Create disk image
./macosx-dmg 15 "vlc-${VERSION}" tmp/*
./macosx-dmg 18 "vlc-${VERSION}" tmp/*
# Clean up
rm -Rf tmp
......
configure.ac.in
View file @ d65301ab
......@@ -51,19 +51,6 @@ AC_CHECK_TOOL(STRIP, strip, :)
AC_CHECK_TOOL(AR, ar, :)
AC_CHECK_TOOL(LD, ld, :)
dnl
dnl Gettext stuff
dnl
ALL_LINGUAS="de en_GB fr it ja no ru nl pl se"
AM_GNU_GETTEXT_VERSION(0.10.40)
AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl)
INCLUDES="${INCLUDES} -I\\\$(top_srcdir)/intl"
fi
AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
XGETTEXT="${XGETTEXT} --keyword=_NS"
dnl AM_PROG_LIBTOOL
AC_PROG_INSTALL
......@@ -100,9 +87,9 @@ case "x${target_os}" in
;;
xdarwin*)
SYS=darwin
CFLAGS_save="${CFLAGS_save} -no-cpp-precomp"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp"; OBJCFLAGS="${OBJCFLAGS_save}"
CFLAGS_save="${CFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; OBJCFLAGS="${OBJCFLAGS_save}"
LDFLAGS_vlc="${LDFLAGS_vlc} -all_load"
LIBEXT=".dylib"
;;
......@@ -175,6 +162,19 @@ AM_CONDITIONAL(HAVE_BEOS, test "x${SYS}" = "xbeos")
AM_CONDITIONAL(HAVE_DARWIN, test "x${SYS}" = "xdarwin")
AM_CONDITIONAL(HAVE_WIN32, test "x${SYS}" = "xmingw32")
dnl
dnl Gettext stuff
dnl
ALL_LINGUAS="de en_GB fr it ja no ru nl pl se"
AM_GNU_GETTEXT_VERSION(0.10.40)
AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl)
INCLUDES="${INCLUDES} -I\\\$(top_srcdir)/intl"
fi
AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
XGETTEXT="${XGETTEXT} --keyword=_NS"
AC_MSG_CHECKING(for suffix of libraries)
AC_MSG_RESULT(${LIBEXT})
......
po/it.po
View file @ d65301ab
This diff is collapsed.
src/libvlc.c
View file @ d65301ab
......@@ -2,7 +2,7 @@
* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.c,v 1.54 2002/12/25 23:39:01 sam Exp $
* $Id: libvlc.c,v 1.55 2002/12/27 00:17:48 massiot Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -225,12 +225,6 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
return VLC_ENOOBJ;
}
/*
* Support for gettext
*/
SetLanguage( "" );
msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
/*
* System specific initialization code
*/
......@@ -251,6 +245,12 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
p_vlc->psz_object_name = "vlc";
}
/*
* Support for gettext
*/
SetLanguage( "" );
msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
/* Hack: insert the help module here */
p_help_module = vlc_object_create( p_vlc, VLC_OBJECT_MODULE );
if( p_help_module == NULL )
......@@ -957,6 +957,12 @@ static void SetLanguage ( char const *psz_lang )
#if defined( ENABLE_NLS ) \
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
char * psz_path;
#ifdef SYS_DARWIN
char * psz_vlcpath = system_GetProgramPath();
char psz_tmp[1024];
#endif
# if defined( HAVE_INCLUDED_GETTEXT ) && !defined( HAVE_LC_MESSAGES )
if( *psz_lang )
{
......@@ -977,10 +983,17 @@ static void SetLanguage ( char const *psz_lang )
setlocale( LC_CTYPE, psz_lang );
/* Specify where to find the locales for current domain */
if( !bindtextdomain( PACKAGE, LOCALEDIR ) )
#ifndef SYS_DARWIN
psz_path = LOCALEDIR;
#else
snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", psz_vlcpath,
"locale" );
psz_path = psz_tmp;
#endif
if( !bindtextdomain( PACKAGE, psz_path ) )
{
fprintf( stderr, "warning: no domain %s in directory %s\n",
PACKAGE, LOCALEDIR );
PACKAGE, psz_path );
}
/* Set the default domain */
......
src/misc/darwin_specific.c
View file @ d65301ab
......@@ -2,7 +2,7 @@
* darwin_specific.c: Darwin specific features
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: darwin_specific.c,v 1.15 2002/07/17 22:23:20 jlj Exp $
* $Id: darwin_specific.c,v 1.16 2002/12/27 00:17:49 massiot Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -53,16 +53,6 @@ void system_Init( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
p_char++;
}
/* Run the interface with a real-time priority too */
{
struct sched_param param;
param.sched_priority = 10;
if (pthread_setschedparam(pthread_self(), SCHED_RR, &param))
{
msg_Err( p_this, "pthread_setschedparam failed" );
}
}
}
/*****************************************************************************
......
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