[Pkg-mozext-commits] [greasemonkey] 07/12: Imported Upstream version 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 da67c42abe89dfa0473b487df7f5381b0c2c8b3f
Merge: 06ff169 92d5f76
Author: David Prévot <taffit at debian.org>
Date:   Sat Jun 7 13:58:23 2014 -0400

    Imported Upstream version 2.0~beta1

 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(-)

diff --cc chrome.manifest
index a9d0c0b,72296ab..86750c6
--- a/chrome.manifest
+++ b/chrome.manifest
@@@ -23,37 -23,3 +23,38 @@@ overlay    chrome://browser/content/scr
  overlay    chrome://browser/content/devtools/scratchpad.xul chrome://greasemonkey/content/scratchpad-overlay.xul appversion>=23.0
  
  locale     greasemonkey en-US locale/en-US/
 +locale  greasemonkey  ar  locale/ar/
 +locale  greasemonkey  ca  locale/ca/
 +locale  greasemonkey  cs  locale/cs/
 +locale  greasemonkey  da  locale/da/
 +locale  greasemonkey  de  locale/de/
 +locale  greasemonkey  el  locale/el/
++locale  greasemonkey  en-GB  locale/en-GB/
 +locale  greasemonkey  es-AR  locale/es-AR/
 +locale  greasemonkey  es-CL  locale/es-CL/
 +locale  greasemonkey  es-ES  locale/es-ES/
 +locale  greasemonkey  es-MX  locale/es-MX/
 +locale  greasemonkey  et  locale/et/
 +locale  greasemonkey  fa  locale/fa/
 +locale  greasemonkey  fi  locale/fi/
 +locale  greasemonkey  fr  locale/fr/
 +locale  greasemonkey  gl  locale/gl/
 +locale  greasemonkey  he  locale/he/
 +locale  greasemonkey  hu  locale/hu/
 +locale  greasemonkey  it  locale/it/
 +locale  greasemonkey  ja  locale/ja/
 +locale  greasemonkey  ko  locale/ko/
 +locale  greasemonkey  lt  locale/lt/
 +locale  greasemonkey  nl  locale/nl/
 +locale  greasemonkey  pl  locale/pl/
 +locale  greasemonkey  pt-BR  locale/pt-BR/
 +locale  greasemonkey  ro  locale/ro/
 +locale  greasemonkey  ru  locale/ru/
 +locale  greasemonkey  si  locale/si/
 +locale  greasemonkey  sk  locale/sk/
 +locale  greasemonkey  sr  locale/sr/
 +locale  greasemonkey  sv-SE  locale/sv-SE/
 +locale  greasemonkey  tr  locale/tr/
 +locale  greasemonkey  uk  locale/uk/
 +locale  greasemonkey  zh-CN  locale/zh-CN/
 +locale  greasemonkey  zh-TW  locale/zh-TW/

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