[telepathy-account-widgets/next: 8/8] Merge branch 'master' into next

[Guillaume Desmottes <gdesmott src gnome org>]

commit 27cb646f9d2a455659fc343364c329205f30b023
Merge: c0098c2 318c05e
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Feb 20 15:31:27 2014 +0100

    Merge branch 'master' into next
    
    Conflicts:
        telepathy-account-widgets-uninstalled.pc.in

 configure.ac                                       |   14 +
 po/he.po                                           |  262 ++++++++++++++------
 po/zh_CN.po                                        |  214 ++++++++++++-----
 tp-account-widgets/tpaw-account-widget-aim.ui      |    2 +-
 .../tpaw-account-widget-groupwise.ui               |    2 +-
 tp-account-widgets/tpaw-account-widget-icq.ui      |    2 +-
 tp-account-widgets/tpaw-account-widget-jabber.ui   |    6 +-
 tp-account-widgets/tpaw-account-widget-msn.ui      |    2 +-
 tp-account-widgets/tpaw-account-widget-sip.ui      |    2 +-
 tp-account-widgets/tpaw-account-widget.c           |   22 +--
 tp-account-widgets/tpaw-protocol.c                 |    5 +
 tp-account-widgets/tpaw-utils.c                    |   10 -
 tp-account-widgets/tpaw-utils.h                    |    2 -
 13 files changed, 371 insertions(+), 174 deletions(-)
---