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

diff --git a/Makefile.am b/Makefile.am
index f1db50ab0721b94858dec0191738d139eea2825a..d07aad6c6b0fbe5491d60b887fc94b03876eb0f5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
 
 

diff --git a/autogen.sh b/autogen.sh
index 19f91c6078e9c018845d799e37ababd399e5b99b..3bb716755f6bc81d75f16e9aba19f49935f6757c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -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

diff --git a/configure.ac b/configure.ac
index b5d2f86799f322a4ae053ab937facf1dca1dc902..f3bb7bf5779bb3879707a5d21c0eb01d9a1019f9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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."
+

diff --git a/coreapi/misc.c b/coreapi/misc.c
index ccadf03e2db63fe1d779d625673021999549cfa4..5bd573203727e6d0ec6e213f05f59625bb98629b 100644 (file)
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -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;
 }

diff --git a/gtk/linphone.h b/gtk/linphone.h
index faa2cb5ed3a10eff8417d8f8a1a76ff0802af7d3..d726c0db1e7915c7e97b5de48de0ad25f396ec42 100644 (file)
--- a/gtk/linphone.h
+++ b/gtk/linphone.h
@@ -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

diff --git a/gtk/main.ui b/gtk/main.ui
index df2156aa91138d56d9061adfde4b06e517467d70..aaa4ae4a40a549269e13e1a25df5637eb3c9c6f2 100644 (file)
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -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>

diff --git a/gtk/propertybox.c b/gtk/propertybox.c
index 50aa588577e0d68068d8cb925748927cc2ac3b0f..49daeb8f2a645e8700ca94ccd9b54a9ff2279ccd 100644 (file)
--- a/gtk/propertybox.c
+++ b/gtk/propertybox.c
@@ -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");

diff --git a/mediastreamer2 b/mediastreamer2
index f5aeb6f365a85888c1049c346af6f7912cc4f4f1..e7ff20be903c328e5c20b14f9f5a458e38da41d9 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f5aeb6f365a85888c1049c346af6f7912cc4f4f1
+Subproject commit e7ff20be903c328e5c20b14f9f5a458e38da41d9

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 79f13ee1cabdeae440741b2def90d5d0d46a2fef..af9a0602eda701c954a34d0a2d0f13c7be5eb0d7 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -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
 

diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index b981d1481a8e34cc7ffa175d207e019d856efcb8..c965d6c490d434261b4548f1be99b39b5d5c18e6 100755 (executable)
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1,47 @@
 
 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
+

diff --git a/po/fr.po b/po/fr.po
index cf97cc586ee207ad9d776fdb91033bbe9a87e0b3..fad8706e0a4be370522b2846a57972efe3d93df0 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -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."
 msgstr "Prise d'appel anticipée"
 
 #: ../coreapi/callbacks.c:291
-#, fuzzy, c-format
+#, c-format
 msgid "Call with %s is paused."
-msgstr "Appel avec %s"
+msgstr "%s est maintenant en attente."
 
 #: ../coreapi/callbacks.c:302
 #, c-format
 msgid "Call answered by %s - on hold."
-msgstr ""
+msgstr "Appel répondu par %s - en attente"
 
 #: ../coreapi/callbacks.c:317
-#, fuzzy
 msgid "Call resumed."
-msgstr "Appel terminé."
+msgstr "Appel repris."
 
 #: ../coreapi/callbacks.c:322
 #, c-format
 msgid "Call answered by %s."
-msgstr ""
+msgstr "Appel répondu par %s."
 
 #: ../coreapi/callbacks.c:383
 msgid "We are being paused..."
-msgstr ""
+msgstr "Mise en attente..."
 
 #: ../coreapi/callbacks.c:387
 msgid "We have been resumed..."
-msgstr ""
+msgstr "Reprise..."
 
 #: ../coreapi/callbacks.c:424
 msgid "Call terminated."
@@ -1330,7 +1312,7 @@ msgstr "Pas de réponse."
 
 #: ../coreapi/callbacks.c:451
 msgid "Protocol error."
-msgstr ""
+msgstr "Erreur de protocole"
 
 #: ../coreapi/callbacks.c:467
 msgid "Redirected"
@@ -1370,293 +1352,9 @@ msgstr "Echec de l'enregistrement sur %s: %s"
 #: ../coreapi/callbacks.c:619
 #, c-format
 msgid "We are transferred to %s"
-msgstr ""
+msgstr "Transfert vers %s"
 
 #: ../coreapi/sal_eXosip2.c:814 ../coreapi/sal_eXosip2.c:816
-#, fuzzy
 msgid "Authentication failure"
