[Pkg-mozext-commits] [firetray] 399/399: Merge tag 'upstream/0.4.7_rc1' into dfsg-clean

[David Prévot]

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

taffit pushed a commit to branch dfsg-clean
in repository firetray.

commit 460a223fe83185856a6d4c7a1cb50bc45f072888
Merge: 5f32e3c 0457722
Author: David Prévot <taffit at debian.org>
Date:   Tue Oct 29 11:33:51 2013 -0400

    Merge tag 'upstream/0.4.7_rc1' into dfsg-clean
    
    Upstream version 0.4.7~rc1
    
    # gpg: Signature faite le mar. 29 oct. 2013 11:33:45 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 src/Makefile                                 |    8 +-
 src/chrome.manifest                          |    5 +
 src/chrome/content/options.js                |   45 ++++-
 src/chrome/content/options.xul               |   26 ++-
 src/chrome/locale/en-US/options.dtd          |   12 +-
 src/chrome/locale/en-US/overlay.properties   |    1 +
 src/chrome/locale/es-AR/options.dtd          |   88 ++++++++++
 src/chrome/locale/es-AR/options.properties   |    8 +
 src/chrome/locale/es-AR/overlay.dtd          |    1 +
 src/chrome/locale/es-AR/overlay.properties   |    8 +
 src/chrome/locale/fr/options.dtd             |   88 ++++++++++
 src/chrome/locale/fr/options.properties      |    8 +
 src/chrome/locale/fr/overlay.dtd             |    1 +
 src/chrome/locale/fr/overlay.properties      |    8 +
 src/chrome/locale/it/options.dtd             |   88 ++++++++++
 src/chrome/locale/it/options.properties      |    8 +
 src/chrome/locale/it/overlay.dtd             |    1 +
 src/chrome/locale/it/overlay.properties      |    8 +
 src/chrome/locale/nl/options.dtd             |   88 ++++++++++
 src/chrome/locale/nl/options.properties      |    8 +
 src/chrome/locale/nl/overlay.dtd             |    1 +
 src/chrome/locale/nl/overlay.properties      |    8 +
 src/chrome/locale/sk-SK/options.dtd          |   11 +-
 src/chrome/locale/sk-SK/overlay.properties   |    1 +
 src/chrome/locale/zh-TW/options.dtd          |   88 ++++++++++
 src/chrome/locale/zh-TW/options.properties   |    8 +
 src/chrome/locale/zh-TW/overlay.dtd          |    1 +
 src/chrome/locale/zh-TW/overlay.properties   |    8 +
 src/components/firetray-clhandler.js         |   40 ++++-
 src/defaults/preferences/prefs.js            |    2 +
 src/install.rdf                              |   55 ++++++-
 src/modules/FiretrayChat.jsm                 |   93 +++++++----
 src/modules/FiretrayHandler.jsm              |   76 +++++++--
 src/modules/FiretrayMessaging.jsm            |   87 +++-------
 src/modules/commons.js                       |    9 +-
 src/modules/ctypes/linux/gdk.jsm             |    6 +-
 src/modules/ctypes/linux/gobject.jsm         |   23 ---
 src/modules/linux/FiretrayChatStatusIcon.jsm |  226 +++++++++++++++++++++-----
 src/modules/linux/FiretrayPopupMenu.jsm      |    9 +-
 src/modules/linux/FiretrayStatusIcon.jsm     |    3 +-
 src/modules/linux/FiretrayWindow.jsm         |  109 ++++++++-----
 src/modules/logging.jsm                      |    2 +-
 42 files changed, 1136 insertions(+), 238 deletions(-)

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