[Pkg-privacy-commits] [torbirdy] 17/17: Merge remote-tracking branch 'torbirdy-upstream/master'

[Ulrike Uhlig]

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

ulrike pushed a commit to branch master
in repository torbirdy.

commit 44e078d2fbb9f49b85eb6883977c7ddafd580070
Merge: ef65fb0 434bb0e
Author: Ulrike Uhlig <u at 451f.org>
Date:   Mon Sep 11 16:21:46 2017 +0200

    Merge remote-tracking branch 'torbirdy-upstream/master'

 ChangeLog                            |  6 +++
 Makefile                             |  4 +-
 chrome/content/preferences.js        | 53 ++++++++++++++++----------
 chrome/content/preferences.xul       |  1 +
 chrome/locale/ar/torbirdy.dtd        |  2 +
 chrome/locale/ar/torbirdy.properties |  2 +-
 chrome/locale/ca/torbirdy.dtd        |  2 +
 chrome/locale/cs/torbirdy.dtd        |  2 +
 chrome/locale/cs/torbirdy.properties |  2 +-
 chrome/locale/da/torbirdy.dtd        | 14 ++++---
 chrome/locale/da/torbirdy.properties |  4 +-
 chrome/locale/de/torbirdy.dtd        | 18 +++++----
 chrome/locale/el/torbirdy.dtd        |  2 +
 chrome/locale/en-GB/torbirdy.dtd     |  2 +
 chrome/locale/en/torbirdy.dtd        |  4 ++
 chrome/locale/es/torbirdy.dtd        |  6 ++-
 chrome/locale/es/torbirdy.properties |  6 +--
 chrome/locale/eu/torbirdy.dtd        |  2 +
 chrome/locale/fr/torbirdy.dtd        | 38 +++++++++---------
 chrome/locale/fr/torbirdy.properties | 22 +++++------
 chrome/locale/he/torbirdy.dtd        |  2 +
 chrome/locale/hu/torbirdy.dtd        |  2 +
 chrome/locale/id/torbirdy.dtd        |  2 +
 chrome/locale/id/torbirdy.properties |  2 +-
 chrome/locale/it/torbirdy.dtd        |  2 +
 chrome/locale/ko/torbirdy.dtd        |  2 +
 chrome/locale/ko/torbirdy.properties |  2 +-
 chrome/locale/lv/torbirdy.dtd        |  2 +
 chrome/locale/lv/torbirdy.properties |  2 +-
 chrome/locale/nb/torbirdy.dtd        |  4 +-
 chrome/locale/nb/torbirdy.properties |  4 +-
 chrome/locale/nl/torbirdy.dtd        |  2 +
 chrome/locale/nl/torbirdy.properties | 22 +++++------
 chrome/locale/pa/torbirdy.dtd        |  5 ++-
 chrome/locale/pa/torbirdy.properties |  2 +-
 chrome/locale/pl/torbirdy.dtd        |  2 +
 chrome/locale/pt-BR/torbirdy.dtd     |  4 +-
 chrome/locale/pt/torbirdy.dtd        | 12 +++---
 chrome/locale/pt/torbirdy.properties |  2 +-
 chrome/locale/ro/torbirdy.dtd        |  2 +
 chrome/locale/ro/torbirdy.properties |  2 +-
 chrome/locale/ru/torbirdy.dtd        |  2 +
 chrome/locale/sk/torbirdy.dtd        |  2 +
 chrome/locale/sl/torbirdy.dtd        |  2 +
 chrome/locale/sr/torbirdy.dtd        |  5 ++-
 chrome/locale/sv/torbirdy.dtd        |  2 +
 chrome/locale/tr/torbirdy.dtd        |  2 +
 chrome/locale/uk/torbirdy.dtd        |  2 +
 chrome/locale/uk/torbirdy.properties |  2 +-
 components/torbirdy.js               | 15 +++++++-
 dirmngr.conf                         | 74 ++++++++++++++++++++++++++++++++++++
 install.rdf                          |  4 +-
 52 files changed, 277 insertions(+), 108 deletions(-)

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