-msgstr "Linphone - Autentification requise"
-
-#: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
-msgid "ITU-G.711 alaw encoder"
-msgstr ""
-
-#: ../mediastreamer2/src/alaw.c:194 ../mediastreamer2/src/alaw.c:211
-msgid "ITU-G.711 alaw decoder"
-msgstr ""
-
-#: ../mediastreamer2/src/alsa.c:950
-msgid "Alsa sound source"
-msgstr "Source alsa"
-
-#: ../mediastreamer2/src/alsa.c:1054
-msgid "Alsa sound output"
-msgstr "Sortie alsa"
-
-#: ../mediastreamer2/src/aqsnd.c:1008
-msgid "Sound capture filter for MacOS X Audio Queue Service"
-msgstr ""
-
-#: ../mediastreamer2/src/aqsnd.c:1032
-msgid "Sound playback filter for MacOS X Audio Queue Service"
-msgstr ""
-
-#: ../mediastreamer2/src/dtmfgen.c:287 ../mediastreamer2/src/dtmfgen.c:306
-msgid "DTMF generator"
-msgstr ""
-
-#: ../mediastreamer2/src/gsm.c:120 ../mediastreamer2/src/gsm.c:138
-msgid "The GSM full-rate codec"
-msgstr "Le codec GSM full-rate"
-
-#: ../mediastreamer2/src/gsm.c:187 ../mediastreamer2/src/gsm.c:205
-msgid "The GSM codec"
-msgstr "Le codec GSM"
-
-#: ../mediastreamer2/src/macsnd.c:627
-msgid "Sound capture filter for MacOS X Audio Unit"
-msgstr ""
-
-#: ../mediastreamer2/src/macsnd.c:642
-msgid "Sound playback filter for MacOS X Audio Unit"
-msgstr ""
-
-#: ../mediastreamer2/src/msconf.c:787 ../mediastreamer2/src/msconf.c:805
-msgid "A filter to make conferencing"
-msgstr ""
-
-#: ../mediastreamer2/src/msfileplayer.c:311
-#: ../mediastreamer2/src/msfileplayer.c:329
-msgid "Raw files and wav reader"
-msgstr ""
-
-#: ../mediastreamer2/src/msfilerec.c:170 ../mediastreamer2/src/msfilerec.c:188
-#: ../mediastreamer2/src/msfilerec_win.c:216
-#: ../mediastreamer2/src/msfilerec_win.c:234
-msgid "Wav file recorder"
-msgstr ""
-
-#: ../mediastreamer2/src/msjoin.c:45 ../mediastreamer2/src/msjoin.c:63
-msgid "A filter that send several inputs to one output."
-msgstr ""
-
-#: ../mediastreamer2/src/msresample.c:159
-#: ../mediastreamer2/src/msresample.c:177
-msgid "Audio resampler"
-msgstr ""
-
-#: ../mediastreamer2/src/msrtp.c:369 ../mediastreamer2/src/msrtp.c:387
-msgid "RTP output filter"
-msgstr ""
-
-#: ../mediastreamer2/src/msrtp.c:505 ../mediastreamer2/src/msrtp.c:523
-msgid "RTP input filter"
-msgstr ""
-
-#: ../mediastreamer2/src/msspeex.c:360 ../mediastreamer2/src/msspeex.c:378
-#: ../mediastreamer2/src/msspeex.c:548 ../mediastreamer2/src/msspeex.c:567
-msgid "The free and wonderful speex codec"
-msgstr "Le codec speex, libre et performant"
-
-#: ../mediastreamer2/src/msvolume.c:528 ../mediastreamer2/src/msvolume.c:543
-msgid "A filter that controls and measure sound volume"
-msgstr ""
-
-#: ../mediastreamer2/src/msv4l.c:1012
-msgid "A video4linux compatible source filter to stream pictures."
-msgstr ""
-
-#: ../mediastreamer2/src/msv4l2.c:554
-msgid "A filter to grab pictures from Video4Linux2-powered cameras"
-msgstr ""
-
-#: ../mediastreamer2/src/nowebcam.c:1854
-msgid "A filter that outputs a static image."
-msgstr ""
-
-#: ../mediastreamer2/src/pixconv.c:129 ../mediastreamer2/src/pixconv.c:147
-msgid "A pixel format converter"
-msgstr ""
-
-#: ../mediastreamer2/src/sizeconv.c:202
-msgid "A video size converter"
-msgstr ""
-
-#: ../mediastreamer2/src/sizeconv.c:220
-msgid "a small video size converter"
-msgstr ""
-
-#: ../mediastreamer2/src/speexec.c:449 ../mediastreamer2/src/speexec.c:467
-msgid "Echo canceller using speex library"
-msgstr ""
-
-#: ../mediastreamer2/src/tee.c:80 ../mediastreamer2/src/tee.c:98
-msgid "A filter that reads from input and copy to its multiple outputs."
-msgstr ""
-
-#: ../mediastreamer2/src/theora.c:375
-msgid "The theora video encoder from xiph.org"
-msgstr ""
-
-#: ../mediastreamer2/src/theora.c:393
-msgid "The open-source and royalty-free 'theora' video codec from xiph.org"
-msgstr ""
-
-#: ../mediastreamer2/src/theora.c:561 ../mediastreamer2/src/theora.c:579
-msgid "The theora video decoder from xiph.org"
-msgstr ""
-
-#: ../mediastreamer2/src/ulaw.c:146 ../mediastreamer2/src/ulaw.c:164
-msgid "ITU-G.711 ulaw encoder"
-msgstr ""
-
-#: ../mediastreamer2/src/ulaw.c:196 ../mediastreamer2/src/ulaw.c:214
-msgid "ITU-G.711 ulaw decoder"
-msgstr ""
-
-#: ../mediastreamer2/src/videodec.c:713 ../mediastreamer2/src/videodec.c:729
-#: ../mediastreamer2/src/videodec.c:812 ../mediastreamer2/src/videodec.c:828
-msgid "A H.263 decoder using ffmpeg library"
-msgstr ""
-
-#: ../mediastreamer2/src/videodec.c:746
-msgid "A MPEG4 decoder using ffmpeg library"
-msgstr ""
-
-#: ../mediastreamer2/src/videodec.c:762
-msgid "A RTP/JPEG decoder using ffmpeg library"
-msgstr ""
-
-#: ../mediastreamer2/src/videodec.c:778
-msgid "A MJPEG decoder using ffmpeg library"
-msgstr ""
-
-#: ../mediastreamer2/src/videodec.c:794
-msgid "A snow decoder using ffmpeg library"
-msgstr ""
-
-#: ../mediastreamer2/src/videoenc.c:908 ../mediastreamer2/src/videoenc.c:990
-msgid "A video H.263 encoder using ffmpeg library."
-msgstr ""
-
-#: ../mediastreamer2/src/videoenc.c:924
-msgid ""
-"A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
-"spec."
-msgstr ""
-
-#: ../mediastreamer2/src/videoenc.c:940 ../mediastreamer2/src/videoenc.c:1022
-msgid "A video MPEG4 encoder using ffmpeg library."
-msgstr ""
-
-#: ../mediastreamer2/src/videoenc.c:956
-msgid "A video snow encoder using ffmpeg library."
-msgstr ""
-
-#: ../mediastreamer2/src/videoenc.c:972
-msgid "A RTP/MJPEG encoder using ffmpeg library."
-msgstr ""
-
-#: ../mediastreamer2/src/videoenc.c:1006
-msgid ""
-"A video H.263 encoder using ffmpeg library, compliant with old RFC2190 spec."
-msgstr ""
-
-#: ../mediastreamer2/src/videoenc.c:1038
-msgid ""
-"The snow codec is royalty-free and is open-source. \n"
-"It uses innovative techniques that makes it one of most promising video "
-"codec. It is implemented within the ffmpeg project.\n"
-"However it is under development, quite unstable and compatibility with other "
-"versions cannot be guaranteed."
-msgstr ""
-
-#: ../mediastreamer2/src/videoenc.c:1058
-msgid "A MJPEG encoder using ffmpeg library."
-msgstr ""
-
-#: ../mediastreamer2/src/videoout.c:933
-msgid "A SDL-based video display"
-msgstr ""
-
-#: ../mediastreamer2/src/wincevideods.c:969
-#: ../mediastreamer2/src/wincevideods.c:987
-#: ../mediastreamer2/src/winvideo.c:596 ../mediastreamer2/src/winvideo.c:614
-#: ../mediastreamer2/src/winvideods.c:1385
-#: ../mediastreamer2/src/winvideods.c:1403
-msgid "A video4windows compatible source filter to stream pictures."
-msgstr ""
-
-#: ../mediastreamer2/src/winvideo2.c:436 ../mediastreamer2/src/winvideo2.c:454
-msgid "A video for windows (vfw.h) based source filter to grab pictures."
-msgstr ""
-
-#: ../mediastreamer2/src/ice.c:1349 ../mediastreamer2/src/ice.c:1367
-msgid "ICE filter"
-msgstr ""
-
-#: ../mediastreamer2/src/void.c:35 ../mediastreamer2/src/void.c:52
-msgid "A filter that trashes its input (useful for terminating some graphs)."
-msgstr ""
-
-#: ../mediastreamer2/src/equalizer.c:338 ../mediastreamer2/src/equalizer.c:356
-msgid "Parametric sound equalizer."
-msgstr ""
-
-#: ../mediastreamer2/src/msdscap-mingw.cc:1038
-msgid "A webcam grabber based on directshow."
-msgstr ""
-
-#: ../mediastreamer2/src/drawdib-display.c:552
-#: ../mediastreamer2/src/drawdib-display.c:570
-msgid "A video display based on windows DrawDib api"
-msgstr ""
-
-#: ../mediastreamer2/src/audiomixer.c:192
-#: ../mediastreamer2/src/audiomixer.c:211
-msgid "A filter that mixes down 16 bit sample audio streams"
-msgstr ""
-
-#: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
-msgid "A filter that converts from mono to stereo and vice versa."
-msgstr ""
-
-#: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
-#: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
-msgid "Inter ticker communication filter."
-msgstr ""
-
-#: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
-msgid "A display filter sending the buffers to draw to the upper layer"
-msgstr ""
-
-#: ../mediastreamer2/src/msiounit.c:650
-msgid "Sound capture filter for MacOS X Audio Unit Service"
-msgstr ""
-
-#: ../mediastreamer2/src/msiounit.c:664
-msgid "Sound playback filter for MacOS X Audio Unit Service"
-msgstr ""
-
-#: ../mediastreamer2/src/x11video.c:562
-msgid "A video display using X11+Xv"
-msgstr ""
-
-#. .id=
-#. .name=
-#. .text=
-#: ../mediastreamer2/src/msandroid.cpp:370
-msgid "Sound capture filter for Android"
-msgstr ""
-
-#. .id=
-#. .name=
-#. .text=
-#: ../mediastreamer2/src/msandroid.cpp:667
-msgid "Sound playback filter for Android"
-msgstr ""
-
-#: ../mediastreamer2/src/msandroidvideo.cpp:134
-msgid "A filter that captures Android video."
-msgstr ""
+msgstr "Echec d'authentification"
 

