[Pkg-mozext-commits] [perspectives-extension] 42/44: Merge tag 'upstream/4.6.1'

[David Prévot]

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

taffit pushed a commit to branch master
in repository perspectives-extension.

commit b4fffa8e36f87f19b6f2bb5ce21e90079fee24fd
Merge: 5373410 d7b221f
Author: David Prévot <david at tilapin.org>
Date:   Fri Jun 5 22:26:53 2015 -0400

    Merge tag 'upstream/4.6.1'
    
    Upstream version 4.6.1
    
    # gpg: Signature made ven. 05 juin 2015 22:26:36 AST
    # gpg:                using RSA key 058C1CF944F6BD3C
    # gpg: Good signature from "David Prévot <david at tilapin.org>"
    # gpg:                 aka "David Prévot <davidp at altern.org>"
    # gpg:                 aka "David Prévot <davidp at no-log.org>"
    # gpg:                 aka "David Prévot <taffit at debian.org>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #      Subkey fingerprint: 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 .gitignore                                     |   2 +-
 CHANGELOG                                      |  98 +++-
 LOCALIZATION                                   |  86 ---
 Makefile                                       |   2 +-
 README.md                                      |  10 +-
 TRANSLATING.md                                 |  82 +++
 licenses/LicensesREADME.txt                    |  13 +-
 plugin/chrome.manifest                         |   1 +
 plugin/chrome/content/about_dialog.xul         |   8 +-
 plugin/chrome/content/client_policy.js         |  16 +-
 plugin/chrome/content/common.js                |   2 +-
 plugin/chrome/content/credits/translators.txt  |   3 +-
 plugin/chrome/content/help.xhtml               |   2 +-
 plugin/chrome/content/preferences_dialog.xul   |   3 +-
 plugin/chrome/content/statusbar.js             |   4 -
 plugin/chrome/content/statusbar.xul            |   9 +-
 plugin/chrome/locale/de/dialogs.dtd            |   3 +-
 plugin/chrome/locale/en-US/dialogs.dtd         |   3 +-
 plugin/chrome/locale/es-MX/dialogs.dtd         |   3 +-
 plugin/chrome/locale/fi/dialogs.dtd            |   3 +-
 plugin/chrome/locale/fr/dialogs.dtd            |   3 +-
 plugin/chrome/locale/nl/dialogs.dtd            |   3 +-
 plugin/chrome/locale/pl/dialogs.dtd            |   3 +-
 plugin/chrome/locale/ru/amodetails.properties  |  11 +
 plugin/chrome/locale/ru/dialogs.dtd            |  68 +++
 plugin/chrome/locale/ru/help.dtd               |  41 ++
 plugin/chrome/locale/ru/notaries.properties    |  79 +++
 plugin/chrome/locale/ru/report.properties      |   8 +
 plugin/chrome/locale/ru/results.properties     |   9 +
 plugin/chrome/locale/ru/whitelist.properties   |   4 +
 plugin/chrome/locale/zh-CN/dialogs.dtd         |   3 +-
 plugin/chrome/locale/zh-CN/notaries.properties |   2 +-
 plugin/defaults/preferences/prefs.js           |   1 -
 plugin/install.rdf                             |  16 +-
 test/checkloc.py                               | 332 -----------
 test/extlib/checkloc.py                        | 743 +++++++++++++++++++++++++
 test/extlib/localecodes.py                     | 182 ++++++
 test/test.html                                 | 194 +++++--
 update_howto.txt                               |   3 +-
 39 files changed, 1559 insertions(+), 499 deletions(-)

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