[Pkg-mozext-commits] [gcontactsync] 15/19: Merge tag 'upstream/2.0.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 gcontactsync.

commit 7a3b98eaba7b61307767402c85c82c6ac8726aee
Merge: 713a660 dc0cbaf
Author: David Prévot <david at tilapin.org>
Date:   Thu Apr 2 02:24:01 2015 -0400

    Merge tag 'upstream/2.0.1'
    
    Upstream version 2.0.1
    
    # gpg: Signature faite le jeu. 02 avril 2015 02:23:53 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                      |   3 +
 content/ABOverlay.js                 |   9 +-
 content/AccountSetupWizard.js        |  30 +++-
 content/Accounts.js                  |   5 +-
 content/CardDialogOverlay.js         |   9 +-
 content/ContactConverter.js          |   9 +-
 content/FileIO.js                    |   9 +-
 content/MessengerOverlay.js          |   9 +-
 content/OAuth2.js                    |  42 ++---
 content/Overlay.js                   |  10 +-
 content/Preferences.js               |  14 +-
 content/SyncWorker.js                |   2 +
 content/gdata.js                     |  12 +-
 content/options.js                   |   9 +-
 content/options.xul                  |   2 +-
 content/synonyms.js                  |   4 +-
 install.rdf                          |   6 +-
 locale/cs/AccountSetupWizard.dtd     |  13 ++
 locale/cs/Accounts.dtd               |  46 ++++++
 locale/cs/ImportDialog.dtd           |  12 ++
 locale/cs/NewRefreshToken.dtd        |   1 +
 locale/cs/gcontactsync.properties    | 295 +++++++++++++++++++++++++++++++++++
 locale/cs/options.dtd                |  66 ++++++++
 locale/cs/overlay.dtd                |  63 ++++++++
 locale/en-US/gcontactsync.properties |   1 +
 locale/es-ES/AccountSetupWizard.dtd  |  13 ++
 locale/es-ES/Accounts.dtd            |  46 ++++++
 locale/es-ES/ImportDialog.dtd        |  12 ++
 locale/es-ES/NewRefreshToken.dtd     |   1 +
 locale/es-ES/gcontactsync.properties | 295 +++++++++++++++++++++++++++++++++++
 locale/es-ES/options.dtd             |  66 ++++++++
 locale/es-ES/overlay.dtd             |  63 ++++++++
 locale/it/AccountSetupWizard.dtd     |  13 ++
 locale/it/Accounts.dtd               |  46 ++++++
 locale/it/ImportDialog.dtd           |  12 ++
 locale/it/NewRefreshToken.dtd        |   1 +
 locale/it/gcontactsync.properties    | 295 +++++++++++++++++++++++++++++++++++
 locale/it/options.dtd                |  66 ++++++++
 locale/it/overlay.dtd                |  63 ++++++++
 39 files changed, 1592 insertions(+), 81 deletions(-)

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