diff --git a/po/nb_NO.po b/po/nb_NO.po
index 24dcb4aae1b4cc0d61589591fa18281460706922..543ec40cef7024e56a58cdf354fbad755e140ac7 100644 (file)
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-04-05 00:37+0200\n"
-"PO-Revision-Date: 2011-03-17 00:10+0100\n"
+"PO-Revision-Date: 2011-04-05 01:56+0200\n"
 "Last-Translator: Øyvind Sæther <oyvinds@everdot.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -20,7 +20,7 @@ msgstr ""
 #: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
-msgstr " Fant ikke pixmap fli: %s"
+msgstr "Fant ikke pixmap fli: %s"
 
 #: ../gtk/chat.c:27
 #, c-format
@@ -93,7 +93,7 @@ msgstr "%s (Standard)"
 
 #: ../gtk/main.c:1186
 msgid "Windows"
-msgstr ""
+msgstr "Vinduer"
 
 #: ../gtk/main.c:1363
 msgid ""
@@ -423,220 +423,207 @@ msgstr "Skriv inn påloggingsinformasjon for %s:"
 
 #: ../gtk/main.ui.h:1
 msgid "#"
-msgstr ""
+msgstr "#"
 
 #: ../gtk/main.ui.h:2
 msgid "*"
-msgstr ""
+msgstr "*"
 
 #: ../gtk/main.ui.h:3
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../gtk/main.ui.h:4
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #: ../gtk/main.ui.h:5
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #: ../gtk/main.ui.h:6
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #: ../gtk/main.ui.h:7
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #: ../gtk/main.ui.h:8
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #: ../gtk/main.ui.h:9
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #: ../gtk/main.ui.h:10
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #: ../gtk/main.ui.h:11
 msgid "8"
