commit 3b3d55878aba65074ed80b22a2dba08e1b739583
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Apr 25 17:32:35 2011 +0200

    prepare 3.0.1 release

 NEWS         |   26 ++++++++++++++++++++++++++
 configure.ac |    4 ++--
 release.py   |    2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

commit d34414f1b8eb0379a497dd7ee3b219fb89f401c4
Author: Abduxukur Abdurixit <abdurixit@gmail.com>
Date:   Mon Apr 25 10:22:50 2011 +0200

    Added UG translation

 po/ug.po | 1521
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 765 insertions(+), 756 deletions(-)

commit 4ef9e9a4fa0f37a2f3b082f4a7e63118d3a1c70f
Author: Sira Nokyoongtong <gumaraa@gmail.com>
Date:   Mon Apr 25 14:42:21 2011 +0700

    Updated Thai translation.

 po/th.po | 2317
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1573 insertions(+), 744 deletions(-)

commit 9e5447c6555abf9ae8f672c20ac7b935964ade93
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Apr 22 10:20:50 2011 +0200

    account-assistant: ensure that the import widget takes all the space
    available (#648372)

 src/empathy-account-assistant.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit b0c00a729525f9ac6a8476c805b880fad511654f
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:   Fri Apr 22 12:28:58 2011 +0430

    Updated Persian translation

 po/fa.po |  921
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 523 insertions(+), 398 deletions(-)

commit e5a6a93f9a4f96b4c66478575b2df1de6087535a
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Wed Apr 20 12:42:28 2011 +0200

    Updated Polish translation

 po/pl.po |  325
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 166 insertions(+), 159 deletions(-)

commit eb3da179975198c9368f9e3d73a54d2d60097faf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Apr 13 12:34:38 2011 +0200

    accounts_dialog_cms_prepare_cb: don't update the settings if we are
    already preparing one

    This may lead to ignoring the existing setting if it's a slow one
    to prepare
    (as Haze for example). (#647641)

 src/empathy-accounts-dialog.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit 7c8d031f4f0efdca0894c21a031df6beb4d43de7
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Sat Apr 16 17:13:51 2011 +0100

    Bug 647056 — Removing a contact causes a segfault

    Fix a double unref which was causing segfaults when removing contacts.

    Closes: bgo#647056

 libempathy-gtk/empathy-individual-view.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit c66c3bf8df20d888bae8e8c89c5041023e65142b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Apr 15 08:33:27 2011 +0200

    connectivity: consider that network is disconnected if state is
    NM_STATE_ASLEEP (#647793)

 libempathy/empathy-connectivity.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 1b4bb48ed66f9c0449ee05a5fefe0cec6ca61c76
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:   Thu Apr 14 18:58:18 2011 +0700

    Updated Vietnamese translation

 po/vi.po |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

commit 9c306739aa4ba5baf2fcc476b9faf3373e761629
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:   Thu Apr 14 18:52:55 2011 +0700

    po/vi.po: import from Damned Lies

 po/vi.po |  760
 +++++++++++++++++++++-----------------------------------------
 1 files changed, 260 insertions(+), 500 deletions(-)

commit 213de201cc61d2ef985d5fed52b824a2c19bde2a
Author: Youness Alaoui <youness.alaoui@collabora.co.uk>
Date:   Mon Apr 4 21:41:40 2011 -0400

    Enable audio/video capabilities if InitialAudio/Video is in the
    fixed props for StreamedMedia channels If a connection manager puts
    InitialAudio=TRUE or InitialVideo=TRUE in the fixed properties,
    empathy thinks the CM doesn't support audio/video.

 libempathy/empathy-contact.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit 10d7351ff8da146ae19652186094b5fb3fde3ebd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Mar 24 11:21:33 2011 +0100

    log_manager_got_entities_cb: don't use the currently selected account

    As the tpl_log_manager_get_entities_async() call is async, the
    selected
    account may have changed while it's running. So we have to explicitely
    pass
    the account which was selected when we started the call (#645586).

 libempathy-gtk/empathy-log-window.c |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

commit bd751c69ef2e0a9928b4853a8657e1cea376531e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Apr 5 16:37:37 2011 +0200

    emulate '/me' command if CM doesn't support Action messages (#622118)

 libempathy-gtk/empathy-chat.c |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

commit ae37cca09e8af88c08d2ed16400c1860fd173f7c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Apr 6 11:37:28 2011 +0200

    add empathy_tp_chat_get_self_contact()

    https://bugzilla.gnome.org/show_bug.cgi?id=622118

 libempathy/empathy-tp-chat.c |   10 ++++++++++
 libempathy/empathy-tp-chat.h |    2 ++
 2 files changed, 12 insertions(+), 0 deletions(-)

commit 048f70b95b6845759d64196b18ebe8ff7d4aba2b
Author: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date:   Wed Apr 6 09:37:34 2011 +0200

    Updated Basque language

 po/eu.po |   41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 deletions(-)

commit af33f911c23b3f478f197088e5ff9ea861cbb442
Author: Bruno Brouard <annoa.b@gmail.com>
Date:   Tue Apr 5 11:41:06 2011 +0200

    Updated French Doc Translation

 help/fr/fr.po |  141
 +++++++++++++++++++++++++++-----------------------------
 1 files changed, 68 insertions(+), 73 deletions(-)

commit d7f6a39d2d12d9c66b94dfd58488b9c8f9aea35e
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Wed Mar 30 15:18:03 2011 +0100

    Bug 646227 — Possible overflow in persona-view:drag_data_get

    I think it was a fluke that this code worked in the first place,
    since it was
    accessing arrays with indices which were out of range, and which
    wouldn't have
    corresponded to the correct entries even if they were in range.

    This should fix the mapping between DND types and DND URIs/atoms
    in the
    contact list, individual and persona views.

    Closes: bgo#646227

 libempathy-gtk/empathy-contact-list-view.c |   18 +------------
 libempathy-gtk/empathy-individual-view.c   |   37
 ++++++++++++++++-----------
 libempathy-gtk/empathy-persona-view.c      |   28 ++++++++++++++-------
 3 files changed, 43 insertions(+), 40 deletions(-)

commit cf5ae6bf0560a62e108eb43b172e1ee837d0aa9c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Apr 4 15:50:58 2011 +0200

    Revert "-Fix use of include <config.h> to make sure translations work"

    This reverts commit f0f99ffaa08240fbb72d7eed198368fd22fe4c47.

    Sorry, I didn't mean to push that...

 libempathy-gtk/empathy-contact-blocking-dialog.c |    4 ----
 libempathy-gtk/empathy-contact-search-dialog.c   |    4 ----
 libempathy/empathy-account-settings.c            |    3 ---
 libempathy/empathy-auth-factory.c                |    4 ----
 libempathy/empathy-connection-managers.c         |    3 ---
 libempathy/empathy-debug.h                       |    3 +++
 libempathy/empathy-ft-handler.c                  |    4 ----
 libempathy/empathy-presence-manager.c            |    6 ++----
 libempathy/empathy-server-sasl-handler.c         |    4 ----
 libempathy/empathy-server-tls-handler.c          |    4 ----
 libempathy/empathy-tp-streamed-media.c           |    4 ----
 src/empathy-invite-participant-dialog.c          |    4 ----
 src/empathy-streamed-media-window.c              |    3 ---
 13 files changed, 5 insertions(+), 45 deletions(-)

commit f0f99ffaa08240fbb72d7eed198368fd22fe4c47
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Tue Mar 29 19:03:09 2011 +0200

    -Fix use of include <config.h> to make sure translations work

 libempathy-gtk/empathy-contact-blocking-dialog.c |    4 ++++
 libempathy-gtk/empathy-contact-search-dialog.c   |    4 ++++
 libempathy/empathy-account-settings.c            |    3 +++
 libempathy/empathy-auth-factory.c                |    4 ++++
 libempathy/empathy-connection-managers.c         |    3 +++
 libempathy/empathy-debug.h                       |    3 ---
 libempathy/empathy-ft-handler.c                  |    4 ++++
 libempathy/empathy-presence-manager.c            |    6 ++++--
 libempathy/empathy-server-sasl-handler.c         |    4 ++++
 libempathy/empathy-server-tls-handler.c          |    4 ++++
 libempathy/empathy-tp-streamed-media.c           |    4 ++++
 src/empathy-invite-participant-dialog.c          |    4 ++++
 src/empathy-streamed-media-window.c              |    3 +++
 13 files changed, 45 insertions(+), 5 deletions(-)

commit 9048ff4f63c8ac3174468ceb4787b658d948c6e0
Author: Stef Walter <stefw@collabora.co.uk>
Date:   Mon Mar 28 13:31:17 2011 +0200

    Remove unnecessary code in empathy_auth_factory_constructed()

    https://bugzilla.gnome.org/show_bug.cgi?id=645930

 libempathy/empathy-auth-factory.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

commit 0b0a93b600355d4c205c7777669ee5a42d5e9a3b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Apr 4 15:19:26 2011 +0200

    remove released flag

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)