[Pkg-mozext-commits] [gcontactsync] 26/31: Merge tag 'upstream/2.0.0_b2'

[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 4df2149a7833c62bd9881af8deeaddbdb061c597
Merge: 78505bd 66ac3fe
Author: David Prévot <david at tilapin.org>
Date:   Sun Feb 22 16:43:58 2015 -0400

    Merge tag 'upstream/2.0.0_b2'
    
    Upstream version 2.0.0~b2
    
    # gpg: Signature faite le dim. 22 févr. 2015 16:43:52 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                      |   9 +-
 content/AccountSetupWizard.js        |  71 ++++-----
 content/AccountSetupWizard.xul       |  48 +++---
 content/Accounts.js                  |  57 -------
 content/Accounts.xul                 |   2 -
 content/CardDialogOverlay.js         |   8 +-
 content/GHttpRequest.js              | 128 ++++++---------
 content/HttpRequest.js               |  49 +++++-
 content/LoginManager.js              |   4 +-
 content/NewRefreshToken.xul          |  49 ++++++
 content/OAuth2.js                    | 114 ++++++++++++++
 content/Overlay.xul                  |   2 +
 content/Preferences.js               |   3 +-
 content/Sync.js                      | 120 ++++++--------
 content/gdata.js                     |  75 ++++++---
 content/synonyms.js                  |  22 ++-
 defaults/preferences/gContactSync.js |   2 +
 install.rdf                          |  12 +-
 locale/cs/AccountSetupWizard.dtd     |  15 --
 locale/cs/Accounts.dtd               |  48 ------
 locale/cs/ImportDialog.dtd           |  12 --
 locale/cs/gcontactsync.properties    | 297 -----------------------------------
 locale/cs/options.dtd                |  66 --------
 locale/cs/overlay.dtd                |  63 --------
 locale/de/AccountSetupWizard.dtd     |  15 --
 locale/de/Accounts.dtd               |  48 ------
 locale/de/ImportDialog.dtd           |  12 --
 locale/de/gcontactsync.properties    | 297 -----------------------------------
 locale/de/options.dtd                |  66 --------
 locale/de/overlay.dtd                |  63 --------
 locale/en-US/AccountSetupWizard.dtd  |  30 ++--
 locale/en-US/Accounts.dtd            |  93 ++++++-----
 locale/en-US/ImportDialog.dtd        |  27 ++--
 locale/en-US/NewRefreshToken.dtd     |   1 +
 locale/en-US/gcontactsync.properties |  46 +++++-
 locale/en-US/options.dtd             | 133 ++++++++--------
 locale/en-US/overlay.dtd             |  75 +++++----
 locale/es-ES/AccountSetupWizard.dtd  |  15 --
 locale/es-ES/Accounts.dtd            |  48 ------
 locale/es-ES/ImportDialog.dtd        |  12 --
 locale/es-ES/gcontactsync.properties | 297 -----------------------------------
 locale/es-ES/options.dtd             |  66 --------
 locale/es-ES/overlay.dtd             |  63 --------
 locale/it/AccountSetupWizard.dtd     |  15 --
 locale/it/Accounts.dtd               |  48 ------
 locale/it/ImportDialog.dtd           |  12 --
 locale/it/gcontactsync.properties    | 297 -----------------------------------
 locale/it/options.dtd                |  66 --------
 locale/it/overlay.dtd                |  63 --------
 locale/nl/AccountSetupWizard.dtd     |  15 --
 locale/nl/Accounts.dtd               |  48 ------
 locale/nl/ImportDialog.dtd           |  12 --
 locale/nl/gcontactsync.properties    | 297 -----------------------------------
 locale/nl/options.dtd                |  66 --------
 locale/nl/overlay.dtd                |  63 --------
 locale/pt-PT/AccountSetupWizard.dtd  |  15 --
 locale/pt-PT/Accounts.dtd            |  48 ------
 locale/pt-PT/ImportDialog.dtd        |  12 --
 locale/pt-PT/gcontactsync.properties | 297 -----------------------------------
 locale/pt-PT/options.dtd             |  66 --------
 locale/pt-PT/overlay.dtd             |  63 --------
 locale/sv-SE/AccountSetupWizard.dtd  |  15 --
 locale/sv-SE/Accounts.dtd            |  48 ------
 locale/sv-SE/ImportDialog.dtd        |  12 --
 locale/sv-SE/gcontactsync.properties | 297 -----------------------------------
 locale/sv-SE/options.dtd             |  66 --------
 locale/sv-SE/overlay.dtd             |  63 --------
 locale/zh-CN/AccountSetupWizard.dtd  |  15 --
 locale/zh-CN/Accounts.dtd            |  48 ------
 locale/zh-CN/ImportDialog.dtd        |  12 --
 locale/zh-CN/gcontactsync.properties | 297 -----------------------------------
 locale/zh-CN/options.dtd             |  66 --------
 locale/zh-CN/overlay.dtd             |  63 --------
 73 files changed, 681 insertions(+), 4507 deletions(-)

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