From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 14 Oct 2013 17:13:03 +0000 (-0400)
Subject: Merge branch 'gnome-3-10'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=10268f4c962a5c307dd012089d03ac1e5c07c9ca;hp=dcc9d91154890cacbc8afabd60c44582df94c434

Merge branch 'gnome-3-10'

Conflicts:
	po/pt.po
	src/empathy-audio-sink.c
---

diff --git a/NEWS b/NEWS
index c5225b25..44c45fdb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,25 @@
+NEW in 3.10.1 (14/10/2013)
+=============
+
+The "Massive Poutine" release.
+
+Bugs fixed:
+ - Fixed #709741, audio-sink: fix compilation with GStreamer 0.10 (Will Thompson)
+ - Fixed #710017, empathy-debugger: no MC logs (Guillaume Desmottes)
+ - Fixed #709677, crash when connecting SIP client (Guillaume Desmottes)
+ - Fixed #708716, crash in empathy-chat (Guillaume Desmottes)
+ - Fixed #707885, need to escape spaces in action names (Guillaume Desmottes)
+ - Fixed #708684, Warning when opening preferences dialog (Guillaume Desmottes)
+
+Translations:
+ - Updated ca@valencia Translation (Carles Ferrando)
+ - Updated fa Translation (Arash Mousavi)
+ - Updated ja Translation (Jiro Matsuzawa, victory)
+ - Updated pt Translation (António Lima)
+ - Updated tr Translation (Emin Tufan Çetin)
+ - Updated zh_HK Translation (Chao-Hsiung Liao)
+ - Updated zh_TW Translation (Chao-Hsiung Liao)
+
 NEW in 3.10.0 (24/09/2013)
 =============
 Bugs fixed:
diff --git a/configure.ac b/configure.ac
index 97bd2427..b0a4b80c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [10])
-m4_define([empathy_micro_version], [0])
+m4_define([empathy_micro_version], [1])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index aa61e688..5dc13098 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -458,13 +458,16 @@ add_phone_numbers (EmpathyIndividualMenu *self)
 
       if (type != NULL)
         {
-          tmp = g_strdup_printf ("Call %s (%s)",
+          /* translators: first argument is a phone number like +32123456 and
+           * the second one is something like 'home' or 'work'. */
+          tmp = g_strdup_printf (_("Call %s (%s)"),
               folks_phone_field_details_get_normalised (details),
               type);
         }
       else
         {
-          tmp = g_strdup_printf ("Call %s",
+          /* translators: argument is a phone number like +32123456 */
+          tmp = g_strdup_printf (_("Call %s"),
               folks_phone_field_details_get_normalised (details));
         }