-msgstr ""
+msgstr "8"
 
 #: ../gtk/main.ui.h:12
 msgid "9"
-msgstr ""
+msgstr "9"
 
 #: ../gtk/main.ui.h:13
 msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Lägg till kontakt ifrån katalogen</b>"
+msgstr "<b>Legg til kontakter fra katalogen</b>"
 
 #: ../gtk/main.ui.h:14
 msgid "<b>Contact list</b>"
-msgstr "<b>Kontaktlista</b>"
+msgstr "<b>Kontaktliste</b>"
 
 #: ../gtk/main.ui.h:15
 msgid "<b>Welcome !</b>"
-msgstr "<b>Välkommen!</b>"
+msgstr "<b>Velkommen!</b>"
 
 #: ../gtk/main.ui.h:16
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #: ../gtk/main.ui.h:17
 msgid "ADSL"
-msgstr ""
+msgstr "ADSL"
 
 #: ../gtk/main.ui.h:18
-#, fuzzy
 msgid "Add contact"
-msgstr "Fant kontakt %i"
+msgstr "Legg til kontakt"
 
 #: ../gtk/main.ui.h:19
 msgid "All users"
-msgstr ""
+msgstr "Alle brukere"
 
 #: ../gtk/main.ui.h:21
-#, fuzzy
 msgid "Audio & video"
-msgstr "Audio & Video"
+msgstr "Lyd og Video"
 
 #: ../gtk/main.ui.h:22
 msgid "Audio only"
-msgstr "Enbart audio"
+msgstr "Kun lyd"
 
 #: ../gtk/main.ui.h:23
 msgid "Automatically log me in"
-msgstr "Logga mig automatiskt"
+msgstr "Logg meg på automatisk"
 
 #: ../gtk/main.ui.h:24
 msgid "B"
-msgstr ""
+msgstr "B"
 
 #: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #: ../gtk/main.ui.h:26
-#, fuzzy
 msgid "Check _Updates"
-msgstr "Letar efter uppdateringar"
+msgstr "Sjekk _Oppdateringer"
 
 #: ../gtk/main.ui.h:27
-#, fuzzy
 msgid "Contacts"
-msgstr "Kontaktar"
+msgstr "Kontakter"
 
 #: ../gtk/main.ui.h:28
 msgid "D"
-msgstr ""
+msgstr "D"
 
 #: ../gtk/main.ui.h:29
 msgid "Decline"
-msgstr "Avböj"
+msgstr "Avvis"
 
 #: ../gtk/main.ui.h:30
-#, fuzzy
 msgid "Default"
-msgstr "%s (Standard)"
+msgstr "Standard"
 
 #: ../gtk/main.ui.h:31
 msgid "Duration"
-msgstr "Förlopp"
+msgstr "Varighet"
 
 #: ../gtk/main.ui.h:32
 msgid "Duration:"
-msgstr "Förlopp:"
+msgstr "Varighet:"
 
 #: ../gtk/main.ui.h:33
 msgid "Enable self-view"
-msgstr "Själv bild"
+msgstr "Vis video av deg selv"
 
 #: ../gtk/main.ui.h:34
 msgid "Enter username, phone number, or full sip address"
-msgstr "Mata in användarnamn, telefonnummer eller SIP adress"
+msgstr "Skriv inn brukernavn, telefonnummer eller full SIP-addresse"
 
 #: ../gtk/main.ui.h:35
-#, fuzzy
 msgid "Fiber Channel"
-msgstr ""
-"ADSL\n"
-"Fiber"
+msgstr "Fiber Kanal"
 
 #: ../gtk/main.ui.h:36
 msgid "In call"
-msgstr "I samtal"
+msgstr "I samtale"
 
 #: ../gtk/main.ui.h:37
 msgid "Initiate a new call"
-msgstr ""
+msgstr "Start en ny samtale"
 
 #: ../gtk/main.ui.h:38
 msgid "Internet connection:"
-msgstr "Internet förbindelse:"
+msgstr "Internet forbindelse:"
 
 #: ../gtk/main.ui.h:39
 msgid "Keypad"
-msgstr ""
+msgstr "Tastatur"
 
 #: ../gtk/main.ui.h:40
 msgid "Login information"
-msgstr "Login information"
+msgstr "Innlogginsinformasjon"
 
 #: ../gtk/main.ui.h:41
 msgid "Lookup:"
-msgstr "Sök:"
+msgstr "Slå opp:"
 
 #: ../gtk/main.ui.h:43
 msgid "My current identity:"
-msgstr "Min nuvarande identitet"
+msgstr "Min nåværende identitet:"
 
 #: ../gtk/main.ui.h:44
-#, fuzzy
 msgid "Online users"
-msgstr ""
-"Alla användare\n"
-"Online användare"
+msgstr "Tilkoblede brukere"
 
 #: ../gtk/main.ui.h:45
 msgid "Password"
-msgstr "Lösenord"
+msgstr "Passord"
 
 #: ../gtk/main.ui.h:47
 msgid "SIP address or phone number:"
-msgstr "Användarnamn"
+msgstr "Sip adresse eller telefonnummer:"
 
 #: ../gtk/main.ui.h:48
 msgid "Search"
