commit 71f34da10e1e25c8c861395beb97c4149f53a852
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon May 24 17:13:31 2010 +0200

    prepare 2.31.2 release

 NEWS         |   26 ++++++++++++++++++++++++++
 configure.ac |    4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

commit 503296c1c8c3cb8bf4bde4e9325fc0a58aa91c70
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Mon May 24 15:36:45 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po |  423
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 211 insertions(+), 212 deletions(-)

commit b9fba4f58c149afedd5a49ab9b44b95ac4ec4023
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri May 21 15:35:44 2010 +0200

    main_window_favorite_chatroom_join: skip not connected accounts
    (#606738)

    This fix a crash if the account is connecting.

 src/empathy-main-window.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

commit 8125535e64eb29da486f642103eb3b220a280fb7
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Fri May 21 09:45:03 2010 +0200

    Remove empathy_link_button_new(), it's unused

 libempathy-gtk/empathy-ui-utils.c |   22 ----------------------
 libempathy-gtk/empathy-ui-utils.h |    2 --
 2 files changed, 0 insertions(+), 24 deletions(-)

commit 64d4af1b917c249a571f8b608c1976fb065dca49
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Fri May 21 17:38:09 2010 +1000

    Change names of variables that shadow libc symbols

 libempathy-gtk/empathy-ui-utils.c |    4 ++--
 src/empathy-about-dialog.c        |    4 ++--
 src/empathy-debug-window.c        |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

commit b1c4c4d2ed01fd1e87f1b3f815b5282fc63183c9
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Thu May 20 18:47:31 2010 +0200

    Updated Galician translations

 po/gl.po |  431
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 216 insertions(+), 215 deletions(-)

commit da99affb434f4bd1b61287ad812c3a5cfb297772
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu May 20 17:10:20 2010 +0200

    use avatar-default instead of the deprecated stock_person icon

 libempathy-gtk/empathy-avatar-chooser.c |    4 +++-
 libempathy-gtk/empathy-images.h         |    1 +
 libempathy-gtk/empathy-theme-adium.c    |    3 ++-
 src/empathy-call-window.c               |    5 +++--
 src/empathy-call-window.ui              |    2 +-
 src/empathy-event-manager.c             |    4 ++--
 6 files changed, 12 insertions(+), 7 deletions(-)

commit bb43456be55d117ea23c65f3488c49a128dbcb62
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Wed May 19 19:24:15 2010 +0100

    Add defaults for VP8 encoding

 data/codec-preferences  |    4 ++++
 data/element-properties |    6 ++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

commit fe45d91be46ad4c05bdecf162b720ee7502c3f30
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed May 19 09:51:02 2010 +0200

    initialize a GError pointer

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

commit 692f6f48a36f967beec4ff2509b6ea2747e6ad76
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue May 18 12:57:08 2010 +0200

    account-widget-irc: call empathy_account_widget_changed when the
    network dialog is destroyed

    This will allow user to save or discard changes he just done
    (#618883).

 libempathy-gtk/empathy-account-widget-irc.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit ab223625f15bae56e5b32b4798e87cf0e4b04944
Author: Rob Bradford <rob@linux.intel.com>
Date:   Tue May 18 11:09:45 2010 +0100

    Use library i18n method for source files included in shared library

    Since these files are included in the g-c-c shared module we must
    use the
    version of the _ macro that includes the domain.

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

 src/empathy-account-assistant.c         |    3 ++-
 src/empathy-accounts-common.c           |    2 +-
 src/empathy-accounts-dialog.c           |    2 +-
 src/empathy-auto-salut-account-helper.c |    4 +++-
 src/empathy-import-dialog.c             |    2 +-
 src/empathy-import-mc4-accounts.c       |    4 +++-
 src/empathy-import-widget.c             |    4 +++-
 7 files changed, 14 insertions(+), 7 deletions(-)

commit ab73964666777182f59203b64b8d8309b996ced0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue May 18 11:33:55 2010 +0200

    add 22x22 version of the im-message icon

    Copied from
    http://git.gnome.org/browse/empathy/tree/data/scalable/message.xcf?id=c7010d43264dafca66ff65540c5d6666f1c66e2a

 data/icons/Makefile.am                         |    1 +
 data/icons/hicolor_status_22x22_im-message.png |  Bin 0 -> 654 bytes
 2 files changed, 1 insertions(+), 0 deletions(-)

commit bf7c9ffb5e2cf5b9c2c00b15da260648db1eadb9
Author: ekspiulo <ekspiulo@gmail.com>
Date:   Tue May 18 11:21:07 2010 +0200

    Use 'A' as accelerator for the "Automatically connect on startup"
    option (#618753)

 src/empathy-preferences.ui |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 693aa043f996448c2a0ffb241c3f5c26b596a625
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon May 17 15:59:57 2010 +0200

    fix irc-networks.xml lookup when EMPATHY_SRCDIR is defined

    The file is in libempathy/

 libempathy-gtk/empathy-account-widget-irc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit ac12fee45e6a1f90189d675e1276c1da8588c887
Author: Brian Curtis <bcurtiswx@ubuntu.com>
Date:   Mon May 17 15:49:01 2010 +0200

    use port 8001 to connect to freenode irc (#618401)

 libempathy/irc-networks.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 51bb109841eee7c9099b938554bb80a3fa449c67
Author: Petr Kovar <pknbe@volny.cz>
Date:   Sun May 16 23:53:59 2010 +0200

    Update Czech translation by Ondrej Kopka

 po/cs.po |  600
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 309 insertions(+), 291 deletions(-)

commit d06fb95a0ed6337d4897e8f9b0538057dee8c053
Author: Robert McQueen <robert.mcqueen@collabora.co.uk>
Date:   Sat May 15 13:54:18 2010 +0100

    use user-extended-away status icon in favour of user-idle

    The freedesktop.org icon spec defines that the icon for the extended
    away
    status is called user-idle. However, some icon theme authors
    interpret this
    name as meaning mere idleness rather than the intended extended
    away semantic
    of away *and* idle, creating visual confusion (extended-away contacts
    appearing
    less away than contacts who are merely away). Some themes contain a
    non-standard user-extended-away icon with the correct semantic,
    so this patch
    makes Empathy use it in preference to user-idle if
    available. (Incidentally, at
    the moment Telepathy itself never actually shows remote contacts
    as idle.)

 libempathy-gtk/empathy-images.h   |    3 ++-
 libempathy-gtk/empathy-ui-utils.c |    8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

commit 3315956fb2248bcadec5042234b6e3fe869995f1
Author: Thomas Thurman <tthurman@gnome.org>
Date:   Wed May 12 18:41:16 2010 -0400

    Updated Shavian transliteration

 po/en@shaw.po | 2451
 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 1672 insertions(+), 779 deletions(-)

commit 81f64a90c243f460624ab1ddb2fb7954ac755d94
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Sat May 8 17:20:25 2010 +0100

    Don't try to start change the camera when there is no input

    Fixes bug #618167

 src/empathy-call-window.c |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

commit 0cd0f8435131a23d216ee6f0f1ea866803ba625e
Author: Rob Bradford <rob@linux.intel.com>
Date:   Thu May 6 15:17:57 2010 +0100

    ui-utils: Set translation domain on GtkBuilder UIs

    This is necessary for when GtkBuilder UIs are used outside of the
    main Empathy
    process.

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

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

commit a56bf15a5dca91b8b7bce593c939ec6404ae37b6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Sat May 8 15:28:47 2010 +0100

    If there is no publish list, don't auto-add people to it

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

commit 95f8148c1324e21bdec46ebe8c43037ffb6f2328
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:   Sat May 8 19:01:14 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  772
 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po |  781
 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 787 insertions(+), 766 deletions(-)

commit 4b8ac78f0001e5dc9ca5cd2aaef11aeb890eea2f
Author: Travis Reitter <treitter@gmail.com>
Date:   Fri May 7 16:47:08 2010 -0700

    Add missing tp-glib/util.h header to the AccountsPage.

 src/cc-empathy-accounts-page.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit aac9ffc5d26531278f64d12209db21cfb5d44dfe
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Thu May 6 14:56:37 2010 +0200

    Remove unused #include from empathy-map-view.c

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

commit da872faea7e299cd6cffe2b121354fd50f9a9409
Author: Andika Triwidada <andika@gmail.com>
Date:   Wed May 5 12:54:35 2010 +0700

    Added Indonesian translation, cotributed by Taufiq Wirahman
    Added id to LINGUAS

 po/LINGUAS |    1 +
 po/id.po   | 3248
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3249 insertions(+), 0 deletions(-)

commit 6b9ab475b3885f265d2d23f9f736575f9a176758
Author: Danishka Navin <danishka@gmail.com>
Date:   Wed May 5 11:17:28 2010 +0530

    updated si.po

 po/si.po | 1067
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 538 insertions(+), 529 deletions(-)

commit 364823fc277db364723b8954135727f2ee200e06
Author: Harold Schreckengost <mewshi@gmail.com>
Date:   Tue May 4 18:44:39 2010 +0200

    [help] Reordered the topics in index.page

 help/C/index.page |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

commit 04d48c09e75845e6ca99b591f1821452667ba770
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue May 4 18:11:54 2010 +0200

    release.py: update last_tag_patern

 release.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 8e337f9b0c7af72c0dbc846d5581edfa69aa9874
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue May 4 18:11:38 2010 +0200

    remove released flag

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