[Pkg-mozext-commits] [greasemonkey] 08/12: Merge tag 'upstream/2.0_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 fbb439c4baca4a02a895948162294e9462d6870a
Merge: 81da73d da67c42
Author: David Prévot <taffit at debian.org>
Date:   Sat Jun 7 13:58:31 2014 -0400

    Merge tag 'upstream/2.0_beta1'
    
    Upstream version 2.0~beta1
    
    # gpg: Signature faite le sam. 07 juin 2014 13:58:25 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 +
 content/addons4-overlay.js                    |  2 +-
 content/browser.xul                           |  2 +-
 install.rdf                                   |  6 ++--
 locale/ar/gm-browser.properties               |  2 +-
 locale/ar/greasemonkey.dtd                    |  2 +-
 locale/ca/gm-browser.properties               |  4 +--
 locale/ca/greasemonkey.dtd                    |  2 +-
 locale/cs/gm-browser.properties               |  2 +-
 locale/cs/greasemonkey.dtd                    |  2 +-
 locale/da/gm-browser.properties               |  2 +-
 locale/da/greasemonkey.dtd                    |  2 +-
 locale/de/gm-browser.properties               |  2 +-
 locale/de/greasemonkey.dtd                    |  2 +-
 locale/el/gm-browser.properties               |  2 +-
 locale/el/greasemonkey.dtd                    |  2 +-
 locale/en-GB/gm-addons.dtd                    | 28 ++++++++++++++++
 locale/en-GB/gm-addons.properties             |  4 +++
 locale/{en-US => en-GB}/gm-browser.properties |  2 +-
 locale/en-GB/gm-cludes.dtd                    | 12 +++++++
 locale/{ca => en-GB}/greasemonkey.dtd         |  2 +-
 locale/en-GB/greasemonkey.properties          | 46 +++++++++++++++++++++++++++
 locale/en-US/gm-browser.properties            |  2 +-
 locale/en-US/greasemonkey.dtd                 |  2 +-
 locale/es-AR/gm-browser.properties            |  2 +-
 locale/es-AR/greasemonkey.dtd                 |  2 +-
 locale/es-CL/gm-browser.properties            |  2 +-
 locale/es-CL/greasemonkey.dtd                 |  2 +-
 locale/es-ES/gm-browser.properties            |  4 +--
 locale/es-ES/greasemonkey.dtd                 |  2 +-
 locale/es-MX/gm-browser.properties            |  2 +-
 locale/es-MX/greasemonkey.dtd                 |  2 +-
 locale/et/gm-browser.properties               |  4 +--
 locale/et/greasemonkey.dtd                    |  2 +-
 locale/fa/greasemonkey.dtd                    |  2 +-
 locale/fi/gm-browser.properties               |  2 +-
 locale/fi/greasemonkey.dtd                    |  2 +-
 locale/fr/gm-browser.properties               |  2 +-
 locale/fr/greasemonkey.dtd                    |  2 +-
 locale/gl/gm-browser.properties               |  2 +-
 locale/gl/greasemonkey.dtd                    |  2 +-
 locale/he/gm-browser.properties               |  2 +-
 locale/he/greasemonkey.dtd                    |  2 +-
 locale/hu/greasemonkey.dtd                    |  2 +-
 locale/it/gm-browser.properties               |  2 +-
 locale/it/greasemonkey.dtd                    |  2 +-
 locale/ja/gm-browser.properties               |  2 +-
 locale/ja/greasemonkey.dtd                    |  2 +-
 locale/ko/greasemonkey.dtd                    |  2 +-
 locale/lt/gm-browser.properties               |  2 +-
 locale/lt/greasemonkey.dtd                    |  2 +-
 locale/nl/gm-browser.properties               |  2 +-
 locale/nl/greasemonkey.dtd                    |  2 +-
 locale/pl/gm-browser.properties               |  2 +-
 locale/pl/greasemonkey.dtd                    |  2 +-
 locale/pt-BR/gm-browser.properties            |  2 +-
 locale/pt-BR/greasemonkey.dtd                 |  2 +-
 locale/ro/gm-browser.properties               |  2 +-
 locale/ro/greasemonkey.dtd                    |  2 +-
 locale/ru/greasemonkey.dtd                    |  2 +-
 locale/si/gm-browser.properties               |  2 +-
 locale/si/greasemonkey.dtd                    |  2 +-
 locale/sk/gm-browser.properties               |  2 +-
 locale/sk/greasemonkey.dtd                    |  2 +-
 locale/sr/gm-browser.properties               |  2 +-
 locale/sr/greasemonkey.dtd                    |  2 +-
 locale/sv-SE/gm-browser.properties            |  2 +-
 locale/sv-SE/greasemonkey.dtd                 |  2 +-
 locale/tr/gm-browser.properties               |  2 +-
 locale/tr/greasemonkey.dtd                    |  2 +-
 locale/uk/gm-browser.properties               |  2 +-
 locale/uk/greasemonkey.dtd                    |  2 +-
 locale/zh-CN/gm-browser.properties            |  2 +-
 locale/zh-CN/greasemonkey.dtd                 |  2 +-
 locale/zh-TW/gm-browser.properties            |  2 +-
 locale/zh-TW/greasemonkey.dtd                 |  2 +-
 modules/script.js                             | 20 ++++++------
 77 files changed, 176 insertions(+), 87 deletions(-)

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