-msgstr "Sök"
+msgstr "Søk"
 
 #: ../gtk/main.ui.h:49
-#, fuzzy
 msgid "Show debug window"
-msgstr "Linphone debug fönster"
+msgstr "Vis avlusningsvindu"
 
 #: ../gtk/main.ui.h:50
 msgid "Username"
-msgstr "Användarnamn"
+msgstr "Brukernavn"
 
 #: ../gtk/main.ui.h:51
 msgid "_Help"
-msgstr ""
+msgstr "_Hjelp"
 
 #: ../gtk/main.ui.h:52
-#, fuzzy
 msgid "_Homepage"
-msgstr "Hemsidan"
+msgstr "H_jemmeside"
 
 #: ../gtk/main.ui.h:53
 msgid "_Linphone"
-msgstr "_inphone"
+msgstr "_Linphone"
 
 #: ../gtk/main.ui.h:54
 msgid "_Options"
-msgstr ""
+msgstr "_Alternativer"
 
 #: ../gtk/main.ui.h:55
 msgid "in"
@@ -648,15 +635,17 @@ msgstr "etikett"
 
 #: ../gtk/about.ui.h:1
 msgid "(C) Belledonne Communications,2010\n"
-msgstr ""
+msgstr "(C) Belledonne Communications,2011\n"
 
 #: ../gtk/about.ui.h:3
 msgid "About linphone"
-msgstr "Apropå linphone"
+msgstr "Om Linphone"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "En Internet video telefon baserat på SIP protokoll."
+msgstr ""
+"En Internet Videotelefon som bruker den standardiserte SIP-protokollen "
+"(rfc3261)."
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -672,89 +661,97 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 msgstr ""
+"fr: Simon Morlat\n"
+"en: Simon Morlat og Delphine Perreau\n"
+"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
+"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
+"sv: Daniel Nylander <po@danielnylander.se>\n"
+"es: Jesus Benitez <gnelson at inMail dot sk>\n"
+"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
+"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
+"pl: Robert Nasiadek <darkone@darkone.pl>\n"
+"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
+"hu: anonym\n"
 
 #: ../gtk/contact.ui.h:1
 msgid "<b>Contact information</b>"
-msgstr "<b>Kontakt information</b>"
+msgstr "<b>Kontaktinformasjon</b>"
 
 #: ../gtk/contact.ui.h:2
 msgid "Allow this contact to see my presence status"
-msgstr "Tillåt den här kontakten att se min närvarostatus"
+msgstr "La denne kontakten se min tilstedestatus"
 
 #: ../gtk/contact.ui.h:4
 msgid "SIP Address"
-msgstr "SIP Adress"
+msgstr "SIP Addresse"
 
 #: ../gtk/contact.ui.h:5
 msgid "Show this contact presence status"
-msgstr "Visa kontaktens närvarostatus"
+msgstr "Vis kontaktens tilstedestatus"
 
 #: ../gtk/contact.ui.h:6 ../gtk/password.ui.h:5
-#, fuzzy
 msgid "gtk-cancel"
-msgstr "Kopplad"
+msgstr "gtk-avbryt"
 
 #: ../gtk/contact.ui.h:7 ../gtk/password.ui.h:6
 msgid "gtk-ok"
-msgstr ""
+msgstr "gtk-ok"
 
 #: ../gtk/log.ui.h:1
 msgid "Linphone debug window"
-msgstr "Linphone debug fönster"
+msgstr "Linphone avlusningsvindu"
 
 #: ../gtk/password.ui.h:1
-#, fuzzy
 msgid "Linphone - Authentication required"
-msgstr "Autorisering kreves"
+msgstr "Linphone - Autorisering kreves"
 
 #: ../gtk/password.ui.h:2
 msgid "Password:"
-msgstr "Lösenord:"
+msgstr "Passord:"
 
 #: ../gtk/password.ui.h:3
 msgid "Please enter the domain password"
-msgstr "Mata in lösenordet för domänen"
+msgstr "Skriv inn passordet for domenet"
 
 #: ../gtk/password.ui.h:4
 msgid "UserID"
-msgstr "AnvändarID"
+msgstr "BrukerID"
 
 #: ../gtk/call_logs.ui.h:1
-#, fuzzy
 msgid "Call back"
-msgstr "Ring %s"
+msgstr "Ring tilbake"
 
 #: ../gtk/call_logs.ui.h:2
 msgid "Call history"
-msgstr "Samtalshistorik"
+msgstr "Samtalehistorikk"
 
 #: ../gtk/call_logs.ui.h:3
 msgid "Clear all"
-msgstr ""
+msgstr "Fjern alle"
 
 #: ../gtk/sip_account.ui.h:1
 msgid "Configure a SIP account"
-msgstr "Konfigurera ett SIP konto"
+msgstr "Konfigurer en SIP konto"
 
 #: ../gtk/sip_account.ui.h:2
 msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - Konfigurera ett SIP konto"
+msgstr "Linphone - Konfigurer en SIP konto"
 
 #: ../gtk/sip_account.ui.h:3
 msgid "Looks like sip:<proxy hostname>"
-msgstr ""
+msgstr "Ser ut som sip:<proxy hostname>"
 
 #: ../gtk/sip_account.ui.h:4
 msgid "Looks like sip:<username>@<domain>"
-msgstr ""
+msgstr "Ser ut som sip:<brukernavn>@<domene>"
 
 #: ../gtk/sip_account.ui.h:5
 msgid "Publish presence information"
-msgstr "Publicera närvaro information"
+msgstr "Publiser tilstedestatus"
 
 #: ../gtk/sip_account.ui.h:6
 msgid "Register at startup"
