[Pkg-mozext-commits] [scrapbook] 02/04: Merge tag 'upstream/1.5.11'

[David Prévot]

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

taffit pushed a commit to branch master
in repository scrapbook.

commit 8d8815a3cd79a41cab78359ff975a28c85c2a0e8
Merge: ffe3302 bf1d49a
Author: David Prévot <taffit at debian.org>
Date:   Sun Sep 28 22:24:22 2014 -0400

    Merge tag 'upstream/1.5.11'
    
    Upstream version 1.5.11
    
    # gpg: Signature faite le dim. 28 sept. 2014 22:24:14 AST
    # gpg:                avec la clef RSA B82A217AFDFE09F2
    # 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

 chrome/content/scrapbook/editor.js      | 15 +++++++++++++++
 chrome/content/scrapbook/overlay.js     | 30 ++++++++----------------------
 chrome/content/scrapbook/overlay.xul    | 27 +++++++++++++++++++++++----
 chrome/content/scrapbook/prefs.xul      |  5 ++---
 chrome/locale/cs-CZ/scrapbook/note.dtd  |  2 +-
 chrome/locale/cs-CZ/scrapbook/prefs.dtd |  2 +-
 chrome/locale/de/scrapbook/note.dtd     |  2 +-
 chrome/locale/de/scrapbook/prefs.dtd    |  2 +-
 chrome/locale/en-US/scrapbook/note.dtd  |  2 +-
 chrome/locale/en-US/scrapbook/prefs.dtd |  2 +-
 chrome/locale/es-ES/scrapbook/note.dtd  |  2 +-
 chrome/locale/es-ES/scrapbook/prefs.dtd |  2 +-
 chrome/locale/fi/scrapbook/note.dtd     |  2 +-
 chrome/locale/fi/scrapbook/prefs.dtd    |  2 +-
 chrome/locale/fr/scrapbook/note.dtd     |  2 +-
 chrome/locale/fr/scrapbook/prefs.dtd    |  2 +-
 chrome/locale/gl-ES/scrapbook/note.dtd  |  2 +-
 chrome/locale/gl-ES/scrapbook/prefs.dtd |  2 +-
 chrome/locale/it/scrapbook/note.dtd     |  2 +-
 chrome/locale/it/scrapbook/prefs.dtd    |  2 +-
 chrome/locale/ja/scrapbook/note.dtd     |  2 +-
 chrome/locale/ja/scrapbook/prefs.dtd    |  2 +-
 chrome/locale/ko-KR/scrapbook/note.dtd  |  2 +-
 chrome/locale/ko-KR/scrapbook/prefs.dtd |  2 +-
 chrome/locale/pl/scrapbook/editor.dtd   |  4 ++--
 chrome/locale/pl/scrapbook/note.dtd     |  2 +-
 chrome/locale/pl/scrapbook/prefs.dtd    |  2 +-
 chrome/locale/pt-BR/scrapbook/note.dtd  |  2 +-
 chrome/locale/pt-BR/scrapbook/prefs.dtd |  2 +-
 chrome/locale/ro/scrapbook/note.dtd     |  2 +-
 chrome/locale/ro/scrapbook/prefs.dtd    |  2 +-
 chrome/locale/ru-RU/scrapbook/note.dtd  |  2 +-
 chrome/locale/ru-RU/scrapbook/prefs.dtd |  2 +-
 chrome/locale/sk-SK/scrapbook/note.dtd  |  2 +-
 chrome/locale/sk-SK/scrapbook/prefs.dtd |  2 +-
 chrome/locale/sv-SE/scrapbook/note.dtd  |  2 +-
 chrome/locale/sv-SE/scrapbook/prefs.dtd |  2 +-
 chrome/locale/tr/scrapbook/note.dtd     |  2 +-
 chrome/locale/tr/scrapbook/prefs.dtd    |  2 +-
 chrome/locale/zh-CN/scrapbook/note.dtd  |  2 +-
 chrome/locale/zh-CN/scrapbook/prefs.dtd |  2 +-
 chrome/locale/zh-TW/scrapbook/note.dtd  |  2 +-
 chrome/locale/zh-TW/scrapbook/prefs.dtd |  2 +-
 defaults/preferences/scrapbook-prefs.js |  2 +-
 install.rdf                             |  2 +-
 modules/data.jsm                        |  2 +-
 46 files changed, 91 insertions(+), 72 deletions(-)

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