[Pkg-mozext-commits] [firetray] 34/38: Merge tag 'upstream/0.5.5_rc1+dfsg'

[David Prévot]

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

taffit pushed a commit to branch master
in repository firetray.

commit b6dcfe76353447511bc04fc3a5f564e023f0343b
Merge: d078baf a43a946
Author: David Prévot <david at tilapin.org>
Date:   Mon Apr 6 10:47:33 2015 -0400

    Merge tag 'upstream/0.5.5_rc1+dfsg'
    
    Upstream version 0.5.5~rc1+dfsg
    
    # gpg: Signature faite le lun. 06 avril 2015 10:47:23 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

 README.md                                   |   2 +-
 src/chrome.manifest                         |   3 +
 src/chrome/content/options.js               |  10 ++-
 src/chrome/content/options.xul              |   7 ++
 src/chrome/locale/bg/options.dtd            | 108 ++++++++++++++++++++++++++++
 src/chrome/locale/bg/options.properties     |   8 +++
 src/chrome/locale/bg/overlay.dtd            |   1 +
 src/chrome/locale/bg/overlay.properties     |  10 +++
 src/chrome/locale/de-DE/options.dtd         |   2 +
 src/chrome/locale/en-US/options.dtd         |   2 +
 src/chrome/locale/es-AR/options.dtd         |   4 ++
 src/chrome/locale/fr/options.dtd            |   8 ++-
 src/chrome/locale/hr-HR/options.dtd         |  12 ++--
 src/chrome/locale/hr-HR/overlay.properties  |   4 +-
 src/chrome/locale/it/options.dtd            |  12 ++--
 src/chrome/locale/it/overlay.properties     |   4 +-
 src/chrome/locale/nl/options.dtd            |   4 ++
 src/chrome/locale/pl-PL/options.dtd         |   2 +
 src/chrome/locale/ru-RU/options.dtd         |   2 +
 src/chrome/locale/sk-SK/options.dtd         |   2 +
 src/chrome/locale/uk-UA/options.dtd         |   2 +
 src/chrome/locale/zh-CN/options.dtd         |  98 +++++++++++++++++++++++++
 src/chrome/locale/zh-CN/options.properties  |   8 +++
 src/chrome/locale/zh-CN/overlay.dtd         |   1 +
 src/chrome/locale/zh-CN/overlay.properties  |  10 +++
 src/chrome/locale/zh-TW/options.dtd         |   4 ++
 src/defaults/preferences/prefs.js           |   1 +
 src/install.rdf                             |  24 ++++++-
 src/modules/FiretrayHandler.jsm             |  57 +++++++++++----
 src/modules/FiretrayMessaging.jsm           |   8 ++-
 src/modules/FiretrayWindow.jsm              |  13 ++--
 src/modules/commons.js                      |   4 +-
 src/modules/ctypes/ctypes-utils.jsm         |   1 +
 src/modules/ctypes/linux/gdk.jsm            |   4 +-
 src/modules/ctypes/linux/libc.jsm           |   3 +
 src/modules/ctypes/linux/x11.jsm            |   4 ++
 src/modules/ctypes/winnt/shell32.jsm        |   4 ++
 src/modules/linux/FiretrayAppIndicator.jsm  |   7 +-
 src/modules/linux/FiretrayGtkStatusIcon.jsm |  59 +++++++--------
 src/modules/linux/FiretrayStatusIcon.jsm    |  41 ++++++++++-
 src/modules/linux/FiretrayWindow.jsm        |  13 ----
 src/modules/winnt/FiretrayStatusIcon.jsm    |  14 +++-
 testing/Makefile                            |   6 +-
 testing/xgetselectionowner.c                |  35 +++++++++
 44 files changed, 522 insertions(+), 106 deletions(-)

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