-msgstr "Registrera vid start"
+msgstr "Registrer ved oppstart"
 
 #: ../gtk/sip_account.ui.h:7
 msgid "Registration duration (sec):"
@@ -762,11 +759,11 @@ msgstr "Registreringsfrekvens (sek.):"
 
 #: ../gtk/sip_account.ui.h:8
 msgid "Route (optional):"
-msgstr "Route (tillval):"
+msgstr "Route (valgfritt):"
 
 #: ../gtk/sip_account.ui.h:9
 msgid "SIP Proxy address:"
-msgstr "SIP Proxy adress:"
+msgstr "SIP Proxy addresse:"
 
 #: ../gtk/sip_account.ui.h:10
 msgid "Your SIP identity:"
@@ -778,32 +775,31 @@ msgstr "sip:"
 
 #: ../gtk/chatroom.ui.h:1
 msgid "Send"
-msgstr "Skicka"
+msgstr "Send"
 
 #: ../gtk/chatroom.ui.h:2
-#, fuzzy
 msgid "gtk-close"
-msgstr "Kopplad"
+msgstr "gtk-lukk"
 
 #: ../gtk/parameters.ui.h:1
 msgid "0 stands for \"unlimited\""
-msgstr "0 står för \"utan begränsning\""
+msgstr "0 betyr \"ubegrenset\""
 
 #: ../gtk/parameters.ui.h:2
 msgid "<b>Audio</b>"
-msgstr "<b>Audio</b>"
+msgstr "<b>Lyd</b>"
 
 #: ../gtk/parameters.ui.h:3
 msgid "<b>Bandwidth control</b>"
-msgstr "<b>Bandbreddskontroll</b>"
+msgstr "<b>Båndbreddekontrol</b>"
 
 #: ../gtk/parameters.ui.h:4
 msgid "<b>Codecs</b>"
-msgstr "<b>Codecs</b>"
+msgstr "<b>Kodeker</b>"
 
 #: ../gtk/parameters.ui.h:5
 msgid "<b>Default identity</b>"
-msgstr "<b>Default identitet</b>"
+msgstr "<b>Standard identitet</b>"
 
 #: ../gtk/parameters.ui.h:6
 msgid "<b>Language</b>"
@@ -815,19 +811,19 @@ msgstr "<b>Nivå</b>"
 
 #: ../gtk/parameters.ui.h:8
 msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT och Brandvägg</b>"
+msgstr "<b>NAT og Brannvegg</b>"
 
 #: ../gtk/parameters.ui.h:9
 msgid "<b>Ports</b>"
-msgstr "<b>Portar</b>"
+msgstr "<b>Porter</b>"
 
 #: ../gtk/parameters.ui.h:10
 msgid "<b>Privacy</b>"
-msgstr "<b>Integritet</b>"
+msgstr "<b>Personvern</b>"
 
 #: ../gtk/parameters.ui.h:11
 msgid "<b>Proxy accounts</b>"
-msgstr "<b>Proxy konton</b>"
+msgstr "<b>Proxy kontoer</b>"
 
 #: ../gtk/parameters.ui.h:12
 msgid "<b>Transport</b>"
@@ -839,215 +835,207 @@ msgstr "<b>Video</b>"
 
 #: ../gtk/parameters.ui.h:14
 msgid "ALSA special device (optional):"
-msgstr "ALSA speciell enhet (tillval):"
+msgstr "Spesiell ALSA enhet (valgfritt):"
 
 #: ../gtk/parameters.ui.h:15
 msgid "Add"
-msgstr "Lägg till"
+msgstr "Legg til"
 
 #: ../gtk/parameters.ui.h:16
 msgid "Audio RTP/UDP:"
-msgstr ""
+msgstr "Lyd RTP/UDP:"
 
 #: ../gtk/parameters.ui.h:17
-#, fuzzy
 msgid "Audio codecs"
-msgstr ""
-"Audio codecs\n"
-"Video codecs"
+msgstr "Lyd kodek"
 
 #: ../gtk/parameters.ui.h:18
 msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr "Bakom en NAT / brandvägg (specificera gatewap IP adress nedan)"
+msgstr "Bak NAT / Brannmur (spesifiser gateway IP under)"
 
 #: ../gtk/parameters.ui.h:19
 msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Bakom en NAT / brandvägg (använd STUN för att avgöra adressen)"
+msgstr "Bak NAT / Brannmur (bruk STUN for å avgjøre)"
 
 #: ../gtk/parameters.ui.h:21
 msgid "CIF"
-msgstr ""
+msgstr "CIF"
 
 #: ../gtk/parameters.ui.h:22
 msgid "Capture device:"
-msgstr "Mikrofon enhet:"
+msgstr "Mikrofonenhet:"
 
 #: ../gtk/parameters.ui.h:23
 msgid "Codecs"
-msgstr "Codecs"
+msgstr "Kodek"
 
 #: ../gtk/parameters.ui.h:24
 msgid "Direct connection to the Internet"
-msgstr "Direkt förbindelse till Internet"
+msgstr "Tilkoblet Internett direkte"
 
 #: ../gtk/parameters.ui.h:25
 msgid "Disable"
-msgstr "Inaktivera"
+msgstr "Deaktiver"
 
 #: ../gtk/parameters.ui.h:26
 msgid "Done"
-msgstr "Klar"
+msgstr "Ferdig"
 
 #: ../gtk/parameters.ui.h:27
 msgid "Download speed limit in Kbit/sec:"
-msgstr "Max downstream bandbreddshastighet i kbit/sek:"
+msgstr "Nedlastningsbegrensning i Kbit/sek:"
 
 #: ../gtk/parameters.ui.h:28
 msgid "Edit"
