[Pkg-privacy-commits] [torbrowser-launcher] 25/26: Merge branch 'master' of https://github.com/NaruTrey/torbrowser-launcher into NaruTrey-master

[Ulrike Uhlig]

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

u-guest pushed a commit to annotated tag v0.2.7
in repository torbrowser-launcher.

commit 79ea7c8890a05c2637361d39d4d140cd8668ea2b
Merge: cc5c22e f2d0d2b
Author: Micah Lee <micah at micahflee.com>
Date:   Thu Jan 26 20:32:58 2017 -0800

    Merge branch 'master' of https://github.com/NaruTrey/torbrowser-launcher into NaruTrey-master
    
    Conflicts:
    	share/torbrowser-launcher/locale/en/messages.pot
    	share/torbrowser-launcher/locale/nl_NL/messages.pot

 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 +++++++++++++++
 setup.py                                           |  23 +-
 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.pot                            | 255 ++++++++++++++
 torbrowser_launcher/common.py                      |   2 +-
 torbrowser_launcher/launcher.py                    |  16 +-
 16 files changed, 1373 insertions(+), 1792 deletions(-)


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