[Pkg-privacy-commits] [torbirdy] 01/10: Merge tag '0.2.0' into debian/sid

[Ulrike Uhlig]

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

u-guest pushed a commit to branch debian/sid
in repository torbirdy.

commit 5b3335ae39ac61e80bc3fa09c87ca11c74645198
Merge: 66d1e5c 3751aa7
Author: Ulrike Uhlig <u at 451f.org>
Date:   Sat Jul 2 22:58:25 2016 +0200

    Merge tag '0.2.0' into debian/sid
    
    version 0.2.0
    
    Conflicts:
    	ChangeLog
    	Makefile

 ChangeLog                               | 191 ++++++++++++++++++
 Makefile                                |  34 ++++
 chrome.manifest                         |   4 +-
 chrome/content/composeoverlay.js        |  85 --------
 chrome/content/composeoverlay.xul       |   7 -
 chrome/content/emailwizard.js           | 174 +++++++++++------
 chrome/content/emailwizard.xul          |   2 +-
 chrome/content/feedwizard.js            |  43 ++++
 chrome/content/feedwizard.xul           |  10 +
 chrome/content/nntpwizard.js            |  90 +++++++++
 chrome/content/nntpwizard.xul           |  10 +
 chrome/content/overlay.js               |   7 +-
 chrome/content/preferences.js           | 110 ++---------
 chrome/content/preferences.xul          |  11 --
 chrome/locale/ar/torbirdy.dtd           |   5 -
 chrome/locale/ar/torbirdy.properties    |   3 +-
 chrome/locale/ca/torbirdy.dtd           |  27 ++-
 chrome/locale/ca/torbirdy.properties    |   3 +-
 chrome/locale/cs/torbirdy.dtd           |   5 -
 chrome/locale/cs/torbirdy.properties    |   3 +-
 chrome/locale/da/torbirdy.dtd           |   5 -
 chrome/locale/da/torbirdy.properties    |   3 +-
 chrome/locale/de/torbirdy.dtd           |  25 +--
 chrome/locale/de/torbirdy.properties    |   3 +-
 chrome/locale/el/torbirdy.dtd           |   7 +-
 chrome/locale/el/torbirdy.properties    |   3 +-
 chrome/locale/en-GB/torbirdy.dtd        |   5 -
 chrome/locale/en-GB/torbirdy.properties |   3 +-
 chrome/locale/en/torbirdy.dtd           |   5 -
 chrome/locale/en/torbirdy.properties    |   3 +-
 chrome/locale/es/torbirdy.dtd           |   5 -
 chrome/locale/es/torbirdy.properties    |   3 +-
 chrome/locale/eu/torbirdy.dtd           |   5 -
 chrome/locale/eu/torbirdy.properties    |   3 +-
 chrome/locale/fr/torbirdy.dtd           |  11 +-
 chrome/locale/fr/torbirdy.properties    |  19 +-
 chrome/locale/he/torbirdy.dtd           |   5 -
 chrome/locale/he/torbirdy.properties    |   3 +-
 chrome/locale/hu/torbirdy.dtd           |   9 +-
 chrome/locale/hu/torbirdy.properties    |   5 +-
 chrome/locale/id/torbirdy.dtd           |  27 ++-
 chrome/locale/id/torbirdy.properties    |   3 +-
 chrome/locale/it/torbirdy.dtd           |   5 -
 chrome/locale/it/torbirdy.properties    |   3 +-
 chrome/locale/ko/torbirdy.dtd           |  17 +-
 chrome/locale/ko/torbirdy.properties    |   3 +-
 chrome/locale/lv/torbirdy.dtd           |   5 -
 chrome/locale/lv/torbirdy.properties    |   3 +-
 chrome/locale/nb/torbirdy.dtd           |  31 ++-
 chrome/locale/nb/torbirdy.properties    |   7 +-
 chrome/locale/nl/torbirdy.dtd           |  11 +-
 chrome/locale/nl/torbirdy.properties    |   5 +-
 chrome/locale/pa/torbirdy.dtd           |   5 -
 chrome/locale/pa/torbirdy.properties    |   3 +-
 chrome/locale/pl/torbirdy.dtd           |   5 -
 chrome/locale/pl/torbirdy.properties    |   3 +-
 chrome/locale/pt-BR/torbirdy.dtd        |   9 +-
 chrome/locale/pt-BR/torbirdy.properties |   5 +-
 chrome/locale/pt/torbirdy.dtd           |  11 +-
 chrome/locale/pt/torbirdy.properties    |   3 +-
 chrome/locale/ro/torbirdy.dtd           |   5 -
 chrome/locale/ro/torbirdy.properties    |   3 +-
 chrome/locale/ru/torbirdy.dtd           |  17 +-
 chrome/locale/ru/torbirdy.properties    |   3 +-
 chrome/locale/sk/torbirdy.dtd           |   5 -
 chrome/locale/sk/torbirdy.properties    |   3 +-
 chrome/locale/sl/torbirdy.dtd           |   7 +-
 chrome/locale/sl/torbirdy.properties    |   3 +-
 chrome/locale/sr/torbirdy.dtd           |   6 -
 chrome/locale/sr/torbirdy.properties    |   3 +-
 chrome/locale/sv/torbirdy.dtd           |   5 -
 chrome/locale/sv/torbirdy.properties    |   3 +-
 chrome/locale/tr/torbirdy.dtd           |  58 +++---
 chrome/locale/tr/torbirdy.properties    |  23 ++-
 chrome/locale/uk/torbirdy.dtd           |   5 -
 chrome/locale/uk/torbirdy.properties    |   3 +-
 chrome/skin/contents.rdf                |   4 -
 components/torbirdy.js                  | 335 ++++++++++++++++++++++----------
 defaults/preferences/prefs.js           |   1 +
 install.rdf                             |   6 +-
 80 files changed, 903 insertions(+), 713 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbirdy.git