-msgstr "Editera"
+msgstr "Rediger"
 
 #: ../gtk/parameters.ui.h:29
 msgid "Enable"
-msgstr "Möjliggör"
+msgstr "Aktiver"
 
 #: ../gtk/parameters.ui.h:30
 msgid "Enable echo cancellation"
-msgstr "Tillåta ekokancellering"
+msgstr "Bruk ekko-kansellering"
 
 #: ../gtk/parameters.ui.h:31
 msgid "Erase all passwords"
-msgstr "Glöm alla lösenord"
+msgstr "Slett alle passord"
 
 #: ../gtk/parameters.ui.h:32
 msgid "Manage SIP Accounts"
-msgstr "Hantera SIP konton"
+msgstr "Behandle SIP-kontoer"
 
 #: ../gtk/parameters.ui.h:33
 msgid "Multimedia settings"
-msgstr "Multimedia inställningar"
+msgstr "Multimediainnstillinger"
 
 #: ../gtk/parameters.ui.h:34
 msgid "Network settings"
-msgstr "Nätverksinställningar"
+msgstr "Nettverksinnstillinger"
 
 #: ../gtk/parameters.ui.h:35
 msgid "Playback device:"
-msgstr "Uppspelningsenhet:"
+msgstr "Avspillingsenhet:"
 
 #: ../gtk/parameters.ui.h:36
 msgid "Prefered video resolution:"
-msgstr "Video upplösning:"
+msgstr "Foretrukke video-oppløsning:"
 
 #: ../gtk/parameters.ui.h:37
 msgid "Public IP address:"
-msgstr "Publik IP adress:"
+msgstr "Offentlig IP-addresse:"
 
 #: ../gtk/parameters.ui.h:38
 msgid ""
 "Register to FONICS\n"
 "virtual network !"
 msgstr ""
-"Registrera hos FONICS\n"
-"virtuella nätverk!"
+"Registrer hos FONICS\n"
+"virtuelle nettverk !"
 
 #: ../gtk/parameters.ui.h:40
 msgid "Remove"
-msgstr "Ta bort"
+msgstr "Fjern"
 
 #: ../gtk/parameters.ui.h:41
 msgid "Ring device:"
-msgstr "Ringning enhet:"
+msgstr "Ringe-enhet:"
 
 #: ../gtk/parameters.ui.h:42
 msgid "Ring sound:"
-msgstr "Ring signal:"
+msgstr "Ringelyd:"
 
 #: ../gtk/parameters.ui.h:43
 msgid "SIP (TCP):"
-msgstr ""
+msgstr "SIP (TCP):"
 
 #: ../gtk/parameters.ui.h:44
 msgid "SIP (UDP):"
-msgstr ""
+msgstr "SIP (UDP):"
 
 #: ../gtk/parameters.ui.h:45
 msgid "Send DTMFs as SIP info"
-msgstr "Kicka DTMF koder som SIP info"
+msgstr "Send DTMF som SIP-info"
 
 #: ../gtk/parameters.ui.h:46
 msgid "Set Maximum Transmission Unit:"
-msgstr "Välj MTU (Maximum Transmission Unit):"
+msgstr "Velg MTU (Maximum Transmission Unit):"
 
 #: ../gtk/parameters.ui.h:47
 msgid "Settings"
-msgstr "Inställningar"
+msgstr "Innstillinger"
 
 #: ../gtk/parameters.ui.h:48
 msgid "Show advanced settings"
-msgstr "Visa avancerade inställningar"
+msgstr "Vis avanserte innstillinger"
 
 #: ../gtk/parameters.ui.h:49
 msgid "Stun server:"
-msgstr "STUN server:"
+msgstr "STUN tjener:"
 
 #: ../gtk/parameters.ui.h:50
 msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-"Denna sektion specificerar din SIP adress när du inte använder ett SIP konto"
+msgstr "Denne seksjonen velger SIP-addresse når du ikke bruker en SIP-konto"
 
 #: ../gtk/parameters.ui.h:51
 msgid "Upload speed limit in Kbit/sec:"
-msgstr "Max upstream bandbreddshastighet i kbit/sek:"
+msgstr "Maks opplastningshastighet i Kbit/sek:"
 
 #: ../gtk/parameters.ui.h:52
 msgid "Use IPv6 instead of IPv4"
-msgstr "Använd IPv6 istället av IPv4"
+msgstr "Bruk IPv6 istedet for IPv4"
 
 #: ../gtk/parameters.ui.h:53
 msgid "User interface"
-msgstr "Användarinterface"
+msgstr "Brukergrensesnitt"
 
 #: ../gtk/parameters.ui.h:54
 msgid "Video RTP/UDP:"
-msgstr ""
+msgstr "Video RTP/UDP:"
 
 #: ../gtk/parameters.ui.h:55
-#, fuzzy
 msgid "Video codecs"
-msgstr ""
-"Audio codecs\n"
-"Video codecs"
+msgstr "Video kodek"
 
 #: ../gtk/parameters.ui.h:56
 msgid "Video input device:"
-msgstr "Video ingångsenhet:"
+msgstr "Videoenhet:"
 
 #: ../gtk/parameters.ui.h:57
 msgid "Your display name (eg: John Doe):"
-msgstr "Ditt synliga namn, e.g. Kalle Karlsson:"
+msgstr "Vist navn (eks: Ola Nordmann):"
 
 #: ../gtk/parameters.ui.h:58
 msgid "Your resulting SIP address:"
-msgstr "Din SIP adress:"
+msgstr "Din resulterende SIP addresse:"
 
 #: ../gtk/parameters.ui.h:59
 msgid "Your username:"
-msgstr "Ditt användarnamn:"
+msgstr "Ditt brukernavn:"
 
 #: ../gtk/parameters.ui.h:60
