fix and improve build process.

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@60 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

linphone/Makefile.am

@@ -10,7 +10,7 @@ ORTP_DIR = oRTP
 endif
 
 SUBDIRS = m4 pixmaps po ipkg $(ORTP_DIR) mediastreamer2\
-		media_api coreapi console gtk gtk-glade share
+		media_api coreapi console gtk-glade share
 
 
 EXTRA_DIST = config.rpath   linphone2.glade BUGS linphone.kdevprj \

linphone/configure.in

@@ -65,21 +65,16 @@ AC_ARG_ENABLE(gtk_ui,
         *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk_ui) ;;
       esac],[gtk_ui=true])
 
-dnl conditionnal build of old gtk interface.
-AC_ARG_ENABLE(old-gtk_ui,
-      [  --enable-old-gtk_ui=[yes/no]    Turn on or off compilation of old gtk interface [default=no]],
-      [case "${enableval}" in
-        yes) old_gtk_ui=true ;;
-        no)  old_gtk_ui=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-old-gtk_ui) ;;
-      esac],[old_gtk_ui=false])
 
 if test "$gtk_ui" = "true" ; then
 	PKG_CHECK_MODULES(LIBGTK, gtk+-2.0 >= 2.4.0 gthread-2.0, ,gtk_ui=false)
+	PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= 2.4.0 , glade_ui=true, glade_ui=false)
 	AC_SUBST(LIBGTK_CFLAGS)
 	AC_SUBST(LIBGTK_LIBS)
+	AC_SUBST(LIBGLADE_CFLAGS)
+	AC_SUBST(LIBGLADE_LIBS)
 	
-	if test "$gtk_ui" = "true" ; then
+	if test "$gtk_ui$glade_ui" = "truetrue" ; then
 		AC_DEFINE(HAVE_GTK,1,[Defined if we can use the gtk api])
 	else
 		missing_gtk_libs=true
@@ -89,19 +84,6 @@ else
 fi
 
 
-if test "$gtk_ui" = "true" ; then
-	PKG_CHECK_MODULES(GNOME_APPLETS, libpanelapplet-2.0 >= 2.0.0 , 
-			build_gnome_applet=true,build_gnome_applet=false)
-	AC_SUBST(GNOME_APPLETS_CFLAGS)
-	AC_SUBST(GNOME_APPLETS_LIBS)
-	PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= 2.4.0 , glade_ui=true, glade_ui=false)
-	AC_SUBST(LIBGLADE_CFLAGS)
-	AC_SUBST(LIBGLADE_LIBS)
-else
-	build_gnome_applet=false
-fi
-
-
 dnl os-specific problems not handled by existing macros.
 case "$host_os" in
 	*freebsd*)
@@ -261,10 +243,6 @@ AM_CONDITIONAL(BUILD_MEDIA_API, test x$media_api = xtrue)
 
 dnl build console if required
 AM_CONDITIONAL(BUILD_CONSOLE, test x$console_ui = xtrue)
-dnl build gtk if required
-AM_CONDITIONAL(BUILD_GTK, test x$old_gtk_ui = xtrue)
-dnl build gnome applet if possible
-AM_CONDITIONAL(BUILD_GNOME_APPLET, test x$build_gnome_applet = xtrue)
 dnl special things for arm-linux cross compilation toolchain
 AM_CONDITIONAL(ARMBUILD, test x$use_arm_toolchain = xyes)
 dnl compilation of gtk-glade user interface
@@ -347,7 +325,6 @@ ipkg/Makefile
 ipkg/linphone.control
 media_api/Makefile
 coreapi/Makefile
-gtk/Makefile
 gtk-glade/Makefile
 console/Makefile
 share/Makefile

linphone/mediastreamer2/acinclude.m4

