[Pkg-privacy-commits] [torbrowser-launcher] 02/02: Merge branch 'master' of https://github.com/micahflee/torbrowser-launcher

[Ulrike Uhlig]

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

u-guest pushed a commit to branch master
in repository torbrowser-launcher.

commit 216b37ba7d8b85cbf1c7d299fb356dd9695c5124
Merge: a29f2d9 0b5ea6d
Author: Ulrike Uhlig <u at 451f.org>
Date:   Fri Jan 27 19:16:27 2017 +0100

    Merge branch 'master' of https://github.com/micahflee/torbrowser-launcher

 BUILD.md                                           |   2 +-
 CHANGELOG.md                                       |   6 +
 LICENSE                                            |   2 +-
 apparmor/torbrowser.Browser.firefox                |   4 +
 apparmor/usr.bin.torbrowser-launcher               |   2 +-
 build_rpm.sh                                       |   2 +-
 locale/fr/messages.pot                             | 381 ---------------------
 locale/pl/messages.pot                             | 162 ---------
 locale/ru/messages.pot                             | 369 --------------------
 makepot.sh                                         |   3 +
 po/fr.po                                           | 273 +++++++++++++++
 po/nl.po                                           | 268 +++++++++++++++
 po/pl.po                                           | 266 ++++++++++++++
 po/ru.po                                           | 271 +++++++++++++++
 ppa_release.sh                                     |  18 +-
 setup.py                                           |  25 +-
 share/applications/torbrowser-settings.desktop     |   6 +
 share/torbrowser-launcher/locale/en/messages.pot   | 344 -------------------
 .../torbrowser-launcher/locale/nl_NL/messages.pot  | 364 --------------------
 share/torbrowser-launcher/locale/pl/messages.pot   | 162 ---------
 .../torbrowser-launcher/tor-browser-developers.asc | 332 +++++++++++-------
 share/torbrowser-launcher/version                  |   2 +-
 stdeb.cfg                                          |   2 +-
 torbrowser-launcher                                |   2 +-
 torbrowser_launcher.pot                            | 255 ++++++++++++++
 torbrowser_launcher/__init__.py                    |   3 +-
 torbrowser_launcher/common.py                      |   6 +-
 torbrowser_launcher/launcher.py                    |  18 +-
 torbrowser_launcher/settings.py                    |   2 +-
 29 files changed, 1618 insertions(+), 1934 deletions(-)

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