-#, fuzzy
 msgid "a sound card"
-msgstr "ett ljud kort\n"
+msgstr "ett lydkort"
 
 #: ../gtk/parameters.ui.h:61
 msgid "default camera"
-msgstr "default kamera"
+msgstr "standard kamera"
 
 #: ../gtk/parameters.ui.h:62
 msgid "default soundcard"
-msgstr "default ljudkort"
+msgstr "standard lydkort"
 
 #: ../gtk/buddylookup.ui.h:1
 msgid "<b>Search somebody</b>"
-msgstr "<b>Sök efter kontakter</b>"
+msgstr "<b>Søk noen</b>"
 
 #: ../gtk/buddylookup.ui.h:2
 msgid "Add to my list"
-msgstr "Lägg till min lista"
+msgstr "Legg til listen min"
 
 #: ../gtk/buddylookup.ui.h:3
 msgid "Search contacts in directory"
-msgstr "Sök för kontakter i katalogen"
+msgstr "Søk kontakter i katalogen"
 
 #: ../gtk/waiting.ui.h:1
 msgid "Linphone"
@@ -1055,7 +1043,7 @@ msgstr "Linphone"
 
 #: ../gtk/waiting.ui.h:2
 msgid "Please wait"
-msgstr "Vänta"
+msgstr "Vennligst vent"
 
 #: ../coreapi/linphonecore.c:165
 #, c-format
@@ -1109,7 +1097,7 @@ msgstr "Ser etter telefonnummer for destinasjonen..."
 
 #: ../coreapi/linphonecore.c:1776
 msgid "Could not resolve this number."
-msgstr "Kan ikke nå dette nummeret."
+msgstr "Kan ikke tilkoble dette nummeret."
 
 #: ../coreapi/linphonecore.c:1820
 msgid ""
@@ -1610,76 +1598,77 @@ msgstr "Ett video4windows-kompatibelt kildefiler for bildestrømmer."
 
 #: ../mediastreamer2/src/winvideo2.c:436 ../mediastreamer2/src/winvideo2.c:454
 msgid "A video for windows (vfw.h) based source filter to grab pictures."
-msgstr ""
+msgstr "Ett video for vinduer (vfw.h) baserte kildefilter for å fange bilder"
 
 #: ../mediastreamer2/src/ice.c:1349 ../mediastreamer2/src/ice.c:1367
 msgid "ICE filter"
-msgstr ""
+msgstr "ICE filter"
 
 #: ../mediastreamer2/src/void.c:35 ../mediastreamer2/src/void.c:52
 msgid "A filter that trashes its input (useful for terminating some graphs)."
-msgstr ""
+msgstr "Ett filter som ødelegger input (nyttig for å terminere noen grafer)."
 
 #: ../mediastreamer2/src/equalizer.c:338 ../mediastreamer2/src/equalizer.c:356
 msgid "Parametric sound equalizer."
-msgstr ""
+msgstr "Parameterisk lyd-mixer"
 
 #: ../mediastreamer2/src/msdscap-mingw.cc:1038
 msgid "A webcam grabber based on directshow."
-msgstr ""
+msgstr "En webcam-fanger basert på directshow."
 
 #: ../mediastreamer2/src/drawdib-display.c:552
 #: ../mediastreamer2/src/drawdib-display.c:570
 msgid "A video display based on windows DrawDib api"
-msgstr ""
+msgstr "Videovisning basert på windows DrawDib api"
 
 #: ../mediastreamer2/src/audiomixer.c:192
 #: ../mediastreamer2/src/audiomixer.c:211
 msgid "A filter that mixes down 16 bit sample audio streams"
-msgstr ""
+msgstr "Ett filter som mixer ned til 16 bits lydstrømmer"
 
 #: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
 msgid "A filter that converts from mono to stereo and vice versa."
-msgstr ""
+msgstr "Ett filter som konverterer fra mono til stereo og motsatt."
 
 #: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
 #: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
 msgid "Inter ticker communication filter."
-msgstr ""
+msgstr "Inter ticker kommunikasjonsfilter."
 
 #: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
 msgid "A display filter sending the buffers to draw to the upper layer"
 msgstr ""
+"Et visningsfilter for å sende buffere for å tegne det oppdaterte nivået"
 
 #: ../mediastreamer2/src/msiounit.c:650
 msgid "Sound capture filter for MacOS X Audio Unit Service"
-msgstr ""
+msgstr "Lydfangefilter for MacOS X Audio Unit Service"
 
 #: ../mediastreamer2/src/msiounit.c:664
 msgid "Sound playback filter for MacOS X Audio Unit Service"
-msgstr ""
+msgstr "Lydavspillingsfilter for MacOS X Audio Unit Service"
 
 #: ../mediastreamer2/src/x11video.c:562
 msgid "A video display using X11+Xv"
-msgstr ""
+msgstr "En videovisning som bruker X11-Xv"
 
 #. .id=
 #. .name=
 #. .text=
 #: ../mediastreamer2/src/msandroid.cpp:370
 msgid "Sound capture filter for Android"
-msgstr ""
+msgstr "Lydfangefilter for Android"
 
 #. .id=
 #. .name=
 #. .text=
 #: ../mediastreamer2/src/msandroid.cpp:667
 msgid "Sound playback filter for Android"
-msgstr ""
+msgstr "Lydavspillingsfilter for Android"
 
 #: ../mediastreamer2/src/msandroidvideo.cpp:134
 msgid "A filter that captures Android video."
-msgstr ""
+msgstr "Ett filter som fanger Android video."
 
 #~ msgid ""
 #~ "Your machine appears to be connected to an IPv6 network. By default "