@@ -18,6 +18,7 @@ AC_DEFUN([MS_CHECK_DEP],[
 	
 	CPPFLAGS_save=$CPPFLAGS
 	LDFLAGS_save=$LDFLAGS
+	LIBS_save=$LIBS
 	CPPFLAGS=`echo "-I$dep_headersdir"|sed -e "s:-I/usr/include[\ ]*$::"`
 	LIBS="-l$dep_lib"
 	LDFLAGS=`echo "-L$dep_libsdir"|sed -e "s:-L/usr/lib\(64\)*[\ ]*::"`
@@ -39,6 +40,7 @@ AC_DEFUN([MS_CHECK_DEP],[
 	AC_SUBST($2_LIBS)
 	CPPFLAGS=$CPPFLAGS_save
 	LDFLAGS=$LDFLAGS_save
+	LIBS=$LIBS_save
 ])
 
 

linphone/po/POTFILES.in

@@ -1,15 +1,12 @@
 # List of source files containing translatable strings.
+gtk-glade/calllogs.c
+gtk-glade/logging.c
+gtk-glade/support.c
+gtk-glade/chat.c
+gtk-glade/main.c
+gtk-glade/friendlist.c
+gtk-glade/propertybox.c
 
-gtk/main.c
-gtk/interface.c
-gtk/callbacks.c
-gtk/support.c
-gtk/propertybox.c
-gtk/gui_utils.c
-gtk/linphone.c
-gtk/presence.c
-gtk/friends.c
-gtk/addressbook.c
 
 coreapi/linphonecore.c
 coreapi/misc.c

linphone/po/linphone.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: linphone-developers@nongnu.org\n"
-"POT-Creation-Date: 2008-09-23 12:23+0200\n"
+"POT-Creation-Date: 2008-09-30 21:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,688 +16,92 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gtk/main.c:58
-msgid "A free SIP video-phone"
-msgstr ""
-
-#: gtk/interface.c:138
-msgid "linphone"
-msgstr ""
-
-#: gtk/interface.c:155
-msgid "Go"
-msgstr ""
-
-#: gtk/interface.c:162
-msgid "Address book"
-msgstr ""
-
-#: gtk/interface.c:174
-msgid "Call history"
-msgstr ""
-
-#: gtk/interface.c:177
-msgid "Shows calls"
-msgstr ""
-
-#: gtk/interface.c:188
-msgid "Exit"
-msgstr ""
-
-#: gtk/interface.c:196
-msgid "Help"
-msgstr ""
-
-#: gtk/interface.c:236
-msgid "Enter sip address or phone number here"
-msgstr ""
-
-#: gtk/interface.c:237 gtk/interface.c:1398 gtk/interface.c:2335
-#: gtk/interface.c:2357 gtk/interface.c:2497
-msgid "sip:"
-msgstr ""
-
-#: gtk/interface.c:239 gtk/interface.c:2512
-msgid "Sip address:"
-msgstr ""
-
-#: gtk/interface.c:247
-msgid "Shows the address book"
-msgstr ""
-
-#: gtk/interface.c:261
-msgid "..."
-msgstr ""
-
-#: gtk/interface.c:269 gtk/interface.c:2519
-msgid "Proxy to use:"
-msgstr ""
-
-#: gtk/interface.c:278
-msgid ""
-"Call or\n"
-"answer"
-msgstr ""
-
-#: gtk/interface.c:283
-msgid ""
-"Hangup\n"
-"or refuse"
-msgstr ""
-
-#: gtk/interface.c:288
-msgid "Or chat !"
-msgstr ""
-
-#: gtk/interface.c:310
-msgid "Show more..."
-msgstr ""
-
-#: gtk/interface.c:332
-msgid "Playback level:"
-msgstr ""
-
-#: gtk/interface.c:343
-msgid "Recording level:"
-msgstr ""
-
-#: gtk/interface.c:354
-msgid "Ring level:"
-msgstr ""
-
-#: gtk/interface.c:365
-msgid "Sound"
-msgstr ""
-
-#: gtk/interface.c:382
-msgid "Enable video"
-msgstr ""
-
-#: gtk/interface.c:387
-msgid "Video"
-msgstr ""
-
-#: gtk/interface.c:392
-msgid "Controls"
-msgstr ""
-
-#: gtk/interface.c:410
-msgid "Reachable"
-msgstr ""
-
-#: gtk/interface.c:421
-msgid "Busy, I'll be back in "
-msgstr ""
-
-#: gtk/interface.c:430
-msgid "The other party will be informed that you'll be back in X minutes"
-msgstr ""
-
-#: gtk/interface.c:431
-msgid "5"
-msgstr ""
-
-#: gtk/interface.c:433
-msgid "mn"
-msgstr ""
-
-#: gtk/interface.c:438 coreapi/presence.c:146
-msgid "Away"
-msgstr ""
-
-#: gtk/interface.c:444
-msgid "Do not disturb"
-msgstr ""
-
-#: gtk/interface.c:450
-msgid "Moved temporarily"
-msgstr ""
-
-#: gtk/interface.c:456
-msgid "Alternative service"
-msgstr ""
-
-#: gtk/interface.c:466
-msgid "URL:"
-msgstr ""
-
-#: gtk/interface.c:475
-msgid "Presence"
-msgstr ""
-
-#: gtk/interface.c:492
-msgid "Press digits to send DTMFs."
-msgstr ""
-
-#: gtk/interface.c:501
-msgid ""
-"  3\n"
-"def"
-msgstr ""
-
-#: gtk/interface.c:507
-msgid ""
-"  2\n"
-"abc"
-msgstr ""
-
-#: gtk/interface.c:513
-msgid "1"
-msgstr ""
-
-#: gtk/interface.c:519
-msgid ""
-"  4\n"
-"ghi"
-msgstr ""
-
-#: gtk/interface.c:525
-msgid ""
-" 5\n"
-"jkl"
-msgstr ""
-
-#: gtk/interface.c:531
-msgid ""
-"  6\n"
-"mno"
-msgstr ""
-
-#: gtk/interface.c:537
-msgid ""
-"   7\n"
-"pqrs"
-msgstr ""
-
-#: gtk/interface.c:543
-msgid ""
-"  8\n"
-"tuv"
-msgstr ""
-
-#: gtk/interface.c:549
-msgid ""
-"   9\n"
-"wxyz"
-msgstr ""
-
-#: gtk/interface.c:555
-msgid "*"
-msgstr ""
-
-#: gtk/interface.c:561
-msgid "0"
-msgstr ""
-
-#: gtk/interface.c:567
-msgid "#"
-msgstr ""
-
-#: gtk/interface.c:573
-msgid "DTMF"
-msgstr ""
-
-#: gtk/interface.c:590
-msgid "My online friends"
-msgstr ""
-
-#: gtk/interface.c:849 gtk/interface.c:3029
-msgid "Linphone"
-msgstr ""
-
-#: gtk/interface.c:850 gtk/interface.c:3030
-msgid ""
-"C: 2001\n"
-"Made in Old Europe"
-msgstr ""
-
-#: gtk/interface.c:851 gtk/interface.c:3031
-msgid ""
-"Linphone is a web-phone.\n"
-"It is compatible with SIP and RTP protocols."
-msgstr ""
-
-#: gtk/interface.c:854
-msgid "http://www.linphone.org"
-msgstr ""
-
-#: gtk/interface.c:1028
-msgid "Parameters"
-msgstr ""
-
-#: gtk/interface.c:1061
-msgid "Use IPv6 network (if available)"
-msgstr ""
-
-#: gtk/interface.c:1064
-msgid ""
-"Toggle this if you are on an ipv6 network and you wish linphone to use it."
-msgstr ""
-
-#: gtk/interface.c:1066
-msgid "Global"
-msgstr ""
-
-#: gtk/interface.c:1081
-msgid ""
-"These options is only for users in a private network, behind a gateway. If "
-"you are not in this situation, then leave this empty."
-msgstr ""
-
-#: gtk/interface.c:1091
-msgid "No firewall"
-msgstr ""
-
-#: gtk/interface.c:1099
-msgid "Use this STUN server to guess firewall address :"
-msgstr ""
-
-#: gtk/interface.c:1107
-msgid "Specify firewall address manually:"
-msgstr ""
-
-#: gtk/interface.c:1127
-msgid "NAT traversal options (experimental)"
-msgstr ""
-
-#: gtk/interface.c:1156
-msgid "Number of buffered miliseconds (jitter compensation):"
-msgstr ""
-
-#: gtk/interface.c:1164
-msgid "RTP port used for audio:"
-msgstr ""
-
-#: gtk/interface.c:1171
-msgid "RTP properties"
-msgstr ""
-
-#: gtk/interface.c:1189
-msgid "Use SIP INFO message instead of RTP rfc2833 for DTMF transmitting"
-msgstr ""
-
-#: gtk/interface.c:1192
-msgid "RTP-RFC2833 is the recommended way."
-msgstr ""
-
-#: gtk/interface.c:1194
-msgid "Other"
-msgstr ""
-
-#: gtk/interface.c:1199
-msgid "Network"
-msgstr ""
-
-#: gtk/interface.c:1225
-msgid "Playback sound device:"
-msgstr ""
-
-#: gtk/interface.c:1240 gtk/propertybox.c:629 gtk/propertybox.c:654
-msgid "micro"
-msgstr ""
-
-#: gtk/interface.c:1241 gtk/propertybox.c:632 gtk/propertybox.c:655
-msgid "line"
-msgstr ""
-
-#: gtk/interface.c:1250
-msgid "Capture sound device:"
-msgstr ""
-
-#: gtk/interface.c:1270
-msgid "Recording source:"
-msgstr ""
-
-#: gtk/interface.c:1277
-msgid "Ring sound device"
-msgstr ""
-
-#: gtk/interface.c:1285
-msgid "Ring sound:"
-msgstr ""
-
-#: gtk/interface.c:1305
-msgid "Enable echo-canceler (cancels the echo heard by the remote party)"
-msgstr ""
-
-#: gtk/interface.c:1319
-msgid "Choose file"
-msgstr ""
-
-#: gtk/interface.c:1339
-msgid "Listen"
-msgstr ""
-
-#: gtk/interface.c:1343
-msgid "Sound properties"
-msgstr ""
-
-#: gtk/interface.c:1347
-msgid "Sound device"
-msgstr ""
-
-#: gtk/interface.c:1365
-msgid "Run sip user agent on port:"
-msgstr ""
-
-#: gtk/interface.c:1374
-msgid "It is strongly recommended to use port 5060."
-msgstr ""
-
-#: gtk/interface.c:1376
-msgid "SIP port"
-msgstr ""
-
-#: gtk/interface.c:1393
-msgid "Your sip address:"
-msgstr ""
-
-#: gtk/interface.c:1407
-msgid "@"
-msgstr ""
-
-#: gtk/interface.c:1416
-msgid "Automatically guess a valid hostname"
-msgstr ""
-
-#: gtk/interface.c:1420
-msgid "Identity"
-msgstr ""
-
-#: gtk/interface.c:1467
-msgid "Add proxy/registrar"
-msgstr ""
-
-#: gtk/interface.c:1488 gtk/interface.c:2114
-msgid "Edit"
-msgstr ""
-
-#: gtk/interface.c:1509
-msgid "Remove"
-msgstr ""
-
-#: gtk/interface.c:1513
-msgid "Remote services"
-msgstr ""
-
-#: gtk/interface.c:1543
-msgid "Clear all stored authentication information (username,password...)"
-msgstr ""
-
-#: gtk/interface.c:1547
-msgid "Authentication information"
-msgstr ""
-
-#: gtk/interface.c:1551
-msgid "SIP"
-msgstr ""
-
-#: gtk/interface.c:1574
-msgid "List of audio codecs, in order of preference:"
-msgstr ""
-
-#: gtk/interface.c:1595
-msgid "Audio codecs"
-msgstr ""
-
-#: gtk/interface.c:1608
-msgid "Video Codecs"
-msgstr ""
-
-#: gtk/interface.c:1644
-msgid "Enable"
-msgstr ""
-
-#: gtk/interface.c:1665
-msgid "Disable"
-msgstr ""
-
-#: gtk/interface.c:1673
-msgid "Upload bandwidth (kbit/sec):"
-msgstr ""
-
-#: gtk/interface.c:1681
-msgid "Download bandwidth (kbit/sec):"
-msgstr ""
-
-#: gtk/interface.c:1708
-msgid ""
-"Note: Codecs in red are not usable regarding to your connection type to the "
-"internet."
-msgstr ""
-
-#: gtk/interface.c:1720
-msgid "No information availlable"
-msgstr ""
-
-#: gtk/interface.c:1727
-msgid "Codec information"
-msgstr ""
-
-#: gtk/interface.c:1731
-msgid "Audio and video codecs"
-msgstr ""
-
-#: gtk/interface.c:1736
-msgid "Codecs"
-msgstr ""
-
-#: gtk/interface.c:2044
-msgid "Address Book"
-msgstr ""
-
-#: gtk/interface.c:2140
-msgid "Select"
-msgstr ""
-
-#: gtk/interface.c:2199
-msgid "Information"
-msgstr ""
-
-#: gtk/interface.c:2217
-msgid ""
-"User is not reachable at the moment but he invites you to contact him using "
-"the following alternate ressource:"
-msgstr ""
-
-#: gtk/interface.c:2224
-msgid "None."
-msgstr ""
-
-#: gtk/interface.c:2285 gtk/interface.c:2394
-msgid "Proxy/Registrar configuration box"
-msgstr ""
-
-#: gtk/interface.c:2315
-msgid "Route (optional):"
-msgstr ""
-
-#: gtk/interface.c:2337
-msgid "SIP Proxy:"
-msgstr ""
-
-#: gtk/interface.c:2344
-msgid "SIP Identity:"
-msgstr ""
-
-#: gtk/interface.c:2359
-msgid "Registration Period:"
-msgstr ""
-
-#: gtk/interface.c:2374
-msgid "Send registration:"
-msgstr ""
-
-#: gtk/interface.c:2381
-msgid "Publish presence information:"
-msgstr ""
-
-#: gtk/interface.c:2466
-msgid "Edit contact information"
-msgstr ""
-
-#: gtk/interface.c:2505
-msgid "Name:"
-msgstr ""
-
-#: gtk/interface.c:2526
-msgid "Subscribe policy:"
-msgstr ""
-
-#: gtk/interface.c:2533
-msgid "Send subscription (see person's online status)"
-msgstr ""
-
-#: gtk/interface.c:2537
-msgid "Contact information"
-msgstr ""
-
-#: gtk/interface.c:2608
-msgid "New incoming subscription"
-msgstr ""
-
-#: gtk/interface.c:2628
-msgid "You have received a new subscription..."
-msgstr ""
-
-#: gtk/interface.c:2655
-msgid "Refuse"
-msgstr ""
-
-#: gtk/interface.c:2676 gtk/addressbook.c:57
-msgid "Accept"
-msgstr ""
-
-#: gtk/interface.c:2729
-msgid "Authentication requested"
-msgstr ""
-
-#: gtk/interface.c:2755
-msgid "Authentication required for realm"
-msgstr ""
-
-#: gtk/interface.c:2791
-msgid "userid:"
-msgstr ""
-
-#: gtk/interface.c:2799
-msgid "password:"
-msgstr ""
-
-#: gtk/interface.c:2807
-msgid "username:"
-msgstr ""
-
-#: gtk/interface.c:2815
-msgid "realm:"
-msgstr ""
-
-#: gtk/interface.c:2876
-msgid "Linphone - Call history"
-msgstr ""
-
-#: gtk/interface.c:2943
-msgid "Chat Room"
-msgstr ""
-
-#: gtk/interface.c:2971
-msgid "Text:"
-msgstr ""
-
-#: gtk/callbacks.c:600
-#, c-format
-msgid "Chat with %s"
-msgstr ""
-
-#: gtk/support.c:90 gtk/support.c:114
+#: gtk-glade/support.c:49 gtk-glade/support.c:73
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: gtk/propertybox.c:207
-msgid "Account"
+#: gtk-glade/chat.c:27
+#, c-format
+msgid "Chat with %s"
 msgstr ""
 
-#: gtk/propertybox.c:439 gtk/propertybox.c:524 gtk/propertybox.c:536
-#: gtk/propertybox.c:883
-msgid "Enabled"
+#: gtk-glade/main.c:397
+#, c-format
+msgid "Incoming call from %s"
 msgstr ""
 
-#: gtk/propertybox.c:440 gtk/propertybox.c:884
-msgid "Disabled"
+#: gtk-glade/main.c:433
+#, c-format
+msgid ""
+"%s would like to add you to his contact list.\n"
+"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 ""
 
-#: gtk/propertybox.c:458 gtk/friends.c:110
+#: gtk-glade/main.c:500
+#, c-format
+msgid "Please enter your password for domain %s:"
+msgstr ""
+
+#: gtk-glade/main.c:574
+msgid "Linphone - a video internet phone"
+msgstr ""
+
+#: gtk-glade/main.c:591
+#, c-format
+msgid "%s (Default)"
+msgstr ""
+
+#: gtk-glade/main.c:699
+msgid "A free SIP video-phone"
+msgstr ""
+
+#: gtk-glade/friendlist.c:199 gtk-glade/propertybox.c:209
 msgid "Name"
 msgstr ""
 
-#: gtk/propertybox.c:464
-msgid "Rate (Hz)"
-msgstr ""
-
-#: gtk/propertybox.c:470
-msgid "Status"
-msgstr ""
-
-#: gtk/propertybox.c:476
-msgid "Min bitrate (kbit/s)"
-msgstr ""
-
-#: gtk/propertybox.c:504 gtk/propertybox.c:509 gtk/propertybox.c:1061
-#: gtk/propertybox.c:1072
-msgid "Unlimited"
-msgstr ""
-
-#: gtk/linphone.c:215
-msgid "The caller asks for resource reservation. Do you agree ?"
-msgstr ""
-
-#: gtk/linphone.c:218
-msgid ""
-"The caller doesn't use resource reservation. \t\t\t\t\tDo you wish to "
-"continue anyway ?"
-msgstr ""
-
-#: gtk/linphone.c:245
-#, c-format
-msgid "linphone - receiving call from %s"
-msgstr ""
-
-#: gtk/linphone.c:272
-#, c-format
-msgid ""
-"You have received a subscription from %s.This means that this person wishes "
-"to be notified of your presence information (online, busy, away...).\n"
-"Do you agree ?"
-msgstr ""
-
-#: gtk/linphone.c:287
-#, c-format
-msgid "Authentication required for realm %s"
-msgstr ""
-
-#: gtk/linphone.c:410
-msgid "None"
-msgstr ""
-
-#: gtk/friends.c:117
+#: gtk-glade/friendlist.c:206
 msgid "Presence status"
 msgstr ""
 
-#: gtk/addressbook.c:55
-msgid "Wait"
+#: gtk-glade/friendlist.c:397
+#, c-format
+msgid "Call %s"
 msgstr ""
 
-#: gtk/addressbook.c:56
-msgid "Deny"
+#: gtk-glade/friendlist.c:398
+#, c-format
+msgid "Send text to %s"
 msgstr ""
 
-#: gtk/addressbook.c:124
-msgid "Bad sip address: a sip address looks like sip:user@domain"
+#: gtk-glade/propertybox.c:215
+msgid "Rate (Hz)"
 msgstr ""
 
-#: gtk/addressbook.c:226
-msgid "Contact list"
+#: gtk-glade/propertybox.c:221
+msgid "Status"
+msgstr ""
+
+#: gtk-glade/propertybox.c:227
+msgid "Min bitrate (kbit/s)"
+msgstr ""
+
+#: gtk-glade/propertybox.c:233
+msgid "Parameters"
+msgstr ""
+
+#: gtk-glade/propertybox.c:260 gtk-glade/propertybox.c:397
+msgid "Enabled"
+msgstr ""
+
+#: gtk-glade/propertybox.c:261 gtk-glade/propertybox.c:397
+msgid "Disabled"
+msgstr ""
+
+#: gtk-glade/propertybox.c:442
+msgid "Account"
 msgstr ""
 
 #: coreapi/linphonecore.c:192
@@ -767,7 +171,7 @@ msgstr ""
 msgid "Sorry, having multiple simultaneous calls is not supported yet !"
 msgstr ""
 
-#: coreapi/linphonecore.c:1190
+#: coreapi/linphonecore.c:1211
 msgid "Contacting"
 msgstr ""
 
@@ -775,24 +179,24 @@ msgstr ""
 msgid "could not call"
 msgstr ""
 
-#: coreapi/linphonecore.c:1522 coreapi/exevents.c:41
+#: coreapi/linphonecore.c:1517 coreapi/exevents.c:41
 msgid "Connected."
 msgstr ""
 
-#: coreapi/linphonecore.c:1548
+#: coreapi/linphonecore.c:1543
 msgid "Call ended"
 msgstr ""
 
-#: coreapi/linphonecore.c:1859
+#: coreapi/linphonecore.c:1854
 msgid "No nat/firewall address supplied !"
 msgstr ""
 
-#: coreapi/linphonecore.c:1871 coreapi/linphonecore.c:1883
+#: coreapi/linphonecore.c:1866 coreapi/linphonecore.c:1878
 #, c-format
 msgid "Invalid nat address '%s' : %s"
 msgstr ""
 
-#: coreapi/misc.c:132
+#: coreapi/misc.c:131
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
 "This is the best choice. However the pcm oss emulation module\n"
@@ -800,7 +204,7 @@ msgid ""
 "'modprobe snd-pcm-oss' as root to load it."
 msgstr ""
 
-#: coreapi/misc.c:135
+#: coreapi/misc.c:134
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"
 "This is the best choice. However the mixer oss emulation module\n"
@@ -913,6 +317,10 @@ msgstr ""
 msgid "Be Right Back"
 msgstr ""
 
+#: coreapi/presence.c:146
+msgid "Away"
+msgstr ""
+
 #: coreapi/presence.c:151
 msgid "On The Phone"
 msgstr ""