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
......@@ -27,25 +27,26 @@ msgstr "Chat avec %s"
#: ../gtk/main.c:74
msgid "log to stdout some debug information while running."
msgstr ""
msgstr "affiche des informations de debogage"
#: ../gtk/main.c:81
msgid "Start only in the system tray, do not show the main interface."
msgstr ""
msgstr "Démarre iconifié, sans interface principale."
#: ../gtk/main.c:88
msgid "address to call right now"
msgstr ""
msgstr "addresse à appeler maintenant"
#: ../gtk/main.c:95
msgid "if set automatically answer incoming calls"
msgstr ""
msgstr "si positionné, répond automatiquement aux appels entrants"
#: ../gtk/main.c:102
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
msgstr ""
msgstr "Spécifie un répertoire de travail (qui devrait être le répertoire d'installation, par exemple c:"
"\\Program Files\\Linphone)"
#: ../gtk/main.c:442
#, c-format
......@@ -59,7 +60,9 @@ msgid ""
"Would you allow him to see your presence status or add him to your contact "
"list ?\n"
"If you answer no, this person will be temporarily blacklisted."
msgstr ""
msgstr "%s souhaite vous ajouter à sa liste de contact.\n"
"Souhaitez vous l'autoriser à voir votre information de présence et l'ajouter à votre liste également ?\n"
"Si vous répondez non, cette personne sera mise temporairement sur liste noire."
#: ../gtk/main.c:903
#, c-format
......@@ -92,6 +95,8 @@ msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
msgstr ""
"Aucune carte son n'a été détectée sur cet ordinateur.\n"
"Vous ne pourrez pas effectuer d'appels audio."
#: ../gtk/main.c:1422
msgid "A free SIP video-phone"
......@@ -347,41 +352,37 @@ msgstr ""
#: ../gtk/incall_view.c:113
msgid "Transfer"
msgstr ""
msgstr "Transfert"
#: ../gtk/incall_view.c:187
#, fuzzy
msgid "<b>Calling...</b>"
msgstr "<b>Usage de l'IPv6</b>"
msgstr "<b>Appel en cours</b>"
#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
msgid "00::00::00"
msgstr ""
#: ../gtk/incall_view.c:206
#, fuzzy
msgid "<b>Incoming call</b>"
msgstr "Appel entrant"
msgstr "<b>Appel entrant</b>"
#: ../gtk/incall_view.c:216
msgid ""
"Pause all calls\n"
"and answer"
msgstr ""
msgstr "Pauser les appels en cours\net répondre"
#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
msgid "Answer"
msgstr ""
msgstr "Répondre"
#: ../gtk/incall_view.c:244
#, fuzzy
msgid "<b>In call</b>"
msgstr "Raccrocher"
msgstr "<b>Appel en cours</b>"
#: ../gtk/incall_view.c:260
#, fuzzy
msgid "<b>Paused call</b>"
msgstr "Raccrocher"
msgstr "<b>Appel en attente<b>"
#: ../gtk/incall_view.c:272
#, c-format
......@@ -389,9 +390,8 @@ msgid "%02i::%02i::%02i"
msgstr ""
#: ../gtk/incall_view.c:288
#, fuzzy
msgid "<b>Call ended.</b>"
msgstr "Appel terminé."
msgstr "<b>Appel terminé.</b>"
#: ../gtk/incall_view.c:309
msgid "Unmute"
......@@ -403,16 +403,16 @@ msgstr ""
#: ../gtk/incall_view.c:340
msgid "Resume"
msgstr ""
msgstr "Reprendre"
#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
msgid "Pause"
msgstr ""
msgstr "Mettre en attente"
#: ../gtk/loginframe.c:93
#, fuzzy, c-format
#, c-format
msgid "Please enter login information for %s"
msgstr "Entrez votre mot de passe pour le domaine %s"
msgstr "Entrez vos identifiants pour %s"
#: ../gtk/main.ui.h:1
msgid "#"
......@@ -468,7 +468,7 @@ msgstr "<b>Ajouter un contact depuis l'annuaire</b>"
#: ../gtk/main.ui.h:14
msgid "<b>Contact list</b>"
msgstr "<b>List de contacts</b>"
msgstr "<b>Liste de contacts</b>"
#: ../gtk/main.ui.h:15
msgid "<b>Welcome !</b>"
......@@ -483,16 +483,14 @@ msgid "ADSL"
msgstr ""
#: ../gtk/main.ui.h:18
#, fuzzy
msgid "Add contact"
msgstr "%i contact trouvé."
msgstr "Ajouter un contact."
#: ../gtk/main.ui.h:19
msgid "All users"
msgstr ""
msgstr "Tous"
#: ../gtk/main.ui.h:21
#, fuzzy
msgid "Audio & video"
msgstr "Audio et video"
......@@ -502,7 +500,7 @@ msgstr "Audio seul"
#: ../gtk/main.ui.h:23
msgid "Automatically log me in"
msgstr ""
msgstr "Me connecter automatiquement"
#: ../gtk/main.ui.h:24
msgid "B"
......@@ -559,7 +557,7 @@ msgstr "Appel en cours"
#: ../gtk/main.ui.h:37
msgid "Initiate a new call"
msgstr ""
msgstr "Démarrer un nouvel appel"
#: ../gtk/main.ui.h:38
msgid "Internet connection:"
......@@ -567,11 +565,11 @@ msgstr ""
#: ../gtk/main.ui.h:39
msgid "Keypad"
msgstr ""
msgstr "Clavier"
#: ../gtk/main.ui.h:40
msgid "Login information"
msgstr "Info de login"
msgstr "Information de login"
#: ../gtk/main.ui.h:41
msgid "Lookup:"
......@@ -582,10 +580,8 @@ msgid "My current identity:"
msgstr "Mon identité sip :"
#: ../gtk/main.ui.h:44
#, fuzzy
msgid "Online users"
msgstr ""
"Tous\n"
"En ligne"
#: ../gtk/main.ui.h:45
......@@ -601,9 +597,8 @@ msgid "Search"
msgstr "Rechercher"
#: ../gtk/main.ui.h:49
#, fuzzy
msgid "Show debug window"
msgstr "Fenêtre de débogage de linphone"
msgstr "Fenêtre de débogage"
#: ../gtk/main.ui.h:50
msgid "Username"
......@@ -611,11 +606,11 @@ msgstr "Nom d'utilisateur"
#: ../gtk/main.ui.h:51
msgid "_Help"
msgstr ""
msgstr "_Aide"
#: ../gtk/main.ui.h:52
msgid "_Homepage"
msgstr ""
msgstr "_Site web"
#: ../gtk/main.ui.h:53
msgid "_Linphone"
......@@ -689,9 +684,8 @@ msgid "Linphone debug window"
msgstr "Fenêtre de débogage de linphone"
#: ../gtk/password.ui.h:1
#, fuzzy
msgid "Linphone - Authentication required"
msgstr "Linphone - Autentification requise"
msgstr "Linphone - Autentification demandée"
#: ../gtk/password.ui.h:2
msgid "Password:"
......@@ -706,9 +700,8 @@ msgid "UserID"
msgstr ""
#: ../gtk/call_logs.ui.h:1
#, fuzzy
msgid "Call back"
msgstr "Appeler %s"
msgstr "Rappeler"
#: ../gtk/call_logs.ui.h:2
msgid "Call history"
......@@ -716,7 +709,7 @@ msgstr "Historique des appels"
#: ../gtk/call_logs.ui.h:3
msgid "Clear all"
msgstr ""
msgstr "Tout vider"
#: ../gtk/sip_account.ui.h:1
msgid "Configure a SIP account"
......@@ -728,11 +721,11 @@ msgstr "Linphone - Configurer un compte SIP"
#: ../gtk/sip_account.ui.h:3
msgid "Looks like sip:<proxy hostname>"
msgstr ""
msgstr "De la forme sip:<proxy hostname>"
#: ../gtk/sip_account.ui.h:4
msgid "Looks like sip:<username>@<domain>"
msgstr ""
msgstr "De la forme sip:<username>@<domain>"
#: ../gtk/sip_account.ui.h:5
msgid "Publish presence information"
......@@ -819,9 +812,8 @@ msgid "<b>Transport</b>"
msgstr "<b>Transport</b>"
#: ../gtk/parameters.ui.h:13
#, fuzzy
msgid "<b>Video</b>"
msgstr "<b>Son</b>"
msgstr "<b>Video</b>"
#: ../gtk/parameters.ui.h:14
msgid "ALSA special device (optional):"
......@@ -836,11 +828,10 @@ msgid "Audio RTP/UDP:"
msgstr ""
#: ../gtk/parameters.ui.h:17
#, fuzzy
msgid "Audio codecs"
msgstr ""
"Codecs audio\n"
"Codecs video"
"Codecs audio"
#: ../gtk/parameters.ui.h:18
msgid "Behind NAT / Firewall (specify gateway IP below)"
......@@ -859,9 +850,8 @@ msgid "Capture device:"
msgstr "Périphérique de capture:"
#: ../gtk/parameters.ui.h:23
#, fuzzy
msgid "Codecs"
msgstr "<b>Codecs</b>"
msgstr ""
#: ../gtk/parameters.ui.h:24
msgid "Direct connection to the Internet"
......@@ -869,7 +859,7 @@ msgstr "Connection directe à l'Internet"
#: ../gtk/parameters.ui.h:25
msgid "Disable"
msgstr "Désactive"
msgstr "Désactiver"
#: ../gtk/parameters.ui.h:26
msgid "Done"
......@@ -885,7 +875,7 @@ msgstr "Editer"
#: ../gtk/parameters.ui.h:29
msgid "Enable"
msgstr "Active"
msgstr "Activer"
#: ../gtk/parameters.ui.h:30
msgid "Enable echo cancellation"
......@@ -988,10 +978,8 @@ msgid "Video RTP/UDP:"
msgstr ""
#: ../gtk/parameters.ui.h:55
#, fuzzy
msgid "Video codecs"
msgstr ""
"Codecs audio\n"
"Codecs video"
#: ../gtk/parameters.ui.h:56
......@@ -1011,9 +999,8 @@ msgid "Your username:"
msgstr "Votre nom d'utilisateur:"
#: ../gtk/parameters.ui.h:60
#, fuzzy
msgid "a sound card"
msgstr "une carte son\n"
msgstr "une carte son"
#: ../gtk/parameters.ui.h:61
msgid "default camera"
......@@ -1109,13 +1096,12 @@ msgid "Contacting"
msgstr "Appel de"
#: ../coreapi/linphonecore.c:1974
#, fuzzy
msgid "Could not call"
msgstr "Echec"
msgstr "Echec de l'appel"
#: ../coreapi/linphonecore.c:2081
msgid "Sorry, you have to pause or stop the current call first !"
msgstr ""
msgstr "Désolé, vous devez d'abord mettre en attente l'appel en cours."
#: ../coreapi/linphonecore.c:2086
msgid "Sorry, we have reached the maximum number of simultaneous calls"
......@@ -1123,33 +1109,31 @@ msgstr ""
#: ../coreapi/linphonecore.c:2208
msgid "Modifying call parameters..."
msgstr ""
msgstr "Modifications des paramètres d'appels..."
#: ../coreapi/linphonecore.c:2311
msgid "Connected."
msgstr "En ligne."
#: ../coreapi/linphonecore.c:2334
#, fuzzy
msgid "Call aborted"
msgstr "abandonné"
msgstr "Appel abandonné"
#: ../coreapi/linphonecore.c:2374
msgid "Call ended"
msgstr "Appel terminé."
#: ../coreapi/linphonecore.c:2456
#, fuzzy
msgid "Could not pause the call"
msgstr "Echec"
msgstr "La mise en attente a échoué"
#: ../coreapi/linphonecore.c:2460
msgid "Pausing the current call..."
msgstr ""
msgstr "Mise en attente de l'appel..."
#: ../coreapi/linphonecore.c:2499
msgid "There is already a call in process, pause or stop it first."
msgstr ""
msgstr "Il y a déjà un appel en cours, veuillez d'abord le mettre en attente ou le raccrocher."
#: ../coreapi/misc.c:147
msgid ""
......@@ -1267,41 +1251,39 @@ msgid "Remote ringing."
msgstr "Sonnerie distante."
#: ../coreapi/callbacks.c:242
#, fuzzy
msgid "Remote ringing..."
msgstr "Sonnerie distante."
msgstr "Sonnerie distante..."
#: ../coreapi/callbacks.c:253
msgid "Early media."