[Pkg-telepathy-commits] [empathy] 03/04: Merge tag 'upstream/3.12.1' into debian

[Laurent Bigonville]

This is an automated email from the git hooks/post-receive script.

bigon pushed a commit to branch debian
in repository empathy.

commit 07c3b30290e4a7a4979b20e15e965de457c5db4a
Merge: 48acad7 95c23c1
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sat Apr 19 16:06:35 2014 +0200

    Merge tag 'upstream/3.12.1' into debian
    
    Upstream version 3.12.1

 ChangeLog                            |  66 ++++
 NEWS                                 |   7 +
 configure                            |  20 +-
 configure.ac                         |   2 +-
 data/empathy.desktop                 |   2 +-
 data/empathy.desktop.in              |   2 +-
 help/cs/account-irc.page             | 133 ++++----
 help/cs/account-jabber.page          |  74 ++---
 help/cs/accounts-window.page         |  37 ++-
 help/cs/add-account.page             |  62 ++--
 help/cs/add-contact.page             |  50 +--
 help/cs/audio-call.page              |  71 +++--
 help/cs/audio-video.page             | 146 ++++-----
 help/cs/change-status.page           |  49 +--
 help/cs/create-account.page          |  98 +++---
 help/cs/disable-account.page         |  46 ++-
 help/cs/favorite-rooms.page          | 106 +++----
 help/cs/geolocation-not-showing.page |  51 +--
 help/cs/geolocation-privacy.page     |  88 +++---
 help/cs/geolocation-supported.page   |  49 +--
 help/cs/geolocation-turn.page        |  57 ++--
 help/cs/geolocation-what-is.page     |  55 ++--
 help/cs/geolocation.page             |  34 +-
 help/cs/group-conversations.page     | 115 +++----
 help/cs/hide-contacts.page           |  45 ++-
 help/cs/import-account.page          |  45 ++-
 help/cs/index.page                   |  43 ++-
 help/cs/introduction.page            |  51 +--
 help/cs/irc-commands.page            |  37 ++-
 help/cs/irc-join-pwd.page            |  42 ++-
 help/cs/irc-join-room.page           |  55 ++--
 help/cs/irc-manage.page              |  40 ++-
 help/cs/irc-nick-password.page       |  57 ++--
 help/cs/irc-send-file.page           |  30 +-
 help/cs/irc-start-conversation.page  |  47 ++-
 help/cs/license.page                 |  75 ++---
 help/cs/link-contacts.page           | 117 +++----
 help/cs/overview.page                |  56 ++--
 help/cs/prev-conv.page               |  86 +++---
 help/cs/prob-conn-acctdisabled.page  |  59 ++--
 help/cs/prob-conn-auth.page          |  58 ++--
 help/cs/prob-conn-name.page          |  56 ++--
 help/cs/prob-conn-neterror.page      |  65 ++--
 help/cs/prob-conn.page               |  30 +-
 help/cs/remove-account.page          |  47 ++-
 help/cs/salut-protocol.page          |  52 ++--
 help/cs/send-file.page               |  75 +++--
 help/cs/send-message.page            |  56 ++--
 help/cs/set-custom-status.page       | 111 +++----
 help/cs/share-desktop.page           |  84 +++--
 help/cs/status-icons.page            |  64 ++--
 help/cs/video-call.page              |  65 ++--
 po/de.po                             | 584 +++++++++++++++++------------------
 po/ru.po                             |  67 ++--
 54 files changed, 2028 insertions(+), 1691 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git