Commit 32196b37 authored by Simon Morlat's avatar Simon Morlat

remove i18n things that belong to mediastreamer2, update french and norwegian languages

parent 3873e40d
......@@ -3,20 +3,7 @@
# let make re-run automake upon need
ACLOCAL_AMFLAGS = -I m4 $(ACLOCAL_MACOS_FLAGS)
if EXTERNAL_MEDIASTREAMER
MS2_DIR=
else
MS2_DIR=mediastreamer2
endif
if EXTERNAL_ORTP
ORTP_DIR=
else
ORTP_DIR=oRTP
endif
SUBDIRS = build m4 pixmaps po $(ORTP_DIR) $(MS2_DIR) \
SUBDIRS = build m4 pixmaps po @ORTP_DIR@ @MS2_DIR@ \
coreapi console gtk share scripts
......
......@@ -42,8 +42,12 @@ autoheader
$AUTOMAKE --force-missing --add-missing --copy
autoconf
echo "Generating build scripts in oRTP..."
cd oRTP && ./autogen.sh && cd -
if [ -x oRTP/autogen.sh ]; then
echo "Generating build scripts in oRTP..."
( cd oRTP && ./autogen.sh )
fi
echo "Generating build scripts in mediastreamer2..."
cd mediastreamer2 && ./autogen.sh && cd -
if [ -x mediastreamer2/autogen.sh ]; then
echo "Generating build scripts in mediastreamer2..."
( cd mediastreamer2 && ./autogen.sh )
fi
......@@ -73,12 +73,7 @@ dnl localization tools
IT_PROG_INTLTOOL([0.40], [no-xml])
dnl Initialize libtool
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AM_PROG_LIBTOOL
AC_ENABLE_SHARED(yes)
AC_ENABLE_STATIC(no)
LT_INIT([win32-dll shared disable-static])
AC_CONFIG_COMMANDS([libtool-hacking],[
if test "$mingw_found" = "yes" ; then
......@@ -407,7 +402,7 @@ AS_CASE($enable_external_mediastreamer,
[yes],[
PKG_CHECK_MODULES([MEDIASTREAMER], [mediastreamer])
MS2_VERSION=`$PKG_CONFIG --modversion mediastreamer`
AM_CONDITIONAL(EXTERNAL_MEDIASTREAMER, [true])],
],
[no],[
AC_CONFIG_SUBDIRS( mediastreamer2 )
MEDIASTREAMER_DIR=${top_srcdir}/mediastreamer2
......@@ -417,12 +412,14 @@ dnl need to temporary change quotes to allow square brackets
changequote(<<, >>)
MS2_VERSION=`grep -e '^.C_INIT(' $MEDIASTREAMER_DIR/configure.ac | sed -e 's:\([^(]\+\)(\[mediastreamer\],\[\(.*\)\]):\2:g'`
changequote([, ])
AM_CONDITIONAL(EXTERNAL_MEDIASTREAMER, [false])],
MS2_DIR=mediastreamer2
],
[AC_MSG_ERROR([bad value '${enable_external_mediastreamer}' for --enable-external-mediastreamer])])
AC_SUBST(MEDIASTREAMER_CFLAGS)
AC_SUBST(MEDIASTREAMER_LIBS)
AC_SUBST([MS2_VERSION])
AC_SUBST([MS2_DIR])
dnl check for db2html (docbook) to generate html user manual
AC_CHECK_PROG(have_sgmltools,sgmltools, yes, no)
......@@ -462,6 +459,7 @@ else
if test x$ac_cv_c_bigendian = xyes ; then
ORTP_CFLAGS="$ORTP_CFLAGS -DORTP_BIGENDIAN"
fi
ORTP_DIR=oRTP
changequote(<<, >>)
ORTP_VERSION=`grep -E ^[AC]+_INIT ${top_srcdir}/oRTP/configure.ac | sed -e 's:^.*_INIT(.*,\[\(.*\)\]):\1:g'`
changequote([, ])
......@@ -469,8 +467,7 @@ fi
AC_SUBST(ORTP_CFLAGS)
AC_SUBST(ORTP_LIBS)
AC_SUBST([ORTP_VERSION])
AM_CONDITIONAL(EXTERNAL_ORTP, [test "$external_ortp" = 'true'])
AC_SUBST([ORTP_DIR])
dnl ##################################################
dnl # Check for doxygen
......@@ -480,7 +477,7 @@ AC_PATH_PROG(DOXYGEN,doxygen,false)
AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false)
AC_OUTPUT([
AC_CONFIG_FILES([
Makefile
build/Makefile
build/macos/Makefile
......@@ -506,6 +503,8 @@ linphone.spec
linphone.iss
])
AC_OUTPUT
echo "Linphone build configuration ended."
if test x$gtk_ui = xtrue ; then
......@@ -516,3 +515,4 @@ if test x$console_ui = xtrue ; then
fi
echo "Now type 'make' to compile, and then 'make install' as root to install it."
......@@ -205,7 +205,11 @@ int linphone_core_enable_payload_type(LinphoneCore *lc, PayloadType *pt, bool_t
const char *linphone_core_get_payload_type_description(LinphoneCore *lc, PayloadType *pt){
if (ms_filter_codec_supported(pt->mime_type)){
MSFilterDesc *desc=ms_filter_get_encoder(pt->mime_type);
return _(desc->text);
#ifdef ENABLE_NLS
return dgettext("mediastreamer",desc->text);
#else
return desc->text;
#endif
}
return NULL;
}
......
......@@ -28,11 +28,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#endif
#include "linphonecore.h"
#include <libintl.h>
#ifndef _
#define _(String) gettext (String)
#ifdef ENABLE_NLS
# include <libintl.h>
# undef _
# define _(String) gettext (String)
#else
# define _(String) (String)
#endif
#undef N_
#define N_(str) (str)
#ifdef USE_BUILDDATE_VERSION
#include "version_date.h"
#undef LINPHONE_VERSION
......
......@@ -93,7 +93,7 @@
</child>
<child>
<object class="GtkImageMenuItem" id="call_history_item">
<property name="label">_Call history</property>
<property name="label" translatable="yes">_Call history</property>
<property name="visible">True</property>
<property name="use_underline">True</property>
<property name="image">image2</property>
......
......@@ -321,6 +321,7 @@ static void linphone_gtk_show_codecs(GtkTreeView *listview, const MSList *codecl
gfloat bitrate;
gchar *color;
const char *params="";
struct _PayloadType *pt=(struct _PayloadType *)elem->data;
if (linphone_core_payload_type_enabled(linphone_gtk_get_core(),pt)) status=_("Enabled");
else status=_("Disabled");
......
mediastreamer2 @ e7ff20be
Subproject commit f5aeb6f365a85888c1049c346af6f7912cc4f4f1
Subproject commit e7ff20be903c328e5c20b14f9f5a458e38da41d9
......@@ -30,50 +30,4 @@ coreapi/friend.c
coreapi/proxy.c
coreapi/callbacks.c
coreapi/sal_eXosip2.c
mediastreamer2/src/alaw.c
mediastreamer2/src/alsa.c
mediastreamer2/src/aqsnd.c
mediastreamer2/src/dtmfgen.c
mediastreamer2/src/gsm.c
mediastreamer2/src/macsnd.c
mediastreamer2/src/msconf.c
mediastreamer2/src/msfileplayer.c
mediastreamer2/src/msfilerec.c
mediastreamer2/src/msfilerec_win.c
mediastreamer2/src/msjoin.c
mediastreamer2/src/msresample.c
mediastreamer2/src/msrtp.c
mediastreamer2/src/msspeex.c
mediastreamer2/src/msvolume.c
mediastreamer2/src/msv4l.c
mediastreamer2/src/msv4l2.c
mediastreamer2/src/msv4m.m
mediastreamer2/src/nowebcam.c
mediastreamer2/src/oss.c
mediastreamer2/src/pixconv.c
mediastreamer2/src/sizeconv.c
mediastreamer2/src/speexec.c
mediastreamer2/src/tee.c
mediastreamer2/src/theora.c
mediastreamer2/src/ulaw.c
mediastreamer2/src/videodec.c
mediastreamer2/src/videoenc.c
mediastreamer2/src/videoout.c
mediastreamer2/src/wincevideods.c
mediastreamer2/src/winvideo.c
mediastreamer2/src/winvideods.c
mediastreamer2/src/winvideo2.c
mediastreamer2/src/ice.c
mediastreamer2/src/void.c
mediastreamer2/src/equalizer.c
mediastreamer2/src/msdscap-mingw.cc
mediastreamer2/src/drawdib-display.c
mediastreamer2/src/audiomixer.c
mediastreamer2/src/chanadapt.c
mediastreamer2/src/itc.c
mediastreamer2/src/extdisplay.c
mediastreamer2/src/msiounit.c
mediastreamer2/src/x11video.c
mediastreamer2/src/msandroid.cpp
mediastreamer2/src/msandroidvideo.cpp
gtk/p2pwizard.ui
mediastreamer2/src/alaw.c
mediastreamer2/src/alsa.c
mediastreamer2/src/aqsnd.c
mediastreamer2/src/audiomixer.c
mediastreamer2/src/chanadapt.c
mediastreamer2/src/drawdib-display.c
mediastreamer2/src/dtmfgen.c
mediastreamer2/src/equalizer.c
mediastreamer2/src/extdisplay.c
mediastreamer2/src/gsm.c
mediastreamer2/src/ice.c
mediastreamer2/src/itc.c
mediastreamer2/src/macsnd.c
mediastreamer2/src/msandroid.cpp
mediastreamer2/src/msandroidvideo.cpp
mediastreamer2/src/msconf.c
mediastreamer2/src/msdscap-mingw.cc
mediastreamer2/src/msfileplayer.c
mediastreamer2/src/msfilerec.c
mediastreamer2/src/msfilerec_win.c
mediastreamer2/src/msiounit.c
mediastreamer2/src/msjoin.c
mediastreamer2/src/msresample.c
mediastreamer2/src/msrtp.c
mediastreamer2/src/msspeex.c
mediastreamer2/src/msv4l.c
mediastreamer2/src/msv4l2.c
mediastreamer2/src/msvolume.c
mediastreamer2/src/nowebcam.c
mediastreamer2/src/pixconv.c
mediastreamer2/src/sizeconv.c
mediastreamer2/src/speexec.c
mediastreamer2/src/tee.c
mediastreamer2/src/theora.c
mediastreamer2/src/ulaw.c
mediastreamer2/src/videodec.c
mediastreamer2/src/videoenc.c
mediastreamer2/src/videoout.c
mediastreamer2/src/void.c
mediastreamer2/src/wincevideods.c
mediastreamer2/src/winvideo.c
mediastreamer2/src/winvideo2.c
mediastreamer2/src/winvideods.c
mediastreamer2/src/x11video.c
This diff is collapsed.
This diff is collapsed.
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