[Pkg-mozext-commits] [greasemonkey] 12/13: Merge tag 'upstream/2.1_beta1'

[David Prévot]

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

taffit pushed a commit to branch master
in repository greasemonkey.

commit 2fbb35d22a8e6e5a65e839aed75e86a5cc18889d
Merge: cdb377a a5f2ca2
Author: David Prévot <taffit at debian.org>
Date:   Thu Jul 17 12:01:47 2014 -0400

    Merge tag 'upstream/2.1_beta1'
    
    Upstream version 2.1~beta1
    
    # gpg: Signature faite le jeu. 17 juil. 2014 12:01:40 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

 chrome.manifest                      |  1 +
 components/greasemonkey.js           | 13 +-------
 content/addons4-overlay.js           |  8 ++++-
 install.rdf                          |  2 +-
 locale/cs/gm-browser.properties      |  2 +-
 locale/cs/greasemonkey.dtd           |  2 +-
 locale/ja/gm-browser.properties      |  2 +-
 locale/ja/greasemonkey.dtd           |  2 +-
 locale/pt-BR/gm-browser.properties   |  2 +-
 locale/pt-BR/greasemonkey.dtd        |  2 +-
 locale/pt-PT/gm-addons.dtd           | 28 ++++++++++++++++
 locale/pt-PT/gm-addons.properties    |  4 +++
 locale/pt-PT/gm-browser.properties   | 27 ++++++++++++++++
 locale/pt-PT/gm-cludes.dtd           | 12 +++++++
 locale/pt-PT/greasemonkey.dtd        | 55 ++++++++++++++++++++++++++++++++
 locale/pt-PT/greasemonkey.properties | 46 ++++++++++++++++++++++++++
 locale/tr/gm-browser.properties      |  2 +-
 locale/tr/greasemonkey.dtd           |  2 +-
 locale/zh-CN/gm-browser.properties   |  2 +-
 locale/zh-CN/greasemonkey.dtd        |  2 +-
 modules/miscapis.js                  | 40 -----------------------
 modules/remoteScript.js              | 34 ++++++++++++++++----
 modules/script.js                    |  6 ++--
 modules/util/apiLeakCheck.js         | 62 ------------------------------------
 modules/xmlhttprequester.js          | 23 ++++++++-----
 25 files changed, 237 insertions(+), 144 deletions(-)

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