[Pkg-mozext-commits] [scrapbook] 03/08: Merge tag 'upstream/1.5.10'

[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 31fd1f6f04d6b39ba7e9f497962b472b66ddd5c2
Merge: b4a0fe1 ec5ba22
Author: David Prévot <taffit at debian.org>
Date:   Fri Sep 19 14:41:33 2014 -0400

    Merge tag 'upstream/1.5.10'
    
    Upstream version 1.5.10
    
    # gpg: Signature faite le ven. 19 sept. 2014 14:41:21 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

 LICENSE.txt                                        |   2 +-
 chrome.manifest                                    |  57 +--
 chrome/content/scrapbook/editor.js                 |  17 -
 chrome/content/scrapbook/overlay.js                |  21 +-
 chrome/content/scrapbook/overlay.xul               | 357 +++++++++---------
 chrome/content/scrapbook/prefs.xul                 | 406 ++++++++++-----------
 chrome/locale/cs-CZ/scrapbook/note.dtd             |   2 +-
 chrome/locale/cs-CZ/scrapbook/prefs.dtd            |   1 -
 chrome/locale/de/scrapbook/note.dtd                |   2 +-
 chrome/locale/de/scrapbook/prefs.dtd               |   1 -
 chrome/locale/en-US/scrapbook/note.dtd             |   2 +-
 chrome/locale/en-US/scrapbook/prefs.dtd            |   1 -
 chrome/locale/es-ES/scrapbook/note.dtd             |   2 +-
 chrome/locale/es-ES/scrapbook/prefs.dtd            |   1 -
 chrome/locale/fi/scrapbook/prefs.dtd               |   1 -
 chrome/locale/fr/scrapbook/note.dtd                |   2 +-
 chrome/locale/fr/scrapbook/prefs.dtd               |   1 -
 chrome/locale/gl-ES/scrapbook/note.dtd             |   2 +-
 chrome/locale/gl-ES/scrapbook/prefs.dtd            |   1 -
 chrome/locale/it/scrapbook/note.dtd                |   2 +-
 chrome/locale/it/scrapbook/prefs.dtd               |   1 -
 chrome/locale/ja/scrapbook/note.dtd                |   2 +-
 chrome/locale/ja/scrapbook/prefs.dtd               |   1 -
 chrome/locale/ko-KR/scrapbook/note.dtd             |   2 +-
 chrome/locale/ko-KR/scrapbook/prefs.dtd            |   1 -
 chrome/locale/pl/scrapbook/editor.dtd              |   4 +-
 chrome/locale/pl/scrapbook/note.dtd                |   2 +-
 chrome/locale/pl/scrapbook/prefs.dtd               |   1 -
 chrome/locale/pt-BR/scrapbook/calculate.dtd        |   2 +
 chrome/locale/pt-BR/scrapbook/capture.dtd          |  13 +
 chrome/locale/pt-BR/scrapbook/capture.properties   |  13 +
 chrome/locale/pt-BR/scrapbook/combine.dtd          |   4 +
 chrome/locale/pt-BR/scrapbook/combine.properties   |   3 +
 chrome/locale/pt-BR/scrapbook/detail.dtd           |  17 +
 chrome/locale/pt-BR/scrapbook/editor.dtd           |  23 ++
 chrome/locale/pt-BR/scrapbook/fulltext.properties  |   9 +
 chrome/locale/pt-BR/scrapbook/hlCustom.dtd         |  20 +
 chrome/locale/pt-BR/scrapbook/mbManage.dtd         |   6 +
 chrome/locale/pt-BR/scrapbook/multiple.dtd         |   8 +
 chrome/locale/pt-BR/scrapbook/note.dtd             |  19 +
 chrome/locale/pt-BR/scrapbook/output.dtd           |   3 +
 chrome/locale/pt-BR/scrapbook/overlay.dtd          |  13 +
 chrome/locale/pt-BR/scrapbook/overlay.properties   |   8 +
 chrome/locale/pt-BR/scrapbook/prefs.dtd            |  34 ++
 chrome/locale/pt-BR/scrapbook/property.dtd         |  13 +
 chrome/locale/pt-BR/scrapbook/property.properties  |  14 +
 chrome/locale/pt-BR/scrapbook/repair.dtd           |   9 +
 chrome/locale/pt-BR/scrapbook/scrapbook.dtd        |  18 +
 chrome/locale/pt-BR/scrapbook/scrapbook.properties |  13 +
 chrome/locale/pt-BR/scrapbook/sort.dtd             |   8 +
 chrome/locale/pt-BR/scrapbook/templateHelp.html    | 109 ++++++
 chrome/locale/pt-BR/scrapbook/trade.dtd            |   5 +
 chrome/locale/pt-BR/scrapbook/trade.properties     |   6 +
 chrome/locale/pt-BR/scrapbook/tree.dtd             |  33 ++
 chrome/locale/ro/scrapbook/note.dtd                |   2 +-
 chrome/locale/ro/scrapbook/prefs.dtd               |   1 -
 chrome/locale/ru-RU/scrapbook/note.dtd             |   2 +-
 chrome/locale/ru-RU/scrapbook/prefs.dtd            |   1 -
 chrome/locale/sk-SK/scrapbook/note.dtd             |   2 +-
 chrome/locale/sk-SK/scrapbook/prefs.dtd            |   1 -
 chrome/locale/sv-SE/scrapbook/note.dtd             |   2 +-
 chrome/locale/sv-SE/scrapbook/prefs.dtd            |   1 -
 chrome/locale/tr/scrapbook/prefs.dtd               |   1 -
 chrome/locale/zh-CN/scrapbook/note.dtd             |   2 +-
 chrome/locale/zh-CN/scrapbook/prefs.dtd            |   1 -
 chrome/locale/zh-TW/scrapbook/note.dtd             |   2 +-
 chrome/locale/zh-TW/scrapbook/prefs.dtd            |   1 -
 defaults/preferences/scrapbook-prefs.js            |   1 -
 install.rdf                                        |  14 +-
 69 files changed, 874 insertions(+), 478 deletions(-)

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