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

[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 48a61299feb9c1b0f233720bcab39ffb186b4312
Merge: eaab55a be6c153
Author: David Prévot <david at tilapin.org>
Date:   Fri Apr 17 16:50:53 2015 -0400

    Merge tag 'upstream/1.5.13'
    
    Upstream version 1.5.13
    
    # gpg: Signature faite le ven. 17 avril 2015 16:50:49 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 +
 chrome/locale/uk-UA/scrapbook/calculate.dtd        |   2 +
 chrome/locale/uk-UA/scrapbook/capture.dtd          |  13 +++
 chrome/locale/uk-UA/scrapbook/capture.properties   |  13 +++
 chrome/locale/uk-UA/scrapbook/combine.dtd          |   4 +
 chrome/locale/uk-UA/scrapbook/combine.properties   |   3 +
 chrome/locale/uk-UA/scrapbook/detail.dtd           |  17 ++++
 chrome/locale/uk-UA/scrapbook/editor.dtd           |  23 +++++
 chrome/locale/uk-UA/scrapbook/fulltext.properties  |   9 ++
 chrome/locale/uk-UA/scrapbook/hlCustom.dtd         |  20 ++++
 chrome/locale/uk-UA/scrapbook/mbManage.dtd         |   6 ++
 chrome/locale/uk-UA/scrapbook/multiple.dtd         |   8 ++
 chrome/locale/uk-UA/scrapbook/note.dtd             |  19 ++++
 chrome/locale/uk-UA/scrapbook/output.dtd           |   3 +
 chrome/locale/uk-UA/scrapbook/overlay.dtd          |  13 +++
 chrome/locale/uk-UA/scrapbook/overlay.properties   |   8 ++
 chrome/locale/uk-UA/scrapbook/prefs.dtd            |  34 +++++++
 chrome/locale/uk-UA/scrapbook/property.dtd         |  13 +++
 chrome/locale/uk-UA/scrapbook/property.properties  |  14 +++
 chrome/locale/uk-UA/scrapbook/repair.dtd           |   9 ++
 chrome/locale/uk-UA/scrapbook/scrapbook.dtd        |  18 ++++
 chrome/locale/uk-UA/scrapbook/scrapbook.properties |  13 +++
 chrome/locale/uk-UA/scrapbook/sort.dtd             |   8 ++
 chrome/locale/uk-UA/scrapbook/templateHelp.html    | 109 +++++++++++++++++++++
 chrome/locale/uk-UA/scrapbook/trade.dtd            |   5 +
 chrome/locale/uk-UA/scrapbook/trade.properties     |   6 ++
 chrome/locale/uk-UA/scrapbook/tree.dtd             |  33 +++++++
 install.rdf                                        |  14 ++-
 28 files changed, 436 insertions(+), 2 deletions(-)

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