[Pkg-telepathy-commits] [empathy] 02/05: Merge tag 'upstream/3.12.11' into debian

Laurent Bigonville bigon at moszumanska.debian.org
Wed Oct 14 14:04:40 UTC 2015


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

bigon pushed a commit to annotated tag debian/3.12.11-1
in repository empathy.

commit 89b3955fbe390551114f518ce31cf169392c4b5f
Merge: c386ce9 ee3db0d
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Oct 14 15:48:52 2015 +0200

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

 ChangeLog                                          |  776 ++-
 Makefile.in                                        |    2 +-
 NEWS                                               |   27 +
 configure                                          |  277 +-
 configure.ac                                       |   20 +-
 data/empathy.desktop                               |   12 +-
 data/empathy.desktop.in                            |    2 +-
 help/ca/account-irc.page                           |    4 +-
 help/ca/account-jabber.page                        |    2 +-
 help/ca/add-account.page                           |    2 +-
 help/ca/audio-call.page                            |    2 +-
 help/ca/ca.po                                      |   38 +-
 help/ca/geolocation-privacy.page                   |    2 +-
 help/ca/geolocation-what-is.page                   |    2 +-
 help/ca/group-conversations.page                   |    2 +-
 help/ca/hide-contacts.page                         |    2 +-
 help/ca/import-account.page                        |    2 +-
 help/ca/irc-start-conversation.page                |    2 +-
 help/ca/link-contacts.page                         |    2 +-
 help/ca/overview.page                              |    2 +-
 help/ca/send-message.page                          |    4 +-
 help/ca/set-custom-status.page                     |    2 +-
 help/ca/share-desktop.page                         |    4 +-
 help/ca/video-call.page                            |    2 +-
 help/de/account-irc.page                           |    2 +-
 help/de/account-jabber.page                        |   10 +-
 help/de/accounts-window.page                       |    2 +-
 help/de/add-account.page                           |    2 +-
 help/de/add-contact.page                           |    2 +-
 help/de/audio-call.page                            |    2 +-
 help/de/audio-video.page                           |    2 +-
 help/de/change-status.page                         |    2 +-
 help/de/create-account.page                        |    2 +-
 help/de/de.po                                      |  265 +-
 help/de/disable-account.page                       |    2 +-
 help/de/favorite-rooms.page                        |    2 +-
 help/de/geolocation-not-showing.page               |    2 +-
 help/de/geolocation-privacy.page                   |    2 +-
 help/de/geolocation-supported.page                 |    2 +-
 help/de/geolocation-turn.page                      |    2 +-
 help/de/geolocation-what-is.page                   |    2 +-
 help/de/geolocation.page                           |    2 +-
 help/de/group-conversations.page                   |    2 +-
 help/de/hide-contacts.page                         |    2 +-
 help/de/import-account.page                        |    2 +-
 help/de/index.page                                 |    4 +-
 help/de/introduction.page                          |    8 +-
 help/de/irc-commands.page                          |    2 +-
 help/de/irc-join-pwd.page                          |    2 +-
 help/de/irc-join-room.page                         |    2 +-
 help/de/irc-manage.page                            |    2 +-
 help/de/irc-nick-password.page                     |    2 +-
 help/de/irc-send-file.page                         |    2 +-
 help/de/irc-start-conversation.page                |    2 +-
 help/de/license.page                               |    2 +-
 help/de/link-contacts.page                         |    6 +-
 help/de/overview.page                              |    2 +-
 help/de/prev-conv.page                             |    2 +-
 help/de/prob-conn-acctdisabled.page                |    2 +-
 help/de/prob-conn-auth.page                        |    2 +-
 help/de/prob-conn-name.page                        |    2 +-
 help/de/prob-conn-neterror.page                    |    2 +-
 help/de/prob-conn.page                             |    2 +-
 help/de/remove-account.page                        |    2 +-
 help/de/salut-protocol.page                        |    2 +-
 help/de/send-file.page                             |    2 +-
 help/de/send-message.page                          |    2 +-
 help/de/set-custom-status.page                     |    2 +-
 help/de/share-desktop.page                         |    2 +-
 help/de/status-icons.page                          |    2 +-
 help/de/video-call.page                            |    2 +-
 help/el/el.po                                      |   23 +-
 help/el/index.page                                 |    2 +-
 help/fr/add-account.page                           |   10 +-
 help/fr/audio-video.page                           |    3 +-
 help/fr/fr.po                                      | 2188 ++++---
 help/fr/index.page                                 |    2 +-
 help/fr/introduction.page                          |    6 +-
 help/fr/link-contacts.page                         |    4 +-
 libempathy-gtk/empathy-geoclue-helper.c            |    4 +-
 po/ar.po                                           |  962 +--
 po/eo.po                                           | 5075 ++++++++--------
 po/oc.po                                           | 6155 +++++++++++++-------
 po/pl.po                                           |  329 +-
 po/pt.po                                           |  847 ++-
 po/sv.po                                           |  791 ++-
 po/tg.po                                           |  592 +-
 po/zh_TW.po                                        |  407 +-
 src/chat-manager-interface.c                       |    2 +-
 src/chat-manager-interface.h                       |    2 +-
 src/empathy.c                                      |    4 +
 telepathy-account-widgets/po/pt.po                 |  216 +-
 .../tp-account-widgets/tpaw-account-settings.c     |   10 +-
 .../tp-account-widgets/tpaw-account-widget.c       |    7 +-
 .../tp-account-widgets/tpaw-avatar-chooser.c       |    8 +-
 .../tp-account-widgets/tpaw-connection-managers.c  |    1 +
 .../tp-account-widgets/tpaw-protocol.c             |    7 +-
 97 files changed, 10564 insertions(+), 8662 deletions(-)

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



More information about the Pkg-telepathy-commits mailing list