[Pkg-privacy-commits] [torbrowser-launcher] 36/39: Merge remote-tracking branch 'micahflee/develop'

[Roger Shimizu]

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

rosh pushed a commit to branch rosh/experimental
in repository torbrowser-launcher.

commit 8301c4db11a0e5e12f35e9816f233d44f4187953
Merge: 52d0a1b 2f8b8dd
Author: Roger Shimizu <rosh at debian.org>
Date:   Tue Mar 27 22:20:20 2018 +0900

    Merge remote-tracking branch 'micahflee/develop'

 .github/CODEOWNERS                                 |   5 +
 BUILD.md                                           |  10 +-
 apparmor/local/torbrowser.Browser.plugin-container |   2 +-
 apparmor/local/torbrowser.Tor.tor                  |   2 +-
 build_deb.sh                                       |   4 +-
 build_rpm.sh                                       |   2 +-
 po/cs.po                                           | 280 ++++---
 po/fr.po                                           | 313 ++++----
 po/hu.po                                           | 285 ++++---
 po/nl.po                                           | 249 +++---
 po/pl.po                                           | 232 +++---
 po/ru.po                                           | 277 ++++---
 requirements.txt                                   |  18 -
 setup.py                                           |  19 +-
 share/torbrowser-launcher/modem.ogg                | Bin 163622 -> 0 bytes
 share/torbrowser-launcher/version                  |   2 +-
 stdeb.cfg                                          |   8 +-
 torbrowser-launcher                                |   2 +-
 torbrowser_launcher.pot                            | 203 +++--
 torbrowser_launcher/__init__.py                    |  50 +-
 torbrowser_launcher/common.py                      | 122 +--
 torbrowser_launcher/launcher.py                    | 880 ++++++++++-----------
 torbrowser_launcher/settings.py                    | 323 +++-----
 23 files changed, 1624 insertions(+), 1664 deletions(-)

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